From 57ce19150f38842cdf44370b358881dbb83fb20e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 21:39:06 +0100
Subject: [PATCH 01/25] Bump golang.org/x/net from 0.5.0 to 0.7.0 (#2003)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.5.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](https://github.com/golang/net/compare/v0.5.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod                                        |   8 +-
 go.sum                                        |  15 +-
 vendor/golang.org/x/net/html/parse.go         |   2 +-
 vendor/golang.org/x/net/html/token.go         |  49 +++-
 vendor/golang.org/x/net/http2/flow.go         |   2 +-
 vendor/golang.org/x/net/http2/frame.go        |  11 +-
 vendor/golang.org/x/net/http2/hpack/hpack.go  |  87 ++++---
 vendor/golang.org/x/net/http2/server.go       |  20 +-
 vendor/golang.org/x/net/http2/transport.go    |   2 +-
 vendor/golang.org/x/net/websocket/hybi.go     |   2 +-
 vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c   |   1 +
 vendor/golang.org/x/sys/cpu/endian_big.go     |  11 +
 vendor/golang.org/x/sys/cpu/endian_little.go  |  11 +
 vendor/golang.org/x/sys/unix/gccgo_c.c        |   4 +-
 .../golang.org/x/sys/unix/syscall_darwin.go   |   1 +
 .../x/sys/unix/syscall_freebsd_386.go         |   9 +-
 .../x/sys/unix/syscall_freebsd_amd64.go       |   9 +-
 .../x/sys/unix/syscall_freebsd_arm.go         |   9 +-
 .../x/sys/unix/syscall_freebsd_arm64.go       |   9 +-
 .../x/sys/unix/syscall_freebsd_riscv64.go     |   9 +-
 vendor/golang.org/x/sys/unix/syscall_linux.go |   3 +-
 vendor/golang.org/x/sys/unix/syscall_unix.go  |   2 +-
 vendor/golang.org/x/sys/unix/timestruct.go    |   2 +-
 vendor/golang.org/x/sys/unix/xattr_bsd.go     |   9 +-
 vendor/golang.org/x/sys/unix/zerrors_linux.go |  30 ++-
 .../x/sys/unix/zerrors_linux_386.go           |   1 +
 .../x/sys/unix/zerrors_linux_amd64.go         |   1 +
 .../x/sys/unix/zerrors_linux_arm.go           |   1 +
 .../x/sys/unix/zerrors_linux_arm64.go         |   1 +
 .../x/sys/unix/zerrors_linux_loong64.go       |   1 +
 .../x/sys/unix/zerrors_linux_mips.go          |   1 +
 .../x/sys/unix/zerrors_linux_mips64.go        |   1 +
 .../x/sys/unix/zerrors_linux_mips64le.go      |   1 +
 .../x/sys/unix/zerrors_linux_mipsle.go        |   1 +
 .../x/sys/unix/zerrors_linux_ppc.go           |   1 +
 .../x/sys/unix/zerrors_linux_ppc64.go         |   1 +
 .../x/sys/unix/zerrors_linux_ppc64le.go       |   1 +
 .../x/sys/unix/zerrors_linux_riscv64.go       |   1 +
 .../x/sys/unix/zerrors_linux_s390x.go         |   1 +
 .../x/sys/unix/zerrors_linux_sparc64.go       |   1 +
 .../golang.org/x/sys/unix/zsyscall_linux.go   |  11 +
 vendor/golang.org/x/sys/unix/ztypes_linux.go  | 217 +++++++++++++++---
 .../x/sys/windows/syscall_windows.go          |  14 +-
 .../internal/language/compact/language.go     |   2 +-
 .../x/text/internal/language/language.go      |   2 +-
 vendor/golang.org/x/text/language/language.go |   2 +-
 vendor/modules.txt                            |   8 +-
 47 files changed, 447 insertions(+), 141 deletions(-)
 create mode 100644 vendor/golang.org/x/sys/cpu/endian_big.go
 create mode 100644 vendor/golang.org/x/sys/cpu/endian_little.go

diff --git a/go.mod b/go.mod
index 4bd1808d..04ebadf3 100644
--- a/go.mod
+++ b/go.mod
@@ -50,7 +50,7 @@ require (
 	go.mau.fi/whatsmeow v0.0.0-20230128195103-dcbc8dd31a22
 	golang.org/x/image v0.3.0
 	golang.org/x/oauth2 v0.4.0
-	golang.org/x/text v0.6.0
+	golang.org/x/text v0.7.0
 	gomod.garykim.dev/nc-talk v0.3.0
 	google.golang.org/protobuf v1.28.1
 	gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376
@@ -135,9 +135,9 @@ require (
 	go.uber.org/zap v1.21.0 // indirect
 	golang.org/x/crypto v0.4.0 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.5.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/term v0.4.0 // indirect
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/term v0.5.0 // indirect
 	golang.org/x/time v0.2.0 // indirect
 	golang.org/x/tools v0.1.12 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
diff --git a/go.sum b/go.sum
index f68ae47f..20ac1552 100644
--- a/go.sum
+++ b/go.sum
@@ -1969,8 +1969,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220403103023-749bd193bc2b/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -2141,13 +2141,13 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
-golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
+golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2157,8 +2157,9 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
diff --git a/vendor/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go
index 291c9190..46a89eda 100644
--- a/vendor/golang.org/x/net/html/parse.go
+++ b/vendor/golang.org/x/net/html/parse.go
@@ -184,7 +184,7 @@ func (p *parser) clearStackToContext(s scope) {
 	}
 }
 
-// parseGenericRawTextElements implements the generic raw text element parsing
+// parseGenericRawTextElement implements the generic raw text element parsing
 // algorithm defined in 12.2.6.2.
 // https://html.spec.whatwg.org/multipage/parsing.html#parsing-elements-that-contain-only-text
 // TODO: Since both RAWTEXT and RCDATA states are treated as tokenizer's part
diff --git a/vendor/golang.org/x/net/html/token.go b/vendor/golang.org/x/net/html/token.go
index ae24a6fd..50f7c6aa 100644
--- a/vendor/golang.org/x/net/html/token.go
+++ b/vendor/golang.org/x/net/html/token.go
@@ -598,6 +598,11 @@ scriptDataDoubleEscapeEnd:
 // readComment reads the next comment token starting with "<!--". The opening
 // "<!--" has already been consumed.
 func (z *Tokenizer) readComment() {
+	// When modifying this function, consider manually increasing the suffixLen
+	// constant in func TestComments, from 6 to e.g. 9 or more. That increase
+	// should only be temporary, not committed, as it exponentially affects the
+	// test running time.
+
 	z.data.start = z.raw.end
 	defer func() {
 		if z.data.end < z.data.start {
@@ -611,11 +616,7 @@ func (z *Tokenizer) readComment() {
 	for {
 		c := z.readByte()
 		if z.err != nil {
-			// Ignore up to two dashes at EOF.
-			if dashCount > 2 {
-				dashCount = 2
-			}
-			z.data.end = z.raw.end - dashCount
+			z.data.end = z.calculateAbruptCommentDataEnd()
 			return
 		}
 		switch c {
@@ -631,12 +632,15 @@ func (z *Tokenizer) readComment() {
 			if dashCount >= 2 {
 				c = z.readByte()
 				if z.err != nil {
-					z.data.end = z.raw.end
+					z.data.end = z.calculateAbruptCommentDataEnd()
 					return
-				}
-				if c == '>' {
+				} else if c == '>' {
 					z.data.end = z.raw.end - len("--!>")
 					return
+				} else if c == '-' {
+					dashCount = 1
+					beginning = false
+					continue
 				}
 			}
 		}
@@ -645,6 +649,35 @@ func (z *Tokenizer) readComment() {
 	}
 }
 
+func (z *Tokenizer) calculateAbruptCommentDataEnd() int {
+	raw := z.Raw()
+	const prefixLen = len("<!--")
+	if len(raw) >= prefixLen {
+		raw = raw[prefixLen:]
+		if hasSuffix(raw, "--!") {
+			return z.raw.end - 3
+		} else if hasSuffix(raw, "--") {
+			return z.raw.end - 2
+		} else if hasSuffix(raw, "-") {
+			return z.raw.end - 1
+		}
+	}
+	return z.raw.end
+}
+
+func hasSuffix(b []byte, suffix string) bool {
+	if len(b) < len(suffix) {
+		return false
+	}
+	b = b[len(b)-len(suffix):]
+	for i := range b {
+		if b[i] != suffix[i] {
+			return false
+		}
+	}
+	return true
+}
+
 // readUntilCloseAngle reads until the next ">".
 func (z *Tokenizer) readUntilCloseAngle() {
 	z.data.start = z.raw.end
diff --git a/vendor/golang.org/x/net/http2/flow.go b/vendor/golang.org/x/net/http2/flow.go
index 750ac52f..b7dbd186 100644
--- a/vendor/golang.org/x/net/http2/flow.go
+++ b/vendor/golang.org/x/net/http2/flow.go
@@ -18,7 +18,7 @@ type inflow struct {
 	unsent int32
 }
 
-// set sets the initial window.
+// init sets the initial window.
 func (f *inflow) init(n int32) {
 	f.avail = n
 }
diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go
index 184ac45f..c1f6b90d 100644
--- a/vendor/golang.org/x/net/http2/frame.go
+++ b/vendor/golang.org/x/net/http2/frame.go
@@ -662,6 +662,15 @@ func (f *Framer) WriteData(streamID uint32, endStream bool, data []byte) error {
 // It is the caller's responsibility not to violate the maximum frame size
 // and to not call other Write methods concurrently.
 func (f *Framer) WriteDataPadded(streamID uint32, endStream bool, data, pad []byte) error {
+	if err := f.startWriteDataPadded(streamID, endStream, data, pad); err != nil {
+		return err
+	}
+	return f.endWrite()
+}
+
+// startWriteDataPadded is WriteDataPadded, but only writes the frame to the Framer's internal buffer.
+// The caller should call endWrite to flush the frame to the underlying writer.
+func (f *Framer) startWriteDataPadded(streamID uint32, endStream bool, data, pad []byte) error {
 	if !validStreamID(streamID) && !f.AllowIllegalWrites {
 		return errStreamID
 	}
@@ -691,7 +700,7 @@ func (f *Framer) WriteDataPadded(streamID uint32, endStream bool, data, pad []by
 	}
 	f.wbuf = append(f.wbuf, data...)
 	f.wbuf = append(f.wbuf, pad...)
-	return f.endWrite()
+	return nil
 }
 
 // A SettingsFrame conveys configuration parameters that affect how
diff --git a/vendor/golang.org/x/net/http2/hpack/hpack.go b/vendor/golang.org/x/net/http2/hpack/hpack.go
index ebdfbee9..7a1d9766 100644
--- a/vendor/golang.org/x/net/http2/hpack/hpack.go
+++ b/vendor/golang.org/x/net/http2/hpack/hpack.go
@@ -211,7 +211,7 @@ func (d *Decoder) at(i uint64) (hf HeaderField, ok bool) {
 	return dt.ents[dt.len()-(int(i)-staticTable.len())], true
 }
 
-// Decode decodes an entire block.
+// DecodeFull decodes an entire block.
 //
 // TODO: remove this method and make it incremental later? This is
 // easier for debugging now.
@@ -359,6 +359,7 @@ func (d *Decoder) parseFieldLiteral(n uint8, it indexType) error {
 
 	var hf HeaderField
 	wantStr := d.emitEnabled || it.indexed()
+	var undecodedName undecodedString
 	if nameIdx > 0 {
 		ihf, ok := d.at(nameIdx)
 		if !ok {
@@ -366,15 +367,27 @@ func (d *Decoder) parseFieldLiteral(n uint8, it indexType) error {
 		}
 		hf.Name = ihf.Name
 	} else {
-		hf.Name, buf, err = d.readString(buf, wantStr)
+		undecodedName, buf, err = d.readString(buf)
 		if err != nil {
 			return err
 		}
 	}
-	hf.Value, buf, err = d.readString(buf, wantStr)
+	undecodedValue, buf, err := d.readString(buf)
 	if err != nil {
 		return err
 	}
+	if wantStr {
+		if nameIdx <= 0 {
+			hf.Name, err = d.decodeString(undecodedName)
+			if err != nil {
+				return err
+			}
+		}
+		hf.Value, err = d.decodeString(undecodedValue)
+		if err != nil {
+			return err
+		}
+	}
 	d.buf = buf
 	if it.indexed() {
 		d.dynTab.add(hf)
@@ -459,46 +472,52 @@ func readVarInt(n byte, p []byte) (i uint64, remain []byte, err error) {
 	return 0, origP, errNeedMore
 }
 
-// readString decodes an hpack string from p.
+// readString reads an hpack string from p.
 //
-// wantStr is whether s will be used. If false, decompression and
-// []byte->string garbage are skipped if s will be ignored
-// anyway. This does mean that huffman decoding errors for non-indexed
-// strings past the MAX_HEADER_LIST_SIZE are ignored, but the server
-// is returning an error anyway, and because they're not indexed, the error
-// won't affect the decoding state.
-func (d *Decoder) readString(p []byte, wantStr bool) (s string, remain []byte, err error) {
+// It returns a reference to the encoded string data to permit deferring decode costs
+// until after the caller verifies all data is present.
+func (d *Decoder) readString(p []byte) (u undecodedString, remain []byte, err error) {
 	if len(p) == 0 {
-		return "", p, errNeedMore
+		return u, p, errNeedMore
 	}
 	isHuff := p[0]&128 != 0
 	strLen, p, err := readVarInt(7, p)
 	if err != nil {
-		return "", p, err
+		return u, p, err
 	}
 	if d.maxStrLen != 0 && strLen > uint64(d.maxStrLen) {
-		return "", nil, ErrStringLength
+		// Returning an error here means Huffman decoding errors
+		// for non-indexed strings past the maximum string length
+		// are ignored, but the server is returning an error anyway
+		// and because the string is not indexed the error will not
+		// affect the decoding state.
+		return u, nil, ErrStringLength
 	}
 	if uint64(len(p)) < strLen {
-		return "", p, errNeedMore
+		return u, p, errNeedMore
 	}
-	if !isHuff {
-		if wantStr {
-			s = string(p[:strLen])
-		}
-		return s, p[strLen:], nil
-	}
-
-	if wantStr {
-		buf := bufPool.Get().(*bytes.Buffer)
-		buf.Reset() // don't trust others
-		defer bufPool.Put(buf)
-		if err := huffmanDecode(buf, d.maxStrLen, p[:strLen]); err != nil {
-			buf.Reset()
-			return "", nil, err
-		}
-		s = buf.String()
-		buf.Reset() // be nice to GC
-	}
-	return s, p[strLen:], nil
+	u.isHuff = isHuff
+	u.b = p[:strLen]
+	return u, p[strLen:], nil
+}
+
+type undecodedString struct {
+	isHuff bool
+	b      []byte
+}
+
+func (d *Decoder) decodeString(u undecodedString) (string, error) {
+	if !u.isHuff {
+		return string(u.b), nil
+	}
+	buf := bufPool.Get().(*bytes.Buffer)
+	buf.Reset() // don't trust others
+	var s string
+	err := huffmanDecode(buf, d.maxStrLen, u.b)
+	if err == nil {
+		s = buf.String()
+	}
+	buf.Reset() // be nice to GC
+	bufPool.Put(buf)
+	return s, err
 }
diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go
index b624dc0a..8cb14f3c 100644
--- a/vendor/golang.org/x/net/http2/server.go
+++ b/vendor/golang.org/x/net/http2/server.go
@@ -843,8 +843,13 @@ type frameWriteResult struct {
 // and then reports when it's done.
 // At most one goroutine can be running writeFrameAsync at a time per
 // serverConn.
-func (sc *serverConn) writeFrameAsync(wr FrameWriteRequest) {
-	err := wr.write.writeFrame(sc)
+func (sc *serverConn) writeFrameAsync(wr FrameWriteRequest, wd *writeData) {
+	var err error
+	if wd == nil {
+		err = wr.write.writeFrame(sc)
+	} else {
+		err = sc.framer.endWrite()
+	}
 	sc.wroteFrameCh <- frameWriteResult{wr: wr, err: err}
 }
 
@@ -1251,9 +1256,16 @@ func (sc *serverConn) startFrameWrite(wr FrameWriteRequest) {
 		sc.writingFrameAsync = false
 		err := wr.write.writeFrame(sc)
 		sc.wroteFrame(frameWriteResult{wr: wr, err: err})
+	} else if wd, ok := wr.write.(*writeData); ok {
+		// Encode the frame in the serve goroutine, to ensure we don't have
+		// any lingering asynchronous references to data passed to Write.
+		// See https://go.dev/issue/58446.
+		sc.framer.startWriteDataPadded(wd.streamID, wd.endStream, wd.p, nil)
+		sc.writingFrameAsync = true
+		go sc.writeFrameAsync(wr, wd)
 	} else {
 		sc.writingFrameAsync = true
-		go sc.writeFrameAsync(wr)
+		go sc.writeFrameAsync(wr, nil)
 	}
 }
 
@@ -2192,7 +2204,7 @@ func (sc *serverConn) newWriterAndRequestNoBody(st *stream, rp requestParam) (*r
 		tlsState = sc.tlsState
 	}
 
-	needsContinue := rp.header.Get("Expect") == "100-continue"
+	needsContinue := httpguts.HeaderValuesContainsToken(rp.header["Expect"], "100-continue")
 	if needsContinue {
 		rp.header.Del("Expect")
 	}
diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go
index b43ec10c..05ba23d3 100644
--- a/vendor/golang.org/x/net/http2/transport.go
+++ b/vendor/golang.org/x/net/http2/transport.go
@@ -1569,7 +1569,7 @@ func (cs *clientStream) cleanupWriteRequest(err error) {
 	close(cs.donec)
 }
 
-// awaitOpenSlotForStream waits until len(streams) < maxConcurrentStreams.
+// awaitOpenSlotForStreamLocked waits until len(streams) < maxConcurrentStreams.
 // Must hold cc.mu.
 func (cc *ClientConn) awaitOpenSlotForStreamLocked(cs *clientStream) error {
 	for {
diff --git a/vendor/golang.org/x/net/websocket/hybi.go b/vendor/golang.org/x/net/websocket/hybi.go
index 8cffdd16..48a069e1 100644
--- a/vendor/golang.org/x/net/websocket/hybi.go
+++ b/vendor/golang.org/x/net/websocket/hybi.go
@@ -369,7 +369,7 @@ func generateNonce() (nonce []byte) {
 	return
 }
 
-// removeZone removes IPv6 zone identifer from host.
+// removeZone removes IPv6 zone identifier from host.
 // E.g., "[fe80::1%en0]:8080" to "[fe80::1]:8080"
 func removeZone(host string) string {
 	if !strings.HasPrefix(host, "[") {
diff --git a/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c b/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c
index a4605e6d..6cc73109 100644
--- a/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c
+++ b/vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (386 || amd64 || amd64p32) && gccgo
 // +build 386 amd64 amd64p32
 // +build gccgo
 
diff --git a/vendor/golang.org/x/sys/cpu/endian_big.go b/vendor/golang.org/x/sys/cpu/endian_big.go
new file mode 100644
index 00000000..93ce03a3
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/endian_big.go
@@ -0,0 +1,11 @@
+// Copyright 2023 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build armbe || arm64be || m68k || mips || mips64 || mips64p32 || ppc || ppc64 || s390 || s390x || shbe || sparc || sparc64
+// +build armbe arm64be m68k mips mips64 mips64p32 ppc ppc64 s390 s390x shbe sparc sparc64
+
+package cpu
+
+// IsBigEndian records whether the GOARCH's byte order is big endian.
+const IsBigEndian = true
diff --git a/vendor/golang.org/x/sys/cpu/endian_little.go b/vendor/golang.org/x/sys/cpu/endian_little.go
new file mode 100644
index 00000000..fe545966
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/endian_little.go
@@ -0,0 +1,11 @@
+// Copyright 2023 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build 386 || amd64 || amd64p32 || alpha || arm || arm64 || loong64 || mipsle || mips64le || mips64p32le || nios2 || ppc64le || riscv || riscv64 || sh
+// +build 386 amd64 amd64p32 alpha arm arm64 loong64 mipsle mips64le mips64p32le nios2 ppc64le riscv riscv64 sh
+
+package cpu
+
+// IsBigEndian records whether the GOARCH's byte order is big endian.
+const IsBigEndian = false
diff --git a/vendor/golang.org/x/sys/unix/gccgo_c.c b/vendor/golang.org/x/sys/unix/gccgo_c.c
index c4fce0e7..f98a1c54 100644
--- a/vendor/golang.org/x/sys/unix/gccgo_c.c
+++ b/vendor/golang.org/x/sys/unix/gccgo_c.c
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build gccgo,!hurd
-// +build !aix,!hurd
+//go:build gccgo && !aix && !hurd
+// +build gccgo,!aix,!hurd
 
 #include <errno.h>
 #include <stdint.h>
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go
index 1f633821..192b071b 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go
@@ -230,6 +230,7 @@ func direntNamlen(buf []byte) (uint64, bool) {
 
 func PtraceAttach(pid int) (err error) { return ptrace(PT_ATTACH, pid, 0, 0) }
 func PtraceDetach(pid int) (err error) { return ptrace(PT_DETACH, pid, 0, 0) }
+func PtraceDenyAttach() (err error)    { return ptrace(PT_DENY_ATTACH, 0, 0, 0) }
 
 //sysnb	pipe(p *[2]int32) (err error)
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
index b11ede89..6a91d471 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
@@ -60,8 +60,13 @@ func PtraceGetFsBase(pid int, fsbase *int64) (err error) {
 	return ptrace(PT_GETFSBASE, pid, uintptr(unsafe.Pointer(fsbase)), 0)
 }
 
-func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) {
-	ioDesc := PtraceIoDesc{Op: int32(req), Offs: uintptr(unsafe.Pointer(addr)), Addr: uintptr(unsafe.Pointer(&out[0])), Len: uint32(countin)}
+func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
+	ioDesc := PtraceIoDesc{
+		Op:   int32(req),
+		Offs: offs,
+		Addr: uintptr(unsafe.Pointer(&out[0])), // TODO(#58351): this is not safe.
+		Len:  uint32(countin),
+	}
 	err = ptrace(PT_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
 	return int(ioDesc.Len), err
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
index 9ed8eec6..48110a0a 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
@@ -60,8 +60,13 @@ func PtraceGetFsBase(pid int, fsbase *int64) (err error) {
 	return ptrace(PT_GETFSBASE, pid, uintptr(unsafe.Pointer(fsbase)), 0)
 }
 
-func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) {
-	ioDesc := PtraceIoDesc{Op: int32(req), Offs: uintptr(unsafe.Pointer(addr)), Addr: uintptr(unsafe.Pointer(&out[0])), Len: uint64(countin)}
+func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
+	ioDesc := PtraceIoDesc{
+		Op:   int32(req),
+		Offs: offs,
+		Addr: uintptr(unsafe.Pointer(&out[0])), // TODO(#58351): this is not safe.
+		Len:  uint64(countin),
+	}
 	err = ptrace(PT_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
 	return int(ioDesc.Len), err
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
index f8ac9824..52f1d4b7 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
@@ -56,8 +56,13 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
-func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) {
-	ioDesc := PtraceIoDesc{Op: int32(req), Offs: uintptr(unsafe.Pointer(addr)), Addr: uintptr(unsafe.Pointer(&out[0])), Len: uint32(countin)}
+func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
+	ioDesc := PtraceIoDesc{
+		Op:   int32(req),
+		Offs: offs,
+		Addr: uintptr(unsafe.Pointer(&out[0])), // TODO(#58351): this is not safe.
+		Len:  uint32(countin),
+	}
 	err = ptrace(PT_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
 	return int(ioDesc.Len), err
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
index 8e932036..5537ee4f 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
@@ -56,8 +56,13 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
-func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) {
-	ioDesc := PtraceIoDesc{Op: int32(req), Offs: uintptr(unsafe.Pointer(addr)), Addr: uintptr(unsafe.Pointer(&out[0])), Len: uint64(countin)}
+func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
+	ioDesc := PtraceIoDesc{
+		Op:   int32(req),
+		Offs: offs,
+		Addr: uintptr(unsafe.Pointer(&out[0])), // TODO(#58351): this is not safe.
+		Len:  uint64(countin),
+	}
 	err = ptrace(PT_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
 	return int(ioDesc.Len), err
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
index cbe12227..164abd5d 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
@@ -56,8 +56,13 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
-func PtraceIO(req int, pid int, addr uintptr, out []byte, countin int) (count int, err error) {
-	ioDesc := PtraceIoDesc{Op: int32(req), Offs: uintptr(unsafe.Pointer(addr)), Addr: uintptr(unsafe.Pointer(&out[0])), Len: uint64(countin)}
+func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
+	ioDesc := PtraceIoDesc{
+		Op:   int32(req),
+		Offs: offs,
+		Addr: uintptr(unsafe.Pointer(&out[0])), // TODO(#58351): this is not safe.
+		Len:  uint64(countin),
+	}
 	err = ptrace(PT_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
 	return int(ioDesc.Len), err
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
index d839962e..5443dddd 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -1800,6 +1800,7 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sysnb	Capset(hdr *CapUserHeader, data *CapUserData) (err error)
 //sys	Chdir(path string) (err error)
 //sys	Chroot(path string) (err error)
+//sys	ClockAdjtime(clockid int32, buf *Timex) (state int, err error)
 //sys	ClockGetres(clockid int32, res *Timespec) (err error)
 //sys	ClockGettime(clockid int32, time *Timespec) (err error)
 //sys	ClockNanosleep(clockid int32, flags int, request *Timespec, remain *Timespec) (err error)
@@ -1999,7 +2000,7 @@ func appendBytes(vecs []Iovec, bs [][]byte) []Iovec {
 // offs2lohi splits offs into its low and high order bits.
 func offs2lohi(offs int64) (lo, hi uintptr) {
 	const longBits = SizeofLong * 8
-	return uintptr(offs), uintptr(uint64(offs) >> longBits)
+	return uintptr(offs), uintptr(uint64(offs) >> (longBits - 1) >> 1) // two shifts to avoid false positive in vet
 }
 
 func Readv(fd int, iovs [][]byte) (n int, err error) {
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go
index a386f889..00f0aa37 100644
--- a/vendor/golang.org/x/sys/unix/syscall_unix.go
+++ b/vendor/golang.org/x/sys/unix/syscall_unix.go
@@ -578,7 +578,7 @@ func Lutimes(path string, tv []Timeval) error {
 	return UtimesNanoAt(AT_FDCWD, path, ts, AT_SYMLINK_NOFOLLOW)
 }
 
-// emptyIovec reports whether there are no bytes in the slice of Iovec.
+// emptyIovecs reports whether there are no bytes in the slice of Iovec.
 func emptyIovecs(iov []Iovec) bool {
 	for i := range iov {
 		if iov[i].Len > 0 {
diff --git a/vendor/golang.org/x/sys/unix/timestruct.go b/vendor/golang.org/x/sys/unix/timestruct.go
index 3d893040..616b1b28 100644
--- a/vendor/golang.org/x/sys/unix/timestruct.go
+++ b/vendor/golang.org/x/sys/unix/timestruct.go
@@ -9,7 +9,7 @@ package unix
 
 import "time"
 
-// TimespecToNSec returns the time stored in ts as nanoseconds.
+// TimespecToNsec returns the time stored in ts as nanoseconds.
 func TimespecToNsec(ts Timespec) int64 { return ts.Nano() }
 
 // NsecToTimespec converts a number of nanoseconds into a Timespec.
diff --git a/vendor/golang.org/x/sys/unix/xattr_bsd.go b/vendor/golang.org/x/sys/unix/xattr_bsd.go
index 663b3779..f5f8e9f3 100644
--- a/vendor/golang.org/x/sys/unix/xattr_bsd.go
+++ b/vendor/golang.org/x/sys/unix/xattr_bsd.go
@@ -36,9 +36,14 @@ func xattrnamespace(fullattr string) (ns int, attr string, err error) {
 func initxattrdest(dest []byte, idx int) (d unsafe.Pointer) {
 	if len(dest) > idx {
 		return unsafe.Pointer(&dest[idx])
-	} else {
-		return unsafe.Pointer(_zero)
 	}
+	if dest != nil {
+		// extattr_get_file and extattr_list_file treat NULL differently from
+		// a non-NULL pointer of length zero. Preserve the property of nilness,
+		// even if we can't use dest directly.
+		return unsafe.Pointer(&_zero)
+	}
+	return nil
 }
 
 // FreeBSD and NetBSD implement their own syscalls to handle extended attributes
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go
index 785d693e..e174685a 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go
@@ -457,7 +457,6 @@ const (
 	B600                                        = 0x8
 	B75                                         = 0x2
 	B9600                                       = 0xd
-	BALLOON_KVM_MAGIC                           = 0x13661366
 	BDEVFS_MAGIC                                = 0x62646576
 	BINDERFS_SUPER_MAGIC                        = 0x6c6f6f70
 	BINFMTFS_MAGIC                              = 0x42494e4d
@@ -563,6 +562,7 @@ const (
 	BUS_USB                                     = 0x3
 	BUS_VIRTUAL                                 = 0x6
 	CAN_BCM                                     = 0x2
+	CAN_BUS_OFF_THRESHOLD                       = 0x100
 	CAN_CTRLMODE_3_SAMPLES                      = 0x4
 	CAN_CTRLMODE_BERR_REPORTING                 = 0x10
 	CAN_CTRLMODE_CC_LEN8_DLC                    = 0x100
@@ -577,9 +577,12 @@ const (
 	CAN_EFF_FLAG                                = 0x80000000
 	CAN_EFF_ID_BITS                             = 0x1d
 	CAN_EFF_MASK                                = 0x1fffffff
+	CAN_ERROR_PASSIVE_THRESHOLD                 = 0x80
+	CAN_ERROR_WARNING_THRESHOLD                 = 0x60
 	CAN_ERR_ACK                                 = 0x20
 	CAN_ERR_BUSERROR                            = 0x80
 	CAN_ERR_BUSOFF                              = 0x40
+	CAN_ERR_CNT                                 = 0x200
 	CAN_ERR_CRTL                                = 0x4
 	CAN_ERR_CRTL_ACTIVE                         = 0x40
 	CAN_ERR_CRTL_RX_OVERFLOW                    = 0x1
@@ -820,9 +823,9 @@ const (
 	DM_UUID_FLAG                                = 0x4000
 	DM_UUID_LEN                                 = 0x81
 	DM_VERSION                                  = 0xc138fd00
-	DM_VERSION_EXTRA                            = "-ioctl (2022-02-22)"
+	DM_VERSION_EXTRA                            = "-ioctl (2022-07-28)"
 	DM_VERSION_MAJOR                            = 0x4
-	DM_VERSION_MINOR                            = 0x2e
+	DM_VERSION_MINOR                            = 0x2f
 	DM_VERSION_PATCHLEVEL                       = 0x0
 	DT_BLK                                      = 0x6
 	DT_CHR                                      = 0x2
@@ -1049,6 +1052,7 @@ const (
 	ETH_P_CAIF                                  = 0xf7
 	ETH_P_CAN                                   = 0xc
 	ETH_P_CANFD                                 = 0xd
+	ETH_P_CANXL                                 = 0xe
 	ETH_P_CFM                                   = 0x8902
 	ETH_P_CONTROL                               = 0x16
 	ETH_P_CUST                                  = 0x6006
@@ -1060,6 +1064,7 @@ const (
 	ETH_P_DNA_RT                                = 0x6003
 	ETH_P_DSA                                   = 0x1b
 	ETH_P_DSA_8021Q                             = 0xdadb
+	ETH_P_DSA_A5PSW                             = 0xe001
 	ETH_P_ECONET                                = 0x18
 	ETH_P_EDSA                                  = 0xdada
 	ETH_P_ERSPAN                                = 0x88be
@@ -1194,8 +1199,10 @@ const (
 	FAN_MARK_EVICTABLE                          = 0x200
 	FAN_MARK_FILESYSTEM                         = 0x100
 	FAN_MARK_FLUSH                              = 0x80
+	FAN_MARK_IGNORE                             = 0x400
 	FAN_MARK_IGNORED_MASK                       = 0x20
 	FAN_MARK_IGNORED_SURV_MODIFY                = 0x40
+	FAN_MARK_IGNORE_SURV                        = 0x440
 	FAN_MARK_INODE                              = 0x0
 	FAN_MARK_MOUNT                              = 0x10
 	FAN_MARK_ONLYDIR                            = 0x8
@@ -1253,6 +1260,7 @@ const (
 	FSCRYPT_MODE_AES_128_CBC                    = 0x5
 	FSCRYPT_MODE_AES_128_CTS                    = 0x6
 	FSCRYPT_MODE_AES_256_CTS                    = 0x4
+	FSCRYPT_MODE_AES_256_HCTR2                  = 0xa
 	FSCRYPT_MODE_AES_256_XTS                    = 0x1
 	FSCRYPT_POLICY_FLAGS_PAD_16                 = 0x2
 	FSCRYPT_POLICY_FLAGS_PAD_32                 = 0x3
@@ -1430,6 +1438,7 @@ const (
 	IFF_NOARP                                   = 0x80
 	IFF_NOFILTER                                = 0x1000
 	IFF_NOTRAILERS                              = 0x20
+	IFF_NO_CARRIER                              = 0x40
 	IFF_NO_PI                                   = 0x1000
 	IFF_ONE_QUEUE                               = 0x2000
 	IFF_PERSIST                                 = 0x800
@@ -1805,6 +1814,7 @@ const (
 	MADV_DONTDUMP                               = 0x10
 	MADV_DONTFORK                               = 0xa
 	MADV_DONTNEED                               = 0x4
+	MADV_DONTNEED_LOCKED                        = 0x18
 	MADV_FREE                                   = 0x8
 	MADV_HUGEPAGE                               = 0xe
 	MADV_HWPOISON                               = 0x64
@@ -1846,7 +1856,7 @@ const (
 	MFD_ALLOW_SEALING                           = 0x2
 	MFD_CLOEXEC                                 = 0x1
 	MFD_HUGETLB                                 = 0x4
-	MFD_HUGE_16GB                               = -0x78000000
+	MFD_HUGE_16GB                               = 0x88000000
 	MFD_HUGE_16MB                               = 0x60000000
 	MFD_HUGE_1GB                                = 0x78000000
 	MFD_HUGE_1MB                                = 0x50000000
@@ -2212,6 +2222,11 @@ const (
 	PERF_AUX_FLAG_PARTIAL                       = 0x4
 	PERF_AUX_FLAG_PMU_FORMAT_TYPE_MASK          = 0xff00
 	PERF_AUX_FLAG_TRUNCATED                     = 0x1
+	PERF_BR_ARM64_DEBUG_DATA                    = 0x7
+	PERF_BR_ARM64_DEBUG_EXIT                    = 0x5
+	PERF_BR_ARM64_DEBUG_HALT                    = 0x4
+	PERF_BR_ARM64_DEBUG_INST                    = 0x6
+	PERF_BR_ARM64_FIQ                           = 0x3
 	PERF_FLAG_FD_CLOEXEC                        = 0x8
 	PERF_FLAG_FD_NO_GROUP                       = 0x1
 	PERF_FLAG_FD_OUTPUT                         = 0x2
@@ -2232,6 +2247,8 @@ const (
 	PERF_MEM_LOCK_NA                            = 0x1
 	PERF_MEM_LOCK_SHIFT                         = 0x18
 	PERF_MEM_LVLNUM_ANY_CACHE                   = 0xb
+	PERF_MEM_LVLNUM_CXL                         = 0x9
+	PERF_MEM_LVLNUM_IO                          = 0xa
 	PERF_MEM_LVLNUM_L1                          = 0x1
 	PERF_MEM_LVLNUM_L2                          = 0x2
 	PERF_MEM_LVLNUM_L3                          = 0x3
@@ -2265,6 +2282,7 @@ const (
 	PERF_MEM_REMOTE_REMOTE                      = 0x1
 	PERF_MEM_REMOTE_SHIFT                       = 0x25
 	PERF_MEM_SNOOPX_FWD                         = 0x1
+	PERF_MEM_SNOOPX_PEER                        = 0x2
 	PERF_MEM_SNOOPX_SHIFT                       = 0x26
 	PERF_MEM_SNOOP_HIT                          = 0x4
 	PERF_MEM_SNOOP_HITM                         = 0x10
@@ -2301,7 +2319,6 @@ const (
 	PERF_SAMPLE_BRANCH_PLM_ALL                  = 0x7
 	PERF_SAMPLE_WEIGHT_TYPE                     = 0x1004000
 	PIPEFS_MAGIC                                = 0x50495045
-	PPC_CMM_MAGIC                               = 0xc7571590
 	PPPIOCGNPMODE                               = 0xc008744c
 	PPPIOCNEWUNIT                               = 0xc004743e
 	PRIO_PGRP                                   = 0x1
@@ -2999,6 +3016,7 @@ const (
 	STATX_BLOCKS                                = 0x400
 	STATX_BTIME                                 = 0x800
 	STATX_CTIME                                 = 0x80
+	STATX_DIOALIGN                              = 0x2000
 	STATX_GID                                   = 0x10
 	STATX_INO                                   = 0x100
 	STATX_MNT_ID                                = 0x1000
@@ -3392,9 +3410,7 @@ const (
 	XDP_ZEROCOPY                                = 0x4
 	XENFS_SUPER_MAGIC                           = 0xabba1974
 	XFS_SUPER_MAGIC                             = 0x58465342
-	Z3FOLD_MAGIC                                = 0x33
 	ZONEFS_MAGIC                                = 0x5a4f4653
-	ZSMALLOC_MAGIC                              = 0x58295829
 	_HIDIOCGRAWNAME_LEN                         = 0x80
 	_HIDIOCGRAWPHYS_LEN                         = 0x40
 	_HIDIOCGRAWUNIQ_LEN                         = 0x40
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
index 36c0dfc7..a46df0f1 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -133,6 +133,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
+	MEMREAD                          = 0xc03c4d1a
 	MEMREADOOB                       = 0xc00c4d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
index 4ff94270..6cd4a3ea 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -133,6 +133,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
index 3eaa0fb7..c7ebee24 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -131,6 +131,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc00c4d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
index d7995bdc..9d5352c3 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -134,6 +134,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
index 928e24c2..f26a164f 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
@@ -132,6 +132,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
index 179bffb4..890bc3c9 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
@@ -131,6 +131,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc00c4d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
index 1fba17bd..549f26ac 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -131,6 +131,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
index b77dde31..e0365e32 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -131,6 +131,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
index 78c6c751..fdccce15 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
@@ -131,6 +131,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc00c4d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
index 1c0d31f0..b2205c83 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
@@ -131,6 +131,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc00c4d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
index 959dd9bb..81aa5ad0 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -131,6 +131,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
index 5a873cdb..76807a1f 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -131,6 +131,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
index e336d141..d4a5ab9e 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
@@ -131,6 +131,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
index 390c01d9..66e65db9 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -131,6 +131,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x80044d07
 	MEMISLOCKED                      = 0x80084d17
 	MEMLOCK                          = 0x40084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x40084d0c
 	MEMUNLOCK                        = 0x40084d06
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
index 98a6e5f1..f6192526 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
@@ -136,6 +136,7 @@ const (
 	MEMGETREGIONCOUNT                = 0x40044d07
 	MEMISLOCKED                      = 0x40084d17
 	MEMLOCK                          = 0x80084d05
+	MEMREAD                          = 0xc0404d1a
 	MEMREADOOB                       = 0xc0104d04
 	MEMSETBADBLOCK                   = 0x80084d0c
 	MEMUNLOCK                        = 0x80084d06
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux.go b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
index 293cf368..36ea3a55 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
@@ -537,6 +537,17 @@ func Chroot(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ClockAdjtime(clockid int32, buf *Timex) (state int, err error) {
+	r0, _, e1 := Syscall(SYS_CLOCK_ADJTIME, uintptr(clockid), uintptr(unsafe.Pointer(buf)), 0)
+	state = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ClockGetres(clockid int32, res *Timespec) (err error) {
 	_, _, e1 := Syscall(SYS_CLOCK_GETRES, uintptr(clockid), uintptr(unsafe.Pointer(res)), 0)
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go
index ff688116..7d9fc8f1 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go
@@ -29,6 +29,41 @@ type Itimerval struct {
 	Value    Timeval
 }
 
+const (
+	ADJ_OFFSET            = 0x1
+	ADJ_FREQUENCY         = 0x2
+	ADJ_MAXERROR          = 0x4
+	ADJ_ESTERROR          = 0x8
+	ADJ_STATUS            = 0x10
+	ADJ_TIMECONST         = 0x20
+	ADJ_TAI               = 0x80
+	ADJ_SETOFFSET         = 0x100
+	ADJ_MICRO             = 0x1000
+	ADJ_NANO              = 0x2000
+	ADJ_TICK              = 0x4000
+	ADJ_OFFSET_SINGLESHOT = 0x8001
+	ADJ_OFFSET_SS_READ    = 0xa001
+)
+
+const (
+	STA_PLL       = 0x1
+	STA_PPSFREQ   = 0x2
+	STA_PPSTIME   = 0x4
+	STA_FLL       = 0x8
+	STA_INS       = 0x10
+	STA_DEL       = 0x20
+	STA_UNSYNC    = 0x40
+	STA_FREQHOLD  = 0x80
+	STA_PPSSIGNAL = 0x100
+	STA_PPSJITTER = 0x200
+	STA_PPSWANDER = 0x400
+	STA_PPSERROR  = 0x800
+	STA_CLOCKERR  = 0x1000
+	STA_NANO      = 0x2000
+	STA_MODE      = 0x4000
+	STA_CLK       = 0x8000
+)
+
 const (
 	TIME_OK    = 0x0
 	TIME_INS   = 0x1
@@ -53,29 +88,30 @@ type StatxTimestamp struct {
 }
 
 type Statx_t struct {
-	Mask            uint32
-	Blksize         uint32
-	Attributes      uint64
-	Nlink           uint32
-	Uid             uint32
-	Gid             uint32
-	Mode            uint16
-	_               [1]uint16
-	Ino             uint64
-	Size            uint64
-	Blocks          uint64
-	Attributes_mask uint64
-	Atime           StatxTimestamp
-	Btime           StatxTimestamp
-	Ctime           StatxTimestamp
-	Mtime           StatxTimestamp
-	Rdev_major      uint32
-	Rdev_minor      uint32
-	Dev_major       uint32
-	Dev_minor       uint32
-	Mnt_id          uint64
-	_               uint64
-	_               [12]uint64
+	Mask             uint32
+	Blksize          uint32
+	Attributes       uint64
+	Nlink            uint32
+	Uid              uint32
+	Gid              uint32
+	Mode             uint16
+	_                [1]uint16
+	Ino              uint64
+	Size             uint64
+	Blocks           uint64
+	Attributes_mask  uint64
+	Atime            StatxTimestamp
+	Btime            StatxTimestamp
+	Ctime            StatxTimestamp
+	Mtime            StatxTimestamp
+	Rdev_major       uint32
+	Rdev_minor       uint32
+	Dev_major        uint32
+	Dev_minor        uint32
+	Mnt_id           uint64
+	Dio_mem_align    uint32
+	Dio_offset_align uint32
+	_                [12]uint64
 }
 
 type Fsid struct {
@@ -1099,7 +1135,8 @@ const (
 	PERF_SAMPLE_BRANCH_NO_CYCLES_SHIFT    = 0xf
 	PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT    = 0x10
 	PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT     = 0x11
-	PERF_SAMPLE_BRANCH_MAX_SHIFT          = 0x12
+	PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT    = 0x12
+	PERF_SAMPLE_BRANCH_MAX_SHIFT          = 0x13
 	PERF_SAMPLE_BRANCH_USER               = 0x1
 	PERF_SAMPLE_BRANCH_KERNEL             = 0x2
 	PERF_SAMPLE_BRANCH_HV                 = 0x4
@@ -1118,7 +1155,8 @@ const (
 	PERF_SAMPLE_BRANCH_NO_CYCLES          = 0x8000
 	PERF_SAMPLE_BRANCH_TYPE_SAVE          = 0x10000
 	PERF_SAMPLE_BRANCH_HW_INDEX           = 0x20000
-	PERF_SAMPLE_BRANCH_MAX                = 0x40000
+	PERF_SAMPLE_BRANCH_PRIV_SAVE          = 0x40000
+	PERF_SAMPLE_BRANCH_MAX                = 0x80000
 	PERF_BR_UNKNOWN                       = 0x0
 	PERF_BR_COND                          = 0x1
 	PERF_BR_UNCOND                        = 0x2
@@ -1132,7 +1170,10 @@ const (
 	PERF_BR_COND_RET                      = 0xa
 	PERF_BR_ERET                          = 0xb
 	PERF_BR_IRQ                           = 0xc
-	PERF_BR_MAX                           = 0xd
+	PERF_BR_SERROR                        = 0xd
+	PERF_BR_NO_TX                         = 0xe
+	PERF_BR_EXTEND_ABI                    = 0xf
+	PERF_BR_MAX                           = 0x10
 	PERF_SAMPLE_REGS_ABI_NONE             = 0x0
 	PERF_SAMPLE_REGS_ABI_32               = 0x1
 	PERF_SAMPLE_REGS_ABI_64               = 0x2
@@ -1151,7 +1192,8 @@ const (
 	PERF_FORMAT_TOTAL_TIME_RUNNING        = 0x2
 	PERF_FORMAT_ID                        = 0x4
 	PERF_FORMAT_GROUP                     = 0x8
-	PERF_FORMAT_MAX                       = 0x10
+	PERF_FORMAT_LOST                      = 0x10
+	PERF_FORMAT_MAX                       = 0x20
 	PERF_IOC_FLAG_GROUP                   = 0x1
 	PERF_RECORD_MMAP                      = 0x1
 	PERF_RECORD_LOST                      = 0x2
@@ -2979,7 +3021,16 @@ const (
 	DEVLINK_CMD_TRAP_POLICER_NEW                       = 0x47
 	DEVLINK_CMD_TRAP_POLICER_DEL                       = 0x48
 	DEVLINK_CMD_HEALTH_REPORTER_TEST                   = 0x49
-	DEVLINK_CMD_MAX                                    = 0x51
+	DEVLINK_CMD_RATE_GET                               = 0x4a
+	DEVLINK_CMD_RATE_SET                               = 0x4b
+	DEVLINK_CMD_RATE_NEW                               = 0x4c
+	DEVLINK_CMD_RATE_DEL                               = 0x4d
+	DEVLINK_CMD_LINECARD_GET                           = 0x4e
+	DEVLINK_CMD_LINECARD_SET                           = 0x4f
+	DEVLINK_CMD_LINECARD_NEW                           = 0x50
+	DEVLINK_CMD_LINECARD_DEL                           = 0x51
+	DEVLINK_CMD_SELFTESTS_GET                          = 0x52
+	DEVLINK_CMD_MAX                                    = 0x53
 	DEVLINK_PORT_TYPE_NOTSET                           = 0x0
 	DEVLINK_PORT_TYPE_AUTO                             = 0x1
 	DEVLINK_PORT_TYPE_ETH                              = 0x2
@@ -3208,7 +3259,13 @@ const (
 	DEVLINK_ATTR_RATE_NODE_NAME                        = 0xa8
 	DEVLINK_ATTR_RATE_PARENT_NODE_NAME                 = 0xa9
 	DEVLINK_ATTR_REGION_MAX_SNAPSHOTS                  = 0xaa
-	DEVLINK_ATTR_MAX                                   = 0xae
+	DEVLINK_ATTR_LINECARD_INDEX                        = 0xab
+	DEVLINK_ATTR_LINECARD_STATE                        = 0xac
+	DEVLINK_ATTR_LINECARD_TYPE                         = 0xad
+	DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES              = 0xae
+	DEVLINK_ATTR_NESTED_DEVLINK                        = 0xaf
+	DEVLINK_ATTR_SELFTESTS                             = 0xb0
+	DEVLINK_ATTR_MAX                                   = 0xb0
 	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_NONE              = 0x0
 	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_IFINDEX           = 0x1
 	DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT               = 0x0
@@ -3317,7 +3374,8 @@ const (
 	LWTUNNEL_ENCAP_SEG6_LOCAL = 0x7
 	LWTUNNEL_ENCAP_RPL        = 0x8
 	LWTUNNEL_ENCAP_IOAM6      = 0x9
-	LWTUNNEL_ENCAP_MAX        = 0x9
+	LWTUNNEL_ENCAP_XFRM       = 0xa
+	LWTUNNEL_ENCAP_MAX        = 0xa
 
 	MPLS_IPTUNNEL_UNSPEC = 0x0
 	MPLS_IPTUNNEL_DST    = 0x1
@@ -3512,7 +3570,9 @@ const (
 	ETHTOOL_MSG_PHC_VCLOCKS_GET               = 0x21
 	ETHTOOL_MSG_MODULE_GET                    = 0x22
 	ETHTOOL_MSG_MODULE_SET                    = 0x23
-	ETHTOOL_MSG_USER_MAX                      = 0x23
+	ETHTOOL_MSG_PSE_GET                       = 0x24
+	ETHTOOL_MSG_PSE_SET                       = 0x25
+	ETHTOOL_MSG_USER_MAX                      = 0x25
 	ETHTOOL_MSG_KERNEL_NONE                   = 0x0
 	ETHTOOL_MSG_STRSET_GET_REPLY              = 0x1
 	ETHTOOL_MSG_LINKINFO_GET_REPLY            = 0x2
@@ -3550,7 +3610,8 @@ const (
 	ETHTOOL_MSG_PHC_VCLOCKS_GET_REPLY         = 0x22
 	ETHTOOL_MSG_MODULE_GET_REPLY              = 0x23
 	ETHTOOL_MSG_MODULE_NTF                    = 0x24
-	ETHTOOL_MSG_KERNEL_MAX                    = 0x24
+	ETHTOOL_MSG_PSE_GET_REPLY                 = 0x25
+	ETHTOOL_MSG_KERNEL_MAX                    = 0x25
 	ETHTOOL_A_HEADER_UNSPEC                   = 0x0
 	ETHTOOL_A_HEADER_DEV_INDEX                = 0x1
 	ETHTOOL_A_HEADER_DEV_NAME                 = 0x2
@@ -3609,7 +3670,8 @@ const (
 	ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG      = 0x7
 	ETHTOOL_A_LINKMODES_MASTER_SLAVE_STATE    = 0x8
 	ETHTOOL_A_LINKMODES_LANES                 = 0x9
-	ETHTOOL_A_LINKMODES_MAX                   = 0x9
+	ETHTOOL_A_LINKMODES_RATE_MATCHING         = 0xa
+	ETHTOOL_A_LINKMODES_MAX                   = 0xa
 	ETHTOOL_A_LINKSTATE_UNSPEC                = 0x0
 	ETHTOOL_A_LINKSTATE_HEADER                = 0x1
 	ETHTOOL_A_LINKSTATE_LINK                  = 0x2
@@ -4201,6 +4263,9 @@ const (
 	NL80211_ACL_POLICY_DENY_UNLESS_LISTED                   = 0x1
 	NL80211_AC_VI                                           = 0x1
 	NL80211_AC_VO                                           = 0x0
+	NL80211_AP_SETTINGS_EXTERNAL_AUTH_SUPPORT               = 0x1
+	NL80211_AP_SETTINGS_SA_QUERY_OFFLOAD_SUPPORT            = 0x2
+	NL80211_AP_SME_SA_QUERY_OFFLOAD                         = 0x1
 	NL80211_ATTR_4ADDR                                      = 0x53
 	NL80211_ATTR_ACK                                        = 0x5c
 	NL80211_ATTR_ACK_SIGNAL                                 = 0x107
@@ -4209,6 +4274,7 @@ const (
 	NL80211_ATTR_AIRTIME_WEIGHT                             = 0x112
 	NL80211_ATTR_AKM_SUITES                                 = 0x4c
 	NL80211_ATTR_AP_ISOLATE                                 = 0x60
+	NL80211_ATTR_AP_SETTINGS_FLAGS                          = 0x135
 	NL80211_ATTR_AUTH_DATA                                  = 0x9c
 	NL80211_ATTR_AUTH_TYPE                                  = 0x35
 	NL80211_ATTR_BANDS                                      = 0xef
@@ -4240,6 +4306,9 @@ const (
 	NL80211_ATTR_COALESCE_RULE_DELAY                        = 0x1
 	NL80211_ATTR_COALESCE_RULE_MAX                          = 0x3
 	NL80211_ATTR_COALESCE_RULE_PKT_PATTERN                  = 0x3
+	NL80211_ATTR_COLOR_CHANGE_COLOR                         = 0x130
+	NL80211_ATTR_COLOR_CHANGE_COUNT                         = 0x12f
+	NL80211_ATTR_COLOR_CHANGE_ELEMS                         = 0x131
 	NL80211_ATTR_CONN_FAILED_REASON                         = 0x9b
 	NL80211_ATTR_CONTROL_PORT                               = 0x44
 	NL80211_ATTR_CONTROL_PORT_ETHERTYPE                     = 0x66
@@ -4266,6 +4335,7 @@ const (
 	NL80211_ATTR_DEVICE_AP_SME                              = 0x8d
 	NL80211_ATTR_DFS_CAC_TIME                               = 0x7
 	NL80211_ATTR_DFS_REGION                                 = 0x92
+	NL80211_ATTR_DISABLE_EHT                                = 0x137
 	NL80211_ATTR_DISABLE_HE                                 = 0x12d
 	NL80211_ATTR_DISABLE_HT                                 = 0x93
 	NL80211_ATTR_DISABLE_VHT                                = 0xaf
@@ -4273,6 +4343,8 @@ const (
 	NL80211_ATTR_DONT_WAIT_FOR_ACK                          = 0x8e
 	NL80211_ATTR_DTIM_PERIOD                                = 0xd
 	NL80211_ATTR_DURATION                                   = 0x57
+	NL80211_ATTR_EHT_CAPABILITY                             = 0x136
+	NL80211_ATTR_EML_CAPABILITY                             = 0x13d
 	NL80211_ATTR_EXT_CAPA                                   = 0xa9
 	NL80211_ATTR_EXT_CAPA_MASK                              = 0xaa
 	NL80211_ATTR_EXTERNAL_AUTH_ACTION                       = 0x104
@@ -4337,10 +4409,11 @@ const (
 	NL80211_ATTR_MAC_HINT                                   = 0xc8
 	NL80211_ATTR_MAC_MASK                                   = 0xd7
 	NL80211_ATTR_MAX_AP_ASSOC_STA                           = 0xca
-	NL80211_ATTR_MAX                                        = 0x137
+	NL80211_ATTR_MAX                                        = 0x140
 	NL80211_ATTR_MAX_CRIT_PROT_DURATION                     = 0xb4
 	NL80211_ATTR_MAX_CSA_COUNTERS                           = 0xce
 	NL80211_ATTR_MAX_MATCH_SETS                             = 0x85
+	NL80211_ATTR_MAX_NUM_AKM_SUITES                         = 0x13c
 	NL80211_ATTR_MAX_NUM_PMKIDS                             = 0x56
 	NL80211_ATTR_MAX_NUM_SCAN_SSIDS                         = 0x2b
 	NL80211_ATTR_MAX_NUM_SCHED_SCAN_PLANS                   = 0xde
@@ -4350,6 +4423,8 @@ const (
 	NL80211_ATTR_MAX_SCAN_PLAN_INTERVAL                     = 0xdf
 	NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS                   = 0xe0
 	NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN                      = 0x7c
+	NL80211_ATTR_MBSSID_CONFIG                              = 0x132
+	NL80211_ATTR_MBSSID_ELEMS                               = 0x133
 	NL80211_ATTR_MCAST_RATE                                 = 0x6b
 	NL80211_ATTR_MDID                                       = 0xb1
 	NL80211_ATTR_MEASUREMENT_DURATION                       = 0xeb
@@ -4359,6 +4434,11 @@ const (
 	NL80211_ATTR_MESH_PEER_AID                              = 0xed
 	NL80211_ATTR_MESH_SETUP                                 = 0x70
 	NL80211_ATTR_MGMT_SUBTYPE                               = 0x29
+	NL80211_ATTR_MLD_ADDR                                   = 0x13a
+	NL80211_ATTR_MLD_CAPA_AND_OPS                           = 0x13e
+	NL80211_ATTR_MLO_LINK_ID                                = 0x139
+	NL80211_ATTR_MLO_LINKS                                  = 0x138
+	NL80211_ATTR_MLO_SUPPORT                                = 0x13b
 	NL80211_ATTR_MNTR_FLAGS                                 = 0x17
 	NL80211_ATTR_MPATH_INFO                                 = 0x1b
 	NL80211_ATTR_MPATH_NEXT_HOP                             = 0x1a
@@ -4371,6 +4451,7 @@ const (
 	NL80211_ATTR_NETNS_FD                                   = 0xdb
 	NL80211_ATTR_NOACK_MAP                                  = 0x95
 	NL80211_ATTR_NSS                                        = 0x106
+	NL80211_ATTR_OBSS_COLOR_BITMAP                          = 0x12e
 	NL80211_ATTR_OFFCHANNEL_TX_OK                           = 0x6c
 	NL80211_ATTR_OPER_CLASS                                 = 0xd6
 	NL80211_ATTR_OPMODE_NOTIF                               = 0xc2
@@ -4397,6 +4478,7 @@ const (
 	NL80211_ATTR_PROTOCOL_FEATURES                          = 0xad
 	NL80211_ATTR_PS_STATE                                   = 0x5d
 	NL80211_ATTR_QOS_MAP                                    = 0xc7
+	NL80211_ATTR_RADAR_BACKGROUND                           = 0x134
 	NL80211_ATTR_RADAR_EVENT                                = 0xa8
 	NL80211_ATTR_REASON_CODE                                = 0x36
 	NL80211_ATTR_RECEIVE_MULTICAST                          = 0x121
@@ -4412,6 +4494,7 @@ const (
 	NL80211_ATTR_RESP_IE                                    = 0x4e
 	NL80211_ATTR_ROAM_SUPPORT                               = 0x83
 	NL80211_ATTR_RX_FRAME_TYPES                             = 0x64
+	NL80211_ATTR_RX_HW_TIMESTAMP                            = 0x140
 	NL80211_ATTR_RXMGMT_FLAGS                               = 0xbc
 	NL80211_ATTR_RX_SIGNAL_DBM                              = 0x97
 	NL80211_ATTR_S1G_CAPABILITY                             = 0x128
@@ -4484,6 +4567,7 @@ const (
 	NL80211_ATTR_TSID                                       = 0xd2
 	NL80211_ATTR_TWT_RESPONDER                              = 0x116
 	NL80211_ATTR_TX_FRAME_TYPES                             = 0x63
+	NL80211_ATTR_TX_HW_TIMESTAMP                            = 0x13f
 	NL80211_ATTR_TX_NO_CCK_RATE                             = 0x87
 	NL80211_ATTR_TXQ_LIMIT                                  = 0x10a
 	NL80211_ATTR_TXQ_MEMORY_LIMIT                           = 0x10b
@@ -4557,6 +4641,10 @@ const (
 	NL80211_BAND_ATTR_RATES                                 = 0x2
 	NL80211_BAND_ATTR_VHT_CAPA                              = 0x8
 	NL80211_BAND_ATTR_VHT_MCS_SET                           = 0x7
+	NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC                    = 0x8
+	NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MCS_SET                = 0xa
+	NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PHY                    = 0x9
+	NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PPE                    = 0xb
 	NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA                   = 0x6
 	NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC                     = 0x2
 	NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET                 = 0x4
@@ -4564,6 +4652,8 @@ const (
 	NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE                     = 0x5
 	NL80211_BAND_IFTYPE_ATTR_IFTYPES                        = 0x1
 	NL80211_BAND_IFTYPE_ATTR_MAX                            = 0xb
+	NL80211_BAND_IFTYPE_ATTR_VENDOR_ELEMS                   = 0x7
+	NL80211_BAND_LC                                         = 0x5
 	NL80211_BAND_S1GHZ                                      = 0x4
 	NL80211_BITRATE_ATTR_2GHZ_SHORTPREAMBLE                 = 0x2
 	NL80211_BITRATE_ATTR_MAX                                = 0x2
@@ -4584,7 +4674,9 @@ const (
 	NL80211_BSS_FREQUENCY_OFFSET                            = 0x14
 	NL80211_BSS_INFORMATION_ELEMENTS                        = 0x6
 	NL80211_BSS_LAST_SEEN_BOOTTIME                          = 0xf
-	NL80211_BSS_MAX                                         = 0x14
+	NL80211_BSS_MAX                                         = 0x16
+	NL80211_BSS_MLD_ADDR                                    = 0x16
+	NL80211_BSS_MLO_LINK_ID                                 = 0x15
 	NL80211_BSS_PAD                                         = 0x10
 	NL80211_BSS_PARENT_BSSID                                = 0x12
 	NL80211_BSS_PARENT_TSF                                  = 0x11
@@ -4612,6 +4704,7 @@ const (
 	NL80211_CHAN_WIDTH_20                                   = 0x1
 	NL80211_CHAN_WIDTH_20_NOHT                              = 0x0
 	NL80211_CHAN_WIDTH_2                                    = 0x9
+	NL80211_CHAN_WIDTH_320                                  = 0xd
 	NL80211_CHAN_WIDTH_40                                   = 0x2
 	NL80211_CHAN_WIDTH_4                                    = 0xa
 	NL80211_CHAN_WIDTH_5                                    = 0x6
@@ -4621,8 +4714,11 @@ const (
 	NL80211_CMD_ABORT_SCAN                                  = 0x72
 	NL80211_CMD_ACTION                                      = 0x3b
 	NL80211_CMD_ACTION_TX_STATUS                            = 0x3c
+	NL80211_CMD_ADD_LINK                                    = 0x94
+	NL80211_CMD_ADD_LINK_STA                                = 0x96
 	NL80211_CMD_ADD_NAN_FUNCTION                            = 0x75
 	NL80211_CMD_ADD_TX_TS                                   = 0x69
+	NL80211_CMD_ASSOC_COMEBACK                              = 0x93
 	NL80211_CMD_ASSOCIATE                                   = 0x26
 	NL80211_CMD_AUTHENTICATE                                = 0x25
 	NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL                    = 0x38
@@ -4630,6 +4726,10 @@ const (
 	NL80211_CMD_CHANNEL_SWITCH                              = 0x66
 	NL80211_CMD_CH_SWITCH_NOTIFY                            = 0x58
 	NL80211_CMD_CH_SWITCH_STARTED_NOTIFY                    = 0x6e
+	NL80211_CMD_COLOR_CHANGE_ABORTED                        = 0x90
+	NL80211_CMD_COLOR_CHANGE_COMPLETED                      = 0x91
+	NL80211_CMD_COLOR_CHANGE_REQUEST                        = 0x8e
+	NL80211_CMD_COLOR_CHANGE_STARTED                        = 0x8f
 	NL80211_CMD_CONNECT                                     = 0x2e
 	NL80211_CMD_CONN_FAILED                                 = 0x5b
 	NL80211_CMD_CONTROL_PORT_FRAME                          = 0x81
@@ -4678,8 +4778,9 @@ const (
 	NL80211_CMD_LEAVE_IBSS                                  = 0x2c
 	NL80211_CMD_LEAVE_MESH                                  = 0x45
 	NL80211_CMD_LEAVE_OCB                                   = 0x6d
-	NL80211_CMD_MAX                                         = 0x93
+	NL80211_CMD_MAX                                         = 0x98
 	NL80211_CMD_MICHAEL_MIC_FAILURE                         = 0x29
+	NL80211_CMD_MODIFY_LINK_STA                             = 0x97
 	NL80211_CMD_NAN_MATCH                                   = 0x78
 	NL80211_CMD_NEW_BEACON                                  = 0xf
 	NL80211_CMD_NEW_INTERFACE                               = 0x7
@@ -4692,6 +4793,7 @@ const (
 	NL80211_CMD_NEW_WIPHY                                   = 0x3
 	NL80211_CMD_NOTIFY_CQM                                  = 0x40
 	NL80211_CMD_NOTIFY_RADAR                                = 0x86
+	NL80211_CMD_OBSS_COLOR_COLLISION                        = 0x8d
 	NL80211_CMD_PEER_MEASUREMENT_COMPLETE                   = 0x85
 	NL80211_CMD_PEER_MEASUREMENT_RESULT                     = 0x84
 	NL80211_CMD_PEER_MEASUREMENT_START                      = 0x83
@@ -4707,6 +4809,8 @@ const (
 	NL80211_CMD_REGISTER_FRAME                              = 0x3a
 	NL80211_CMD_RELOAD_REGDB                                = 0x7e
 	NL80211_CMD_REMAIN_ON_CHANNEL                           = 0x37
+	NL80211_CMD_REMOVE_LINK                                 = 0x95
+	NL80211_CMD_REMOVE_LINK_STA                             = 0x98
 	NL80211_CMD_REQ_SET_REG                                 = 0x1b
 	NL80211_CMD_ROAM                                        = 0x2f
 	NL80211_CMD_SCAN_ABORTED                                = 0x23
@@ -4717,6 +4821,7 @@ const (
 	NL80211_CMD_SET_CHANNEL                                 = 0x41
 	NL80211_CMD_SET_COALESCE                                = 0x65
 	NL80211_CMD_SET_CQM                                     = 0x3f
+	NL80211_CMD_SET_FILS_AAD                                = 0x92
 	NL80211_CMD_SET_INTERFACE                               = 0x6
 	NL80211_CMD_SET_KEY                                     = 0xa
 	NL80211_CMD_SET_MAC_ACL                                 = 0x5d
@@ -4791,6 +4896,8 @@ const (
 	NL80211_EDMG_BW_CONFIG_MIN                              = 0x4
 	NL80211_EDMG_CHANNELS_MAX                               = 0x3c
 	NL80211_EDMG_CHANNELS_MIN                               = 0x1
+	NL80211_EHT_MAX_CAPABILITY_LEN                          = 0x33
+	NL80211_EHT_MIN_CAPABILITY_LEN                          = 0xd
 	NL80211_EXTERNAL_AUTH_ABORT                             = 0x1
 	NL80211_EXTERNAL_AUTH_START                             = 0x0
 	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK               = 0x32
@@ -4807,6 +4914,7 @@ const (
 	NL80211_EXT_FEATURE_BEACON_RATE_HT                      = 0x7
 	NL80211_EXT_FEATURE_BEACON_RATE_LEGACY                  = 0x6
 	NL80211_EXT_FEATURE_BEACON_RATE_VHT                     = 0x8
+	NL80211_EXT_FEATURE_BSS_COLOR                           = 0x3a
 	NL80211_EXT_FEATURE_BSS_PARENT_TSF                      = 0x4
 	NL80211_EXT_FEATURE_CAN_REPLACE_PTK0                    = 0x1f
 	NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH             = 0x2a
@@ -4818,6 +4926,7 @@ const (
 	NL80211_EXT_FEATURE_DFS_OFFLOAD                         = 0x19
 	NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER                = 0x20
 	NL80211_EXT_FEATURE_EXT_KEY_ID                          = 0x24
+	NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD                 = 0x3b
 	NL80211_EXT_FEATURE_FILS_DISCOVERY                      = 0x34
 	NL80211_EXT_FEATURE_FILS_MAX_CHANNEL_TIME               = 0x11
 	NL80211_EXT_FEATURE_FILS_SK_OFFLOAD                     = 0xe
@@ -4833,8 +4942,10 @@ const (
 	NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION  = 0x14
 	NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE          = 0x13
 	NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION        = 0x31
+	NL80211_EXT_FEATURE_POWERED_ADDR_CHANGE                 = 0x3d
 	NL80211_EXT_FEATURE_PROTECTED_TWT                       = 0x2b
 	NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE         = 0x39
+	NL80211_EXT_FEATURE_RADAR_BACKGROUND                    = 0x3c
 	NL80211_EXT_FEATURE_RRM                                 = 0x1
 	NL80211_EXT_FEATURE_SAE_OFFLOAD_AP                      = 0x33
 	NL80211_EXT_FEATURE_SAE_OFFLOAD                         = 0x26
@@ -4906,7 +5017,9 @@ const (
 	NL80211_FREQUENCY_ATTR_NO_10MHZ                         = 0x11
 	NL80211_FREQUENCY_ATTR_NO_160MHZ                        = 0xc
 	NL80211_FREQUENCY_ATTR_NO_20MHZ                         = 0x10
+	NL80211_FREQUENCY_ATTR_NO_320MHZ                        = 0x1a
 	NL80211_FREQUENCY_ATTR_NO_80MHZ                         = 0xb
+	NL80211_FREQUENCY_ATTR_NO_EHT                           = 0x1b
 	NL80211_FREQUENCY_ATTR_NO_HE                            = 0x13
 	NL80211_FREQUENCY_ATTR_NO_HT40_MINUS                    = 0x9
 	NL80211_FREQUENCY_ATTR_NO_HT40_PLUS                     = 0xa
@@ -5006,6 +5119,12 @@ const (
 	NL80211_MAX_SUPP_HT_RATES                               = 0x4d
 	NL80211_MAX_SUPP_RATES                                  = 0x20
 	NL80211_MAX_SUPP_REG_RULES                              = 0x80
+	NL80211_MBSSID_CONFIG_ATTR_EMA                          = 0x5
+	NL80211_MBSSID_CONFIG_ATTR_INDEX                        = 0x3
+	NL80211_MBSSID_CONFIG_ATTR_MAX                          = 0x5
+	NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY  = 0x2
+	NL80211_MBSSID_CONFIG_ATTR_MAX_INTERFACES               = 0x1
+	NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX                   = 0x4
 	NL80211_MESHCONF_ATTR_MAX                               = 0x1f
 	NL80211_MESHCONF_AUTO_OPEN_PLINKS                       = 0x7
 	NL80211_MESHCONF_AWAKE_WINDOW                           = 0x1b
@@ -5168,6 +5287,7 @@ const (
 	NL80211_PMSR_FTM_FAILURE_UNSPECIFIED                    = 0x0
 	NL80211_PMSR_FTM_FAILURE_WRONG_CHANNEL                  = 0x3
 	NL80211_PMSR_FTM_REQ_ATTR_ASAP                          = 0x1
+	NL80211_PMSR_FTM_REQ_ATTR_BSS_COLOR                     = 0xd
 	NL80211_PMSR_FTM_REQ_ATTR_BURST_DURATION                = 0x5
 	NL80211_PMSR_FTM_REQ_ATTR_BURST_PERIOD                  = 0x4
 	NL80211_PMSR_FTM_REQ_ATTR_FTMS_PER_BURST                = 0x6
@@ -5244,12 +5364,36 @@ const (
 	NL80211_RADAR_PRE_CAC_EXPIRED                           = 0x4
 	NL80211_RATE_INFO_10_MHZ_WIDTH                          = 0xb
 	NL80211_RATE_INFO_160_MHZ_WIDTH                         = 0xa
+	NL80211_RATE_INFO_320_MHZ_WIDTH                         = 0x12
 	NL80211_RATE_INFO_40_MHZ_WIDTH                          = 0x3
 	NL80211_RATE_INFO_5_MHZ_WIDTH                           = 0xc
 	NL80211_RATE_INFO_80_MHZ_WIDTH                          = 0x8
 	NL80211_RATE_INFO_80P80_MHZ_WIDTH                       = 0x9
 	NL80211_RATE_INFO_BITRATE32                             = 0x5
 	NL80211_RATE_INFO_BITRATE                               = 0x1
+	NL80211_RATE_INFO_EHT_GI_0_8                            = 0x0
+	NL80211_RATE_INFO_EHT_GI_1_6                            = 0x1
+	NL80211_RATE_INFO_EHT_GI_3_2                            = 0x2
+	NL80211_RATE_INFO_EHT_GI                                = 0x15
+	NL80211_RATE_INFO_EHT_MCS                               = 0x13
+	NL80211_RATE_INFO_EHT_NSS                               = 0x14
+	NL80211_RATE_INFO_EHT_RU_ALLOC_106                      = 0x3
+	NL80211_RATE_INFO_EHT_RU_ALLOC_106P26                   = 0x4
+	NL80211_RATE_INFO_EHT_RU_ALLOC_242                      = 0x5
+	NL80211_RATE_INFO_EHT_RU_ALLOC_26                       = 0x0
+	NL80211_RATE_INFO_EHT_RU_ALLOC_2x996                    = 0xb
+	NL80211_RATE_INFO_EHT_RU_ALLOC_2x996P484                = 0xc
+	NL80211_RATE_INFO_EHT_RU_ALLOC_3x996                    = 0xd
+	NL80211_RATE_INFO_EHT_RU_ALLOC_3x996P484                = 0xe
+	NL80211_RATE_INFO_EHT_RU_ALLOC_484                      = 0x6
+	NL80211_RATE_INFO_EHT_RU_ALLOC_484P242                  = 0x7
+	NL80211_RATE_INFO_EHT_RU_ALLOC_4x996                    = 0xf
+	NL80211_RATE_INFO_EHT_RU_ALLOC_52                       = 0x1
+	NL80211_RATE_INFO_EHT_RU_ALLOC_52P26                    = 0x2
+	NL80211_RATE_INFO_EHT_RU_ALLOC_996                      = 0x8
+	NL80211_RATE_INFO_EHT_RU_ALLOC_996P484                  = 0x9
+	NL80211_RATE_INFO_EHT_RU_ALLOC_996P484P242              = 0xa
+	NL80211_RATE_INFO_EHT_RU_ALLOC                          = 0x16
 	NL80211_RATE_INFO_HE_1XLTF                              = 0x0
 	NL80211_RATE_INFO_HE_2XLTF                              = 0x1
 	NL80211_RATE_INFO_HE_4XLTF                              = 0x2
@@ -5292,6 +5436,7 @@ const (
 	NL80211_RRF_GO_CONCURRENT                               = 0x1000
 	NL80211_RRF_IR_CONCURRENT                               = 0x1000
 	NL80211_RRF_NO_160MHZ                                   = 0x10000
+	NL80211_RRF_NO_320MHZ                                   = 0x40000
 	NL80211_RRF_NO_80MHZ                                    = 0x8000
 	NL80211_RRF_NO_CCK                                      = 0x2
 	NL80211_RRF_NO_HE                                       = 0x20000
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go
index a49853e9..41cb3c01 100644
--- a/vendor/golang.org/x/sys/windows/syscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/syscall_windows.go
@@ -10,7 +10,6 @@ import (
 	errorspkg "errors"
 	"fmt"
 	"runtime"
-	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -87,22 +86,13 @@ func StringToUTF16(s string) []uint16 {
 // s, with a terminating NUL added. If s contains a NUL byte at any
 // location, it returns (nil, syscall.EINVAL).
 func UTF16FromString(s string) ([]uint16, error) {
-	if strings.IndexByte(s, 0) != -1 {
-		return nil, syscall.EINVAL
-	}
-	return utf16.Encode([]rune(s + "\x00")), nil
+	return syscall.UTF16FromString(s)
 }
 
 // UTF16ToString returns the UTF-8 encoding of the UTF-16 sequence s,
 // with a terminating NUL and any bytes after the NUL removed.
 func UTF16ToString(s []uint16) string {
-	for i, v := range s {
-		if v == 0 {
-			s = s[:i]
-			break
-		}
-	}
-	return string(utf16.Decode(s))
+	return syscall.UTF16ToString(s)
 }
 
 // StringToUTF16Ptr is deprecated. Use UTF16PtrFromString instead.
diff --git a/vendor/golang.org/x/text/internal/language/compact/language.go b/vendor/golang.org/x/text/internal/language/compact/language.go
index 83816a72..8c1b6666 100644
--- a/vendor/golang.org/x/text/internal/language/compact/language.go
+++ b/vendor/golang.org/x/text/internal/language/compact/language.go
@@ -118,7 +118,7 @@ func (t Tag) Parent() Tag {
 	return Tag{language: lang, locale: lang}
 }
 
-// returns token t and the rest of the string.
+// nextToken returns token t and the rest of the string.
 func nextToken(s string) (t, tail string) {
 	p := strings.Index(s[1:], "-")
 	if p == -1 {
diff --git a/vendor/golang.org/x/text/internal/language/language.go b/vendor/golang.org/x/text/internal/language/language.go
index 6105bc7f..09d41c73 100644
--- a/vendor/golang.org/x/text/internal/language/language.go
+++ b/vendor/golang.org/x/text/internal/language/language.go
@@ -409,7 +409,7 @@ func (t Tag) SetTypeForKey(key, value string) (Tag, error) {
 	return t, nil
 }
 
-// findKeyAndType returns the start and end position for the type corresponding
+// findTypeForKey returns the start and end position for the type corresponding
 // to key or the point at which to insert the key-value pair if the type
 // wasn't found. The hasExt return value reports whether an -u extension was present.
 // Note: the extensions are typically very small and are likely to contain
diff --git a/vendor/golang.org/x/text/language/language.go b/vendor/golang.org/x/text/language/language.go
index 289b3a36..4d9c6612 100644
--- a/vendor/golang.org/x/text/language/language.go
+++ b/vendor/golang.org/x/text/language/language.go
@@ -344,7 +344,7 @@ func (t Tag) Parent() Tag {
 	return Tag(compact.Tag(t).Parent())
 }
 
-// returns token t and the rest of the string.
+// nextToken returns token t and the rest of the string.
 func nextToken(s string) (t, tail string) {
 	p := strings.Index(s[1:], "-")
 	if p == -1 {
diff --git a/vendor/modules.txt b/vendor/modules.txt
index d48fd0c5..9db87c70 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -578,7 +578,7 @@ golang.org/x/image/webp
 # golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
 ## explicit; go 1.17
 golang.org/x/mod/semver
-# golang.org/x/net v0.5.0
+# golang.org/x/net v0.7.0
 ## explicit; go 1.17
 golang.org/x/net/context
 golang.org/x/net/context/ctxhttp
@@ -597,7 +597,7 @@ golang.org/x/oauth2
 golang.org/x/oauth2/clientcredentials
 golang.org/x/oauth2/internal
 golang.org/x/oauth2/microsoft
-# golang.org/x/sys v0.4.0
+# golang.org/x/sys v0.5.0
 ## explicit; go 1.17
 golang.org/x/sys/cpu
 golang.org/x/sys/execabs
@@ -605,10 +605,10 @@ golang.org/x/sys/internal/unsafeheader
 golang.org/x/sys/plan9
 golang.org/x/sys/unix
 golang.org/x/sys/windows
-# golang.org/x/term v0.4.0
+# golang.org/x/term v0.5.0
 ## explicit; go 1.17
 golang.org/x/term
-# golang.org/x/text v0.6.0
+# golang.org/x/text v0.7.0
 ## explicit; go 1.17
 golang.org/x/text/encoding
 golang.org/x/text/encoding/charmap

From ac681687f8afe770edbae439e08d49b472517fc6 Mon Sep 17 00:00:00 2001
From: Joseph Mansy <36427684+yousefmansy1@users.noreply.github.com>
Date: Thu, 9 Mar 2023 12:46:57 -0800
Subject: [PATCH 02/25] Handle messages with link preview not being relayed
 (whatsapp) (#1970)

Resolves #1840
---
 bridge/whatsappmulti/handlers.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bridge/whatsappmulti/handlers.go b/bridge/whatsappmulti/handlers.go
index 34dce471..95fe8232 100644
--- a/bridge/whatsappmulti/handlers.go
+++ b/bridge/whatsappmulti/handlers.go
@@ -63,6 +63,10 @@ func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto.
 	// nolint:nestif
 	if msg.GetExtendedTextMessage() == nil {
 		text = msg.GetConversation()
+	} else if msg.GetExtendedTextMessage().GetContextInfo() == nil {
+		// Handle pure text message with a link preview
+		// A pure text message with a link preview acts as an extended text message but will not contain any context info
+		text = msg.GetExtendedTextMessage().GetText()
 	} else {
 		text = msg.GetExtendedTextMessage().GetText()
 		ci := msg.GetExtendedTextMessage().GetContextInfo()

From a9ccc18d735ac173c77c61770dc7d097d67b4407 Mon Sep 17 00:00:00 2001
From: Joseph Mansy <36427684+yousefmansy1@users.noreply.github.com>
Date: Thu, 9 Mar 2023 12:49:38 -0800
Subject: [PATCH 03/25] Prefer mp4 extension for video attachments (whatsapp)
 (#1971)

resolves #1967
---
 bridge/whatsappmulti/handlers.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bridge/whatsappmulti/handlers.go b/bridge/whatsappmulti/handlers.go
index 95fe8232..fd75be09 100644
--- a/bridge/whatsappmulti/handlers.go
+++ b/bridge/whatsappmulti/handlers.go
@@ -211,7 +211,16 @@ func (b *Bwhatsapp) handleVideoMessage(msg *events.Message) {
 		fileExt = append(fileExt, ".mp4")
 	}
 
-	filename := fmt.Sprintf("%v%v", msg.Info.ID, fileExt[0])
+	// Prefer .mp4 extension, otherwise fallback to first index
+	fileExtIndex := 0
+	for i, n := range fileExt {
+		if ".mp4" == n {
+			fileExtIndex = i
+			break
+		}
+	}
+
+	filename := fmt.Sprintf("%v%v", msg.Info.ID, fileExt[fileExtIndex])
 
 	b.Log.Debugf("Trying to download %s with size %#v and type %s", filename, imsg.GetFileLength(), imsg.GetMimetype())
 

From f436ae7b31f51e1322e8fd4fa5242092d5a3cd5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 21:50:26 +0100
Subject: [PATCH 04/25] Bump golang.org/x/image from 0.3.0 to 0.5.0 (#1973)

Bumps [golang.org/x/image](https://github.com/golang/image) from 0.3.0 to 0.5.0.
- [Release notes](https://github.com/golang/image/releases)
- [Commits](https://github.com/golang/image/compare/v0.3.0...v0.5.0)

---
updated-dependencies:
- dependency-name: golang.org/x/image
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod             | 2 +-
 go.sum             | 5 ++---
 vendor/modules.txt | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index 04ebadf3..d16782a7 100644
--- a/go.mod
+++ b/go.mod
@@ -48,7 +48,7 @@ require (
 	github.com/yaegashi/msgraph.go v0.1.4
 	github.com/zfjagann/golang-ring v0.0.0-20220330170733-19bcea1b6289
 	go.mau.fi/whatsmeow v0.0.0-20230128195103-dcbc8dd31a22
-	golang.org/x/image v0.3.0
+	golang.org/x/image v0.5.0
 	golang.org/x/oauth2 v0.4.0
 	golang.org/x/text v0.7.0
 	gomod.garykim.dev/nc-talk v0.3.0
diff --git a/go.sum b/go.sum
index 20ac1552..336c1869 100644
--- a/go.sum
+++ b/go.sum
@@ -1856,8 +1856,8 @@ golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+o
 golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20210622092929-e6eecd499c2c/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20220321031419-a8550c1d254a/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.3.0 h1:HTDXbdK9bjfSWkPzDJIw89W8CAtfFGduujWs33NLLsg=
-golang.org/x/image v0.3.0/go.mod h1:fXd9211C/0VTlYuAcOhW8dY/RtEJqODXOWBDpmYBf+A=
+golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
+golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -2157,7 +2157,6 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 9db87c70..3cdd98aa 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -569,7 +569,7 @@ golang.org/x/crypto/scrypt
 golang.org/x/crypto/ssh
 golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
 golang.org/x/crypto/ssh/terminal
-# golang.org/x/image v0.3.0
+# golang.org/x/image v0.5.0
 ## explicit; go 1.12
 golang.org/x/image/riff
 golang.org/x/image/vp8

From d5980303e5344b5c7c0804f712c4c5365fd6c929 Mon Sep 17 00:00:00 2001
From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
Date: Thu, 9 Mar 2023 21:51:11 +0100
Subject: [PATCH 05/25] Provide a multi-room multi-bridge example (#1972)

---
 matterbridge.toml.multi | 61 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 matterbridge.toml.multi

diff --git a/matterbridge.toml.multi b/matterbridge.toml.multi
new file mode 100644
index 00000000..35a9e347
--- /dev/null
+++ b/matterbridge.toml.multi
@@ -0,0 +1,61 @@
+#WARNING: as this file contains credentials, be sure to set correct file permissions
+
+[irc]
+    [irc.foo]
+    Server="irc.myfooserver.com:6667"
+    Nick="matterbot"
+
+# Can also connect to multiple different servers of the same protocol:
+[irc]
+    [irc.bar]
+    Server="irc.mybarserver.com:6667"
+    Nick="matterbot"
+
+[telegram]
+    [telegram.mytelegram]
+    Token="123456789:FillInYourTokenHereThatIsImportant"
+
+[mattermost]
+    [mattermost.work]
+    #do not prefix it wit http:// or https://
+    Server="yourmattermostserver.domain" 
+    Team="yourteam"
+    Login="yourlogin"
+    Password="yourpass"
+    PrefixMessagesWithNick=true
+
+# Bridge 1: Copy all messages from all rooms to all rooms.
+# This shows how you can have multiple rooms in a single bridge.
+[[gateway]]
+name="cats-are-cool"
+enable=true
+    [[gateway.inout]]
+    account="irc.foo"
+    channel="#cats-are-cool"
+    [[gateway.inout]]
+    account="irc.bar"
+    channel="#cats-are-cool"
+    [[gateway.inout]]
+    account="telegram.mytelegram"
+    channel="-1234567890123"
+    [[gateway.inout]]
+    account="mattermost.work"
+    channel="cats-are-cool"
+
+# Bridge 2: Copy some messages from some rooms to some rooms.
+# This shows how you can have multiple bridges.
+[[gateway]]
+name="dog-announcements"
+enable=true
+    [[gateway.in]]
+    account="irc.foo"
+    channel="#dog-announcements"
+    [[gateway.in]]
+    account="irc.bar"
+    channel="#dog-announcements"
+    [[gateway.out]]
+    account="telegram.mytelegram"
+    channel="-9876543219876"
+    [[gateway.out]]
+    account="mattermost.work"
+    channel="dog-announcements"

From d00dcf3f58ba8f6a0919e8bdadfe9ba89864ed8d Mon Sep 17 00:00:00 2001
From: Joseph Mansy <36427684+yousefmansy1@users.noreply.github.com>
Date: Thu, 9 Mar 2023 12:57:19 -0800
Subject: [PATCH 06/25] Handle Whatsapp threading/replies (whatsapp) (#1974)

* Handle Whatsapp threading/replies.
In this change we are updating whatsapp message IDs to include sender JID as this is necessary to reply to a message
https://github.com/tulir/whatsmeow/issues/88#issuecomment-1093195237
https://github.com/tulir/whatsmeow/discussions/148#discussioncomment-3094325

Based on commit 6afa93e537c53b371db37f35a3546ff0fb669416 from #1934
    Author: Iiro Laiho <iiro.laiho@iki.fi>

* Fix replies.
Sender JID can have a `:` inside of it, using `/` as a delimiter now.
Added messageID parser + struct.
messages sent with an attachment do not show replies
But at least common `sendMessage` will make repies from whatsapp to an attachement bridge across.

The new message ID format broke message deleting, so we change the messageID into the real id at the beginning of send.
We really do need the extra info for when we reply to a message though.

* Refactored message replies.
file/Image/audio/replies all work now.
---
 bridge/whatsappmulti/handlers.go | 24 +++++++---
 bridge/whatsappmulti/helpers.go  | 63 ++++++++++++++++++++++++++
 bridge/whatsappmulti/whatsapp.go | 76 ++++++++++++++++++++++++--------
 3 files changed, 137 insertions(+), 26 deletions(-)

diff --git a/bridge/whatsappmulti/handlers.go b/bridge/whatsappmulti/handlers.go
index fd75be09..b8e78572 100644
--- a/bridge/whatsappmulti/handlers.go
+++ b/bridge/whatsappmulti/handlers.go
@@ -1,3 +1,4 @@
+//go:build whatsappmulti
 // +build whatsappmulti
 
 package bwhatsapp
@@ -89,6 +90,12 @@ func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto.
 		}
 	}
 
+	parentID := ""
+	if msg.GetExtendedTextMessage() != nil {
+		ci := msg.GetExtendedTextMessage().GetContextInfo()
+		parentID = getParentIdFromCtx(ci)
+	}
+
 	rmsg := config.Message{
 		UserID:   senderJID.String(),
 		Username: senderName,
@@ -97,8 +104,8 @@ func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto.
 		Account:  b.Account,
 		Protocol: b.Protocol,
 		Extra:    make(map[string][]interface{}),
-		//      ParentID: TODO, // TODO handle thread replies  // map from Info.QuotedMessageID string
-		ID: messageInfo.ID,
+		ID:       getMessageIdFormat(senderJID, messageInfo.ID),
+		ParentID: parentID,
 	}
 
 	if avatarURL, exists := b.userAvatars[senderJID.String()]; exists {
@@ -130,7 +137,8 @@ func (b *Bwhatsapp) handleImageMessage(msg *events.Message) {
 		Account:  b.Account,
 		Protocol: b.Protocol,
 		Extra:    make(map[string][]interface{}),
-		ID:       msg.Info.ID,
+		ID:       getMessageIdFormat(senderJID, msg.Info.ID),
+		ParentID: getParentIdFromCtx(ci),
 	}
 
 	if avatarURL, exists := b.userAvatars[senderJID.String()]; exists {
@@ -193,7 +201,8 @@ func (b *Bwhatsapp) handleVideoMessage(msg *events.Message) {
 		Account:  b.Account,
 		Protocol: b.Protocol,
 		Extra:    make(map[string][]interface{}),
-		ID:       msg.Info.ID,
+		ID:       getMessageIdFormat(senderJID, msg.Info.ID),
+		ParentID: getParentIdFromCtx(ci),
 	}
 
 	if avatarURL, exists := b.userAvatars[senderJID.String()]; exists {
@@ -251,7 +260,6 @@ func (b *Bwhatsapp) handleAudioMessage(msg *events.Message) {
 	if senderJID == (types.JID{}) && ci.Participant != nil {
 		senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer)
 	}
-
 	rmsg := config.Message{
 		UserID:   senderJID.String(),
 		Username: senderName,
@@ -259,7 +267,8 @@ func (b *Bwhatsapp) handleAudioMessage(msg *events.Message) {
 		Account:  b.Account,
 		Protocol: b.Protocol,
 		Extra:    make(map[string][]interface{}),
-		ID:       msg.Info.ID,
+		ID:       getMessageIdFormat(senderJID, msg.Info.ID),
+		ParentID: getParentIdFromCtx(ci),
 	}
 
 	if avatarURL, exists := b.userAvatars[senderJID.String()]; exists {
@@ -316,7 +325,8 @@ func (b *Bwhatsapp) handleDocumentMessage(msg *events.Message) {
 		Account:  b.Account,
 		Protocol: b.Protocol,
 		Extra:    make(map[string][]interface{}),
-		ID:       msg.Info.ID,
+		ID:       getMessageIdFormat(senderJID, msg.Info.ID),
+		ParentID: getParentIdFromCtx(ci),
 	}
 
 	if avatarURL, exists := b.userAvatars[senderJID.String()]; exists {
diff --git a/bridge/whatsappmulti/helpers.go b/bridge/whatsappmulti/helpers.go
index 75d9f5fd..963eafa1 100644
--- a/bridge/whatsappmulti/helpers.go
+++ b/bridge/whatsappmulti/helpers.go
@@ -7,7 +7,10 @@ import (
 	"fmt"
 	"strings"
 
+	goproto "google.golang.org/protobuf/proto"
+
 	"go.mau.fi/whatsmeow"
+	"go.mau.fi/whatsmeow/binary/proto"
 	"go.mau.fi/whatsmeow/store"
 	"go.mau.fi/whatsmeow/store/sqlstore"
 	"go.mau.fi/whatsmeow/types"
@@ -122,3 +125,63 @@ func (b *Bwhatsapp) getDevice() (*store.Device, error) {
 
 	return device, nil
 }
+
+func (b *Bwhatsapp) getNewReplyContext(parentID string) (*proto.ContextInfo, error) {
+	replyInfo, err := b.parseMessageID(parentID)
+
+	if err != nil {
+		return nil, err
+	}
+
+	sender := fmt.Sprintf("%s@%s", replyInfo.Sender.User, replyInfo.Sender.Server)
+	ctx := &proto.ContextInfo{
+		StanzaId:      &replyInfo.MessageID,
+		Participant:   &sender,
+		QuotedMessage: &proto.Message{Conversation: goproto.String("")},
+	}
+
+	return ctx, nil
+}
+
+func (b *Bwhatsapp) parseMessageID(id string) (*Replyable, error) {
+	// No message ID in case action is executed on a message sent before the bridge was started
+	// and then the bridge cache doesn't have this message ID mapped
+	if id == "" {
+		return &Replyable{MessageID: id}, nil
+	}
+
+	replyInfo := strings.Split(id, "/")
+
+	if len(replyInfo) == 2 {
+		sender, err := types.ParseJID(replyInfo[0])
+
+		if err == nil {
+			return &Replyable{
+				MessageID: types.MessageID(replyInfo[1]),
+				Sender:    sender,
+			}, nil
+		}
+	}
+
+	err := fmt.Errorf("MessageID does not match format of {senderJID}:{messageID} : \"%s\"", id)
+
+	return &Replyable{MessageID: id}, err
+}
+
+func getParentIdFromCtx(ci *proto.ContextInfo) string {
+	if ci != nil && ci.StanzaId != nil {
+		senderJid, err := types.ParseJID(*ci.Participant)
+
+		if err == nil {
+			return getMessageIdFormat(senderJid, *ci.StanzaId)
+		}
+	}
+
+	return ""
+}
+
+func getMessageIdFormat(jid types.JID, messageID string) string {
+	// we're crafting our own JID str as AD JID format messes with how stuff looks on a webclient
+	jidStr := fmt.Sprintf("%s@%s", jid.User, jid.Server)
+	return fmt.Sprintf("%s/%s", jidStr, messageID)
+}
diff --git a/bridge/whatsappmulti/whatsapp.go b/bridge/whatsappmulti/whatsapp.go
index 76e4ae46..6798d827 100644
--- a/bridge/whatsappmulti/whatsapp.go
+++ b/bridge/whatsappmulti/whatsapp.go
@@ -42,6 +42,11 @@ type Bwhatsapp struct {
 	userAvatars map[string]string
 }
 
+type Replyable struct {
+	MessageID types.MessageID
+	Sender    types.JID
+}
+
 // New Create a new WhatsApp bridge. This will be called for each [whatsapp.<server>] entry you have in the config file
 func New(cfg *bridge.Config) bridge.Bridger {
 	number := cfg.GetString(cfgNumber)
@@ -222,6 +227,10 @@ func (b *Bwhatsapp) PostDocumentMessage(msg config.Message, filetype string) (st
 
 	// Post document message
 	var message proto.Message
+	var ctx *proto.ContextInfo
+	if msg.ParentID != "" {
+		ctx, _ = b.getNewReplyContext(msg.ParentID)
+	}
 
 	message.DocumentMessage = &proto.DocumentMessage{
 		Title:         &fi.Name,
@@ -233,6 +242,7 @@ func (b *Bwhatsapp) PostDocumentMessage(msg config.Message, filetype string) (st
 		FileSha256:    resp.FileSHA256,
 		FileLength:    goproto.Uint64(resp.FileLength),
 		Url:           &resp.URL,
+		ContextInfo:   ctx,
 	}
 
 	b.Log.Debugf("=> Sending %#v as a document", msg)
@@ -246,8 +256,6 @@ func (b *Bwhatsapp) PostDocumentMessage(msg config.Message, filetype string) (st
 // Post an image message from the bridge to WhatsApp
 // Handle, for sure image/jpeg, image/png and image/gif MIME types
 func (b *Bwhatsapp) PostImageMessage(msg config.Message, filetype string) (string, error) {
-	groupJID, _ := types.ParseJID(msg.Channel)
-
 	fi := msg.Extra["file"][0].(config.FileInfo)
 
 	caption := msg.Username + fi.Comment
@@ -258,6 +266,10 @@ func (b *Bwhatsapp) PostImageMessage(msg config.Message, filetype string) (strin
 	}
 
 	var message proto.Message
+	var ctx *proto.ContextInfo
+	if msg.ParentID != "" {
+		ctx, _ = b.getNewReplyContext(msg.ParentID)
+	}
 
 	message.ImageMessage = &proto.ImageMessage{
 		Mimetype:      &filetype,
@@ -267,20 +279,16 @@ func (b *Bwhatsapp) PostImageMessage(msg config.Message, filetype string) (strin
 		FileSha256:    resp.FileSHA256,
 		FileLength:    goproto.Uint64(resp.FileLength),
 		Url:           &resp.URL,
+		ContextInfo:   ctx,
 	}
 
 	b.Log.Debugf("=> Sending %#v as an image", msg)
 
-	ID := whatsmeow.GenerateMessageID()
-	_, err = b.wc.SendMessage(context.TODO(), groupJID, &message, whatsmeow.SendRequestExtra{ID: ID})
-
-	return ID, err
+	return b.sendMessage(msg, &message)
 }
 
 // Post a video message from the bridge to WhatsApp
 func (b *Bwhatsapp) PostVideoMessage(msg config.Message, filetype string) (string, error) {
-	groupJID, _ := types.ParseJID(msg.Channel)
-
 	fi := msg.Extra["file"][0].(config.FileInfo)
 
 	caption := msg.Username + fi.Comment
@@ -291,6 +299,10 @@ func (b *Bwhatsapp) PostVideoMessage(msg config.Message, filetype string) (strin
 	}
 
 	var message proto.Message
+	var ctx *proto.ContextInfo
+	if msg.ParentID != "" {
+		ctx, _ = b.getNewReplyContext(msg.ParentID)
+	}
 
 	message.VideoMessage = &proto.VideoMessage{
 		Mimetype:      &filetype,
@@ -300,14 +312,12 @@ func (b *Bwhatsapp) PostVideoMessage(msg config.Message, filetype string) (strin
 		FileSha256:    resp.FileSHA256,
 		FileLength:    goproto.Uint64(resp.FileLength),
 		Url:           &resp.URL,
+		ContextInfo:   ctx,
 	}
 
 	b.Log.Debugf("=> Sending %#v as a video", msg)
 
-	ID := whatsmeow.GenerateMessageID()
-	_, err = b.wc.SendMessage(context.TODO(), groupJID, &message, whatsmeow.SendRequestExtra{ID: ID})
-
-	return ID, err
+	return b.sendMessage(msg, &message)
 }
 
 // Post audio inline
@@ -322,6 +332,10 @@ func (b *Bwhatsapp) PostAudioMessage(msg config.Message, filetype string) (strin
 	}
 
 	var message proto.Message
+	var ctx *proto.ContextInfo
+	if msg.ParentID != "" {
+		ctx, _ = b.getNewReplyContext(msg.ParentID)
+	}
 
 	message.AudioMessage = &proto.AudioMessage{
 		Mimetype:      &filetype,
@@ -330,12 +344,12 @@ func (b *Bwhatsapp) PostAudioMessage(msg config.Message, filetype string) (strin
 		FileSha256:    resp.FileSHA256,
 		FileLength:    goproto.Uint64(resp.FileLength),
 		Url:           &resp.URL,
+		ContextInfo:   ctx,
 	}
 
 	b.Log.Debugf("=> Sending %#v as audio", msg)
 
-	ID := whatsmeow.GenerateMessageID()
-	_, err = b.wc.SendMessage(context.TODO(), groupJID, &message, whatsmeow.SendRequestExtra{ID: ID})
+	ID, err := b.sendMessage(msg, &message)
 
 	var captionMessage proto.Message
 	caption := msg.Username + fi.Comment + "\u2B06" // the char on the end is upwards arrow emoji
@@ -351,6 +365,9 @@ func (b *Bwhatsapp) PostAudioMessage(msg config.Message, filetype string) (strin
 func (b *Bwhatsapp) Send(msg config.Message) (string, error) {
 	groupJID, _ := types.ParseJID(msg.Channel)
 
+	extendedMsgID, _ := b.parseMessageID(msg.ID)
+	msg.ID = extendedMsgID.MessageID
+
 	b.Log.Debugf("=> Receiving %#v", msg)
 
 	// Delete message
@@ -400,14 +417,35 @@ func (b *Bwhatsapp) Send(msg config.Message) (string, error) {
 		}
 	}
 
+	var message proto.Message
 	text := msg.Username + msg.Text
 
-	var message proto.Message
+	// If we have a parent ID send an extended message
+	if msg.ParentID != "" {
+		replyContext, err := b.getNewReplyContext(msg.ParentID)
+
+		if err == nil {
+			message = proto.Message{
+				ExtendedTextMessage: &proto.ExtendedTextMessage{
+					Text:        &text,
+					ContextInfo: replyContext,
+				},
+			}
+
+			return b.sendMessage(msg, &message)
+		}
+	}
 
 	message.Conversation = &text
 
-	ID := whatsmeow.GenerateMessageID()
-	_, err := b.wc.SendMessage(context.TODO(), groupJID, &message, whatsmeow.SendRequestExtra{ID: ID})
-
-	return ID, err
+	return b.sendMessage(msg, &message)
+}
+
+func (b *Bwhatsapp) sendMessage(rmsg config.Message, message *proto.Message) (string, error) {
+	groupJID, _ := types.ParseJID(rmsg.Channel)
+	ID := whatsmeow.GenerateMessageID()
+
+	_, err := b.wc.SendMessage(context.Background(), groupJID, message, whatsmeow.SendRequestExtra{ID: ID})
+
+	return getMessageIdFormat(*b.wc.Store.ID, ID), err
 }

From 768fb791c52a24b81f5acb10e0bb90e697ebc552 Mon Sep 17 00:00:00 2001
From: Joseph Mansy <36427684+yousefmansy1@users.noreply.github.com>
Date: Thu, 9 Mar 2023 13:02:31 -0800
Subject: [PATCH 07/25] Use AuthorSignature as a fallback username (telegram)
 (#1979)

This comes in handy for annoucement type channels where neither the SenderChat or From structs contain name information.

Also Tweak username logic as when using a full name the username field can be " " instead of "".
---
 bridge/telegram/handlers.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go
index b9cc7e6f..5ffb1eca 100644
--- a/bridge/telegram/handlers.go
+++ b/bridge/telegram/handlers.go
@@ -128,7 +128,9 @@ func (b *Btelegram) handleUsername(rmsg *config.Message, message *tgbotapi.Messa
 			rmsg.Username = message.From.FirstName
 		}
 		if b.GetBool("UseFullName") {
-			rmsg.Username = message.From.FirstName + " " + message.From.LastName
+			if message.From.FirstName != "" && message.From.LastName != "" {
+				rmsg.Username = message.From.FirstName + " " + message.From.LastName
+			}
 		}
 		if rmsg.Username == "" {
 			rmsg.Username = message.From.UserName
@@ -148,7 +150,9 @@ func (b *Btelegram) handleUsername(rmsg *config.Message, message *tgbotapi.Messa
 			rmsg.Username = message.SenderChat.FirstName
 		}
 		if b.GetBool("UseFullName") {
-			rmsg.Username = message.SenderChat.FirstName + " " + message.SenderChat.LastName
+			if message.SenderChat.FirstName != "" && message.SenderChat.LastName != "" {
+				rmsg.Username = message.SenderChat.FirstName + " " + message.SenderChat.LastName
+			}
 		}
 
 		if rmsg.Username == "" || rmsg.Username == "Channel_Bot" {
@@ -164,6 +168,11 @@ func (b *Btelegram) handleUsername(rmsg *config.Message, message *tgbotapi.Messa
 		}
 	}
 
+	// Fallback on author signature (used in "channel" type of chat)
+	if rmsg.Username == "" && message.AuthorSignature != "" {
+		rmsg.Username = message.AuthorSignature
+	}
+
 	// if we really didn't find a username, set it to unknown
 	if rmsg.Username == "" {
 		rmsg.Username = unknownUser

From 2b236f3ff7460f785794fefb60fe987a92357366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Asiel=20D=C3=ADaz=20Ben=C3=ADtez?= <adbenitez@nauta.cu>
Date: Thu, 9 Mar 2023 16:08:29 -0500
Subject: [PATCH 08/25] add deltachat to 3rd party API bridges (#1992)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index dd166457..cc04db3d 100644
--- a/README.md
+++ b/README.md
@@ -114,6 +114,7 @@ And more...
 
 ### 3rd party via matterbridge api
 
+- [Delta Chat](https://github.com/deltachat-bot/matterdelta)
 - [Discourse](https://github.com/DeclanHoare/matterbabble)
 - [Facebook messenger](https://github.com/powerjungle/fbridge-asyncio)
 - [Facebook messenger](https://github.com/VictorNine/fbridge)

From 3a4bdd7c561c1f8bf0cadcae755e690f3443a75c Mon Sep 17 00:00:00 2001
From: Joseph Mansy <36427684+yousefmansy1@users.noreply.github.com>
Date: Thu, 9 Mar 2023 13:10:09 -0800
Subject: [PATCH 09/25] Fix rate-overlimit issue when there are more than 5
 whatsapp channels in a single account (whatsapp) (#1998)

Resolves #1844
---
 bridge/whatsappmulti/whatsapp.go | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/bridge/whatsappmulti/whatsapp.go b/bridge/whatsappmulti/whatsapp.go
index 6798d827..e943fc86 100644
--- a/bridge/whatsappmulti/whatsapp.go
+++ b/bridge/whatsappmulti/whatsapp.go
@@ -35,11 +35,12 @@ const (
 type Bwhatsapp struct {
 	*bridge.Config
 
-	startedAt   time.Time
-	wc          *whatsmeow.Client
-	contacts    map[types.JID]types.ContactInfo
-	users       map[string]types.ContactInfo
-	userAvatars map[string]string
+	startedAt    time.Time
+	wc           *whatsmeow.Client
+	contacts     map[types.JID]types.ContactInfo
+	users        map[string]types.ContactInfo
+	userAvatars  map[string]string
+	joinedGroups []*types.GroupInfo
 }
 
 type Replyable struct {
@@ -126,6 +127,11 @@ func (b *Bwhatsapp) Connect() error {
 		return errors.New("failed to get contacts: " + err.Error())
 	}
 
+	b.joinedGroups, err = b.wc.GetJoinedGroups()
+	if err != nil {
+		return errors.New("failed to get list of joined groups: " + err.Error())
+	}
+
 	b.startedAt = time.Now()
 
 	// map all the users
@@ -171,11 +177,6 @@ func (b *Bwhatsapp) Disconnect() error {
 func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error {
 	byJid := isGroupJid(channel.Name)
 
-	groups, err := b.wc.GetJoinedGroups()
-	if err != nil {
-		return err
-	}
-
 	// verify if we are member of the given group
 	if byJid {
 		gJID, err := types.ParseJID(channel.Name)
@@ -183,7 +184,7 @@ func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error {
 			return err
 		}
 
-		for _, group := range groups {
+		for _, group := range b.joinedGroups {
 			if group.JID == gJID {
 				return nil
 			}
@@ -192,7 +193,7 @@ func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error {
 
 	foundGroups := []string{}
 
-	for _, group := range groups {
+	for _, group := range b.joinedGroups {
 		if group.Name == channel.Name {
 			foundGroups = append(foundGroups, group.Name)
 		}
@@ -201,7 +202,7 @@ func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error {
 	switch len(foundGroups) {
 	case 0:
 		// didn't match any group - print out possibilites
-		for _, group := range groups {
+		for _, group := range b.joinedGroups {
 			b.Log.Infof("%s %s", group.JID, group.Name)
 		}
 		return fmt.Errorf("please specify group's JID from the list above instead of the name '%s'", channel.Name)

From d5f9cdf912d43cd2a5cb243e086fbdab9a9073b0 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Thu, 9 Mar 2023 22:29:58 +0100
Subject: [PATCH 10/25] Update builds to go 1.20 (#2006)

---
 .github/workflows/development.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
index 4d00e0ec..ff8c1ce4 100644
--- a/.github/workflows/development.yml
+++ b/.github/workflows/development.yml
@@ -16,7 +16,7 @@ jobs:
   test-build-upload:
     strategy:
       matrix:
-        go-version: [1.18.x]
+        go-version: [1.20.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -39,19 +39,19 @@ jobs:
         CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-s -X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o output/win/matterbridge-$VERSION-windows-amd64.exe
         CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags "-s -X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o output/mac/matterbridge-$VERSION-darwin-amd64
     - name: Upload linux 64-bit
-      if: startsWith(matrix.go-version,'1.18')
+      if: startsWith(matrix.go-version,'1.20')
       uses: actions/upload-artifact@v2
       with:
         name: matterbridge-linux-64bit
         path: output/lin
     - name: Upload windows 64-bit
-      if: startsWith(matrix.go-version,'1.18')
+      if: startsWith(matrix.go-version,'1.20')
       uses: actions/upload-artifact@v2
       with:
         name: matterbridge-windows-64bit
         path: output/win
     - name: Upload darwin 64-bit
-      if: startsWith(matrix.go-version,'1.18')
+      if: startsWith(matrix.go-version,'1.20')
       uses: actions/upload-artifact@v2
       with:
         name: matterbridge-darwin-64bit

From 08779c29099e8940493df56d28d8aa131ac8342e Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Thu, 9 Mar 2023 22:48:00 +0100
Subject: [PATCH 11/25] Update dependencies (#2007)

* Update dependencies
---
 go.mod                                        |    48 +-
 go.sum                                        |   110 +-
 .../SevereCloud/vksdk/v2/.golangci.yml        |    33 +-
 .../SevereCloud/vksdk/v2/CONTRIBUTING.md      |    29 +-
 .../SevereCloud/vksdk/v2/api/ads.go           |     1 -
 .../SevereCloud/vksdk/v2/api/api.go           |     4 +-
 .../SevereCloud/vksdk/v2/api/apps.go          |     8 +-
 .../SevereCloud/vksdk/v2/api/auth.go          |    28 +-
 .../SevereCloud/vksdk/v2/api/board.go         |     8 +-
 .../SevereCloud/vksdk/v2/api/calls.go         |    23 +
 .../SevereCloud/vksdk/v2/api/execute.go       |     4 +-
 .../SevereCloud/vksdk/v2/api/fave.go          |     4 +-
 .../SevereCloud/vksdk/v2/api/friends.go       |     4 +-
 .../SevereCloud/vksdk/v2/api/groups.go        |    24 +-
 .../SevereCloud/vksdk/v2/api/likes.go         |     4 +-
 .../SevereCloud/vksdk/v2/api/market.go        |     4 +-
 .../SevereCloud/vksdk/v2/api/messages.go      |    16 +-
 .../SevereCloud/vksdk/v2/api/newsfeed.go      |     8 +-
 .../SevereCloud/vksdk/v2/api/photos.go        |    20 +-
 .../SevereCloud/vksdk/v2/api/podcasts.go      |    12 +-
 .../SevereCloud/vksdk/v2/api/stories.go       |    22 +-
 .../SevereCloud/vksdk/v2/api/upload.go        |     5 +-
 .../SevereCloud/vksdk/v2/api/users.go         |     4 +-
 .../SevereCloud/vksdk/v2/api/utils.go         |     4 +-
 .../SevereCloud/vksdk/v2/api/video.go         |    20 +-
 .../SevereCloud/vksdk/v2/api/wall.go          |    20 +-
 vendor/github.com/SevereCloud/vksdk/v2/doc.go |     2 +-
 .../SevereCloud/vksdk/v2/events/events.go     |   114 +-
 .../SevereCloud/vksdk/v2/object/stats.go      |    12 +
 .../SevereCloud/vksdk/v2/object/stories.go    |     2 +-
 .../SevereCloud/vksdk/v2/object/users.go      |     8 +
 .../SevereCloud/vksdk/v2/object/wall.go       |     1 +
 vendor/github.com/google/gops/agent/agent.go  |     3 +-
 .../google/gops/internal/internal.go          |    12 +-
 .../klauspost/compress/.goreleaser.yml        |     2 +-
 .../github.com/klauspost/compress/README.md   |    64 +-
 .../klauspost/compress/fse/compress.go        |    31 +-
 .../klauspost/compress/huff0/bitreader.go     |     8 +-
 .../klauspost/compress/huff0/compress.go      |   114 +-
 .../klauspost/compress/huff0/decompress.go    |    38 +-
 .../compress/huff0/decompress_amd64.go        |     4 +
 .../compress/huff0/decompress_amd64.s         |   585 +-
 .../compress/huff0/decompress_generic.go      |    18 +-
 .../compress/internal/snapref/encode_other.go |    28 +-
 .../klauspost/compress/s2/README.md           |   465 +-
 .../klauspost/compress/s2/decode.go           |   504 +-
 .../klauspost/compress/s2/decode_other.go     |    47 +-
 .../github.com/klauspost/compress/s2/dict.go  |   331 +
 .../klauspost/compress/s2/encode.go           |    54 +-
 .../klauspost/compress/s2/encode_all.go       |   595 +-
 .../klauspost/compress/s2/encode_amd64.go     |    14 +-
 .../klauspost/compress/s2/encode_best.go      |   225 +-
 .../klauspost/compress/s2/encode_better.go    |   727 +-
 .../klauspost/compress/s2/encode_go.go        |   414 +-
 .../compress/s2/encodeblock_amd64.go          |    47 +-
 .../klauspost/compress/s2/encodeblock_amd64.s | 18233 +++++++++-------
 .../klauspost/compress/s2/lz4convert.go       |   585 +
 .../klauspost/compress/zstd/README.md         |     2 +
 .../klauspost/compress/zstd/blockdec.go       |    19 +-
 .../klauspost/compress/zstd/bytebuf.go        |    16 +-
 .../klauspost/compress/zstd/decodeheader.go   |     9 +-
 .../klauspost/compress/zstd/decoder.go        |   140 +-
 .../compress/zstd/decoder_options.go          |    68 +-
 .../klauspost/compress/zstd/dict.go           |    51 +-
 .../klauspost/compress/zstd/enc_base.go       |    28 +-
 .../klauspost/compress/zstd/enc_best.go       |    64 +-
 .../klauspost/compress/zstd/enc_better.go     |    35 +-
 .../klauspost/compress/zstd/enc_dfast.go      |    23 +-
 .../klauspost/compress/zstd/enc_fast.go       |    20 +-
 .../klauspost/compress/zstd/encoder.go        |    39 +-
 .../compress/zstd/encoder_options.go          |    38 +-
 .../klauspost/compress/zstd/framedec.go       |   104 +-
 .../compress/zstd/fse_decoder_amd64.go        |     7 +-
 .../compress/zstd/fse_decoder_amd64.s         |     1 -
 .../klauspost/compress/zstd/history.go        |    25 +-
 .../compress/zstd/internal/xxhash/README.md   |    49 +-
 .../compress/zstd/internal/xxhash/xxhash.go   |    47 +-
 .../zstd/internal/xxhash/xxhash_amd64.s       |   308 +-
 .../zstd/internal/xxhash/xxhash_arm64.s       |   136 +-
 .../zstd/internal/xxhash/xxhash_asm.go        |     2 +-
 .../zstd/internal/xxhash/xxhash_other.go      |    19 +-
 .../klauspost/compress/zstd/seqdec.go         |    22 +-
 .../klauspost/compress/zstd/seqdec_amd64.go   |    43 +-
 .../klauspost/compress/zstd/seqdec_amd64.s    |   489 +-
 .../klauspost/compress/zstd/seqdec_generic.go |     4 +-
 .../klauspost/compress/zstd/zstd.go           |    31 +-
 .../github.com/klauspost/cpuid/v2/README.md   |   350 +-
 vendor/github.com/klauspost/cpuid/v2/cpuid.go |   361 +-
 .../klauspost/cpuid/v2/detect_x86.go          |     2 +-
 .../klauspost/cpuid/v2/featureid_string.go    |   324 +-
 .../klauspost/cpuid/v2/os_darwin_arm64.go     |   112 +-
 vendor/github.com/kyokomi/emoji/v2/emoji.go   |     5 +-
 .../github.com/labstack/echo/v4/.travis.yml   |    21 -
 .../github.com/labstack/echo/v4/CHANGELOG.md  |    27 +
 vendor/github.com/labstack/echo/v4/README.md  |    37 +-
 vendor/github.com/labstack/echo/v4/echo.go    |    67 +-
 .../echo/v4/middleware/context_timeout.go     |    72 +
 .../labstack/echo/v4/middleware/cors.go       |    11 +-
 .../labstack/echo/v4/middleware/csrf.go       |     6 +-
 .../labstack/echo/v4/middleware/jwt.go        |     6 +-
 .../labstack/echo/v4/middleware/key_auth.go   |     6 +-
 .../labstack/echo/v4/middleware/static.go     |    28 +-
 .../echo/v4/middleware/static_other.go        |    12 +
 .../echo/v4/middleware/static_windows.go      |    23 +
 vendor/github.com/labstack/echo/v4/router.go  |     1 -
 .../matterbridge/matterclient/channels.go     |    39 +-
 .../matterbridge/matterclient/matterclient.go |    41 +-
 .../github.com/mattn/go-isatty/isatty_bsd.go  |     4 +-
 .../github.com/remyoudompheng/bigfft/README   |    11 +
 .../remyoudompheng/bigfft/arith_386.s         |    36 -
 .../remyoudompheng/bigfft/arith_amd64.s       |    38 -
 .../remyoudompheng/bigfft/arith_arm.s         |    36 -
 .../remyoudompheng/bigfft/arith_arm64.s       |    36 -
 .../remyoudompheng/bigfft/arith_decl.go       |    21 +-
 .../remyoudompheng/bigfft/arith_mips64x.s     |    40 -
 .../remyoudompheng/bigfft/arith_mipsx.s       |    40 -
 .../remyoudompheng/bigfft/arith_ppc64x.s      |    38 -
 .../remyoudompheng/bigfft/arith_s390x.s       |    37 -
 vendor/go.mau.fi/whatsmeow/appstate.go        |     2 +-
 .../whatsmeow/binary/proto/def.pb.go          |  4629 ++--
 .../whatsmeow/binary/proto/def.pb.raw         |   Bin 68546 -> 70468 bytes
 .../whatsmeow/binary/proto/def.proto          |   135 +-
 vendor/go.mau.fi/whatsmeow/broadcast.go       |    13 +-
 vendor/go.mau.fi/whatsmeow/client.go          |     9 +-
 .../go.mau.fi/whatsmeow/connectionevents.go   |     7 +-
 vendor/go.mau.fi/whatsmeow/download.go        |     4 +-
 vendor/go.mau.fi/whatsmeow/message.go         |     2 +-
 .../whatsmeow/store/clientpayload.go          |     2 +-
 .../whatsmeow/store/sqlstore/store.go         |     1 +
 .../whatsmeow/types/events/events.go          |     5 +
 vendor/go.mau.fi/whatsmeow/types/jid.go       |     1 +
 vendor/go.mau.fi/whatsmeow/user.go            |    46 +-
 vendor/golang.org/x/crypto/acme/rfc8555.go    |     2 +-
 vendor/golang.org/x/crypto/bcrypt/bcrypt.go   |     9 +
 .../curve25519/internal/field/fe_generic.go   |     2 +-
 vendor/golang.org/x/crypto/ssh/handshake.go   |    50 +-
 .../x/net/context/ctxhttp/ctxhttp.go          |    71 -
 vendor/golang.org/x/net/html/doc.go           |    15 +
 vendor/golang.org/x/net/html/escape.go        |    81 +
 vendor/golang.org/x/net/html/render.go        |     2 +-
 vendor/golang.org/x/net/html/token.go         |    10 +-
 vendor/golang.org/x/oauth2/internal/token.go  |     4 +-
 vendor/golang.org/x/sys/cpu/hwcap_linux.go    |    15 +
 vendor/golang.org/x/sys/cpu/runtime_auxv.go   |    16 +
 .../x/sys/cpu/runtime_auxv_go121.go           |    19 +
 vendor/golang.org/x/sys/execabs/execabs.go    |     2 +-
 .../golang.org/x/sys/execabs/execabs_go118.go |     6 +
 .../golang.org/x/sys/execabs/execabs_go119.go |     4 +
 vendor/golang.org/x/sys/unix/ioctl.go         |    17 +-
 vendor/golang.org/x/sys/unix/ioctl_zos.go     |     8 +-
 vendor/golang.org/x/sys/unix/ptrace_darwin.go |     6 +
 vendor/golang.org/x/sys/unix/ptrace_ios.go    |     6 +
 vendor/golang.org/x/sys/unix/syscall_aix.go   |     5 +-
 vendor/golang.org/x/sys/unix/syscall_bsd.go   |     3 +-
 .../golang.org/x/sys/unix/syscall_darwin.go   |    12 +-
 .../x/sys/unix/syscall_darwin_amd64.go        |     1 +
 .../x/sys/unix/syscall_darwin_arm64.go        |     1 +
 .../x/sys/unix/syscall_dragonfly.go           |     1 +
 .../golang.org/x/sys/unix/syscall_freebsd.go  |    43 +-
 .../x/sys/unix/syscall_freebsd_386.go         |    17 +-
 .../x/sys/unix/syscall_freebsd_amd64.go       |    17 +-
 .../x/sys/unix/syscall_freebsd_arm.go         |    15 +-
 .../x/sys/unix/syscall_freebsd_arm64.go       |    15 +-
 .../x/sys/unix/syscall_freebsd_riscv64.go     |    15 +-
 vendor/golang.org/x/sys/unix/syscall_hurd.go  |     8 +
 vendor/golang.org/x/sys/unix/syscall_linux.go |    36 +-
 .../golang.org/x/sys/unix/syscall_netbsd.go   |     5 +-
 .../golang.org/x/sys/unix/syscall_openbsd.go  |     1 +
 .../golang.org/x/sys/unix/syscall_solaris.go  |    21 +-
 .../x/sys/unix/syscall_zos_s390x.go           |     4 +-
 vendor/golang.org/x/sys/unix/zerrors_linux.go |    10 +-
 .../x/sys/unix/zptrace_armnn_linux.go         |     8 +-
 .../x/sys/unix/zptrace_linux_arm64.go         |     4 +-
 .../x/sys/unix/zptrace_mipsnn_linux.go        |     8 +-
 .../x/sys/unix/zptrace_mipsnnle_linux.go      |     8 +-
 .../x/sys/unix/zptrace_x86_linux.go           |     8 +-
 .../golang.org/x/sys/unix/zsyscall_aix_ppc.go |    10 +
 .../x/sys/unix/zsyscall_aix_ppc64.go          |    10 +
 .../x/sys/unix/zsyscall_aix_ppc64_gc.go       |     7 +
 .../x/sys/unix/zsyscall_aix_ppc64_gccgo.go    |     8 +
 .../x/sys/unix/zsyscall_darwin_amd64.go       |    16 +
 .../x/sys/unix/zsyscall_darwin_arm64.go       |    16 +
 .../x/sys/unix/zsyscall_dragonfly_amd64.go    |    10 +
 .../x/sys/unix/zsyscall_freebsd_386.go        |    20 +
 .../x/sys/unix/zsyscall_freebsd_amd64.go      |    20 +
 .../x/sys/unix/zsyscall_freebsd_arm.go        |    20 +
 .../x/sys/unix/zsyscall_freebsd_arm64.go      |    20 +
 .../x/sys/unix/zsyscall_freebsd_riscv64.go    |    20 +
 .../golang.org/x/sys/unix/zsyscall_linux.go   |    10 +
 .../x/sys/unix/zsyscall_netbsd_386.go         |    10 +
 .../x/sys/unix/zsyscall_netbsd_amd64.go       |    10 +
 .../x/sys/unix/zsyscall_netbsd_arm.go         |    10 +
 .../x/sys/unix/zsyscall_netbsd_arm64.go       |    10 +
 .../x/sys/unix/zsyscall_openbsd_386.go        |     8 +
 .../x/sys/unix/zsyscall_openbsd_amd64.go      |     8 +
 .../x/sys/unix/zsyscall_openbsd_arm.go        |     8 +
 .../x/sys/unix/zsyscall_openbsd_arm64.go      |     8 +
 .../x/sys/unix/zsyscall_openbsd_mips64.go     |     8 +
 .../x/sys/unix/zsyscall_openbsd_ppc64.go      |     8 +
 .../x/sys/unix/zsyscall_openbsd_riscv64.go    |     8 +
 .../x/sys/unix/zsyscall_solaris_amd64.go      |    11 +
 .../x/sys/unix/zsyscall_zos_s390x.go          |    10 +
 .../x/sys/unix/ztypes_freebsd_386.go          |     2 +-
 .../x/sys/unix/ztypes_freebsd_amd64.go        |     2 +-
 .../x/sys/unix/ztypes_freebsd_arm.go          |     2 +-
 .../x/sys/unix/ztypes_freebsd_arm64.go        |     2 +-
 .../x/sys/unix/ztypes_freebsd_riscv64.go      |     2 +-
 vendor/golang.org/x/sys/unix/ztypes_linux.go  |   140 +-
 .../golang.org/x/sys/unix/ztypes_linux_386.go |     2 +-
 .../x/sys/unix/ztypes_linux_amd64.go          |     2 +-
 .../golang.org/x/sys/unix/ztypes_linux_arm.go |     2 +-
 .../x/sys/unix/ztypes_linux_arm64.go          |     2 +-
 .../x/sys/unix/ztypes_linux_loong64.go        |     2 +-
 .../x/sys/unix/ztypes_linux_mips.go           |     2 +-
 .../x/sys/unix/ztypes_linux_mips64.go         |     2 +-
 .../x/sys/unix/ztypes_linux_mips64le.go       |     2 +-
 .../x/sys/unix/ztypes_linux_mipsle.go         |     2 +-
 .../golang.org/x/sys/unix/ztypes_linux_ppc.go |     2 +-
 .../x/sys/unix/ztypes_linux_ppc64.go          |     2 +-
 .../x/sys/unix/ztypes_linux_ppc64le.go        |     2 +-
 .../x/sys/unix/ztypes_linux_riscv64.go        |     2 +-
 .../x/sys/unix/ztypes_linux_s390x.go          |     2 +-
 .../x/sys/unix/ztypes_linux_sparc64.go        |     2 +-
 .../x/sys/windows/syscall_windows.go          |     6 +-
 .../golang.org/x/sys/windows/types_windows.go |    85 +
 .../x/sys/windows/zsyscall_windows.go         |    27 +
 .../x/text/encoding/internal/internal.go      |     2 +-
 .../x/text/unicode/norm/forminfo.go           |     2 +-
 vendor/golang.org/x/time/rate/rate.go         |    20 +-
 .../x/tools/go/gcexportdata/gcexportdata.go   |    32 +-
 .../go/internal/gcimporter/gcimporter.go      |  1125 -
 .../golang.org/x/tools/go/packages/golist.go  |    22 +-
 .../x/tools/go/packages/packages.go           |    87 +-
 .../{go => }/internal/gcimporter/bexport.go   |     9 +-
 .../{go => }/internal/gcimporter/bimport.go   |     0
 .../internal/gcimporter/exportdata.go         |     0
 .../x/tools/internal/gcimporter/gcimporter.go |   265 +
 .../{go => }/internal/gcimporter/iexport.go   |   198 +-
 .../{go => }/internal/gcimporter/iimport.go   |   112 +-
 .../internal/gcimporter/newInterface10.go     |     0
 .../internal/gcimporter/newInterface11.go     |     0
 .../internal/gcimporter/support_go117.go      |     0
 .../internal/gcimporter/support_go118.go      |    14 +
 .../internal/gcimporter/unified_no.go         |     0
 .../internal/gcimporter/unified_yes.go        |     0
 .../internal/gcimporter/ureader_no.go         |     0
 .../internal/gcimporter/ureader_yes.go        |   220 +-
 .../x/tools/internal/gocommand/invoke.go      |    83 +-
 .../x/tools/internal/gocommand/version.go     |    36 +-
 .../tools/{go => }/internal/pkgbits/codes.go  |     0
 .../{go => }/internal/pkgbits/decoder.go      |   108 +-
 .../x/tools/{go => }/internal/pkgbits/doc.go  |     0
 .../{go => }/internal/pkgbits/encoder.go      |    20 +-
 .../tools/{go => }/internal/pkgbits/flags.go  |     0
 .../{go => }/internal/pkgbits/frames_go1.go   |     0
 .../{go => }/internal/pkgbits/frames_go17.go  |     0
 .../tools/{go => }/internal/pkgbits/reloc.go  |     4 +-
 .../{go => }/internal/pkgbits/support.go      |     0
 .../x/tools/{go => }/internal/pkgbits/sync.go |     0
 .../internal/pkgbits/syncmarker_string.go     |     0
 .../internal/tokeninternal/tokeninternal.go   |    59 +
 .../tools/internal/typesinternal/errorcode.go |    38 +-
 .../typesinternal/errorcode_string.go         |    26 +-
 .../protobuf/encoding/protowire/wire.go       |     8 +-
 .../protobuf/internal/encoding/text/decode.go |     5 +-
 .../internal/encoding/text/decode_number.go   |    43 +-
 .../protobuf/internal/genid/descriptor_gen.go |    90 +-
 .../protobuf/internal/impl/convert.go         |     1 -
 .../protobuf/internal/strs/strings_unsafe.go  |     2 +-
 .../protobuf/internal/version/version.go      |     4 +-
 .../google.golang.org/protobuf/proto/doc.go   |     9 +-
 .../google.golang.org/protobuf/proto/equal.go |   172 +-
 .../reflect/protoreflect/source_gen.go        |    14 +
 .../protobuf/reflect/protoreflect/value.go    |     2 +-
 .../reflect/protoreflect/value_equal.go       |   168 +
 .../reflect/protoreflect/value_union.go       |     4 +-
 .../reflect/protoregistry/registry.go         |     2 +-
 .../types/descriptorpb/descriptor.pb.go       |  1547 +-
 vendor/modernc.org/libc/Makefile              |     2 +-
 vendor/modernc.org/libc/capi_darwin_amd64.go  |     1 +
 vendor/modernc.org/libc/capi_darwin_arm64.go  |     1 +
 vendor/modernc.org/libc/capi_freebsd_386.go   |     1 +
 vendor/modernc.org/libc/capi_freebsd_amd64.go |     1 +
 vendor/modernc.org/libc/capi_freebsd_arm.go   |     1 +
 vendor/modernc.org/libc/capi_freebsd_arm64.go |     1 +
 vendor/modernc.org/libc/capi_linux_386.go     |     2 +
 vendor/modernc.org/libc/capi_linux_amd64.go   |     2 +
 vendor/modernc.org/libc/capi_linux_arm.go     |     2 +
 vendor/modernc.org/libc/capi_linux_arm64.go   |     2 +
 vendor/modernc.org/libc/capi_linux_ppc64le.go |     2 +
 vendor/modernc.org/libc/capi_linux_riscv64.go |     2 +
 vendor/modernc.org/libc/capi_linux_s390x.go   |     2 +
 vendor/modernc.org/libc/capi_netbsd_amd64.go  |     1 +
 vendor/modernc.org/libc/capi_netbsd_arm.go    |     1 +
 vendor/modernc.org/libc/capi_openbsd_386.go   |     1 +
 vendor/modernc.org/libc/capi_openbsd_amd64.go |     1 +
 vendor/modernc.org/libc/capi_openbsd_arm64.go |     1 +
 vendor/modernc.org/libc/capi_windows_386.go   |     1 +
 vendor/modernc.org/libc/capi_windows_amd64.go |     1 +
 vendor/modernc.org/libc/capi_windows_arm64.go |     1 +
 vendor/modernc.org/libc/libc.go               |     1 +
 vendor/modernc.org/libc/libc_linux.go         |     7 +
 vendor/modernc.org/memory/Makefile            |     1 +
 .../modernc.org/memory/mmap_illumos_amd64.go  |    91 +
 vendor/modernc.org/memory/mmap_netbsd_32.go   |     2 +-
 vendor/modernc.org/memory/mmap_unix.go        |     4 +-
 vendor/modernc.org/sqlite/doc.go              |    28 +-
 vendor/modernc.org/sqlite/generator.go        |    17 +-
 .../sqlite/lib/capi_darwin_amd64.go           |     8 +-
 .../sqlite/lib/capi_darwin_arm64.go           |     8 +-
 .../sqlite/lib/capi_freebsd_386.go            |     8 +-
 .../sqlite/lib/capi_freebsd_amd64.go          |     8 +-
 .../sqlite/lib/capi_freebsd_arm.go            |     8 +-
 .../sqlite/lib/capi_freebsd_arm64.go          |     8 +-
 .../modernc.org/sqlite/lib/capi_linux_386.go  |     8 +-
 .../sqlite/lib/capi_linux_amd64.go            |     8 +-
 .../modernc.org/sqlite/lib/capi_linux_arm.go  |     8 +-
 .../sqlite/lib/capi_linux_arm64.go            |     8 +-
 .../sqlite/lib/capi_linux_ppc64le.go          |     8 +-
 .../sqlite/lib/capi_linux_riscv64.go          |     8 +-
 .../sqlite/lib/capi_linux_s390x.go            |     8 +-
 .../sqlite/lib/capi_openbsd_amd64.go          |     8 +-
 .../sqlite/lib/capi_openbsd_arm64.go          |     8 +-
 .../sqlite/lib/capi_windows_amd64.go          |     8 +-
 .../sqlite/lib/capi_windows_arm64.go          |     8 +-
 vendor/modernc.org/sqlite/lib/defs.go         |     6 +
 .../sqlite/lib/sqlite_darwin_amd64.go         | 14063 ++++++------
 .../sqlite/lib/sqlite_darwin_arm64.go         | 14063 ++++++------
 .../sqlite/lib/sqlite_freebsd_386.go          | 14050 ++++++------
 .../sqlite/lib/sqlite_freebsd_amd64.go        | 14045 ++++++------
 .../sqlite/lib/sqlite_freebsd_arm.go          | 13912 ++++++------
 .../sqlite/lib/sqlite_freebsd_arm64.go        | 14045 ++++++------
 .../sqlite/lib/sqlite_linux_386.go            | 14058 ++++++------
 .../sqlite/lib/sqlite_linux_amd64.go          | 14054 ++++++------
 .../sqlite/lib/sqlite_linux_arm.go            | 13920 ++++++------
 .../sqlite/lib/sqlite_linux_arm64.go          | 14053 ++++++------
 .../sqlite/lib/sqlite_linux_ppc64le.go        | 14073 ++++++------
 .../sqlite/lib/sqlite_linux_riscv64.go        | 14073 ++++++------
 .../sqlite/lib/sqlite_linux_s390x.go          | 14073 ++++++------
 .../sqlite/lib/sqlite_openbsd_amd64.go        | 14039 ++++++------
 .../sqlite/lib/sqlite_openbsd_arm64.go        | 14039 ++++++------
 .../sqlite/lib/sqlite_windows_amd64.go        | 13985 ++++++------
 .../sqlite/lib/sqlite_windows_arm64.go        | 13985 ++++++------
 vendor/modernc.org/sqlite/sqlite.go           |     1 -
 vendor/modules.txt                            |    66 +-
 345 files changed, 151040 insertions(+), 125983 deletions(-)
 create mode 100644 vendor/github.com/SevereCloud/vksdk/v2/api/calls.go
 create mode 100644 vendor/github.com/klauspost/compress/s2/dict.go
 create mode 100644 vendor/github.com/klauspost/compress/s2/lz4convert.go
 delete mode 100644 vendor/github.com/labstack/echo/v4/.travis.yml
 create mode 100644 vendor/github.com/labstack/echo/v4/middleware/context_timeout.go
 create mode 100644 vendor/github.com/labstack/echo/v4/middleware/static_other.go
 create mode 100644 vendor/github.com/labstack/echo/v4/middleware/static_windows.go
 delete mode 100644 vendor/github.com/remyoudompheng/bigfft/arith_386.s
 delete mode 100644 vendor/github.com/remyoudompheng/bigfft/arith_amd64.s
 delete mode 100644 vendor/github.com/remyoudompheng/bigfft/arith_arm.s
 delete mode 100644 vendor/github.com/remyoudompheng/bigfft/arith_arm64.s
 delete mode 100644 vendor/github.com/remyoudompheng/bigfft/arith_mips64x.s
 delete mode 100644 vendor/github.com/remyoudompheng/bigfft/arith_mipsx.s
 delete mode 100644 vendor/github.com/remyoudompheng/bigfft/arith_ppc64x.s
 delete mode 100644 vendor/github.com/remyoudompheng/bigfft/arith_s390x.s
 delete mode 100644 vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go
 create mode 100644 vendor/golang.org/x/sys/cpu/runtime_auxv.go
 create mode 100644 vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go
 delete mode 100644 vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/bexport.go (99%)
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/bimport.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/exportdata.go (100%)
 create mode 100644 vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/iexport.go (78%)
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/iimport.go (86%)
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/newInterface10.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/newInterface11.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/support_go117.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/support_go118.go (62%)
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/unified_no.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/unified_yes.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/ureader_no.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/gcimporter/ureader_yes.go (70%)
 rename vendor/golang.org/x/tools/{go => }/internal/pkgbits/codes.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/pkgbits/decoder.go (83%)
 rename vendor/golang.org/x/tools/{go => }/internal/pkgbits/doc.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/pkgbits/encoder.go (95%)
 rename vendor/golang.org/x/tools/{go => }/internal/pkgbits/flags.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/pkgbits/frames_go1.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/pkgbits/frames_go17.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/pkgbits/reloc.go (95%)
 rename vendor/golang.org/x/tools/{go => }/internal/pkgbits/support.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/pkgbits/sync.go (100%)
 rename vendor/golang.org/x/tools/{go => }/internal/pkgbits/syncmarker_string.go (100%)
 create mode 100644 vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go
 create mode 100644 vendor/google.golang.org/protobuf/reflect/protoreflect/value_equal.go
 create mode 100644 vendor/modernc.org/memory/mmap_illumos_amd64.go

diff --git a/go.mod b/go.mod
index d16782a7..f4e31db3 100644
--- a/go.mod
+++ b/go.mod
@@ -6,29 +6,29 @@ require (
 	github.com/Benau/tgsconverter v0.0.0-20210809170556-99f4a4f6337f
 	github.com/Philipp15b/go-steam v1.0.1-0.20200727090957-6ae9b3c0a560
 	github.com/Rhymen/go-whatsapp v0.1.2-0.20211102134409-31a2e740845c
-	github.com/SevereCloud/vksdk/v2 v2.15.0
+	github.com/SevereCloud/vksdk/v2 v2.16.0
 	github.com/bwmarrin/discordgo v0.27.0
 	github.com/d5/tengo/v2 v2.13.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
 	github.com/gomarkdown/markdown v0.0.0-20221013030248-663e2500819c
-	github.com/google/gops v0.3.26
+	github.com/google/gops v0.3.27
 	github.com/gorilla/schema v1.2.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/harmony-development/shibshib v0.0.0-20220101224523-c98059d09cfa
 	github.com/hashicorp/golang-lru v0.6.0
 	github.com/jpillora/backoff v1.0.0
 	github.com/keybase/go-keybase-chat-bot v0.0.0-20221220212439-e48d9abd2c20
-	github.com/kyokomi/emoji/v2 v2.2.11
-	github.com/labstack/echo/v4 v4.10.0
+	github.com/kyokomi/emoji/v2 v2.2.12
+	github.com/labstack/echo/v4 v4.10.2
 	github.com/lrstanley/girc v0.0.0-20221222153823-a92667a5c9b4
 	github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696
 	github.com/matterbridge/go-xmpp v0.0.0-20211030125215-791a06c5f1be
 	github.com/matterbridge/gomatrix v0.0.0-20220411225302-271e5088ea27
 	github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75
 	github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba
-	github.com/matterbridge/matterclient v0.0.0-20220624224459-272af20c7ddf
+	github.com/matterbridge/matterclient v0.0.0-20221106190440-8bcf49695e0d
 	github.com/mattermost/mattermost-server/v5 v5.39.3
 	github.com/mattermost/mattermost-server/v6 v6.7.2
 	github.com/mattn/godown v0.0.1
@@ -47,15 +47,15 @@ require (
 	github.com/writeas/go-strip-markdown v2.0.1+incompatible
 	github.com/yaegashi/msgraph.go v0.1.4
 	github.com/zfjagann/golang-ring v0.0.0-20220330170733-19bcea1b6289
-	go.mau.fi/whatsmeow v0.0.0-20230128195103-dcbc8dd31a22
-	golang.org/x/image v0.5.0
-	golang.org/x/oauth2 v0.4.0
-	golang.org/x/text v0.7.0
+	go.mau.fi/whatsmeow v0.0.0-20230306190159-5caded34a872
+	golang.org/x/image v0.6.0
+	golang.org/x/oauth2 v0.6.0
+	golang.org/x/text v0.8.0
 	gomod.garykim.dev/nc-talk v0.3.0
-	google.golang.org/protobuf v1.28.1
+	google.golang.org/protobuf v1.29.0
 	gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376
 	layeh.com/gumble v0.0.0-20221205141517-d1df60a3cc14
-	modernc.org/sqlite v1.20.3
+	modernc.org/sqlite v1.21.0
 )
 
 require (
@@ -80,8 +80,8 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/kettek/apng v0.0.0-20191108220231-414630eed80f // indirect
-	github.com/klauspost/compress v1.15.8 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.12 // indirect
+	github.com/klauspost/compress v1.16.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.3 // indirect
 	github.com/labstack/gommon v0.4.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 // indirect
@@ -89,7 +89,7 @@ require (
 	github.com/mattermost/logr v1.0.13 // indirect
 	github.com/mattermost/logr/v2 v2.0.15 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
@@ -109,7 +109,7 @@ require (
 	github.com/philhofer/fwd v1.1.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rickb777/date v1.12.4 // indirect
 	github.com/rickb777/plural v1.2.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
@@ -133,13 +133,13 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.4.0 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/term v0.5.0 // indirect
-	golang.org/x/time v0.2.0 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/term v0.6.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.6.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
@@ -148,9 +148,9 @@ require (
 	lukechampine.com/uint128 v1.2.0 // indirect
 	modernc.org/cc/v3 v3.40.0 // indirect
 	modernc.org/ccgo/v3 v3.16.13 // indirect
-	modernc.org/libc v1.22.2 // indirect
+	modernc.org/libc v1.22.3 // indirect
 	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.4.0 // indirect
+	modernc.org/memory v1.5.0 // indirect
 	modernc.org/opt v0.1.3 // indirect
 	modernc.org/strutil v1.1.3 // indirect
 	modernc.org/token v1.0.1 // indirect
diff --git a/go.sum b/go.sum
index 336c1869..af479145 100644
--- a/go.sum
+++ b/go.sum
@@ -148,8 +148,8 @@ github.com/Rhymen/go-whatsapp v0.1.2-0.20211102134409-31a2e740845c/go.mod h1:DNS
 github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
 github.com/RoaringBitmap/roaring v0.8.0/go.mod h1:jdT9ykXwHFNdJbEtxePexlFYH9LXucApeS0/+/g+p1I=
 github.com/RoaringBitmap/roaring v0.9.4/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA=
-github.com/SevereCloud/vksdk/v2 v2.15.0 h1:ywyJvuJzN1sD5+GVcYendwNTpK3R/iBZOlOhulyI9ZQ=
-github.com/SevereCloud/vksdk/v2 v2.15.0/go.mod h1:0Q20DuofWA78Vdy6aPjZAM6ep1UR6uVEf/fCqdmBYaY=
+github.com/SevereCloud/vksdk/v2 v2.16.0 h1:DQ90qqwY/yF1X/SWZQs1kQ/Ik+tphK82d+S6Rch46wQ=
+github.com/SevereCloud/vksdk/v2 v2.16.0/go.mod h1:VN6BH9nFUXcP7Uf0uX74Aht2DQ7+139aG3/Og+jia4w=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
@@ -435,7 +435,6 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -585,7 +584,6 @@ github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KE
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
-github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
@@ -729,14 +727,13 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-github/v35 v35.2.0/go.mod h1:s0515YVTI+IMrDoy9Y4pHt9ShGpzHvHO8rZ7L7acgvs=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gops v0.3.26 h1:Ziyfd8sEhWVbrCIy59c1WOKodI63Jzojwm0JSZbBPS4=
-github.com/google/gops v0.3.26/go.mod h1:vZ68aOXu2zJoybPyGpaHMmrCyd51DCxJoex4cO3ht/o=
+github.com/google/gops v0.3.27 h1:BDdWfedShsBbeatZ820oA4DbVOC8yJ4NI8xAlDFWfgI=
+github.com/google/gops v0.3.27/go.mod h1:lYqabmfnq4Q6UumWNx96Hjup5BDAVc8zmfIy0SkNCSk=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -877,7 +874,6 @@ github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
 github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
 github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
@@ -1003,8 +999,8 @@ github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8
 github.com/klauspost/compress v1.13.5/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.15.8 h1:JahtItbkWjf2jzm/T+qgMxkP9EMHsqEUA6vCMGmXvhA=
-github.com/klauspost/compress v1.15.8/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4=
+github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
@@ -1012,8 +1008,9 @@ github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.0.12 h1:p9dKCg8i4gmOxtv35DvrYoWqYzQrvEVdjQ762Y0OqZE=
 github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
+github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU=
+github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/klauspost/pgzip v1.2.4/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/kljensen/snowball v0.6.0/go.mod h1:27N7E8fVU5H68RlUmnWwZCfxgt4POBJfENGMvNRhldw=
@@ -1035,12 +1032,12 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4=
-github.com/kyokomi/emoji/v2 v2.2.11 h1:Pf/ZWVTbnAVkHOLJLWjPxM/FmgyPe+d85cv/OLP5Yus=
-github.com/kyokomi/emoji/v2 v2.2.11/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE=
+github.com/kyokomi/emoji/v2 v2.2.12 h1:sSVA5nH9ebR3Zji1o31wu3yOwD1zKXQA2z0zUyeit60=
+github.com/kyokomi/emoji/v2 v2.2.12/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE=
 github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
 github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y=
-github.com/labstack/echo/v4 v4.10.0 h1:5CiyngihEO4HXsz3vVsJn7f8xAlWwRr3aY6Ih280ZKA=
-github.com/labstack/echo/v4 v4.10.0/go.mod h1:S/T/5fy/GigaXnHTkh0ZGe4LpkkQysvRjFMSUTkDRNQ=
+github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M=
+github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
 github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
@@ -1060,7 +1057,6 @@ github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lrstanley/girc v0.0.0-20221222153823-a92667a5c9b4 h1:eOJJOM8RTmDcK1F0SqCBX/Ic1vgDnAZfdll6oik0Ups=
 github.com/lrstanley/girc v0.0.0-20221222153823-a92667a5c9b4/go.mod h1:lgrnhcF8bg/Bd5HA5DOb4Z+uGqUqGnp4skr+J2GwVgI=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -1087,8 +1083,8 @@ github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75 h1:GslZKF7
 github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75/go.mod h1:yAjnZ34DuDyPHMPHHjOsTk/FefW4JJjoMMCGt/8uuQA=
 github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba h1:XleOY4IjAEIcxAh+IFwT5JT5Ze3RHiYz6m+4ZfZ0rc0=
 github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba/go.mod h1:iXGEotOvwI1R1SjLxRc+BF5rUORTMtE0iMZBT2lxqAU=
-github.com/matterbridge/matterclient v0.0.0-20220624224459-272af20c7ddf h1:vaiRcLFKSD0fzlcLll53LU8HnpVv8XzP7C0mi8Tfvro=
-github.com/matterbridge/matterclient v0.0.0-20220624224459-272af20c7ddf/go.mod h1:Zg8PH1P/1CNUxozQ8blnjAV9PA4Qn2qWf33cX5yNKGM=
+github.com/matterbridge/matterclient v0.0.0-20221106190440-8bcf49695e0d h1:aI0ANEzy3dMv3vEAMQ80AItNie0fBR9ZxE2sAedORmM=
+github.com/matterbridge/matterclient v0.0.0-20221106190440-8bcf49695e0d/go.mod h1:Zg8PH1P/1CNUxozQ8blnjAV9PA4Qn2qWf33cX5yNKGM=
 github.com/mattermost/go-i18n v1.11.0/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34=
 github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 h1:Khvh6waxG1cHc4Cz5ef9n3XVCxRWpAKUtqg9PJl5+y8=
 github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34=
@@ -1129,8 +1125,9 @@ github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcME
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
@@ -1365,7 +1362,6 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -1416,8 +1412,9 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn
 github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/reflog/dateconstraints v0.2.1/go.mod h1:Ax8AxTBcJc3E/oVS2hd2j7RDM/5MDtuPwuR7lIHtPLo=
 github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/richardlehane/mscfb v1.0.3/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
 github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
 github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
@@ -1475,7 +1472,6 @@ github.com/shazow/rateio v0.0.0-20200113175441-4461efc8bdc4 h1:zwQ1HBo5FYwn1ksMd
 github.com/shazow/rateio v0.0.0-20200113175441-4461efc8bdc4/go.mod h1:vt2jWY/3Qw1bIzle5thrJWucsLuuX9iUNnp20CqCciI=
 github.com/shazow/ssh-chat v1.10.1 h1:ePS+ngEYqm+yUuXegDPutysqLV2WoI22XDOeRgI6CE0=
 github.com/shazow/ssh-chat v1.10.1/go.mod h1:0+7szsKylcre0vljkVnbuI6q7Odtc+QCDHxa+fFNV54=
-github.com/shirou/gopsutil/v3 v3.22.10/go.mod h1:QNza6r4YQoydyCfo6rH0blGfKahgibh4dQmV5xdFkQk=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -1554,7 +1550,6 @@ github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHN
 github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
 github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk=
 github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
-github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
@@ -1593,7 +1588,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -1627,8 +1621,6 @@ github.com/tj/go-buffer v1.1.0/go.mod h1:iyiJpfFcR2B9sXu7KvjbT9fpM4mOelRSDTbntVj
 github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0=
 github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod h1:/yhzCV0xPfx6jb1bBgRFjl5lytqVqZXEaeqWP8lTEao=
 github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4=
-github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
-github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
@@ -1698,7 +1690,6 @@ github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g=
 github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM=
@@ -1719,7 +1710,6 @@ github.com/yuin/goldmark v1.3.8/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.11/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
 github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
@@ -1738,8 +1728,8 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
 go.mau.fi/libsignal v0.1.0 h1:vAKI/nJ5tMhdzke4cTK1fb0idJzz1JuEIpmjprueC+c=
 go.mau.fi/libsignal v0.1.0/go.mod h1:R8ovrTezxtUNzCQE5PH30StOQWWeBskBsWE55vMfY9I=
-go.mau.fi/whatsmeow v0.0.0-20230128195103-dcbc8dd31a22 h1:za/zmM0hcfEKTRcLtr2zcUFE4VpUw8CndXNeV+v676c=
-go.mau.fi/whatsmeow v0.0.0-20230128195103-dcbc8dd31a22/go.mod h1:TrdC8N6SnPFxWo5FiMnDIDFuVyfOLzy5dWDaUPNjcHY=
+go.mau.fi/whatsmeow v0.0.0-20230306190159-5caded34a872 h1:jrIWy0l9kTxl7bdp3muFofZcyLyI1xxE7BXWeldVKr0=
+go.mau.fi/whatsmeow v0.0.0-20230306190159-5caded34a872/go.mod h1:zoTtv1CupGEyTew7TOwnBmTbHB4pVad2OzjTf5CVwa0=
 go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.7.0/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8=
 go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
@@ -1826,8 +1816,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
-golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1856,8 +1846,8 @@ golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+o
 golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20210622092929-e6eecd499c2c/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20220321031419-a8550c1d254a/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
-golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
+golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4=
+golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1885,8 +1875,9 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1969,8 +1960,9 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220403103023-749bd193bc2b/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1991,8 +1983,8 @@ golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M=
-golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
+golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw=
+golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
 golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -2007,6 +1999,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180224232135-f6cff0780e54/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -2099,7 +2093,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2134,20 +2127,22 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2157,16 +2152,17 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.2.0 h1:52I/1L54xyEQAYdtcSuxtiT84KGYTBGXwayxmIpNJhE=
-golang.org/x/time v0.2.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -2257,8 +2253,9 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -2437,8 +2434,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.29.0 h1:44S3JjaKmLEE4YIkjzexaP+NzZsudE3Zin5Njn/pYX0=
+google.golang.org/protobuf v1.29.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
@@ -2653,8 +2650,8 @@ modernc.org/libc v1.11.98/go.mod h1:ynK5sbjsU77AP+nn61+k+wxUGRx9rOFcIqWYYMaDZ4c=
 modernc.org/libc v1.11.99/go.mod h1:wLLYgEiY2D17NbBOEp+mIJJJBGSiy7fLL4ZrGGZ+8jI=
 modernc.org/libc v1.11.101/go.mod h1:wLLYgEiY2D17NbBOEp+mIJJJBGSiy7fLL4ZrGGZ+8jI=
 modernc.org/libc v1.11.104/go.mod h1:2MH3DaF/gCU8i/UBiVE1VFRos4o523M7zipmwH8SIgQ=
-modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0=
-modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug=
+modernc.org/libc v1.22.3 h1:D/g6O5ftAfavceqlLOFwaZuA5KYafKwmr30A6iSqoyY=
+modernc.org/libc v1.22.3/go.mod h1:MQrloYP209xa2zHome2a8HLiLm6k0UT8CoHpV74tOFw=
 modernc.org/lldb v1.0.0/go.mod h1:jcRvJGWfCGodDZz8BPwiKMJxGJngQ/5DrRapkQnLob8=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
@@ -2665,8 +2662,8 @@ modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
 modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
 modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
-modernc.org/memory v1.4.0 h1:crykUfNSnMAXaOJnnxcSzbUGMqkLWjklJKkBK2nwZwk=
-modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
+modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
 modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
 modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
 modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
@@ -2674,15 +2671,15 @@ modernc.org/ql v1.0.0/go.mod h1:xGVyrLIatPcO2C1JvI/Co8c0sr6y91HKFNy4pt9JXEY=
 modernc.org/sortutil v1.1.0/go.mod h1:ZyL98OQHJgH9IEfN71VsamvJgrtRX9Dj2gX+vH86L1k=
 modernc.org/sqlite v1.10.6/go.mod h1:Z9FEjUtZP4qFEg6/SiADg9XCER7aYy9a/j7Pg9P7CPs=
 modernc.org/sqlite v1.14.3/go.mod h1:xMpicS1i2MJ4C8+Ap0vYBqTwYfpFvdnPE6brbFOtV2Y=
-modernc.org/sqlite v1.20.3 h1:SqGJMMxjj1PHusLxdYxeQSodg7Jxn9WWkaAQjKrntZs=
-modernc.org/sqlite v1.20.3/go.mod h1:zKcGyrICaxNTMEHSr1HQ2GUraP0j+845GYw37+EyT6A=
+modernc.org/sqlite v1.21.0 h1:4aP4MdUf15i3R3M2mx6Q90WHKz3nZLoz96zlB6tNdow=
+modernc.org/sqlite v1.21.0/go.mod h1:XwQ0wZPIh1iKb5mkvCJ3szzbhk+tykC8ZWqTRTgYRwI=
 modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
 modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
 modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
 modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
 modernc.org/tcl v1.5.2/go.mod h1:pmJYOLgpiys3oI4AeAafkcUfE+TKKilminxNyU/+Zlo=
 modernc.org/tcl v1.9.2/go.mod h1:aw7OnlIoiuJgu1gwbTZtrKnGpDqH9wyH++jZcxdqNsg=
-modernc.org/tcl v1.15.0 h1:oY+JeD11qVVSgVvodMJsu7Edf8tr5E/7tuhF5cNYz34=
+modernc.org/tcl v1.15.1 h1:mOQwiEK4p7HruMZcwKTZPw/aqtGM4aY00uzWhlKKYws=
 modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
 modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
@@ -2692,7 +2689,6 @@ modernc.org/z v1.2.20/go.mod h1:zU9FiF4PbHdOTUxw+IF8j7ArBMRPsHgq10uVPt6xTzo=
 modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE=
 modernc.org/zappy v1.0.0/go.mod h1:hHe+oGahLVII/aTTyWK/b53VDHMAGCBYYeZ9sn83HC4=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/goversion v1.2.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY=
 rsc.io/qr v0.2.0/go.mod h1:IF+uZjkb9fqyeF/4tlBoynqmQxUoPfWEKh921coOuXs=
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/.golangci.yml b/vendor/github.com/SevereCloud/vksdk/v2/.golangci.yml
index 66712f60..8db41072 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/.golangci.yml
+++ b/vendor/github.com/SevereCloud/vksdk/v2/.golangci.yml
@@ -1,9 +1,11 @@
 ---
+run:
+  timeout: 5m
+
 linters:
   disable-all: true
   enable:
     - bodyclose
-    - deadcode
     - errcheck
     - gochecknoglobals
     - goconst
@@ -19,13 +21,11 @@ linters:
     - nakedret
     - prealloc
     - staticcheck
-    - structcheck
     - stylecheck
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace
     - wsl
     - godot
@@ -40,7 +40,6 @@ linters:
     - makezero
     - thelper
     - predeclared
-    - ifshort
     - revive
     - durationcheck
     - gomoddirectives
@@ -57,9 +56,18 @@ linters:
     - grouper
     - decorder
     - containedctx
-    # - execinquery # FIXME: panic in 1.46.0
     - nosprintfhostport
+    - usestdlibvars
 
+    - interfacebloat
+    - reassign
+
+    - testableexamples
+
+    - gocheckcompilerdirectives
+    - asasalint
+
+# - musttag # TODO: need update golangci-lint
 # - wrapcheck # TODO: v3 Fix
 # - testpackage # TODO: Fix testpackage
 # - noctx # TODO: Fix noctx
@@ -90,11 +98,22 @@ linters:
 # - errchkjson
 # - maintidx
 # - nonamedreturns
+# - nosnakecase
+# - execinquery
+# - logrlint
+
+# - dupword
+
+# - ginkgolinter
 
 # depricated
 # - maligned
 # - interfacer
 # - golint
+# - ifshort
+# - deadcode
+# - structcheck
+# - varcheck
 
 issues:
   exclude-rules:
@@ -114,4 +133,8 @@ issues:
         - stylecheck
       text: "ST1003:.*(Ts|ts).*TS"
 
+    - linters:
+        - gosec
+      text: "G307:"
+
   exclude-use-default: false
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/CONTRIBUTING.md b/vendor/github.com/SevereCloud/vksdk/v2/CONTRIBUTING.md
index 76043620..589d1a3d 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/CONTRIBUTING.md
+++ b/vendor/github.com/SevereCloud/vksdk/v2/CONTRIBUTING.md
@@ -6,7 +6,7 @@
 
 Требования:
 
-- [Go 1.16+](https://golang.org/doc/install)
+- [Go 1.18+](https://golang.org/doc/install)
 - [golangci-lint](https://github.com/golangci/golangci-lint)
 - [global .gitignore](https://help.github.com/en/articles/ignoring-files#create-a-global-gitignore)
 
@@ -54,17 +54,17 @@ go test ./...
 
 ```json
 {
-    "go.testEnvVars": {
-        "SERVICE_TOKEN": "",
-        "WIDGET_TOKEN": "",
-        "MARUSIA_TOKEN": "",
-        "GROUP_TOKEN": "",
-        "CLIENT_SECRET": "",
-        "USER_TOKEN": "",
-        "CLIENT_ID": "123456",
-        "GROUP_ID": "123456",
-        "ACCOUNT_ID": "123456"
-    }
+  "go.testEnvVars": {
+    "SERVICE_TOKEN": "",
+    "WIDGET_TOKEN": "",
+    "MARUSIA_TOKEN": "",
+    "GROUP_TOKEN": "",
+    "CLIENT_SECRET": "",
+    "USER_TOKEN": "",
+    "CLIENT_ID": "123456",
+    "GROUP_ID": "123456",
+    "ACCOUNT_ID": "123456"
+  }
 }
 ```
 
@@ -88,7 +88,4 @@ git push origin <name_of_your_new_branch>
 ```
 
 Затем откройте [pull request](https://github.com/SevereCloud/vksdk/pulls)
-с веткой:
-
-- `master` если это багфикс
-- `dev-v1.2.3` если это новая фича
+с веткой master
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/ads.go b/vendor/github.com/SevereCloud/vksdk/v2/api/ads.go
index 544143b3..92c083d8 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/ads.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/ads.go
@@ -203,7 +203,6 @@ type AdsDeleteCampaignsResponse []ErrorType
 
 // AdsDeleteCampaigns archives advertising campaigns.
 //
-//
 // Warning! Maximum allowed number of campaigns archived in one request is 100.
 //
 // https://vk.com/dev/ads.deleteCampaigns
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/api.go b/vendor/github.com/SevereCloud/vksdk/v2/api/api.go
index c1fb3dea..47acd445 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/api.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/api.go
@@ -152,7 +152,7 @@ type Params map[string]interface{}
 // cyrillic symbols will be transliterated automatically.
 // Numeric format from account.getInfo is supported as well.
 //
-// 	p.Lang(object.LangRU)
+//	p.Lang(object.LangRU)
 //
 // See all language code in module object.
 func (p Params) Lang(v int) Params {
@@ -248,7 +248,7 @@ func (vk *VK) DefaultHandler(method string, sliceParams ...Params) (Response, er
 
 		rawBody := bytes.NewBufferString(query.Encode())
 
-		req, err := http.NewRequestWithContext(ctx, "POST", u, rawBody)
+		req, err := http.NewRequestWithContext(ctx, http.MethodPost, u, rawBody)
 		if err != nil {
 			return response, err
 		}
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/apps.go b/vendor/github.com/SevereCloud/vksdk/v2/api/apps.go
index c0ecb38c..f6f1742b 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/apps.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/apps.go
@@ -58,7 +58,7 @@ type AppsGetFriendsListResponse struct {
 
 // AppsGetFriendsList creates friends list for requests and invites in current app.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/apps.getFriendsList
 func (vk *VK) AppsGetFriendsList(params Params) (response AppsGetFriendsListResponse, err error) {
@@ -75,7 +75,7 @@ type AppsGetFriendsListExtendedResponse struct {
 
 // AppsGetFriendsListExtended creates friends list for requests and invites in current app.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/apps.getFriendsList
 func (vk *VK) AppsGetFriendsListExtended(params Params) (response AppsGetFriendsListExtendedResponse, err error) {
@@ -92,7 +92,7 @@ type AppsGetLeaderboardResponse struct {
 
 // AppsGetLeaderboard returns players rating in the game.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/apps.getLeaderboard
 func (vk *VK) AppsGetLeaderboard(params Params) (response AppsGetLeaderboardResponse, err error) {
@@ -113,7 +113,7 @@ type AppsGetLeaderboardExtendedResponse struct {
 
 // AppsGetLeaderboardExtended returns players rating in the game.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/apps.getLeaderboard
 func (vk *VK) AppsGetLeaderboardExtended(params Params) (response AppsGetLeaderboardExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/auth.go b/vendor/github.com/SevereCloud/vksdk/v2/api/auth.go
index 62a08c07..df5b76d7 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/auth.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/auth.go
@@ -45,20 +45,20 @@ func (vk *VK) AuthGetProfileInfoBySilentToken(params Params) (response AuthGetPr
 
 // ExchangeSilentTokenSource call conditions exchangeSilentToken.
 //
-// 	0	Unknown
-// 	1	Silent authentication
-// 	2	Auth by login and password
-// 	3	Extended registration
-// 	4	Auth by exchange token
-// 	5	Auth by exchange token on reset password
-// 	6	Auth by exchange token on unblock
-// 	7	Auth by exchange token on reset session
-// 	8	Auth by exchange token on change password
-// 	9	Finish phone validation on authentication
-// 	10	Auth by code
-// 	11	Auth by external oauth
-// 	12	Reactivation
-// 	15	Auth by SDK temporary access-token
+//	0	Unknown
+//	1	Silent authentication
+//	2	Auth by login and password
+//	3	Extended registration
+//	4	Auth by exchange token
+//	5	Auth by exchange token on reset password
+//	6	Auth by exchange token on unblock
+//	7	Auth by exchange token on reset session
+//	8	Auth by exchange token on change password
+//	9	Finish phone validation on authentication
+//	10	Auth by code
+//	11	Auth by external oauth
+//	12	Reactivation
+//	15	Auth by SDK temporary access-token
 type ExchangeSilentTokenSource int
 
 // AuthExchangeSilentAuthTokenResponse struct.
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/board.go b/vendor/github.com/SevereCloud/vksdk/v2/api/board.go
index 82ddd5c0..de5aeaae 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/board.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/board.go
@@ -78,7 +78,7 @@ type BoardGetCommentsResponse struct {
 
 // BoardGetComments returns a list of comments on a topic on a community's discussion board.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/board.getComments
 func (vk *VK) BoardGetComments(params Params) (response BoardGetCommentsResponse, err error) {
@@ -99,7 +99,7 @@ type BoardGetCommentsExtendedResponse struct {
 
 // BoardGetCommentsExtended returns a list of comments on a topic on a community's discussion board.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/board.getComments
 func (vk *VK) BoardGetCommentsExtended(params Params) (response BoardGetCommentsExtendedResponse, err error) {
@@ -118,7 +118,7 @@ type BoardGetTopicsResponse struct {
 
 // BoardGetTopics returns a list of topics on a community's discussion board.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/board.getTopics
 func (vk *VK) BoardGetTopics(params Params) (response BoardGetTopicsResponse, err error) {
@@ -139,7 +139,7 @@ type BoardGetTopicsExtendedResponse struct {
 
 // BoardGetTopicsExtended returns a list of topics on a community's discussion board.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/board.getTopics
 func (vk *VK) BoardGetTopicsExtended(params Params) (response BoardGetTopicsExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/calls.go b/vendor/github.com/SevereCloud/vksdk/v2/api/calls.go
new file mode 100644
index 00000000..32a51cf2
--- /dev/null
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/calls.go
@@ -0,0 +1,23 @@
+package api // import "github.com/SevereCloud/vksdk/v2/api"
+
+// CallsStartResponse struct.
+type CallsStartResponse struct {
+	JoinLink string `json:"join_link"`
+	CallID   string `json:"call_id"`
+}
+
+// CallsStart method.
+//
+// https://vk.com/dev/calls.start
+func (vk *VK) CallsStart(params Params) (response CallsStartResponse, err error) {
+	err = vk.RequestUnmarshal("calls.start", &response, params)
+	return
+}
+
+// CallsForceFinish method.
+//
+// https://vk.com/dev/calls.forceFinish
+func (vk *VK) CallsForceFinish(params Params) (response int, err error) {
+	err = vk.RequestUnmarshal("calls.forceFinish", &response, params)
+	return
+}
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/execute.go b/vendor/github.com/SevereCloud/vksdk/v2/api/execute.go
index 1ee04cee..1dd35e93 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/execute.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/execute.go
@@ -13,8 +13,8 @@ import (
 // The Args map variable allows you to retrieve the parameters passed during
 // the request and avoids code formatting.
 //
-// 	return Args.code; // return parameter "code"
-// 	return Args.v; // return parameter "v"
+//	return Args.code; // return parameter "code"
+//	return Args.v; // return parameter "v"
 //
 // https://vk.com/dev/execute
 func (vk *VK) ExecuteWithArgs(code string, params Params, obj interface{}) error {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/fave.go b/vendor/github.com/SevereCloud/vksdk/v2/api/fave.go
index 5690aab8..b519f1b0 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/fave.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/fave.go
@@ -79,7 +79,7 @@ type FaveGetResponse struct {
 
 // FaveGet method.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/fave.get
 func (vk *VK) FaveGet(params Params) (response FaveGetResponse, err error) {
@@ -97,7 +97,7 @@ type FaveGetExtendedResponse struct {
 
 // FaveGetExtended method.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/fave.get
 func (vk *VK) FaveGetExtended(params Params) (response FaveGetExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/friends.go b/vendor/github.com/SevereCloud/vksdk/v2/api/friends.go
index 07cfc7d7..4cbb8c7c 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/friends.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/friends.go
@@ -169,7 +169,7 @@ func (vk *VK) FriendsGetMutual(params Params) (response FriendsGetMutualResponse
 
 // FriendsGetOnline returns a list of user IDs of a user's friends who are online.
 //
-// 	online_mobile=0
+//	online_mobile=0
 //
 // https://vk.com/dev/friends.getOnline
 func (vk *VK) FriendsGetOnline(params Params) (response []int, err error) {
@@ -186,7 +186,7 @@ type FriendsGetOnlineOnlineMobileResponse struct {
 
 // FriendsGetOnlineOnlineMobile returns a list of user IDs of a user's friends who are online.
 //
-// 	online_mobile=1
+//	online_mobile=1
 //
 // https://vk.com/dev/friends.getOnline
 func (vk *VK) FriendsGetOnlineOnlineMobile(params Params) (response FriendsGetOnlineOnlineMobileResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/groups.go b/vendor/github.com/SevereCloud/vksdk/v2/api/groups.go
index 72c4143f..868bee86 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/groups.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/groups.go
@@ -157,7 +157,7 @@ type GroupsGetResponse struct {
 
 // GroupsGet returns a list of the communities to which a user belongs.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/groups.get
 func (vk *VK) GroupsGet(params Params) (response GroupsGetResponse, err error) {
@@ -174,7 +174,7 @@ type GroupsGetExtendedResponse struct {
 
 // GroupsGetExtended returns a list of the communities to which a user belongs.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/groups.get
 func (vk *VK) GroupsGetExtended(params Params) (response GroupsGetExtendedResponse, err error) {
@@ -273,6 +273,8 @@ type GroupsGetCatalogResponse struct {
 
 // GroupsGetCatalog returns communities list for a catalog category.
 //
+// Deprecated: This method is deprecated and may be disabled soon, please avoid
+//
 // https://vk.com/dev/groups.getCatalog
 func (vk *VK) GroupsGetCatalog(params Params) (response GroupsGetCatalogResponse, err error) {
 	err = vk.RequestUnmarshal("groups.getCatalog", &response, params)
@@ -287,7 +289,7 @@ type GroupsGetCatalogInfoResponse struct {
 
 // GroupsGetCatalogInfo returns categories list for communities catalog.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/groups.getCatalogInfo
 func (vk *VK) GroupsGetCatalogInfo(params Params) (response GroupsGetCatalogInfoResponse, err error) {
@@ -304,7 +306,7 @@ type GroupsGetCatalogInfoExtendedResponse struct {
 
 // GroupsGetCatalogInfoExtended returns categories list for communities catalog.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/groups.getCatalogInfo
 func (vk *VK) GroupsGetCatalogInfoExtended(params Params) (response GroupsGetCatalogInfoExtendedResponse, err error) {
@@ -421,7 +423,7 @@ type GroupsGetMembersFilterManagersResponse struct {
 
 // GroupsGetMembersFilterManagers returns a list of community members.
 //
-// 	filter=managers
+//	filter=managers
 //
 // https://vk.com/dev/groups.getMembers
 func (vk *VK) GroupsGetMembersFilterManagers(params Params) (
@@ -522,7 +524,7 @@ func (vk *VK) GroupsInvite(params Params) (response int, err error) {
 
 // GroupsIsMember returns information specifying whether a user is a member of a community.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/groups.isMember
 func (vk *VK) GroupsIsMember(params Params) (response int, err error) {
@@ -542,7 +544,7 @@ type GroupsIsMemberExtendedResponse struct {
 
 // GroupsIsMemberExtended returns information specifying whether a user is a member of a community.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/groups.isMember
 func (vk *VK) GroupsIsMemberExtended(params Params) (response GroupsIsMemberExtendedResponse, err error) {
@@ -556,8 +558,8 @@ type GroupsIsMemberUserIDsExtendedResponse []object.GroupsMemberStatusFull
 
 // GroupsIsMemberUserIDsExtended returns information specifying whether a user is a member of a community.
 //
-// 	extended=1
-// 	need user_ids
+//	extended=1
+//	need user_ids
 //
 // https://vk.com/dev/groups.isMember
 func (vk *VK) GroupsIsMemberUserIDsExtended(params Params) (response GroupsIsMemberUserIDsExtendedResponse, err error) {
@@ -571,8 +573,8 @@ type GroupsIsMemberUserIDsResponse []object.GroupsMemberStatus
 
 // GroupsIsMemberUserIDs returns information specifying whether a user is a member of a community.
 //
-// 	extended=0
-// 	need user_ids
+//	extended=0
+//	need user_ids
 //
 // https://vk.com/dev/groups.isMember
 func (vk *VK) GroupsIsMemberUserIDs(params Params) (response GroupsIsMemberUserIDsResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/likes.go b/vendor/github.com/SevereCloud/vksdk/v2/api/likes.go
index 047c2935..fc89c08b 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/likes.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/likes.go
@@ -38,7 +38,7 @@ type LikesGetListResponse struct {
 
 // LikesGetList likes.getList returns a list of IDs of users who added the specified object to their Likes list.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/likes.getList
 func (vk *VK) LikesGetList(params Params) (response LikesGetListResponse, err error) {
@@ -55,7 +55,7 @@ type LikesGetListExtendedResponse struct {
 
 // LikesGetListExtended likes.getList returns a list of IDs of users who added the specified object to their Likes list.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/likes.getList
 func (vk *VK) LikesGetListExtended(params Params) (response LikesGetListExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/market.go b/vendor/github.com/SevereCloud/vksdk/v2/api/market.go
index 6b823818..e11f5a9f 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/market.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/market.go
@@ -181,7 +181,7 @@ type MarketGetCommentsResponse struct {
 
 // MarketGetComments returns comments list for an item.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/market.getComments
 func (vk *VK) MarketGetComments(params Params) (response MarketGetCommentsResponse, err error) {
@@ -199,7 +199,7 @@ type MarketGetCommentsExtendedResponse struct {
 
 // MarketGetCommentsExtended returns comments list for an item.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/market.getComments
 func (vk *VK) MarketGetCommentsExtended(params Params) (response MarketGetCommentsExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/messages.go b/vendor/github.com/SevereCloud/vksdk/v2/api/messages.go
index 7a0bebc4..0b15a6a5 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/messages.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/messages.go
@@ -118,6 +118,8 @@ func (vk *VK) MessagesEditChat(params Params) (response int, err error) {
 
 // MessagesForceCallFinish method.
 //
+// Deprecated: Use CallsForceFinish
+//
 // https://vk.com/dev/messages.forceCallFinish
 func (vk *VK) MessagesForceCallFinish(params Params) (response int, err error) {
 	err = vk.RequestUnmarshal("messages.forceCallFinish", &response, params)
@@ -150,7 +152,7 @@ type MessagesGetByIDResponse struct {
 
 // MessagesGetByID returns messages by their IDs.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/messages.getById
 func (vk *VK) MessagesGetByID(params Params) (response MessagesGetByIDResponse, err error) {
@@ -168,7 +170,7 @@ type MessagesGetByIDExtendedResponse struct {
 
 // MessagesGetByIDExtended returns messages by their IDs.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/messages.getById
 func (vk *VK) MessagesGetByIDExtended(params Params) (response MessagesGetByIDExtendedResponse, err error) {
@@ -268,7 +270,7 @@ type MessagesGetConversationsByIDResponse struct {
 
 // MessagesGetConversationsByID returns conversations by their IDs.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/messages.getConversationsById
 func (vk *VK) MessagesGetConversationsByID(params Params) (response MessagesGetConversationsByIDResponse, err error) {
@@ -286,7 +288,7 @@ type MessagesGetConversationsByIDExtendedResponse struct {
 
 // MessagesGetConversationsByIDExtended returns conversations by their IDs.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/messages.getConversationsById
 func (vk *VK) MessagesGetConversationsByIDExtended(params Params) (
@@ -583,7 +585,7 @@ type MessagesSendUserIDsResponse []struct {
 
 // MessagesSendPeerIDs sends a message.
 //
-// 	need peer_ids;
+//	need peer_ids;
 //
 // https://vk.com/dev/messages.send
 func (vk *VK) MessagesSendPeerIDs(params Params) (response MessagesSendUserIDsResponse, err error) {
@@ -593,7 +595,7 @@ func (vk *VK) MessagesSendPeerIDs(params Params) (response MessagesSendUserIDsRe
 
 // MessagesSendUserIDs sends a message.
 //
-// 	need user_ids or peer_ids;
+//	need user_ids or peer_ids;
 //
 // https://vk.com/dev/messages.send
 //
@@ -649,6 +651,8 @@ type MessagesStartCallResponse struct {
 
 // MessagesStartCall method.
 //
+// Deprecated: Use CallsStart
+//
 // https://vk.com/dev/messages.startCall
 func (vk *VK) MessagesStartCall(params Params) (response MessagesStartCallResponse, err error) {
 	err = vk.RequestUnmarshal("messages.startCall", &response, params)
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/newsfeed.go b/vendor/github.com/SevereCloud/vksdk/v2/api/newsfeed.go
index 36ce1453..52f19cf3 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/newsfeed.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/newsfeed.go
@@ -53,7 +53,7 @@ type NewsfeedGetBannedResponse struct {
 
 // NewsfeedGetBanned returns a list of users and communities banned from the current user's newsfeed.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/newsfeed.getBanned
 func (vk *VK) NewsfeedGetBanned(params Params) (response NewsfeedGetBannedResponse, err error) {
@@ -69,7 +69,7 @@ type NewsfeedGetBannedExtendedResponse struct {
 
 // NewsfeedGetBannedExtended returns a list of users and communities banned from the current user's newsfeed.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/newsfeed.getBanned
 func (vk *VK) NewsfeedGetBannedExtended(params Params) (response NewsfeedGetBannedExtendedResponse, err error) {
@@ -183,7 +183,7 @@ type NewsfeedSearchResponse struct {
 
 // NewsfeedSearch returns search results by statuses.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/newsfeed.search
 func (vk *VK) NewsfeedSearch(params Params) (response NewsfeedSearchResponse, err error) {
@@ -204,7 +204,7 @@ type NewsfeedSearchExtendedResponse struct {
 
 // NewsfeedSearchExtended returns search results by statuses.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/newsfeed.search
 func (vk *VK) NewsfeedSearchExtended(params Params) (response NewsfeedSearchExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/photos.go b/vendor/github.com/SevereCloud/vksdk/v2/api/photos.go
index d52cbeed..3754814c 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/photos.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/photos.go
@@ -95,7 +95,7 @@ type PhotosGetResponse struct {
 
 // PhotosGet returns a list of a user's or community's photos.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/photos.get
 func (vk *VK) PhotosGet(params Params) (response PhotosGetResponse, err error) {
@@ -112,7 +112,7 @@ type PhotosGetExtendedResponse struct {
 
 // PhotosGetExtended returns a list of a user's or community's photos.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/photos.get
 func (vk *VK) PhotosGetExtended(params Params) (response PhotosGetExtendedResponse, err error) {
@@ -152,7 +152,7 @@ type PhotosGetAllResponse struct {
 
 // PhotosGetAll returns a list of photos belonging to a user or community, in reverse chronological order.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/photos.getAll
 func (vk *VK) PhotosGetAll(params Params) (response PhotosGetAllResponse, err error) {
@@ -170,7 +170,7 @@ type PhotosGetAllExtendedResponse struct {
 
 // PhotosGetAllExtended returns a list of photos belonging to a user or community, in reverse chronological order.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/photos.getAll
 func (vk *VK) PhotosGetAllExtended(params Params) (response PhotosGetAllExtendedResponse, err error) {
@@ -199,7 +199,7 @@ type PhotosGetByIDResponse []object.PhotosPhoto
 
 // PhotosGetByID returns information about photos by their IDs.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/photos.getById
 func (vk *VK) PhotosGetByID(params Params) (response PhotosGetByIDResponse, err error) {
@@ -213,7 +213,7 @@ type PhotosGetByIDExtendedResponse []object.PhotosPhotoFull
 
 // PhotosGetByIDExtended returns information about photos by their IDs.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/photos.getById
 func (vk *VK) PhotosGetByIDExtended(params Params) (response PhotosGetByIDExtendedResponse, err error) {
@@ -244,7 +244,7 @@ type PhotosGetCommentsResponse struct {
 
 // PhotosGetComments returns a list of comments on a photo.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/photos.getComments
 func (vk *VK) PhotosGetComments(params Params) (response PhotosGetCommentsResponse, err error) {
@@ -264,7 +264,7 @@ type PhotosGetCommentsExtendedResponse struct {
 
 // PhotosGetCommentsExtended returns a list of comments on a photo.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/photos.getComments
 func (vk *VK) PhotosGetCommentsExtended(params Params) (response PhotosGetCommentsExtendedResponse, err error) {
@@ -395,7 +395,7 @@ type PhotosGetUserPhotosResponse struct {
 
 // PhotosGetUserPhotos returns a list of photos in which a user is tagged.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/photos.getUserPhotos
 func (vk *VK) PhotosGetUserPhotos(params Params) (response PhotosGetUserPhotosResponse, err error) {
@@ -412,7 +412,7 @@ type PhotosGetUserPhotosExtendedResponse struct {
 
 // PhotosGetUserPhotosExtended returns a list of photos in which a user is tagged.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/photos.getUserPhotos
 func (vk *VK) PhotosGetUserPhotosExtended(params Params) (response PhotosGetUserPhotosExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/podcasts.go b/vendor/github.com/SevereCloud/vksdk/v2/api/podcasts.go
index 8534d0fc..51ffb8cb 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/podcasts.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/podcasts.go
@@ -11,7 +11,7 @@ type PodcastsGetCatalogResponse struct {
 
 // PodcastsGetCatalog method.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/podcasts.getCatalog
 func (vk *VK) PodcastsGetCatalog(params Params) (response PodcastsGetCatalogResponse, err error) {
@@ -28,7 +28,7 @@ type PodcastsGetCatalogExtendedResponse struct {
 
 // PodcastsGetCatalogExtended method.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/podcasts.getCatalog
 func (vk *VK) PodcastsGetCatalogExtended(params Params) (response PodcastsGetCatalogExtendedResponse, err error) {
@@ -70,7 +70,7 @@ type PodcastsGetFeedResponse struct {
 
 // PodcastsGetFeed method.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/podcasts.getFeed
 func (vk *VK) PodcastsGetFeed(params Params) (response PodcastsGetFeedResponse, err error) {
@@ -88,7 +88,7 @@ type PodcastsGetFeedExtendedResponse struct {
 
 // PodcastsGetFeedExtended method.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/podcasts.getFeed
 func (vk *VK) PodcastsGetFeedExtended(params Params) (response PodcastsGetFeedExtendedResponse, err error) {
@@ -116,7 +116,7 @@ type PodcastsGetStartPageResponse struct {
 
 // PodcastsGetStartPage method.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/podcasts.getStartPage
 func (vk *VK) PodcastsGetStartPage(params Params) (response PodcastsGetStartPageResponse, err error) {
@@ -145,7 +145,7 @@ type PodcastsGetStartPageExtendedResponse struct {
 
 // PodcastsGetStartPageExtended method.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/podcasts.getStartPage
 func (vk *VK) PodcastsGetStartPageExtended(params Params) (response PodcastsGetStartPageExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/stories.go b/vendor/github.com/SevereCloud/vksdk/v2/api/stories.go
index b68424b8..d3893029 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/stories.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/stories.go
@@ -30,7 +30,7 @@ type StoriesGetResponse struct {
 
 // StoriesGet returns stories available for current user.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/stories.get
 func (vk *VK) StoriesGet(params Params) (response StoriesGetResponse, err error) {
@@ -50,7 +50,7 @@ type StoriesGetExtendedResponse struct {
 
 // StoriesGetExtended returns stories available for current user.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/stories.get
 func (vk *VK) StoriesGetExtended(params Params) (response StoriesGetExtendedResponse, err error) {
@@ -67,7 +67,7 @@ type StoriesGetBannedResponse struct {
 
 // StoriesGetBanned returns list of sources hidden from current user's feed.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/stories.getBanned
 func (vk *VK) StoriesGetBanned(params Params) (response StoriesGetBannedResponse, err error) {
@@ -85,7 +85,7 @@ type StoriesGetBannedExtendedResponse struct {
 
 // StoriesGetBannedExtended returns list of sources hidden from current user's feed.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/stories.getBanned
 func (vk *VK) StoriesGetBannedExtended(params Params) (response StoriesGetBannedExtendedResponse, err error) {
@@ -102,7 +102,7 @@ type StoriesGetByIDResponse struct {
 
 // StoriesGetByID returns story by its ID.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/stories.getById
 func (vk *VK) StoriesGetByID(params Params) (response StoriesGetByIDResponse, err error) {
@@ -120,7 +120,7 @@ type StoriesGetByIDExtendedResponse struct {
 
 // StoriesGetByIDExtended returns story by its ID.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/stories.getById
 func (vk *VK) StoriesGetByIDExtended(params Params) (response StoriesGetByIDExtendedResponse, err error) {
@@ -152,7 +152,7 @@ type StoriesGetRepliesResponse struct {
 
 // StoriesGetReplies returns replies to the story.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/stories.getReplies
 func (vk *VK) StoriesGetReplies(params Params) (response StoriesGetRepliesResponse, err error) {
@@ -170,7 +170,7 @@ type StoriesGetRepliesExtendedResponse struct {
 
 // StoriesGetRepliesExtended returns replies to the story.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/stories.getReplies
 func (vk *VK) StoriesGetRepliesExtended(params Params) (response StoriesGetRepliesExtendedResponse, err error) {
@@ -213,7 +213,7 @@ type StoriesGetViewersResponse struct {
 
 // StoriesGetViewers returns a list of story viewers.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/stories.getViewers
 func (vk *VK) StoriesGetViewers(params Params) (response StoriesGetViewersResponse, err error) {
@@ -261,7 +261,7 @@ type StoriesSearchResponse struct {
 
 // StoriesSearch returns search results for stories.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/stories.search
 func (vk *VK) StoriesSearch(params Params) (response StoriesSearchResponse, err error) {
@@ -279,7 +279,7 @@ type StoriesSearchExtendedResponse struct {
 
 // StoriesSearchExtended returns search results for stories.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/stories.search
 func (vk *VK) StoriesSearchExtended(params Params) (response StoriesSearchExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/upload.go b/vendor/github.com/SevereCloud/vksdk/v2/api/upload.go
index 59f65460..70362ebe 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/upload.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/upload.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
-	"io/ioutil"
 	"mime/multipart"
 
 	"github.com/SevereCloud/vksdk/v2/object"
@@ -34,7 +33,7 @@ func (vk *VK) UploadFile(url string, file io.Reader, fieldname, filename string)
 	}
 	defer resp.Body.Close()
 
-	bodyContent, err = ioutil.ReadAll(resp.Body)
+	bodyContent, err = io.ReadAll(resp.Body)
 
 	return
 }
@@ -214,7 +213,7 @@ func (vk *VK) uploadOwnerPhoto(params Params, squareCrop string, file io.Reader)
 	}
 	defer resp.Body.Close()
 
-	bodyContent, err := ioutil.ReadAll(resp.Body)
+	bodyContent, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return
 	}
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/users.go b/vendor/github.com/SevereCloud/vksdk/v2/api/users.go
index 2251d562..fdd25ead 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/users.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/users.go
@@ -24,7 +24,7 @@ type UsersGetFollowersResponse struct {
 // UsersGetFollowers returns a list of IDs of followers of the user in
 // question, sorted by date added, most recent first.
 //
-// 	fields="";
+//	fields="";
 //
 // https://vk.com/dev/users.getFollowers
 func (vk *VK) UsersGetFollowers(params Params) (response UsersGetFollowersResponse, err error) {
@@ -70,7 +70,7 @@ type UsersGetSubscriptionsResponse struct {
 
 // UsersGetSubscriptions returns a list of IDs of users and public pages followed by the user.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/users.getSubscriptions
 //
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/utils.go b/vendor/github.com/SevereCloud/vksdk/v2/api/utils.go
index 965c26f2..97030e94 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/utils.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/utils.go
@@ -43,7 +43,7 @@ type UtilsGetLinkStatsResponse object.UtilsLinkStats
 
 // UtilsGetLinkStats returns stats data for shortened link.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/utils.getLinkStats
 func (vk *VK) UtilsGetLinkStats(params Params) (response UtilsGetLinkStatsResponse, err error) {
@@ -57,7 +57,7 @@ type UtilsGetLinkStatsExtendedResponse object.UtilsLinkStatsExtended
 
 // UtilsGetLinkStatsExtended returns stats data for shortened link.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/utils.getLinkStats
 func (vk *VK) UtilsGetLinkStatsExtended(params Params) (response UtilsGetLinkStatsExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/video.go b/vendor/github.com/SevereCloud/vksdk/v2/api/video.go
index 01b7f83e..de9eee5a 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/video.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/video.go
@@ -97,7 +97,7 @@ type VideoGetResponse struct {
 
 // VideoGet returns detailed information about videos.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/video.get
 func (vk *VK) VideoGet(params Params) (response VideoGetResponse, err error) {
@@ -115,7 +115,7 @@ type VideoGetExtendedResponse struct {
 
 // VideoGetExtended returns detailed information about videos.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/video.get
 func (vk *VK) VideoGetExtended(params Params) (response VideoGetExtendedResponse, err error) {
@@ -143,7 +143,7 @@ type VideoGetAlbumsResponse struct {
 
 // VideoGetAlbums returns a list of video albums owned by a user or community.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/video.getAlbums
 func (vk *VK) VideoGetAlbums(params Params) (response VideoGetAlbumsResponse, err error) {
@@ -160,7 +160,7 @@ type VideoGetAlbumsExtendedResponse struct {
 
 // VideoGetAlbumsExtended returns a list of video albums owned by a user or community.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/video.getAlbums
 func (vk *VK) VideoGetAlbumsExtended(params Params) (response VideoGetAlbumsExtendedResponse, err error) {
@@ -174,7 +174,7 @@ type VideoGetAlbumsByVideoResponse []int
 
 // VideoGetAlbumsByVideo returns a list of albums in which the video is located.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/video.getAlbumsByVideo
 func (vk *VK) VideoGetAlbumsByVideo(params Params) (response VideoGetAlbumsByVideoResponse, err error) {
@@ -191,7 +191,7 @@ type VideoGetAlbumsByVideoExtendedResponse struct {
 
 // VideoGetAlbumsByVideoExtended returns a list of albums in which the video is located.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/video.getAlbumsByVideo
 func (vk *VK) VideoGetAlbumsByVideoExtended(params Params) (response VideoGetAlbumsByVideoExtendedResponse, err error) {
@@ -208,7 +208,7 @@ type VideoGetCommentsResponse struct {
 
 // VideoGetComments returns a list of comments on a video.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/video.getComments
 func (vk *VK) VideoGetComments(params Params) (response VideoGetCommentsResponse, err error) {
@@ -226,7 +226,7 @@ type VideoGetCommentsExtendedResponse struct {
 
 // VideoGetCommentsExtended returns a list of comments on a video.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/video.getComments
 func (vk *VK) VideoGetCommentsExtended(params Params) (response VideoGetCommentsExtendedResponse, err error) {
@@ -321,7 +321,7 @@ type VideoSearchResponse struct {
 
 // VideoSearch returns a list of videos under the set search criterion.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/video.search
 func (vk *VK) VideoSearch(params Params) (response VideoSearchResponse, err error) {
@@ -339,7 +339,7 @@ type VideoSearchExtendedResponse struct {
 
 // VideoSearchExtended returns a list of videos under the set search criterion.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/video.search
 func (vk *VK) VideoSearchExtended(params Params) (response VideoSearchExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/api/wall.go b/vendor/github.com/SevereCloud/vksdk/v2/api/wall.go
index e951a749..81dab18a 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/api/wall.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/api/wall.go
@@ -87,7 +87,7 @@ type WallGetResponse struct {
 
 // WallGet returns a list of posts on a user wall or community wall.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/wall.get
 func (vk *VK) WallGet(params Params) (response WallGetResponse, err error) {
@@ -105,7 +105,7 @@ type WallGetExtendedResponse struct {
 
 // WallGetExtended returns a list of posts on a user wall or community wall.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/wall.get
 func (vk *VK) WallGetExtended(params Params) (response WallGetExtendedResponse, err error) {
@@ -119,7 +119,7 @@ type WallGetByIDResponse []object.WallWallpost
 
 // WallGetByID returns a list of posts from user or community walls by their IDs.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/wall.getById
 func (vk *VK) WallGetByID(params Params) (response WallGetByIDResponse, err error) {
@@ -136,7 +136,7 @@ type WallGetByIDExtendedResponse struct {
 
 // WallGetByIDExtended returns a list of posts from user or community walls by their IDs.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/wall.getById
 func (vk *VK) WallGetByIDExtended(params Params) (response WallGetByIDExtendedResponse, err error) {
@@ -156,7 +156,7 @@ type WallGetCommentResponse struct {
 
 // WallGetComment allows to obtain wall comment info.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/wall.getComment
 func (vk *VK) WallGetComment(params Params) (response WallGetCommentResponse, err error) {
@@ -179,7 +179,7 @@ type WallGetCommentExtendedResponse struct {
 
 // WallGetCommentExtended allows to obtain wall comment info.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/wall.getComment
 func (vk *VK) WallGetCommentExtended(params Params) (response WallGetCommentExtendedResponse, err error) {
@@ -200,7 +200,7 @@ type WallGetCommentsResponse struct {
 
 // WallGetComments returns a list of comments on a post on a user wall or community wall.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/wall.getComments
 func (vk *VK) WallGetComments(params Params) (response WallGetCommentsResponse, err error) {
@@ -222,7 +222,7 @@ type WallGetCommentsExtendedResponse struct {
 
 // WallGetCommentsExtended returns a list of comments on a post on a user wall or community wall.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/wall.getComments
 func (vk *VK) WallGetCommentsExtended(params Params) (response WallGetCommentsExtendedResponse, err error) {
@@ -347,7 +347,7 @@ type WallSearchResponse struct {
 
 // WallSearch allows to search posts on user or community walls.
 //
-// 	extended=0
+//	extended=0
 //
 // https://vk.com/dev/wall.search
 func (vk *VK) WallSearch(params Params) (response WallSearchResponse, err error) {
@@ -365,7 +365,7 @@ type WallSearchExtendedResponse struct {
 
 // WallSearchExtended allows to search posts on user or community walls.
 //
-// 	extended=1
+//	extended=1
 //
 // https://vk.com/dev/wall.search
 func (vk *VK) WallSearchExtended(params Params) (response WallSearchExtendedResponse, err error) {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/doc.go b/vendor/github.com/SevereCloud/vksdk/v2/doc.go
index a61bad7d..9862a5fe 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/doc.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/doc.go
@@ -7,6 +7,6 @@ package vksdk
 
 // Module constants.
 const (
-	Version = "2.15.0"
+	Version = "2.16.0"
 	API     = "5.131"
 )
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/events/events.go b/vendor/github.com/SevereCloud/vksdk/v2/events/events.go
index 2bda613a..babc23f6 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/events/events.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/events/events.go
@@ -156,13 +156,15 @@ func NewFuncList() *FuncList {
 }
 
 // Handler group event handler.
-func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:gocyclo
+func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { //nolint:gocyclo
 	ctx = context.WithValue(ctx, internal.GroupIDKey, e.GroupID)
 	ctx = context.WithValue(ctx, internal.EventIDKey, e.EventID)
 	ctx = context.WithValue(ctx, internal.EventVersionKey, e.V)
 
 	if sliceFunc, ok := fl.special[e.Type]; ok {
 		for _, f := range sliceFunc {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, e) }()
 			} else {
@@ -179,6 +181,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.messageNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -192,6 +196,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.messageReply {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -205,6 +211,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.messageEdit {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -218,6 +226,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.messageAllow {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -231,6 +241,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.messageDeny {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -244,6 +256,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.messageTypingState {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -257,6 +271,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.messageEvent {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -270,6 +286,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.photoNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -283,6 +301,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.photoCommentNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -296,6 +316,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.photoCommentEdit {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -309,6 +331,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.photoCommentRestore {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -322,6 +346,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.photoCommentDelete {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -335,6 +361,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.audioNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -348,6 +376,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.videoNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -361,6 +391,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.videoCommentNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -374,6 +406,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.videoCommentEdit {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -387,6 +421,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.videoCommentRestore {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -400,6 +436,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.videoCommentDelete {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -413,6 +451,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.wallPostNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -426,6 +466,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.wallRepost {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -439,6 +481,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.wallReplyNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -452,6 +496,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.wallReplyEdit {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -465,6 +511,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.wallReplyRestore {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -478,6 +526,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.wallReplyDelete {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -491,6 +541,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.boardPostNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -504,6 +556,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.boardPostEdit {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -517,6 +571,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.boardPostRestore {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -530,6 +586,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.boardPostDelete {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -543,6 +601,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.marketCommentNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -556,6 +616,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.marketCommentEdit {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -569,6 +631,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.marketCommentRestore {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -582,6 +646,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.marketCommentDelete {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -595,6 +661,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.marketOrderNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -608,6 +676,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.marketOrderEdit {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -621,6 +691,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.groupLeave {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -634,6 +706,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.groupJoin {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -647,6 +721,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.userBlock {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -660,6 +736,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.userUnblock {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -673,6 +751,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.pollVoteNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -686,6 +766,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.groupOfficersEdit {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -699,6 +781,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.groupChangeSettings {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -712,6 +796,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.groupChangePhoto {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -725,6 +811,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.vkpayTransaction {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -738,6 +826,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.leadFormsNew {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -751,6 +841,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.appPayload {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -764,6 +856,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.messageRead {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -777,6 +871,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.likeAdd {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -790,6 +886,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.likeRemove {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -803,6 +901,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.donutSubscriptionCreate {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -816,6 +916,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.donutSubscriptionProlonged {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -829,6 +931,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.donutSubscriptionExpired {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -842,6 +946,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.donutSubscriptionCancelled {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -855,6 +961,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.donutSubscriptionPriceChanged {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -868,6 +976,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.donutMoneyWithdraw {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
@@ -881,6 +991,8 @@ func (fl FuncList) Handler(ctx context.Context, e GroupEvent) error { // nolint:
 		}
 
 		for _, f := range fl.donutMoneyWithdrawError {
+			f := f
+
 			if fl.goroutine {
 				go func() { f(ctx, obj) }()
 			} else {
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/object/stats.go b/vendor/github.com/SevereCloud/vksdk/v2/object/stats.go
index b8fe5001..46b891ba 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/object/stats.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/object/stats.go
@@ -66,12 +66,24 @@ type StatsViews struct {
 
 // StatsWallpostStat struct.
 type StatsWallpostStat struct {
+	PostID           int `json:"post_id"`
 	Hide             int `json:"hide"`              // Hidings number
 	JoinGroup        int `json:"join_group"`        // People have joined the group
 	Links            int `json:"links"`             // Link click-through
 	ReachSubscribers int `json:"reach_subscribers"` // Subscribers reach
 	ReachTotal       int `json:"reach_total"`       // Total reach
+	ReachViral       int `json:"reach_viral"`       // Viral reach
+	ReachAds         int `json:"reach_ads"`         // Advertising reach
 	Report           int `json:"report"`            // Reports number
 	ToGroup          int `json:"to_group"`          // Click-through to community
 	Unsubscribe      int `json:"unsubscribe"`       // Unsubscribed members
+	AdViews          int `json:"ad_views"`
+	AdSubscribers    int `json:"ad_subscribers"`
+	AdHide           int `json:"ad_hide"`
+	AdUnsubscribe    int `json:"ad_unsubscribe"`
+	AdLinks          int `json:"ad_links"`
+	AdToGroup        int `json:"ad_to_group"`
+	AdJoinGroup      int `json:"ad_join_group"`
+	AdCoverage       int `json:"ad_coverage"`
+	AdReport         int `json:"ad_report"`
 }
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/object/stories.go b/vendor/github.com/SevereCloud/vksdk/v2/object/stories.go
index 5f87745a..5de9494c 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/object/stories.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/object/stories.go
@@ -239,7 +239,7 @@ func (cs StoriesClickableStickers) ToJSON() string {
 }
 
 // StoriesClickableSticker struct.
-type StoriesClickableSticker struct { // nolint: maligned
+type StoriesClickableSticker struct { //nolint: maligned
 	ID            int                     `json:"id"`
 	Type          string                  `json:"type"`
 	ClickableArea []StoriesClickablePoint `json:"clickable_area"`
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/object/users.go b/vendor/github.com/SevereCloud/vksdk/v2/object/users.go
index 91ef92be..9027229c 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/object/users.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/object/users.go
@@ -125,6 +125,7 @@ type UsersUser struct {
 	MobilePhone     string                `json:"mobile_phone"`
 	HomePhone       string                `json:"home_phone"`
 	FoundWith       int                   `json:"found_with"` // TODO: check it
+	ImageStatus     ImageStatusInfo       `json:"image_status"`
 	OnlineInfo      UsersOnlineInfo       `json:"online_info"`
 	Mutual          FriendsRequestsMutual `json:"mutual"`
 	TrackCode       string                `json:"track_code"`
@@ -138,6 +139,13 @@ func (user UsersUser) ToMention() string {
 	return fmt.Sprintf("[id%d|%s %s]", user.ID, user.FirstName, user.LastName)
 }
 
+// ImageStatusInfo struct.
+type ImageStatusInfo struct {
+	ID     int         `json:"id"`
+	Name   string      `json:"name"`
+	Images []BaseImage `json:"images"`
+}
+
 // UsersOnlineInfo struct.
 type UsersOnlineInfo struct {
 	AppID    int         `json:"app_id"`
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/object/wall.go b/vendor/github.com/SevereCloud/vksdk/v2/object/wall.go
index 1a195b39..99443659 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/object/wall.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/object/wall.go
@@ -161,6 +161,7 @@ type WallWallpost struct {
 	Edited         int                      `json:"edited"` // Date of editing in Unixtime
 	Copyright      WallPostCopyright        `json:"copyright"`
 	PostID         int                      `json:"post_id"`
+	PostponedID    int                      `json:"postponed_id"` // ID from scheduled posts
 	ParentsStack   []int                    `json:"parents_stack"`
 	Donut          WallWallpostDonut        `json:"donut"`
 	ShortTextRate  float64                  `json:"short_text_rate"`
diff --git a/vendor/github.com/google/gops/agent/agent.go b/vendor/github.com/google/gops/agent/agent.go
index de6d90f9..b7978069 100644
--- a/vendor/github.com/google/gops/agent/agent.go
+++ b/vendor/github.com/google/gops/agent/agent.go
@@ -12,7 +12,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"os"
 	gosignal "os/signal"
@@ -115,7 +114,7 @@ func Listen(opts Options) error {
 	}
 	port := listener.Addr().(*net.TCPAddr).Port
 	portfile = filepath.Join(gopsdir, strconv.Itoa(os.Getpid()))
-	err = ioutil.WriteFile(portfile, []byte(strconv.Itoa(port)), os.ModePerm)
+	err = os.WriteFile(portfile, []byte(strconv.Itoa(port)), os.ModePerm)
 	if err != nil {
 		return err
 	}
diff --git a/vendor/github.com/google/gops/internal/internal.go b/vendor/github.com/google/gops/internal/internal.go
index 7fc162a6..7e3492aa 100644
--- a/vendor/github.com/google/gops/internal/internal.go
+++ b/vendor/github.com/google/gops/internal/internal.go
@@ -6,11 +6,9 @@ package internal
 
 import (
 	"errors"
-	"io/ioutil"
 	"os"
 	"os/user"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"strings"
 )
@@ -26,14 +24,6 @@ func ConfigDir() (string, error) {
 		return filepath.Join(userConfigDir, "gops"), nil
 	}
 
-	if runtime.GOOS == "windows" {
-		return filepath.Join(os.Getenv("APPDATA"), "gops"), nil
-	}
-
-	if xdgConfigDir := os.Getenv("XDG_CONFIG_HOME"); xdgConfigDir != "" {
-		return filepath.Join(xdgConfigDir, "gops"), nil
-	}
-
 	homeDir := guessUnixHomeDir()
 	if homeDir == "" {
 		return "", errors.New("unable to get current user home directory: os/user lookup failed; $HOME is empty")
@@ -62,7 +52,7 @@ func GetPort(pid int) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	b, err := ioutil.ReadFile(portfile)
+	b, err := os.ReadFile(portfile)
 	if err != nil {
 		return "", err
 	}
diff --git a/vendor/github.com/klauspost/compress/.goreleaser.yml b/vendor/github.com/klauspost/compress/.goreleaser.yml
index 0af08e65..7a008a4d 100644
--- a/vendor/github.com/klauspost/compress/.goreleaser.yml
+++ b/vendor/github.com/klauspost/compress/.goreleaser.yml
@@ -3,7 +3,7 @@
 before:
   hooks:
     - ./gen.sh
-    - go install mvdan.cc/garble@latest
+    - go install mvdan.cc/garble@v0.9.3
 
 builds:
   -
diff --git a/vendor/github.com/klauspost/compress/README.md b/vendor/github.com/klauspost/compress/README.md
index c7cf1a20..958666ed 100644
--- a/vendor/github.com/klauspost/compress/README.md
+++ b/vendor/github.com/klauspost/compress/README.md
@@ -9,7 +9,6 @@ This package provides various compression algorithms.
 * [huff0](https://github.com/klauspost/compress/tree/master/huff0) and [FSE](https://github.com/klauspost/compress/tree/master/fse) implementations for raw entropy encoding.
 * [gzhttp](https://github.com/klauspost/compress/tree/master/gzhttp) Provides client and server wrappers for handling gzipped requests efficiently.
 * [pgzip](https://github.com/klauspost/pgzip) is a separate package that provides a very fast parallel gzip implementation.
-* [fuzz package](https://github.com/klauspost/compress-fuzz) for fuzz testing all compressors/decompressors here.
 
 [![Go Reference](https://pkg.go.dev/badge/klauspost/compress.svg)](https://pkg.go.dev/github.com/klauspost/compress?tab=subdirectories)
 [![Go](https://github.com/klauspost/compress/actions/workflows/go.yml/badge.svg)](https://github.com/klauspost/compress/actions/workflows/go.yml)
@@ -17,6 +16,62 @@ This package provides various compression algorithms.
 
 # changelog
 
+* Jan 21st, 2023 (v1.15.15)
+	* deflate: Improve level 7-9 by @klauspost in https://github.com/klauspost/compress/pull/739
+	* zstd: Add delta encoding support by @greatroar in https://github.com/klauspost/compress/pull/728
+	* zstd: Various speed improvements by @greatroar https://github.com/klauspost/compress/pull/741 https://github.com/klauspost/compress/pull/734 https://github.com/klauspost/compress/pull/736 https://github.com/klauspost/compress/pull/744 https://github.com/klauspost/compress/pull/743 https://github.com/klauspost/compress/pull/745
+	* gzhttp: Add SuffixETag() and DropETag() options to prevent ETag collisions on compressed responses by @willbicks in https://github.com/klauspost/compress/pull/740
+
+* Jan 3rd, 2023 (v1.15.14)
+
+	* flate: Improve speed in big stateless blocks https://github.com/klauspost/compress/pull/718
+	* zstd: Minor speed tweaks by @greatroar in https://github.com/klauspost/compress/pull/716 https://github.com/klauspost/compress/pull/720
+	* export NoGzipResponseWriter for custom ResponseWriter wrappers by @harshavardhana in https://github.com/klauspost/compress/pull/722
+	* s2: Add example for indexing and existing stream https://github.com/klauspost/compress/pull/723
+
+* Dec 11, 2022 (v1.15.13)
+	* zstd: Add [MaxEncodedSize](https://pkg.go.dev/github.com/klauspost/compress@v1.15.13/zstd#Encoder.MaxEncodedSize) to encoder  https://github.com/klauspost/compress/pull/691
+	* zstd: Various tweaks and improvements https://github.com/klauspost/compress/pull/693 https://github.com/klauspost/compress/pull/695 https://github.com/klauspost/compress/pull/696 https://github.com/klauspost/compress/pull/701 https://github.com/klauspost/compress/pull/702 https://github.com/klauspost/compress/pull/703 https://github.com/klauspost/compress/pull/704 https://github.com/klauspost/compress/pull/705 https://github.com/klauspost/compress/pull/706 https://github.com/klauspost/compress/pull/707 https://github.com/klauspost/compress/pull/708
+
+* Oct 26, 2022 (v1.15.12)
+
+	* zstd: Tweak decoder allocs. https://github.com/klauspost/compress/pull/680
+	* gzhttp: Always delete `HeaderNoCompression` https://github.com/klauspost/compress/pull/683
+
+* Sept 26, 2022 (v1.15.11)
+
+	* flate: Improve level 1-3 compression  https://github.com/klauspost/compress/pull/678
+	* zstd: Improve "best" compression by @nightwolfz in https://github.com/klauspost/compress/pull/677
+	* zstd: Fix+reduce decompression allocations https://github.com/klauspost/compress/pull/668
+	* zstd: Fix non-effective noescape tag https://github.com/klauspost/compress/pull/667
+
+* Sept 16, 2022 (v1.15.10)
+
+	* zstd: Add [WithDecodeAllCapLimit](https://pkg.go.dev/github.com/klauspost/compress@v1.15.10/zstd#WithDecodeAllCapLimit) https://github.com/klauspost/compress/pull/649
+	* Add Go 1.19 - deprecate Go 1.16  https://github.com/klauspost/compress/pull/651
+	* flate: Improve level 5+6 compression https://github.com/klauspost/compress/pull/656
+	* zstd: Improve "better" compresssion  https://github.com/klauspost/compress/pull/657
+	* s2: Improve "best" compression https://github.com/klauspost/compress/pull/658
+	* s2: Improve "better" compression. https://github.com/klauspost/compress/pull/635
+	* s2: Slightly faster non-assembly decompression https://github.com/klauspost/compress/pull/646
+	* Use arrays for constant size copies https://github.com/klauspost/compress/pull/659
+
+* July 21, 2022 (v1.15.9)
+
+	* zstd: Fix decoder crash on amd64 (no BMI) on invalid input https://github.com/klauspost/compress/pull/645
+	* zstd: Disable decoder extended memory copies (amd64) due to possible crashes https://github.com/klauspost/compress/pull/644
+	* zstd: Allow single segments up to "max decoded size" by @klauspost in https://github.com/klauspost/compress/pull/643
+
+* July 13, 2022 (v1.15.8)
+
+	* gzip: fix stack exhaustion bug in Reader.Read https://github.com/klauspost/compress/pull/641
+	* s2: Add Index header trim/restore https://github.com/klauspost/compress/pull/638
+	* zstd: Optimize seqdeq amd64 asm by @greatroar in https://github.com/klauspost/compress/pull/636
+	* zstd: Improve decoder memcopy https://github.com/klauspost/compress/pull/637
+	* huff0: Pass a single bitReader pointer to asm by @greatroar in https://github.com/klauspost/compress/pull/634
+	* zstd: Branchless getBits for amd64 w/o BMI2 by @greatroar in https://github.com/klauspost/compress/pull/640
+	* gzhttp: Remove header before writing https://github.com/klauspost/compress/pull/639
+
 * June 29, 2022 (v1.15.7)
 
 	* s2: Fix absolute forward seeks  https://github.com/klauspost/compress/pull/633
@@ -81,15 +136,15 @@ This package provides various compression algorithms.
 	* gzhttp: Add zstd to transport by @klauspost in [#400](https://github.com/klauspost/compress/pull/400)
 	* gzhttp: Make content-type optional by @klauspost in [#510](https://github.com/klauspost/compress/pull/510)
 
-<details>
-	<summary>See  Details</summary>
 Both compression and decompression now supports "synchronous" stream operations. This means that whenever "concurrency" is set to 1, they will operate without spawning goroutines.
 
 Stream decompression is now faster on asynchronous, since the goroutine allocation much more effectively splits the workload. On typical streams this will typically use 2 cores fully for decompression. When a stream has finished decoding no goroutines will be left over, so decoders can now safely be pooled and still be garbage collected.
 
 While the release has been extensively tested, it is recommended to testing when upgrading.
-</details>
 
+<details>
+	<summary>See changes to v1.14.x</summary>
+	
 * Feb 22, 2022 (v1.14.4)
 	* flate: Fix rare huffman only (-2) corruption. [#503](https://github.com/klauspost/compress/pull/503)
 	* zip: Update deprecated CreateHeaderRaw to correctly call CreateRaw by @saracen in [#502](https://github.com/klauspost/compress/pull/502)
@@ -115,6 +170,7 @@ While the release has been extensively tested, it is recommended to testing when
 	* zstd: Performance improvement in [#420]( https://github.com/klauspost/compress/pull/420) [#456](https://github.com/klauspost/compress/pull/456) [#437](https://github.com/klauspost/compress/pull/437) [#467](https://github.com/klauspost/compress/pull/467) [#468](https://github.com/klauspost/compress/pull/468)
 	* zstd: add arm64 xxhash assembly in [#464](https://github.com/klauspost/compress/pull/464)
 	* Add garbled for binaries for s2 in [#445](https://github.com/klauspost/compress/pull/445)
+</details>
 
 <details>
 	<summary>See changes to v1.13.x</summary>
diff --git a/vendor/github.com/klauspost/compress/fse/compress.go b/vendor/github.com/klauspost/compress/fse/compress.go
index 6f341914..dac97e58 100644
--- a/vendor/github.com/klauspost/compress/fse/compress.go
+++ b/vendor/github.com/klauspost/compress/fse/compress.go
@@ -146,54 +146,51 @@ func (s *Scratch) compress(src []byte) error {
 		c1.encodeZero(tt[src[ip-2]])
 		ip -= 2
 	}
+	src = src[:ip]
 
 	// Main compression loop.
 	switch {
 	case !s.zeroBits && s.actualTableLog <= 8:
 		// We can encode 4 symbols without requiring a flush.
 		// We do not need to check if any output is 0 bits.
-		for ip >= 4 {
+		for ; len(src) >= 4; src = src[:len(src)-4] {
 			s.bw.flush32()
-			v3, v2, v1, v0 := src[ip-4], src[ip-3], src[ip-2], src[ip-1]
+			v3, v2, v1, v0 := src[len(src)-4], src[len(src)-3], src[len(src)-2], src[len(src)-1]
 			c2.encode(tt[v0])
 			c1.encode(tt[v1])
 			c2.encode(tt[v2])
 			c1.encode(tt[v3])
-			ip -= 4
 		}
 	case !s.zeroBits:
 		// We do not need to check if any output is 0 bits.
-		for ip >= 4 {
+		for ; len(src) >= 4; src = src[:len(src)-4] {
 			s.bw.flush32()
-			v3, v2, v1, v0 := src[ip-4], src[ip-3], src[ip-2], src[ip-1]
+			v3, v2, v1, v0 := src[len(src)-4], src[len(src)-3], src[len(src)-2], src[len(src)-1]
 			c2.encode(tt[v0])
 			c1.encode(tt[v1])
 			s.bw.flush32()
 			c2.encode(tt[v2])
 			c1.encode(tt[v3])
-			ip -= 4
 		}
 	case s.actualTableLog <= 8:
 		// We can encode 4 symbols without requiring a flush
-		for ip >= 4 {
+		for ; len(src) >= 4; src = src[:len(src)-4] {
 			s.bw.flush32()
-			v3, v2, v1, v0 := src[ip-4], src[ip-3], src[ip-2], src[ip-1]
+			v3, v2, v1, v0 := src[len(src)-4], src[len(src)-3], src[len(src)-2], src[len(src)-1]
 			c2.encodeZero(tt[v0])
 			c1.encodeZero(tt[v1])
 			c2.encodeZero(tt[v2])
 			c1.encodeZero(tt[v3])
-			ip -= 4
 		}
 	default:
-		for ip >= 4 {
+		for ; len(src) >= 4; src = src[:len(src)-4] {
 			s.bw.flush32()
-			v3, v2, v1, v0 := src[ip-4], src[ip-3], src[ip-2], src[ip-1]
+			v3, v2, v1, v0 := src[len(src)-4], src[len(src)-3], src[len(src)-2], src[len(src)-1]
 			c2.encodeZero(tt[v0])
 			c1.encodeZero(tt[v1])
 			s.bw.flush32()
 			c2.encodeZero(tt[v2])
 			c1.encodeZero(tt[v3])
-			ip -= 4
 		}
 	}
 
@@ -459,15 +456,17 @@ func (s *Scratch) countSimple(in []byte) (max int) {
 	for _, v := range in {
 		s.count[v]++
 	}
-	m := uint32(0)
+	m, symlen := uint32(0), s.symbolLen
 	for i, v := range s.count[:] {
+		if v == 0 {
+			continue
+		}
 		if v > m {
 			m = v
 		}
-		if v > 0 {
-			s.symbolLen = uint16(i) + 1
-		}
+		symlen = uint16(i) + 1
 	}
+	s.symbolLen = symlen
 	return int(m)
 }
 
diff --git a/vendor/github.com/klauspost/compress/huff0/bitreader.go b/vendor/github.com/klauspost/compress/huff0/bitreader.go
index 504a7be9..e36d9742 100644
--- a/vendor/github.com/klauspost/compress/huff0/bitreader.go
+++ b/vendor/github.com/klauspost/compress/huff0/bitreader.go
@@ -67,7 +67,6 @@ func (b *bitReaderBytes) fillFast() {
 
 	// 2 bounds checks.
 	v := b.in[b.off-4 : b.off]
-	v = v[:4]
 	low := (uint32(v[0])) | (uint32(v[1]) << 8) | (uint32(v[2]) << 16) | (uint32(v[3]) << 24)
 	b.value |= uint64(low) << (b.bitsRead - 32)
 	b.bitsRead -= 32
@@ -88,8 +87,7 @@ func (b *bitReaderBytes) fill() {
 		return
 	}
 	if b.off > 4 {
-		v := b.in[b.off-4:]
-		v = v[:4]
+		v := b.in[b.off-4 : b.off]
 		low := (uint32(v[0])) | (uint32(v[1]) << 8) | (uint32(v[2]) << 16) | (uint32(v[3]) << 24)
 		b.value |= uint64(low) << (b.bitsRead - 32)
 		b.bitsRead -= 32
@@ -179,7 +177,6 @@ func (b *bitReaderShifted) fillFast() {
 
 	// 2 bounds checks.
 	v := b.in[b.off-4 : b.off]
-	v = v[:4]
 	low := (uint32(v[0])) | (uint32(v[1]) << 8) | (uint32(v[2]) << 16) | (uint32(v[3]) << 24)
 	b.value |= uint64(low) << ((b.bitsRead - 32) & 63)
 	b.bitsRead -= 32
@@ -200,8 +197,7 @@ func (b *bitReaderShifted) fill() {
 		return
 	}
 	if b.off > 4 {
-		v := b.in[b.off-4:]
-		v = v[:4]
+		v := b.in[b.off-4 : b.off]
 		low := (uint32(v[0])) | (uint32(v[1]) << 8) | (uint32(v[2]) << 16) | (uint32(v[3]) << 24)
 		b.value |= uint64(low) << ((b.bitsRead - 32) & 63)
 		b.bitsRead -= 32
diff --git a/vendor/github.com/klauspost/compress/huff0/compress.go b/vendor/github.com/klauspost/compress/huff0/compress.go
index 4d14542f..cdc94856 100644
--- a/vendor/github.com/klauspost/compress/huff0/compress.go
+++ b/vendor/github.com/klauspost/compress/huff0/compress.go
@@ -365,29 +365,29 @@ func (s *Scratch) countSimple(in []byte) (max int, reuse bool) {
 	m := uint32(0)
 	if len(s.prevTable) > 0 {
 		for i, v := range s.count[:] {
+			if v == 0 {
+				continue
+			}
 			if v > m {
 				m = v
 			}
-			if v > 0 {
-				s.symbolLen = uint16(i) + 1
-				if i >= len(s.prevTable) {
-					reuse = false
-				} else {
-					if s.prevTable[i].nBits == 0 {
-						reuse = false
-					}
-				}
+			s.symbolLen = uint16(i) + 1
+			if i >= len(s.prevTable) {
+				reuse = false
+			} else if s.prevTable[i].nBits == 0 {
+				reuse = false
 			}
 		}
 		return int(m), reuse
 	}
 	for i, v := range s.count[:] {
+		if v == 0 {
+			continue
+		}
 		if v > m {
 			m = v
 		}
-		if v > 0 {
-			s.symbolLen = uint16(i) + 1
-		}
+		s.symbolLen = uint16(i) + 1
 	}
 	return int(m), false
 }
@@ -484,34 +484,35 @@ func (s *Scratch) buildCTable() error {
 	// Different from reference implementation.
 	huffNode0 := s.nodes[0 : huffNodesLen+1]
 
-	for huffNode[nonNullRank].count == 0 {
+	for huffNode[nonNullRank].count() == 0 {
 		nonNullRank--
 	}
 
 	lowS := int16(nonNullRank)
 	nodeRoot := nodeNb + lowS - 1
 	lowN := nodeNb
-	huffNode[nodeNb].count = huffNode[lowS].count + huffNode[lowS-1].count
-	huffNode[lowS].parent, huffNode[lowS-1].parent = uint16(nodeNb), uint16(nodeNb)
+	huffNode[nodeNb].setCount(huffNode[lowS].count() + huffNode[lowS-1].count())
+	huffNode[lowS].setParent(nodeNb)
+	huffNode[lowS-1].setParent(nodeNb)
 	nodeNb++
 	lowS -= 2
 	for n := nodeNb; n <= nodeRoot; n++ {
-		huffNode[n].count = 1 << 30
+		huffNode[n].setCount(1 << 30)
 	}
 	// fake entry, strong barrier
-	huffNode0[0].count = 1 << 31
+	huffNode0[0].setCount(1 << 31)
 
 	// create parents
 	for nodeNb <= nodeRoot {
 		var n1, n2 int16
-		if huffNode0[lowS+1].count < huffNode0[lowN+1].count {
+		if huffNode0[lowS+1].count() < huffNode0[lowN+1].count() {
 			n1 = lowS
 			lowS--
 		} else {
 			n1 = lowN
 			lowN++
 		}
-		if huffNode0[lowS+1].count < huffNode0[lowN+1].count {
+		if huffNode0[lowS+1].count() < huffNode0[lowN+1].count() {
 			n2 = lowS
 			lowS--
 		} else {
@@ -519,18 +520,19 @@ func (s *Scratch) buildCTable() error {
 			lowN++
 		}
 
-		huffNode[nodeNb].count = huffNode0[n1+1].count + huffNode0[n2+1].count
-		huffNode0[n1+1].parent, huffNode0[n2+1].parent = uint16(nodeNb), uint16(nodeNb)
+		huffNode[nodeNb].setCount(huffNode0[n1+1].count() + huffNode0[n2+1].count())
+		huffNode0[n1+1].setParent(nodeNb)
+		huffNode0[n2+1].setParent(nodeNb)
 		nodeNb++
 	}
 
 	// distribute weights (unlimited tree height)
-	huffNode[nodeRoot].nbBits = 0
+	huffNode[nodeRoot].setNbBits(0)
 	for n := nodeRoot - 1; n >= startNode; n-- {
-		huffNode[n].nbBits = huffNode[huffNode[n].parent].nbBits + 1
+		huffNode[n].setNbBits(huffNode[huffNode[n].parent()].nbBits() + 1)
 	}
 	for n := uint16(0); n <= nonNullRank; n++ {
-		huffNode[n].nbBits = huffNode[huffNode[n].parent].nbBits + 1
+		huffNode[n].setNbBits(huffNode[huffNode[n].parent()].nbBits() + 1)
 	}
 	s.actualTableLog = s.setMaxHeight(int(nonNullRank))
 	maxNbBits := s.actualTableLog
@@ -542,7 +544,7 @@ func (s *Scratch) buildCTable() error {
 	var nbPerRank [tableLogMax + 1]uint16
 	var valPerRank [16]uint16
 	for _, v := range huffNode[:nonNullRank+1] {
-		nbPerRank[v.nbBits]++
+		nbPerRank[v.nbBits()]++
 	}
 	// determine stating value per rank
 	{
@@ -557,7 +559,7 @@ func (s *Scratch) buildCTable() error {
 
 	// push nbBits per symbol, symbol order
 	for _, v := range huffNode[:nonNullRank+1] {
-		s.cTable[v.symbol].nBits = v.nbBits
+		s.cTable[v.symbol()].nBits = v.nbBits()
 	}
 
 	// assign value within rank, symbol order
@@ -603,12 +605,12 @@ func (s *Scratch) huffSort() {
 		pos := rank[r].current
 		rank[r].current++
 		prev := nodes[(pos-1)&huffNodesMask]
-		for pos > rank[r].base && c > prev.count {
+		for pos > rank[r].base && c > prev.count() {
 			nodes[pos&huffNodesMask] = prev
 			pos--
 			prev = nodes[(pos-1)&huffNodesMask]
 		}
-		nodes[pos&huffNodesMask] = nodeElt{count: c, symbol: byte(n)}
+		nodes[pos&huffNodesMask] = makeNodeElt(c, byte(n))
 	}
 }
 
@@ -617,7 +619,7 @@ func (s *Scratch) setMaxHeight(lastNonNull int) uint8 {
 	huffNode := s.nodes[1 : huffNodesLen+1]
 	//huffNode = huffNode[: huffNodesLen]
 
-	largestBits := huffNode[lastNonNull].nbBits
+	largestBits := huffNode[lastNonNull].nbBits()
 
 	// early exit : no elt > maxNbBits
 	if largestBits <= maxNbBits {
@@ -627,14 +629,14 @@ func (s *Scratch) setMaxHeight(lastNonNull int) uint8 {
 	baseCost := int(1) << (largestBits - maxNbBits)
 	n := uint32(lastNonNull)
 
-	for huffNode[n].nbBits > maxNbBits {
-		totalCost += baseCost - (1 << (largestBits - huffNode[n].nbBits))
-		huffNode[n].nbBits = maxNbBits
+	for huffNode[n].nbBits() > maxNbBits {
+		totalCost += baseCost - (1 << (largestBits - huffNode[n].nbBits()))
+		huffNode[n].setNbBits(maxNbBits)
 		n--
 	}
 	// n stops at huffNode[n].nbBits <= maxNbBits
 
-	for huffNode[n].nbBits == maxNbBits {
+	for huffNode[n].nbBits() == maxNbBits {
 		n--
 	}
 	// n end at index of smallest symbol using < maxNbBits
@@ -655,10 +657,10 @@ func (s *Scratch) setMaxHeight(lastNonNull int) uint8 {
 		{
 			currentNbBits := maxNbBits
 			for pos := int(n); pos >= 0; pos-- {
-				if huffNode[pos].nbBits >= currentNbBits {
+				if huffNode[pos].nbBits() >= currentNbBits {
 					continue
 				}
-				currentNbBits = huffNode[pos].nbBits // < maxNbBits
+				currentNbBits = huffNode[pos].nbBits() // < maxNbBits
 				rankLast[maxNbBits-currentNbBits] = uint32(pos)
 			}
 		}
@@ -675,8 +677,8 @@ func (s *Scratch) setMaxHeight(lastNonNull int) uint8 {
 				if lowPos == noSymbol {
 					break
 				}
-				highTotal := huffNode[highPos].count
-				lowTotal := 2 * huffNode[lowPos].count
+				highTotal := huffNode[highPos].count()
+				lowTotal := 2 * huffNode[lowPos].count()
 				if highTotal <= lowTotal {
 					break
 				}
@@ -692,13 +694,14 @@ func (s *Scratch) setMaxHeight(lastNonNull int) uint8 {
 				// this rank is no longer empty
 				rankLast[nBitsToDecrease-1] = rankLast[nBitsToDecrease]
 			}
-			huffNode[rankLast[nBitsToDecrease]].nbBits++
+			huffNode[rankLast[nBitsToDecrease]].setNbBits(1 +
+				huffNode[rankLast[nBitsToDecrease]].nbBits())
 			if rankLast[nBitsToDecrease] == 0 {
 				/* special case, reached largest symbol */
 				rankLast[nBitsToDecrease] = noSymbol
 			} else {
 				rankLast[nBitsToDecrease]--
-				if huffNode[rankLast[nBitsToDecrease]].nbBits != maxNbBits-nBitsToDecrease {
+				if huffNode[rankLast[nBitsToDecrease]].nbBits() != maxNbBits-nBitsToDecrease {
 					rankLast[nBitsToDecrease] = noSymbol /* this rank is now empty */
 				}
 			}
@@ -706,15 +709,15 @@ func (s *Scratch) setMaxHeight(lastNonNull int) uint8 {
 
 		for totalCost < 0 { /* Sometimes, cost correction overshoot */
 			if rankLast[1] == noSymbol { /* special case : no rank 1 symbol (using maxNbBits-1); let's create one from largest rank 0 (using maxNbBits) */
-				for huffNode[n].nbBits == maxNbBits {
+				for huffNode[n].nbBits() == maxNbBits {
 					n--
 				}
-				huffNode[n+1].nbBits--
+				huffNode[n+1].setNbBits(huffNode[n+1].nbBits() - 1)
 				rankLast[1] = n + 1
 				totalCost++
 				continue
 			}
-			huffNode[rankLast[1]+1].nbBits--
+			huffNode[rankLast[1]+1].setNbBits(huffNode[rankLast[1]+1].nbBits() - 1)
 			rankLast[1]++
 			totalCost++
 		}
@@ -722,9 +725,26 @@ func (s *Scratch) setMaxHeight(lastNonNull int) uint8 {
 	return maxNbBits
 }
 
-type nodeElt struct {
-	count  uint32
-	parent uint16
-	symbol byte
-	nbBits uint8
+// A nodeElt is the fields
+//
+//	count  uint32
+//	parent uint16
+//	symbol byte
+//	nbBits uint8
+//
+// in some order, all squashed into an integer so that the compiler
+// always loads and stores entire nodeElts instead of separate fields.
+type nodeElt uint64
+
+func makeNodeElt(count uint32, symbol byte) nodeElt {
+	return nodeElt(count) | nodeElt(symbol)<<48
 }
+
+func (e *nodeElt) count() uint32  { return uint32(*e) }
+func (e *nodeElt) parent() uint16 { return uint16(*e >> 32) }
+func (e *nodeElt) symbol() byte   { return byte(*e >> 48) }
+func (e *nodeElt) nbBits() uint8  { return uint8(*e >> 56) }
+
+func (e *nodeElt) setCount(c uint32) { *e = (*e)&0xffffffff00000000 | nodeElt(c) }
+func (e *nodeElt) setParent(p int16) { *e = (*e)&0xffff0000ffffffff | nodeElt(uint16(p))<<32 }
+func (e *nodeElt) setNbBits(n uint8) { *e = (*e)&0x00ffffffffffffff | nodeElt(n)<<56 }
diff --git a/vendor/github.com/klauspost/compress/huff0/decompress.go b/vendor/github.com/klauspost/compress/huff0/decompress.go
index c0c48bd7..3c0b398c 100644
--- a/vendor/github.com/klauspost/compress/huff0/decompress.go
+++ b/vendor/github.com/klauspost/compress/huff0/decompress.go
@@ -61,7 +61,7 @@ func ReadTable(in []byte, s *Scratch) (s2 *Scratch, remain []byte, err error) {
 		b, err := fse.Decompress(in[:iSize], s.fse)
 		s.fse.Out = nil
 		if err != nil {
-			return s, nil, err
+			return s, nil, fmt.Errorf("fse decompress returned: %w", err)
 		}
 		if len(b) > 255 {
 			return s, nil, errors.New("corrupt input: output table too large")
@@ -763,17 +763,20 @@ func (d *Decoder) decompress4X8bit(dst, src []byte) ([]byte, error) {
 				d.bufs.Put(buf)
 				return nil, errors.New("corruption detected: stream overrun 1")
 			}
-			copy(out, buf[0][:])
-			copy(out[dstEvery:], buf[1][:])
-			copy(out[dstEvery*2:], buf[2][:])
-			copy(out[dstEvery*3:], buf[3][:])
-			out = out[bufoff:]
-			decoded += bufoff * 4
 			// There must at least be 3 buffers left.
-			if len(out) < dstEvery*3 {
+			if len(out)-bufoff < dstEvery*3 {
 				d.bufs.Put(buf)
 				return nil, errors.New("corruption detected: stream overrun 2")
 			}
+			//copy(out, buf[0][:])
+			//copy(out[dstEvery:], buf[1][:])
+			//copy(out[dstEvery*2:], buf[2][:])
+			*(*[bufoff]byte)(out) = buf[0]
+			*(*[bufoff]byte)(out[dstEvery:]) = buf[1]
+			*(*[bufoff]byte)(out[dstEvery*2:]) = buf[2]
+			*(*[bufoff]byte)(out[dstEvery*3:]) = buf[3]
+			out = out[bufoff:]
+			decoded += bufoff * 4
 		}
 	}
 	if off > 0 {
@@ -997,17 +1000,22 @@ func (d *Decoder) decompress4X8bitExactly(dst, src []byte) ([]byte, error) {
 				d.bufs.Put(buf)
 				return nil, errors.New("corruption detected: stream overrun 1")
 			}
-			copy(out, buf[0][:])
-			copy(out[dstEvery:], buf[1][:])
-			copy(out[dstEvery*2:], buf[2][:])
-			copy(out[dstEvery*3:], buf[3][:])
-			out = out[bufoff:]
-			decoded += bufoff * 4
 			// There must at least be 3 buffers left.
-			if len(out) < dstEvery*3 {
+			if len(out)-bufoff < dstEvery*3 {
 				d.bufs.Put(buf)
 				return nil, errors.New("corruption detected: stream overrun 2")
 			}
+
+			//copy(out, buf[0][:])
+			//copy(out[dstEvery:], buf[1][:])
+			//copy(out[dstEvery*2:], buf[2][:])
+			// copy(out[dstEvery*3:], buf[3][:])
+			*(*[bufoff]byte)(out) = buf[0]
+			*(*[bufoff]byte)(out[dstEvery:]) = buf[1]
+			*(*[bufoff]byte)(out[dstEvery*2:]) = buf[2]
+			*(*[bufoff]byte)(out[dstEvery*3:]) = buf[3]
+			out = out[bufoff:]
+			decoded += bufoff * 4
 		}
 	}
 	if off > 0 {
diff --git a/vendor/github.com/klauspost/compress/huff0/decompress_amd64.go b/vendor/github.com/klauspost/compress/huff0/decompress_amd64.go
index 9f3e9f79..ba7e8e6b 100644
--- a/vendor/github.com/klauspost/compress/huff0/decompress_amd64.go
+++ b/vendor/github.com/klauspost/compress/huff0/decompress_amd64.go
@@ -14,12 +14,14 @@ import (
 
 // decompress4x_main_loop_x86 is an x86 assembler implementation
 // of Decompress4X when tablelog > 8.
+//
 //go:noescape
 func decompress4x_main_loop_amd64(ctx *decompress4xContext)
 
 // decompress4x_8b_loop_x86 is an x86 assembler implementation
 // of Decompress4X when tablelog <= 8 which decodes 4 entries
 // per loop.
+//
 //go:noescape
 func decompress4x_8b_main_loop_amd64(ctx *decompress4xContext)
 
@@ -145,11 +147,13 @@ func (d *Decoder) Decompress4X(dst, src []byte) ([]byte, error) {
 
 // decompress4x_main_loop_x86 is an x86 assembler implementation
 // of Decompress1X when tablelog > 8.
+//
 //go:noescape
 func decompress1x_main_loop_amd64(ctx *decompress1xContext)
 
 // decompress4x_main_loop_x86 is an x86 with BMI2 assembler implementation
 // of Decompress1X when tablelog > 8.
+//
 //go:noescape
 func decompress1x_main_loop_bmi2(ctx *decompress1xContext)
 
diff --git a/vendor/github.com/klauspost/compress/huff0/decompress_amd64.s b/vendor/github.com/klauspost/compress/huff0/decompress_amd64.s
index dd1a5aec..c4c7ab2d 100644
--- a/vendor/github.com/klauspost/compress/huff0/decompress_amd64.s
+++ b/vendor/github.com/klauspost/compress/huff0/decompress_amd64.s
@@ -1,364 +1,352 @@
 // Code generated by command: go run gen.go -out ../decompress_amd64.s -pkg=huff0. DO NOT EDIT.
 
 //go:build amd64 && !appengine && !noasm && gc
-// +build amd64,!appengine,!noasm,gc
 
 // func decompress4x_main_loop_amd64(ctx *decompress4xContext)
 TEXT ·decompress4x_main_loop_amd64(SB), $0-8
-	XORQ DX, DX
-
 	// Preload values
 	MOVQ    ctx+0(FP), AX
 	MOVBQZX 8(AX), DI
-	MOVQ    16(AX), SI
-	MOVQ    48(AX), BX
-	MOVQ    24(AX), R9
-	MOVQ    32(AX), R10
-	MOVQ    (AX), R11
+	MOVQ    16(AX), BX
+	MOVQ    48(AX), SI
+	MOVQ    24(AX), R8
+	MOVQ    32(AX), R9
+	MOVQ    (AX), R10
 
 	// Main loop
 main_loop:
-	MOVQ  SI, R8
-	CMPQ  R8, BX
+	XORL  DX, DX
+	CMPQ  BX, SI
 	SETGE DL
 
 	// br0.fillFast32()
-	MOVQ    32(R11), R12
-	MOVBQZX 40(R11), R13
-	CMPQ    R13, $0x20
+	MOVQ    32(R10), R11
+	MOVBQZX 40(R10), R12
+	CMPQ    R12, $0x20
 	JBE     skip_fill0
-	MOVQ    24(R11), AX
-	SUBQ    $0x20, R13
+	MOVQ    24(R10), AX
+	SUBQ    $0x20, R12
 	SUBQ    $0x04, AX
-	MOVQ    (R11), R14
+	MOVQ    (R10), R13
 
 	// b.value |= uint64(low) << (b.bitsRead & 63)
-	MOVL (AX)(R14*1), R14
-	MOVQ R13, CX
-	SHLQ CL, R14
-	MOVQ AX, 24(R11)
-	ORQ  R14, R12
+	MOVL (AX)(R13*1), R13
+	MOVQ R12, CX
+	SHLQ CL, R13
+	MOVQ AX, 24(R10)
+	ORQ  R13, R11
 
-	// exhausted = exhausted || (br0.off < 4)
-	CMPQ  AX, $0x04
-	SETLT AL
-	ORB   AL, DL
+	// exhausted += (br0.off < 4)
+	CMPQ AX, $0x04
+	ADCB $+0, DL
 
 skip_fill0:
 	// val0 := br0.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v0 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br0.advance(uint8(v0.entry)
 	MOVB CH, AL
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val1 := br0.peekTopBits(peekBits)
 	MOVQ DI, CX
-	MOVQ R12, R14
-	SHRQ CL, R14
+	MOVQ R11, R13
+	SHRQ CL, R13
 
 	// v1 := table[val1&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br0.advance(uint8(v1.entry))
 	MOVB CH, AH
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// these two writes get coalesced
 	// out[id * dstEvery + 0] = uint8(v0.entry >> 8)
 	// out[id * dstEvery + 1] = uint8(v1.entry >> 8)
-	MOVW AX, (R8)
+	MOVW AX, (BX)
 
 	// update the bitreader structure
-	MOVQ R12, 32(R11)
-	MOVB R13, 40(R11)
-	ADDQ R9, R8
+	MOVQ R11, 32(R10)
+	MOVB R12, 40(R10)
 
 	// br1.fillFast32()
-	MOVQ    80(R11), R12
-	MOVBQZX 88(R11), R13
-	CMPQ    R13, $0x20
+	MOVQ    80(R10), R11
+	MOVBQZX 88(R10), R12
+	CMPQ    R12, $0x20
 	JBE     skip_fill1
-	MOVQ    72(R11), AX
-	SUBQ    $0x20, R13
+	MOVQ    72(R10), AX
+	SUBQ    $0x20, R12
 	SUBQ    $0x04, AX
-	MOVQ    48(R11), R14
+	MOVQ    48(R10), R13
 
 	// b.value |= uint64(low) << (b.bitsRead & 63)
-	MOVL (AX)(R14*1), R14
-	MOVQ R13, CX
-	SHLQ CL, R14
-	MOVQ AX, 72(R11)
-	ORQ  R14, R12
+	MOVL (AX)(R13*1), R13
+	MOVQ R12, CX
+	SHLQ CL, R13
+	MOVQ AX, 72(R10)
+	ORQ  R13, R11
 
-	// exhausted = exhausted || (br1.off < 4)
-	CMPQ  AX, $0x04
-	SETLT AL
-	ORB   AL, DL
+	// exhausted += (br1.off < 4)
+	CMPQ AX, $0x04
+	ADCB $+0, DL
 
 skip_fill1:
 	// val0 := br1.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v0 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br1.advance(uint8(v0.entry)
 	MOVB CH, AL
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val1 := br1.peekTopBits(peekBits)
 	MOVQ DI, CX
-	MOVQ R12, R14
-	SHRQ CL, R14
+	MOVQ R11, R13
+	SHRQ CL, R13
 
 	// v1 := table[val1&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br1.advance(uint8(v1.entry))
 	MOVB CH, AH
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// these two writes get coalesced
 	// out[id * dstEvery + 0] = uint8(v0.entry >> 8)
 	// out[id * dstEvery + 1] = uint8(v1.entry >> 8)
-	MOVW AX, (R8)
+	MOVW AX, (BX)(R8*1)
 
 	// update the bitreader structure
-	MOVQ R12, 80(R11)
-	MOVB R13, 88(R11)
-	ADDQ R9, R8
+	MOVQ R11, 80(R10)
+	MOVB R12, 88(R10)
 
 	// br2.fillFast32()
-	MOVQ    128(R11), R12
-	MOVBQZX 136(R11), R13
-	CMPQ    R13, $0x20
+	MOVQ    128(R10), R11
+	MOVBQZX 136(R10), R12
+	CMPQ    R12, $0x20
 	JBE     skip_fill2
-	MOVQ    120(R11), AX
-	SUBQ    $0x20, R13
+	MOVQ    120(R10), AX
+	SUBQ    $0x20, R12
 	SUBQ    $0x04, AX
-	MOVQ    96(R11), R14
+	MOVQ    96(R10), R13
 
 	// b.value |= uint64(low) << (b.bitsRead & 63)
-	MOVL (AX)(R14*1), R14
-	MOVQ R13, CX
-	SHLQ CL, R14
-	MOVQ AX, 120(R11)
-	ORQ  R14, R12
+	MOVL (AX)(R13*1), R13
+	MOVQ R12, CX
+	SHLQ CL, R13
+	MOVQ AX, 120(R10)
+	ORQ  R13, R11
 
-	// exhausted = exhausted || (br2.off < 4)
-	CMPQ  AX, $0x04
-	SETLT AL
-	ORB   AL, DL
+	// exhausted += (br2.off < 4)
+	CMPQ AX, $0x04
+	ADCB $+0, DL
 
 skip_fill2:
 	// val0 := br2.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v0 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br2.advance(uint8(v0.entry)
 	MOVB CH, AL
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val1 := br2.peekTopBits(peekBits)
 	MOVQ DI, CX
-	MOVQ R12, R14
-	SHRQ CL, R14
+	MOVQ R11, R13
+	SHRQ CL, R13
 
 	// v1 := table[val1&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br2.advance(uint8(v1.entry))
 	MOVB CH, AH
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// these two writes get coalesced
 	// out[id * dstEvery + 0] = uint8(v0.entry >> 8)
 	// out[id * dstEvery + 1] = uint8(v1.entry >> 8)
-	MOVW AX, (R8)
+	MOVW AX, (BX)(R8*2)
 
 	// update the bitreader structure
-	MOVQ R12, 128(R11)
-	MOVB R13, 136(R11)
-	ADDQ R9, R8
+	MOVQ R11, 128(R10)
+	MOVB R12, 136(R10)
 
 	// br3.fillFast32()
-	MOVQ    176(R11), R12
-	MOVBQZX 184(R11), R13
-	CMPQ    R13, $0x20
+	MOVQ    176(R10), R11
+	MOVBQZX 184(R10), R12
+	CMPQ    R12, $0x20
 	JBE     skip_fill3
-	MOVQ    168(R11), AX
-	SUBQ    $0x20, R13
+	MOVQ    168(R10), AX
+	SUBQ    $0x20, R12
 	SUBQ    $0x04, AX
-	MOVQ    144(R11), R14
+	MOVQ    144(R10), R13
 
 	// b.value |= uint64(low) << (b.bitsRead & 63)
-	MOVL (AX)(R14*1), R14
-	MOVQ R13, CX
-	SHLQ CL, R14
-	MOVQ AX, 168(R11)
-	ORQ  R14, R12
+	MOVL (AX)(R13*1), R13
+	MOVQ R12, CX
+	SHLQ CL, R13
+	MOVQ AX, 168(R10)
+	ORQ  R13, R11
 
-	// exhausted = exhausted || (br3.off < 4)
-	CMPQ  AX, $0x04
-	SETLT AL
-	ORB   AL, DL
+	// exhausted += (br3.off < 4)
+	CMPQ AX, $0x04
+	ADCB $+0, DL
 
 skip_fill3:
 	// val0 := br3.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v0 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br3.advance(uint8(v0.entry)
 	MOVB CH, AL
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val1 := br3.peekTopBits(peekBits)
 	MOVQ DI, CX
-	MOVQ R12, R14
-	SHRQ CL, R14
+	MOVQ R11, R13
+	SHRQ CL, R13
 
 	// v1 := table[val1&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br3.advance(uint8(v1.entry))
 	MOVB CH, AH
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// these two writes get coalesced
 	// out[id * dstEvery + 0] = uint8(v0.entry >> 8)
 	// out[id * dstEvery + 1] = uint8(v1.entry >> 8)
-	MOVW AX, (R8)
+	LEAQ (R8)(R8*2), CX
+	MOVW AX, (BX)(CX*1)
 
 	// update the bitreader structure
-	MOVQ  R12, 176(R11)
-	MOVB  R13, 184(R11)
-	ADDQ  $0x02, SI
+	MOVQ  R11, 176(R10)
+	MOVB  R12, 184(R10)
+	ADDQ  $0x02, BX
 	TESTB DL, DL
 	JZ    main_loop
 	MOVQ  ctx+0(FP), AX
-	SUBQ  16(AX), SI
-	SHLQ  $0x02, SI
-	MOVQ  SI, 40(AX)
+	SUBQ  16(AX), BX
+	SHLQ  $0x02, BX
+	MOVQ  BX, 40(AX)
 	RET
 
 // func decompress4x_8b_main_loop_amd64(ctx *decompress4xContext)
 TEXT ·decompress4x_8b_main_loop_amd64(SB), $0-8
-	XORQ DX, DX
-
 	// Preload values
 	MOVQ    ctx+0(FP), CX
 	MOVBQZX 8(CX), DI
 	MOVQ    16(CX), BX
 	MOVQ    48(CX), SI
-	MOVQ    24(CX), R9
-	MOVQ    32(CX), R10
-	MOVQ    (CX), R11
+	MOVQ    24(CX), R8
+	MOVQ    32(CX), R9
+	MOVQ    (CX), R10
 
 	// Main loop
 main_loop:
-	MOVQ  BX, R8
-	CMPQ  R8, SI
+	XORL  DX, DX
+	CMPQ  BX, SI
 	SETGE DL
 
 	// br0.fillFast32()
-	MOVQ    32(R11), R12
-	MOVBQZX 40(R11), R13
-	CMPQ    R13, $0x20
+	MOVQ    32(R10), R11
+	MOVBQZX 40(R10), R12
+	CMPQ    R12, $0x20
 	JBE     skip_fill0
-	MOVQ    24(R11), R14
-	SUBQ    $0x20, R13
-	SUBQ    $0x04, R14
-	MOVQ    (R11), R15
+	MOVQ    24(R10), R13
+	SUBQ    $0x20, R12
+	SUBQ    $0x04, R13
+	MOVQ    (R10), R14
 
 	// b.value |= uint64(low) << (b.bitsRead & 63)
-	MOVL (R14)(R15*1), R15
-	MOVQ R13, CX
-	SHLQ CL, R15
-	MOVQ R14, 24(R11)
-	ORQ  R15, R12
+	MOVL (R13)(R14*1), R14
+	MOVQ R12, CX
+	SHLQ CL, R14
+	MOVQ R13, 24(R10)
+	ORQ  R14, R11
 
-	// exhausted = exhausted || (br0.off < 4)
-	CMPQ  R14, $0x04
-	SETLT AL
-	ORB   AL, DL
+	// exhausted += (br0.off < 4)
+	CMPQ R13, $0x04
+	ADCB $+0, DL
 
 skip_fill0:
 	// val0 := br0.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v0 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br0.advance(uint8(v0.entry)
 	MOVB CH, AL
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val1 := br0.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v1 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br0.advance(uint8(v1.entry)
 	MOVB   CH, AH
-	SHLQ   CL, R12
-	ADDB   CL, R13
+	SHLQ   CL, R11
+	ADDB   CL, R12
 	BSWAPL AX
 
 	// val2 := br0.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v2 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br0.advance(uint8(v2.entry)
 	MOVB CH, AH
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val3 := br0.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v3 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br0.advance(uint8(v3.entry)
 	MOVB   CH, AL
-	SHLQ   CL, R12
-	ADDB   CL, R13
+	SHLQ   CL, R11
+	ADDB   CL, R12
 	BSWAPL AX
 
 	// these four writes get coalesced
@@ -366,88 +354,86 @@ skip_fill0:
 	// out[id * dstEvery + 1] = uint8(v1.entry >> 8)
 	// out[id * dstEvery + 3] = uint8(v2.entry >> 8)
 	// out[id * dstEvery + 4] = uint8(v3.entry >> 8)
-	MOVL AX, (R8)
+	MOVL AX, (BX)
 
 	// update the bitreader structure
-	MOVQ R12, 32(R11)
-	MOVB R13, 40(R11)
-	ADDQ R9, R8
+	MOVQ R11, 32(R10)
+	MOVB R12, 40(R10)
 
 	// br1.fillFast32()
-	MOVQ    80(R11), R12
-	MOVBQZX 88(R11), R13
-	CMPQ    R13, $0x20
+	MOVQ    80(R10), R11
+	MOVBQZX 88(R10), R12
+	CMPQ    R12, $0x20
 	JBE     skip_fill1
-	MOVQ    72(R11), R14
-	SUBQ    $0x20, R13
-	SUBQ    $0x04, R14
-	MOVQ    48(R11), R15
+	MOVQ    72(R10), R13
+	SUBQ    $0x20, R12
+	SUBQ    $0x04, R13
+	MOVQ    48(R10), R14
 
 	// b.value |= uint64(low) << (b.bitsRead & 63)
-	MOVL (R14)(R15*1), R15
-	MOVQ R13, CX
-	SHLQ CL, R15
-	MOVQ R14, 72(R11)
-	ORQ  R15, R12
+	MOVL (R13)(R14*1), R14
+	MOVQ R12, CX
+	SHLQ CL, R14
+	MOVQ R13, 72(R10)
+	ORQ  R14, R11
 
-	// exhausted = exhausted || (br1.off < 4)
-	CMPQ  R14, $0x04
-	SETLT AL
-	ORB   AL, DL
+	// exhausted += (br1.off < 4)
+	CMPQ R13, $0x04
+	ADCB $+0, DL
 
 skip_fill1:
 	// val0 := br1.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v0 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br1.advance(uint8(v0.entry)
 	MOVB CH, AL
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val1 := br1.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v1 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br1.advance(uint8(v1.entry)
 	MOVB   CH, AH
-	SHLQ   CL, R12
-	ADDB   CL, R13
+	SHLQ   CL, R11
+	ADDB   CL, R12
 	BSWAPL AX
 
 	// val2 := br1.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v2 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br1.advance(uint8(v2.entry)
 	MOVB CH, AH
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val3 := br1.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v3 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br1.advance(uint8(v3.entry)
 	MOVB   CH, AL
-	SHLQ   CL, R12
-	ADDB   CL, R13
+	SHLQ   CL, R11
+	ADDB   CL, R12
 	BSWAPL AX
 
 	// these four writes get coalesced
@@ -455,88 +441,86 @@ skip_fill1:
 	// out[id * dstEvery + 1] = uint8(v1.entry >> 8)
 	// out[id * dstEvery + 3] = uint8(v2.entry >> 8)
 	// out[id * dstEvery + 4] = uint8(v3.entry >> 8)
-	MOVL AX, (R8)
+	MOVL AX, (BX)(R8*1)
 
 	// update the bitreader structure
-	MOVQ R12, 80(R11)
-	MOVB R13, 88(R11)
-	ADDQ R9, R8
+	MOVQ R11, 80(R10)
+	MOVB R12, 88(R10)
 
 	// br2.fillFast32()
-	MOVQ    128(R11), R12
-	MOVBQZX 136(R11), R13
-	CMPQ    R13, $0x20
+	MOVQ    128(R10), R11
+	MOVBQZX 136(R10), R12
+	CMPQ    R12, $0x20
 	JBE     skip_fill2
-	MOVQ    120(R11), R14
-	SUBQ    $0x20, R13
-	SUBQ    $0x04, R14
-	MOVQ    96(R11), R15
+	MOVQ    120(R10), R13
+	SUBQ    $0x20, R12
+	SUBQ    $0x04, R13
+	MOVQ    96(R10), R14
 
 	// b.value |= uint64(low) << (b.bitsRead & 63)
-	MOVL (R14)(R15*1), R15
-	MOVQ R13, CX
-	SHLQ CL, R15
-	MOVQ R14, 120(R11)
-	ORQ  R15, R12
+	MOVL (R13)(R14*1), R14
+	MOVQ R12, CX
+	SHLQ CL, R14
+	MOVQ R13, 120(R10)
+	ORQ  R14, R11
 
-	// exhausted = exhausted || (br2.off < 4)
-	CMPQ  R14, $0x04
-	SETLT AL
-	ORB   AL, DL
+	// exhausted += (br2.off < 4)
+	CMPQ R13, $0x04
+	ADCB $+0, DL
 
 skip_fill2:
 	// val0 := br2.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v0 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br2.advance(uint8(v0.entry)
 	MOVB CH, AL
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val1 := br2.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v1 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br2.advance(uint8(v1.entry)
 	MOVB   CH, AH
-	SHLQ   CL, R12
-	ADDB   CL, R13
+	SHLQ   CL, R11
+	ADDB   CL, R12
 	BSWAPL AX
 
 	// val2 := br2.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v2 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br2.advance(uint8(v2.entry)
 	MOVB CH, AH
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val3 := br2.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v3 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br2.advance(uint8(v3.entry)
 	MOVB   CH, AL
-	SHLQ   CL, R12
-	ADDB   CL, R13
+	SHLQ   CL, R11
+	ADDB   CL, R12
 	BSWAPL AX
 
 	// these four writes get coalesced
@@ -544,88 +528,86 @@ skip_fill2:
 	// out[id * dstEvery + 1] = uint8(v1.entry >> 8)
 	// out[id * dstEvery + 3] = uint8(v2.entry >> 8)
 	// out[id * dstEvery + 4] = uint8(v3.entry >> 8)
-	MOVL AX, (R8)
+	MOVL AX, (BX)(R8*2)
 
 	// update the bitreader structure
-	MOVQ R12, 128(R11)
-	MOVB R13, 136(R11)
-	ADDQ R9, R8
+	MOVQ R11, 128(R10)
+	MOVB R12, 136(R10)
 
 	// br3.fillFast32()
-	MOVQ    176(R11), R12
-	MOVBQZX 184(R11), R13
-	CMPQ    R13, $0x20
+	MOVQ    176(R10), R11
+	MOVBQZX 184(R10), R12
+	CMPQ    R12, $0x20
 	JBE     skip_fill3
-	MOVQ    168(R11), R14
-	SUBQ    $0x20, R13
-	SUBQ    $0x04, R14
-	MOVQ    144(R11), R15
+	MOVQ    168(R10), R13
+	SUBQ    $0x20, R12
+	SUBQ    $0x04, R13
+	MOVQ    144(R10), R14
 
 	// b.value |= uint64(low) << (b.bitsRead & 63)
-	MOVL (R14)(R15*1), R15
-	MOVQ R13, CX
-	SHLQ CL, R15
-	MOVQ R14, 168(R11)
-	ORQ  R15, R12
+	MOVL (R13)(R14*1), R14
+	MOVQ R12, CX
+	SHLQ CL, R14
+	MOVQ R13, 168(R10)
+	ORQ  R14, R11
 
-	// exhausted = exhausted || (br3.off < 4)
-	CMPQ  R14, $0x04
-	SETLT AL
-	ORB   AL, DL
+	// exhausted += (br3.off < 4)
+	CMPQ R13, $0x04
+	ADCB $+0, DL
 
 skip_fill3:
 	// val0 := br3.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v0 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br3.advance(uint8(v0.entry)
 	MOVB CH, AL
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val1 := br3.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v1 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br3.advance(uint8(v1.entry)
 	MOVB   CH, AH
-	SHLQ   CL, R12
-	ADDB   CL, R13
+	SHLQ   CL, R11
+	ADDB   CL, R12
 	BSWAPL AX
 
 	// val2 := br3.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v2 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br3.advance(uint8(v2.entry)
 	MOVB CH, AH
-	SHLQ CL, R12
-	ADDB CL, R13
+	SHLQ CL, R11
+	ADDB CL, R12
 
 	// val3 := br3.peekTopBits(peekBits)
-	MOVQ R12, R14
+	MOVQ R11, R13
 	MOVQ DI, CX
-	SHRQ CL, R14
+	SHRQ CL, R13
 
 	// v3 := table[val0&mask]
-	MOVW (R10)(R14*2), CX
+	MOVW (R9)(R13*2), CX
 
 	// br3.advance(uint8(v3.entry)
 	MOVB   CH, AL
-	SHLQ   CL, R12
-	ADDB   CL, R13
+	SHLQ   CL, R11
+	ADDB   CL, R12
 	BSWAPL AX
 
 	// these four writes get coalesced
@@ -633,11 +615,12 @@ skip_fill3:
 	// out[id * dstEvery + 1] = uint8(v1.entry >> 8)
 	// out[id * dstEvery + 3] = uint8(v2.entry >> 8)
 	// out[id * dstEvery + 4] = uint8(v3.entry >> 8)
-	MOVL AX, (R8)
+	LEAQ (R8)(R8*2), CX
+	MOVL AX, (BX)(CX*1)
 
 	// update the bitreader structure
-	MOVQ  R12, 176(R11)
-	MOVB  R13, 184(R11)
+	MOVQ  R11, 176(R10)
+	MOVB  R12, 184(R10)
 	ADDQ  $0x04, BX
 	TESTB DL, DL
 	JZ    main_loop
@@ -653,7 +636,7 @@ TEXT ·decompress1x_main_loop_amd64(SB), $0-8
 	MOVQ    16(CX), DX
 	MOVQ    24(CX), BX
 	CMPQ    BX, $0x04
-	JB      error_max_decoded_size_exeeded
+	JB      error_max_decoded_size_exceeded
 	LEAQ    (DX)(BX*1), BX
 	MOVQ    (CX), SI
 	MOVQ    (SI), R8
@@ -668,7 +651,7 @@ main_loop:
 	// Check if we have room for 4 bytes in the output buffer
 	LEAQ 4(DX), CX
 	CMPQ CX, BX
-	JGE  error_max_decoded_size_exeeded
+	JGE  error_max_decoded_size_exceeded
 
 	// Decode 4 values
 	CMPQ R11, $0x20
@@ -745,7 +728,7 @@ loop_condition:
 	RET
 
 	// Report error
-error_max_decoded_size_exeeded:
+error_max_decoded_size_exceeded:
 	MOVQ ctx+0(FP), AX
 	MOVQ $-1, CX
 	MOVQ CX, 40(AX)
@@ -758,7 +741,7 @@ TEXT ·decompress1x_main_loop_bmi2(SB), $0-8
 	MOVQ    16(CX), DX
 	MOVQ    24(CX), BX
 	CMPQ    BX, $0x04
-	JB      error_max_decoded_size_exeeded
+	JB      error_max_decoded_size_exceeded
 	LEAQ    (DX)(BX*1), BX
 	MOVQ    (CX), SI
 	MOVQ    (SI), R8
@@ -773,7 +756,7 @@ main_loop:
 	// Check if we have room for 4 bytes in the output buffer
 	LEAQ 4(DX), CX
 	CMPQ CX, BX
-	JGE  error_max_decoded_size_exeeded
+	JGE  error_max_decoded_size_exceeded
 
 	// Decode 4 values
 	CMPQ  R11, $0x20
@@ -840,7 +823,7 @@ loop_condition:
 	RET
 
 	// Report error
-error_max_decoded_size_exeeded:
+error_max_decoded_size_exceeded:
 	MOVQ ctx+0(FP), AX
 	MOVQ $-1, CX
 	MOVQ CX, 40(AX)
diff --git a/vendor/github.com/klauspost/compress/huff0/decompress_generic.go b/vendor/github.com/klauspost/compress/huff0/decompress_generic.go
index 4f6f37cb..908c17de 100644
--- a/vendor/github.com/klauspost/compress/huff0/decompress_generic.go
+++ b/vendor/github.com/klauspost/compress/huff0/decompress_generic.go
@@ -122,17 +122,21 @@ func (d *Decoder) Decompress4X(dst, src []byte) ([]byte, error) {
 				d.bufs.Put(buf)
 				return nil, errors.New("corruption detected: stream overrun 1")
 			}
-			copy(out, buf[0][:])
-			copy(out[dstEvery:], buf[1][:])
-			copy(out[dstEvery*2:], buf[2][:])
-			copy(out[dstEvery*3:], buf[3][:])
-			out = out[bufoff:]
-			decoded += bufoff * 4
 			// There must at least be 3 buffers left.
-			if len(out) < dstEvery*3 {
+			if len(out)-bufoff < dstEvery*3 {
 				d.bufs.Put(buf)
 				return nil, errors.New("corruption detected: stream overrun 2")
 			}
+			//copy(out, buf[0][:])
+			//copy(out[dstEvery:], buf[1][:])
+			//copy(out[dstEvery*2:], buf[2][:])
+			//copy(out[dstEvery*3:], buf[3][:])
+			*(*[bufoff]byte)(out) = buf[0]
+			*(*[bufoff]byte)(out[dstEvery:]) = buf[1]
+			*(*[bufoff]byte)(out[dstEvery*2:]) = buf[2]
+			*(*[bufoff]byte)(out[dstEvery*3:]) = buf[3]
+			out = out[bufoff:]
+			decoded += bufoff * 4
 		}
 	}
 	if off > 0 {
diff --git a/vendor/github.com/klauspost/compress/internal/snapref/encode_other.go b/vendor/github.com/klauspost/compress/internal/snapref/encode_other.go
index 511bba65..05db94d3 100644
--- a/vendor/github.com/klauspost/compress/internal/snapref/encode_other.go
+++ b/vendor/github.com/klauspost/compress/internal/snapref/encode_other.go
@@ -18,6 +18,7 @@ func load64(b []byte, i int) uint64 {
 // emitLiteral writes a literal chunk and returns the number of bytes written.
 //
 // It assumes that:
+//
 //	dst is long enough to hold the encoded bytes
 //	1 <= len(lit) && len(lit) <= 65536
 func emitLiteral(dst, lit []byte) int {
@@ -42,6 +43,7 @@ func emitLiteral(dst, lit []byte) int {
 // emitCopy writes a copy chunk and returns the number of bytes written.
 //
 // It assumes that:
+//
 //	dst is long enough to hold the encoded bytes
 //	1 <= offset && offset <= 65535
 //	4 <= length && length <= 65535
@@ -89,6 +91,7 @@ func emitCopy(dst []byte, offset, length int) int {
 // src[i:i+k-j] and src[j:k] have the same contents.
 //
 // It assumes that:
+//
 //	0 <= i && i < j && j <= len(src)
 func extendMatch(src []byte, i, j int) int {
 	for ; j < len(src) && src[i] == src[j]; i, j = i+1, j+1 {
@@ -100,13 +103,36 @@ func hash(u, shift uint32) uint32 {
 	return (u * 0x1e35a7bd) >> shift
 }
 
+// EncodeBlockInto exposes encodeBlock but checks dst size.
+func EncodeBlockInto(dst, src []byte) (d int) {
+	if MaxEncodedLen(len(src)) > len(dst) {
+		return 0
+	}
+
+	// encodeBlock breaks on too big blocks, so split.
+	for len(src) > 0 {
+		p := src
+		src = nil
+		if len(p) > maxBlockSize {
+			p, src = p[:maxBlockSize], p[maxBlockSize:]
+		}
+		if len(p) < minNonLiteralBlockSize {
+			d += emitLiteral(dst[d:], p)
+		} else {
+			d += encodeBlock(dst[d:], p)
+		}
+	}
+	return d
+}
+
 // encodeBlock encodes a non-empty src to a guaranteed-large-enough dst. It
 // assumes that the varint-encoded length of the decompressed bytes has already
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src)) &&
-// 	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
 func encodeBlock(dst, src []byte) (d int) {
 	// Initialize the hash table. Its size ranges from 1<<8 to 1<<14 inclusive.
 	// The table element type is uint16, as s < sLimit and sLimit < len(src)
diff --git a/vendor/github.com/klauspost/compress/s2/README.md b/vendor/github.com/klauspost/compress/s2/README.md
index 73c0c462..8284bb08 100644
--- a/vendor/github.com/klauspost/compress/s2/README.md
+++ b/vendor/github.com/klauspost/compress/s2/README.md
@@ -20,11 +20,12 @@ This is important, so you don't have to worry about spending CPU cycles on alrea
 * Concurrent stream compression
 * Faster decompression, even for Snappy compatible content
 * Concurrent Snappy/S2 stream decompression
-* Ability to quickly skip forward in compressed stream
+* Skip forward in compressed stream
 * Random seeking with indexes
 * Compatible with reading Snappy compressed content
 * Smaller block size overhead on incompressible blocks
 * Block concatenation
+* Block Dictionary support
 * Uncompressed stream mode
 * Automatic stream size padding
 * Snappy compatible block compression
@@ -325,35 +326,35 @@ The content compressed in this mode is fully compatible with the standard decode
 
 Snappy vs S2 **compression** speed on 16 core (32 thread) computer, using all threads and a single thread (1 CPU):
 
-| File                                                                                                | S2 speed | S2 Throughput | S2 % smaller | S2 "better" | "better" throughput | "better" % smaller |
-|-----------------------------------------------------------------------------------------------------|----------|---------------|--------------|-------------|---------------------|--------------------|
-| [rawstudio-mint14.tar](https://files.klauspost.com/compress/rawstudio-mint14.7z)                    | 12.70x   | 10556 MB/s    | 7.35%        | 4.15x       | 3455 MB/s           | 12.79%             |
-| (1 CPU)                                                                                             | 1.14x    | 948 MB/s      | -            | 0.42x       | 349 MB/s            | -                  |
-| [github-june-2days-2019.json](https://files.klauspost.com/compress/github-june-2days-2019.json.zst) | 17.13x   | 14484 MB/s    | 31.60%       | 10.09x      | 8533 MB/s           | 37.71%             |
-| (1 CPU)                                                                                             | 1.33x    | 1127 MB/s     | -            | 0.70x       | 589 MB/s            | -                  |
-| [github-ranks-backup.bin](https://files.klauspost.com/compress/github-ranks-backup.bin.zst)         | 15.14x   | 12000 MB/s    | -5.79%       | 6.59x       | 5223 MB/s           | 5.80%              |
-| (1 CPU)                                                                                             | 1.11x    | 877 MB/s      | -            | 0.47x       | 370 MB/s            | -                  |
-| [consensus.db.10gb](https://files.klauspost.com/compress/consensus.db.10gb.zst)                     | 14.62x   | 12116 MB/s    | 15.90%       | 5.35x       | 4430 MB/s           | 16.08%             |
-| (1 CPU)                                                                                             | 1.38x    | 1146 MB/s     | -            | 0.38x       | 312 MB/s            | -                  |
-| [adresser.json](https://files.klauspost.com/compress/adresser.json.zst)                             | 8.83x    | 17579 MB/s    | 43.86%       | 6.54x       | 13011 MB/s          | 47.23%             |
-| (1 CPU)                                                                                             | 1.14x    | 2259 MB/s     | -            | 0.74x       | 1475 MB/s           | -                  |
-| [gob-stream](https://files.klauspost.com/compress/gob-stream.7z)                                    | 16.72x   | 14019 MB/s    | 24.02%       | 10.11x      | 8477 MB/s           | 30.48%             |
-| (1 CPU)                                                                                             | 1.24x    | 1043 MB/s     | -            | 0.70x       | 586 MB/s            | -                  |
-| [10gb.tar](http://mattmahoney.net/dc/10gb.html)                                                     | 13.33x   | 9254 MB/s     | 1.84%        | 6.75x       | 4686 MB/s           | 6.72%              |
-| (1 CPU)                                                                                             | 0.97x    | 672 MB/s      | -            | 0.53x       | 366 MB/s            | -                  |
-| sharnd.out.2gb                                                                                      | 2.11x    | 12639 MB/s    | 0.01%        | 1.98x       | 11833 MB/s          | 0.01%              |
-| (1 CPU)                                                                                             | 0.93x    | 5594 MB/s     | -            | 1.34x       | 8030 MB/s           | -                  |
-| [enwik9](http://mattmahoney.net/dc/textdata.html)                                                   | 19.34x   | 8220 MB/s     | 3.98%        | 7.87x       | 3345 MB/s           | 15.82%             |
-| (1 CPU)                                                                                             | 1.06x    | 452 MB/s      | -            | 0.50x       | 213 MB/s            | -                  |
-| [silesia.tar](http://sun.aei.polsl.pl/~sdeor/corpus/silesia.zip)                                    | 10.48x   | 6124 MB/s     | 5.67%        | 3.76x       | 2197 MB/s           | 12.60%             |
-| (1 CPU)                                                                                             | 0.97x    | 568 MB/s      | -            | 0.46x       | 271 MB/s            | -                  |
-| [enwik10](https://encode.su/threads/3315-enwik10-benchmark-results)                                 | 21.07x   | 9020 MB/s     | 6.36%        | 6.91x       | 2959 MB/s           | 16.95%             |
-| (1 CPU)                                                                                             | 1.07x    | 460 MB/s      | -            | 0.51x       | 220 MB/s            | -                  |
+| File                                                                                                    | S2 Speed | S2 Throughput | S2 % smaller | S2 "better" | "better" throughput | "better" % smaller |
+|---------------------------------------------------------------------------------------------------------|----------|---------------|--------------|-------------|---------------------|--------------------|
+| [rawstudio-mint14.tar](https://files.klauspost.com/compress/rawstudio-mint14.7z)                        | 16.33x   | 10556 MB/s    | 8.0%         | 6.04x       | 5252 MB/s           | 14.7%              |
+| (1 CPU)                                                                                                 | 1.08x    | 940 MB/s      | -            | 0.46x       | 400 MB/s            | -                  |
+| [github-june-2days-2019.json](https://files.klauspost.com/compress/github-june-2days-2019.json.zst)     | 16.51x   | 15224 MB/s    | 31.70%       | 9.47x       | 8734 MB/s           | 37.71%             |
+| (1 CPU)                                                                                                 | 1.26x    | 1157 MB/s     | -            | 0.60x       | 556 MB/s            | -                  |
+| [github-ranks-backup.bin](https://files.klauspost.com/compress/github-ranks-backup.bin.zst)             | 15.14x   | 12598 MB/s    | -5.76%       | 6.23x       | 5675 MB/s           | 3.62%              |
+| (1 CPU)                                                                                                 | 1.02x    | 932 MB/s      | -            | 0.47x       | 432 MB/s            | -                  |
+| [consensus.db.10gb](https://files.klauspost.com/compress/consensus.db.10gb.zst)                         | 11.21x   | 12116 MB/s    | 15.95%       | 3.24x       | 3500 MB/s           | 18.00%             |
+| (1 CPU)                                                                                                 | 1.05x    | 1135 MB/s     | -            | 0.27x       | 292 MB/s            | -                  |
+| [apache.log](https://files.klauspost.com/compress/apache.log.zst)                                       | 8.55x    | 16673 MB/s    | 20.54%       | 5.85x       | 11420 MB/s          | 24.97%             |
+| (1 CPU)                                                                                                 | 1.91x    | 1771 MB/s     | -            | 0.53x       | 1041 MB/s           | -                  |
+| [gob-stream](https://files.klauspost.com/compress/gob-stream.7z)                                        | 15.76x   | 14357 MB/s    | 24.01%       | 8.67x       | 7891 MB/s           | 33.68%             |
+| (1 CPU)                                                                                                 | 1.17x    | 1064 MB/s     | -            | 0.65x       | 595 MB/s            | -                  |
+| [10gb.tar](http://mattmahoney.net/dc/10gb.html)                                                         | 13.33x   | 9835 MB/s     | 2.34%        | 6.85x       | 4863 MB/s           | 9.96%              |
+| (1 CPU)                                                                                                 | 0.97x    | 689 MB/s      | -            | 0.55x       | 387 MB/s            | -                  |
+| sharnd.out.2gb                                                                                          | 9.11x    | 13213 MB/s    | 0.01%        | 1.49x       | 9184 MB/s           | 0.01%              |
+| (1 CPU)                                                                                                 | 0.88x    | 5418 MB/s     | -            | 0.77x       | 5417 MB/s           | -                  |
+| [sofia-air-quality-dataset csv](https://files.klauspost.com/compress/sofia-air-quality-dataset.tar.zst) | 22.00x   | 11477 MB/s    | 18.73%       | 11.15x      | 5817 MB/s           | 27.88%             |
+| (1 CPU)                                                                                                 | 1.23x    | 642 MB/s      | -            | 0.71x       | 642 MB/s            | -                  |
+| [silesia.tar](http://sun.aei.polsl.pl/~sdeor/corpus/silesia.zip)                                        | 11.23x   | 6520 MB/s     | 5.9%         | 5.35x       | 3109 MB/s           | 15.88%             |
+| (1 CPU)                                                                                                 | 1.05x    | 607 MB/s      | -            | 0.52x       | 304 MB/s            | -                  |
+| [enwik9](https://files.klauspost.com/compress/enwik9.zst)                                               | 19.28x   | 8440 MB/s     | 4.04%        | 9.31x       | 4076 MB/s           | 18.04%             |
+| (1 CPU)                                                                                                 | 1.12x    | 488 MB/s      | -            | 0.57x       | 250 MB/s            | -                  |
 
 ### Legend
 
-* `S2 speed`: Speed of S2 compared to Snappy, using 16 cores and 1 core.
-* `S2 throughput`: Throughput of S2 in MB/s. 
+* `S2 Speed`: Speed of S2 compared to Snappy, using 16 cores and 1 core.
+* `S2 Throughput`: Throughput of S2 in MB/s. 
 * `S2 % smaller`: How many percent of the Snappy output size is S2 better.
 * `S2 "better"`: Speed when enabling "better" compression mode in S2 compared to Snappy. 
 * `"better" throughput`: Speed when enabling "better" compression mode in S2 compared to Snappy. 
@@ -361,7 +362,7 @@ Snappy vs S2 **compression** speed on 16 core (32 thread) computer, using all th
 
 There is a good speedup across the board when using a single thread and a significant speedup when using multiple threads.
 
-Machine generated data gets by far the biggest compression boost, with size being being reduced by up to 45% of Snappy size.
+Machine generated data gets by far the biggest compression boost, with size being reduced by up to 35% of Snappy size.
 
 The "better" compression mode sees a good improvement in all cases, but usually at a performance cost.
 
@@ -404,15 +405,15 @@ The "better" compression mode will actively look for shorter matches, which is w
 Without assembly decompression is also very fast; single goroutine decompression speed. No assembly:
 
 | File                           | S2 Throughput | S2 throughput |
-|--------------------------------|--------------|---------------|
-| consensus.db.10gb.s2           | 1.84x        | 2289.8 MB/s   |
-| 10gb.tar.s2                    | 1.30x        | 867.07 MB/s   |
-| rawstudio-mint14.tar.s2        | 1.66x        | 1329.65 MB/s  |
-| github-june-2days-2019.json.s2 | 2.36x        | 1831.59 MB/s  |
-| github-ranks-backup.bin.s2     | 1.73x        | 1390.7 MB/s   |
-| enwik9.s2                      | 1.67x        | 681.53 MB/s   |
-| adresser.json.s2               | 3.41x        | 4230.53 MB/s  |
-| silesia.tar.s2                 | 1.52x        | 811.58        |
+|--------------------------------|---------------|---------------|
+| consensus.db.10gb.s2           | 1.84x         | 2289.8 MB/s   |
+| 10gb.tar.s2                    | 1.30x         | 867.07 MB/s   |
+| rawstudio-mint14.tar.s2        | 1.66x         | 1329.65 MB/s  |
+| github-june-2days-2019.json.s2 | 2.36x         | 1831.59 MB/s  |
+| github-ranks-backup.bin.s2     | 1.73x         | 1390.7 MB/s   |
+| enwik9.s2                      | 1.67x         | 681.53 MB/s   |
+| adresser.json.s2               | 3.41x         | 4230.53 MB/s  |
+| silesia.tar.s2                 | 1.52x         | 811.58        |
 
 Even though S2 typically compresses better than Snappy, decompression speed is always better. 
 
@@ -450,14 +451,14 @@ The most reliable is a wide dataset.
 For this we use [`webdevdata.org-2015-01-07-subset`](https://files.klauspost.com/compress/webdevdata.org-2015-01-07-4GB-subset.7z),
 53927 files, total input size: 4,014,735,833 bytes. Single goroutine used.
 
-| *                 | Input      | Output     | Reduction | MB/s   |
-|-------------------|------------|------------|-----------|--------|
-| S2                | 4014735833 | 1059723369 | 73.60%    | **934.34** |
-| S2 Better         | 4014735833 | 969670507  | 75.85%    | 532.70 |
-| S2 Best           | 4014735833 | 906625668  | **77.85%** | 46.84 |
-| Snappy            | 4014735833 | 1128706759 | 71.89%    | 762.59 |
-| S2, Snappy Output | 4014735833 | 1093821420 | 72.75%    | 908.60 |
-| LZ4               | 4014735833 | 1079259294 | 73.12%    | 526.94 |
+| *                 | Input      | Output     | Reduction  | MB/s       |
+|-------------------|------------|------------|------------|------------|
+| S2                | 4014735833 | 1059723369 | 73.60%     | **936.73** |
+| S2 Better         | 4014735833 | 961580539  | 76.05%     | 451.10     |
+| S2 Best           | 4014735833 | 899182886  | **77.60%** | 46.84      |
+| Snappy            | 4014735833 | 1128706759 | 71.89%     | 790.15     |
+| S2, Snappy Output | 4014735833 | 1093823291 | 72.75%     | 936.60     |
+| LZ4               | 4014735833 | 1063768713 | 73.50%     | 452.02     |
 
 S2 delivers both the best single threaded throughput with regular mode and the best compression rate with "best".
 "Better" mode provides the same compression speed as LZ4 with better compression ratio. 
@@ -489,43 +490,24 @@ AMD64 assembly is use for both S2 and Snappy.
 
 | Absolute Perf         | Snappy size | S2 Size | Snappy Speed | S2 Speed    | Snappy dec  | S2 dec      |
 |-----------------------|-------------|---------|--------------|-------------|-------------|-------------|
-| html                  | 22843       | 21111   | 16246 MB/s   | 17438 MB/s  | 40972 MB/s  | 49263 MB/s  |
-| urls.10K              | 335492      | 287326  | 7943 MB/s    | 9693 MB/s   | 22523 MB/s  | 26484 MB/s  |
-| fireworks.jpeg        | 123034      | 123100  | 349544 MB/s  | 273889 MB/s | 718321 MB/s | 827552 MB/s |
-| fireworks.jpeg (200B) | 146         | 155     | 8869 MB/s    | 17773 MB/s  | 33691 MB/s  | 52421 MB/s  |
-| paper-100k.pdf        | 85304       | 84459   | 167546 MB/s  | 101263 MB/s | 326905 MB/s | 291944 MB/s |
-| html_x_4              | 92234       | 21113   | 15194 MB/s   | 50670 MB/s  | 30843 MB/s  | 32217 MB/s  |
-| alice29.txt           | 88034       | 85975   | 5936 MB/s    | 6139 MB/s   | 12882 MB/s  | 20044 MB/s  |
-| asyoulik.txt          | 77503       | 79650   | 5517 MB/s    | 6366 MB/s   | 12735 MB/s  | 22806 MB/s  |
-| lcet10.txt            | 234661      | 220670  | 6235 MB/s    | 6067 MB/s   | 14519 MB/s  | 18697 MB/s  |
-| plrabn12.txt          | 319267      | 317985  | 5159 MB/s    | 5726 MB/s   | 11923 MB/s  | 19901 MB/s  |
-| geo.protodata         | 23335       | 18690   | 21220 MB/s   | 26529 MB/s  | 56271 MB/s  | 62540 MB/s  |
-| kppkn.gtb             | 69526       | 65312   | 9732 MB/s    | 8559 MB/s   | 18491 MB/s  | 18969 MB/s  |
-| alice29.txt (128B)    | 80          | 82      | 6691 MB/s    | 15489 MB/s  | 31883 MB/s  | 38874 MB/s  |
-| alice29.txt (1000B)   | 774         | 774     | 12204 MB/s   | 13000 MB/s  | 48056 MB/s  | 52341 MB/s  |
-| alice29.txt (10000B)  | 6648        | 6933    | 10044 MB/s   | 12806 MB/s  | 32378 MB/s  | 46322 MB/s  |
-| alice29.txt (20000B)  | 12686       | 13574   | 7733 MB/s    | 11210 MB/s  | 30566 MB/s  | 58969 MB/s  |
+| html                  | 22843       | 20868   | 16246 MB/s   | 18617 MB/s  | 40972 MB/s  | 49263 MB/s  |
+| urls.10K              | 335492      | 286541  | 7943 MB/s    | 10201 MB/s  | 22523 MB/s  | 26484 MB/s  |
+| fireworks.jpeg        | 123034      | 123100  | 349544 MB/s  | 303228 MB/s | 718321 MB/s | 827552 MB/s |
+| fireworks.jpeg (200B) | 146         | 155     | 8869 MB/s    | 20180 MB/s  | 33691 MB/s  | 52421 MB/s  |
+| paper-100k.pdf        | 85304       | 84202   | 167546 MB/s  | 112988 MB/s | 326905 MB/s | 291944 MB/s |
+| html_x_4              | 92234       | 20870   | 15194 MB/s   | 54457 MB/s  | 30843 MB/s  | 32217 MB/s  |
+| alice29.txt           | 88034       | 85934   | 5936 MB/s    | 6540 MB/s   | 12882 MB/s  | 20044 MB/s  |
+| asyoulik.txt          | 77503       | 79575   | 5517 MB/s    | 6657 MB/s   | 12735 MB/s  | 22806 MB/s  |
+| lcet10.txt            | 234661      | 220383  | 6235 MB/s    | 6303 MB/s   | 14519 MB/s  | 18697 MB/s  |
+| plrabn12.txt          | 319267      | 318196  | 5159 MB/s    | 6074 MB/s   | 11923 MB/s  | 19901 MB/s  |
+| geo.protodata         | 23335       | 18606   | 21220 MB/s   | 25432 MB/s  | 56271 MB/s  | 62540 MB/s  |
+| kppkn.gtb             | 69526       | 65019   | 9732 MB/s    | 8905 MB/s   | 18491 MB/s  | 18969 MB/s  |
+| alice29.txt (128B)    | 80          | 82      | 6691 MB/s    | 17179 MB/s  | 31883 MB/s  | 38874 MB/s  |
+| alice29.txt (1000B)   | 774         | 774     | 12204 MB/s   | 13273 MB/s  | 48056 MB/s  | 52341 MB/s  |
+| alice29.txt (10000B)  | 6648        | 6933    | 10044 MB/s   | 12824 MB/s  | 32378 MB/s  | 46322 MB/s  |
+| alice29.txt (20000B)  | 12686       | 13516   | 7733 MB/s    | 12160 MB/s  | 30566 MB/s  | 58969 MB/s  |
 
 
-| Relative Perf         | Snappy size | S2 size improved | S2 Speed | S2 Dec Speed |
-|-----------------------|-------------|------------------|----------|--------------|
-| html                  | 22.31%      | 7.58%            | 1.07x    | 1.20x        |
-| urls.10K              | 47.78%      | 14.36%           | 1.22x    | 1.18x        |
-| fireworks.jpeg        | 99.95%      | -0.05%           | 0.78x    | 1.15x        |
-| fireworks.jpeg (200B) | 73.00%      | -6.16%           | 2.00x    | 1.56x        |
-| paper-100k.pdf        | 83.30%      | 0.99%            | 0.60x    | 0.89x        |
-| html_x_4              | 22.52%      | 77.11%           | 3.33x    | 1.04x        |
-| alice29.txt           | 57.88%      | 2.34%            | 1.03x    | 1.56x        |
-| asyoulik.txt          | 61.91%      | -2.77%           | 1.15x    | 1.79x        |
-| lcet10.txt            | 54.99%      | 5.96%            | 0.97x    | 1.29x        |
-| plrabn12.txt          | 66.26%      | 0.40%            | 1.11x    | 1.67x        |
-| geo.protodata         | 19.68%      | 19.91%           | 1.25x    | 1.11x        |
-| kppkn.gtb             | 37.72%      | 6.06%            | 0.88x    | 1.03x        |
-| alice29.txt (128B)    | 62.50%      | -2.50%           | 2.31x    | 1.22x        |
-| alice29.txt (1000B)   | 77.40%      | 0.00%            | 1.07x    | 1.09x        |
-| alice29.txt (10000B)  | 66.48%      | -4.29%           | 1.27x    | 1.43x        |
-| alice29.txt (20000B)  | 63.43%      | -7.00%           | 1.45x    | 1.93x        |
-
 Speed is generally at or above Snappy. Small blocks gets a significant speedup, although at the expense of size. 
 
 Decompression speed is better than Snappy, except in one case. 
@@ -543,43 +525,24 @@ So individual benchmarks should only be seen as a guideline and the overall pict
 
 | Absolute Perf         | Snappy size | Better Size | Snappy Speed | Better Speed | Snappy dec  | Better dec  |
 |-----------------------|-------------|-------------|--------------|--------------|-------------|-------------|
-| html                  | 22843       | 19833       | 16246 MB/s   | 7731 MB/s    | 40972 MB/s  | 40292 MB/s  |
-| urls.10K              | 335492      | 253529      | 7943 MB/s    | 3980 MB/s    | 22523 MB/s  | 20981 MB/s  |
-| fireworks.jpeg        | 123034      | 123100      | 349544 MB/s  | 9760 MB/s    | 718321 MB/s | 823698 MB/s |
-| fireworks.jpeg (200B) | 146         | 142         | 8869 MB/s    | 594 MB/s     | 33691 MB/s  | 30101 MB/s  |
-| paper-100k.pdf        | 85304       | 82915       | 167546 MB/s  | 7470 MB/s    | 326905 MB/s | 198869 MB/s |
-| html_x_4              | 92234       | 19841       | 15194 MB/s   | 23403 MB/s   | 30843 MB/s  | 30937 MB/s  |
-| alice29.txt           | 88034       | 73218       | 5936 MB/s    | 2945 MB/s    | 12882 MB/s  | 16611 MB/s  |
-| asyoulik.txt          | 77503       | 66844       | 5517 MB/s    | 2739 MB/s    | 12735 MB/s  | 14975 MB/s  |
-| lcet10.txt            | 234661      | 190589      | 6235 MB/s    | 3099 MB/s    | 14519 MB/s  | 16634 MB/s  |
-| plrabn12.txt          | 319267      | 270828      | 5159 MB/s    | 2600 MB/s    | 11923 MB/s  | 13382 MB/s  |
-| geo.protodata         | 23335       | 18278       | 21220 MB/s   | 11208 MB/s   | 56271 MB/s  | 57961 MB/s  |
-| kppkn.gtb             | 69526       | 61851       | 9732 MB/s    | 4556 MB/s    | 18491 MB/s  | 16524 MB/s  |
-| alice29.txt (128B)    | 80          | 81          | 6691 MB/s    | 529 MB/s     | 31883 MB/s  | 34225 MB/s  |
-| alice29.txt (1000B)   | 774         | 748         | 12204 MB/s   | 1943 MB/s    | 48056 MB/s  | 42068 MB/s  |
-| alice29.txt (10000B)  | 6648        | 6234        | 10044 MB/s   | 2949 MB/s    | 32378 MB/s  | 28813 MB/s  |
-| alice29.txt (20000B)  | 12686       | 11584       | 7733 MB/s    | 2822 MB/s    | 30566 MB/s  | 27315 MB/s  |
+| html                  | 22843       | 18972       | 16246 MB/s   | 8621 MB/s    | 40972 MB/s  | 40292 MB/s  |
+| urls.10K              | 335492      | 248079      | 7943 MB/s    | 5104 MB/s    | 22523 MB/s  | 20981 MB/s  |
+| fireworks.jpeg        | 123034      | 123100      | 349544 MB/s  | 84429 MB/s   | 718321 MB/s | 823698 MB/s |
+| fireworks.jpeg (200B) | 146         | 149         | 8869 MB/s    | 7125 MB/s    | 33691 MB/s  | 30101 MB/s  |
+| paper-100k.pdf        | 85304       | 82887       | 167546 MB/s  | 11087 MB/s   | 326905 MB/s | 198869 MB/s |
+| html_x_4              | 92234       | 18982       | 15194 MB/s   | 29316 MB/s   | 30843 MB/s  | 30937 MB/s  |
+| alice29.txt           | 88034       | 71611       | 5936 MB/s    | 3709 MB/s    | 12882 MB/s  | 16611 MB/s  |
+| asyoulik.txt          | 77503       | 65941       | 5517 MB/s    | 3380 MB/s    | 12735 MB/s  | 14975 MB/s  |
+| lcet10.txt            | 234661      | 184939      | 6235 MB/s    | 3537 MB/s    | 14519 MB/s  | 16634 MB/s  |
+| plrabn12.txt          | 319267      | 264990      | 5159 MB/s    | 2960 MB/s    | 11923 MB/s  | 13382 MB/s  |
+| geo.protodata         | 23335       | 17689       | 21220 MB/s   | 10859 MB/s   | 56271 MB/s  | 57961 MB/s  |
+| kppkn.gtb             | 69526       | 55398       | 9732 MB/s    | 5206 MB/s    | 18491 MB/s  | 16524 MB/s  |
+| alice29.txt (128B)    | 80          | 78          | 6691 MB/s    | 7422 MB/s    | 31883 MB/s  | 34225 MB/s  |
+| alice29.txt (1000B)   | 774         | 746         | 12204 MB/s   | 5734 MB/s    | 48056 MB/s  | 42068 MB/s  |
+| alice29.txt (10000B)  | 6648        | 6218        | 10044 MB/s   | 6055 MB/s    | 32378 MB/s  | 28813 MB/s  |
+| alice29.txt (20000B)  | 12686       | 11492       | 7733 MB/s    | 3143 MB/s    | 30566 MB/s  | 27315 MB/s  |
 
 
-| Relative Perf         | Snappy size | Better size | Better Speed | Better dec |
-|-----------------------|-------------|-------------|--------------|------------|
-| html                  | 22.31%      | 13.18%      | 0.48x        | 0.98x      |
-| urls.10K              | 47.78%      | 24.43%      | 0.50x        | 0.93x      |
-| fireworks.jpeg        | 99.95%      | -0.05%      | 0.03x        | 1.15x      |
-| fireworks.jpeg (200B) | 73.00%      | 2.74%       | 0.07x        | 0.89x      |
-| paper-100k.pdf        | 83.30%      | 2.80%       | 0.07x        | 0.61x      |
-| html_x_4              | 22.52%      | 78.49%      | 0.04x        | 1.00x      |
-| alice29.txt           | 57.88%      | 16.83%      | 1.54x        | 1.29x      |
-| asyoulik.txt          | 61.91%      | 13.75%      | 0.50x        | 1.18x      |
-| lcet10.txt            | 54.99%      | 18.78%      | 0.50x        | 1.15x      |
-| plrabn12.txt          | 66.26%      | 15.17%      | 0.50x        | 1.12x      |
-| geo.protodata         | 19.68%      | 21.67%      | 0.50x        | 1.03x      |
-| kppkn.gtb             | 37.72%      | 11.04%      | 0.53x        | 0.89x      |
-| alice29.txt (128B)    | 62.50%      | -1.25%      | 0.47x        | 1.07x      |
-| alice29.txt (1000B)   | 77.40%      | 3.36%       | 0.08x        | 0.88x      |
-| alice29.txt (10000B)  | 66.48%      | 6.23%       | 0.16x        | 0.89x      |
-| alice29.txt (20000B)  | 63.43%      | 8.69%       | 0.29x        | 0.89x      |
-
 Except for the mostly incompressible JPEG image compression is better and usually in the 
 double digits in terms of percentage reduction over Snappy.
 
@@ -605,33 +568,150 @@ Some examples compared on 16 core CPU, amd64 assembly used:
 
 ```
 * enwik10
-Default... 10000000000 -> 4761467548 [47.61%]; 1.098s, 8685.6MB/s
-Better...  10000000000 -> 4219438251 [42.19%]; 1.925s, 4954.2MB/s
-Best...    10000000000 -> 3627364337 [36.27%]; 43.051s, 221.5MB/s
+Default... 10000000000 -> 4759950115 [47.60%]; 1.03s, 9263.0MB/s
+Better...  10000000000 -> 4084706676 [40.85%]; 2.16s, 4415.4MB/s
+Best...    10000000000 -> 3615520079 [36.16%]; 42.259s, 225.7MB/s
 
 * github-june-2days-2019.json
-Default... 6273951764 -> 1043196283 [16.63%]; 431ms, 13882.3MB/s
-Better...  6273951764 -> 949146808 [15.13%]; 547ms, 10938.4MB/s
-Best...    6273951764 -> 832855506 [13.27%]; 9.455s, 632.8MB/s
+Default... 6273951764 -> 1041700255 [16.60%]; 431ms, 13882.3MB/s
+Better...  6273951764 -> 945841238 [15.08%]; 547ms, 10938.4MB/s
+Best...    6273951764 -> 826392576 [13.17%]; 9.455s, 632.8MB/s
 
 * nyc-taxi-data-10M.csv
-Default... 3325605752 -> 1095998837 [32.96%]; 324ms, 9788.7MB/s
-Better...  3325605752 -> 954776589 [28.71%]; 491ms, 6459.4MB/s
-Best...    3325605752 -> 779098746 [23.43%]; 8.29s, 382.6MB/s
+Default... 3325605752 -> 1093516949 [32.88%]; 324ms, 9788.7MB/s
+Better...  3325605752 -> 885394158 [26.62%]; 491ms, 6459.4MB/s
+Best...    3325605752 -> 773681257 [23.26%]; 8.29s, 412.0MB/s
 
 * 10gb.tar
-Default... 10065157632 -> 5916578242 [58.78%]; 1.028s, 9337.4MB/s
-Better...  10065157632 -> 5649207485 [56.13%]; 1.597s, 6010.6MB/s
-Best...    10065157632 -> 5208719802 [51.75%]; 32.78s, 292.8MB/
+Default... 10065157632 -> 5915541066 [58.77%]; 1.028s, 9337.4MB/s
+Better...  10065157632 -> 5453844650 [54.19%]; 1.597s, 4862.7MB/s
+Best...    10065157632 -> 5192495021 [51.59%]; 32.78s, 308.2MB/
 
 * consensus.db.10gb
-Default... 10737418240 -> 4562648848 [42.49%]; 882ms, 11610.0MB/s
-Better...  10737418240 -> 4542428129 [42.30%]; 1.533s, 6679.7MB/s
-Best...    10737418240 -> 4244773384 [39.53%]; 42.96s, 238.4MB/s
+Default... 10737418240 -> 4549762344 [42.37%]; 882ms, 12118.4MB/s
+Better...  10737418240 -> 4438535064 [41.34%]; 1.533s, 3500.9MB/s
+Best...    10737418240 -> 4210602774 [39.21%]; 42.96s, 254.4MB/s
 ```
 
 Decompression speed should be around the same as using the 'better' compression mode. 
 
+## Dictionaries
+
+*Note: S2 dictionary compression is currently at an early implementation stage, with no assembly for
+neither encoding nor decoding. Performance improvements can be expected in the future.*
+
+Adding dictionaries allow providing a custom dictionary that will serve as lookup in the beginning of blocks.
+
+The same dictionary *must* be used for both encoding and decoding. 
+S2 does not keep track of whether the same dictionary is used,
+and using the wrong dictionary will most often not result in an error when decompressing.
+
+Blocks encoded *without* dictionaries can be decompressed seamlessly *with* a dictionary.
+This means it is possible to switch from an encoding without dictionaries to an encoding with dictionaries
+and treat the blocks similarly.
+
+Similar to [zStandard dictionaries](https://github.com/facebook/zstd#the-case-for-small-data-compression), 
+the same usage scenario applies to S2 dictionaries.  
+
+> Training works if there is some correlation in a family of small data samples. The more data-specific a dictionary is, the more efficient it is (there is no universal dictionary). Hence, deploying one dictionary per type of data will provide the greatest benefits. Dictionary gains are mostly effective in the first few KB. Then, the compression algorithm will gradually use previously decoded content to better compress the rest of the file.
+
+S2 further limits the dictionary to only be enabled on the first 64KB of a block.
+This will remove any negative (speed) impacts of the dictionaries on bigger blocks. 
+
+### Compression
+
+Using the [github_users_sample_set](https://github.com/facebook/zstd/releases/download/v1.1.3/github_users_sample_set.tar.zst) 
+and a 64KB dictionary trained with zStandard the following sizes can be achieved. 
+
+|                    | Default          | Better           | Best                  |
+|--------------------|------------------|------------------|-----------------------|
+| Without Dictionary | 3362023 (44.92%) | 3083163 (41.19%) | 3057944 (40.86%)      |
+| With Dictionary    | 921524 (12.31%)  | 873154 (11.67%)  | 785503 bytes (10.49%) |
+
+So for highly repetitive content, this case provides an almost 3x reduction in size.
+
+For less uniform data we will use the Go source code tree.
+Compressing First 64KB of all `.go` files in `go/src`, Go 1.19.5, 8912 files, 51253563 bytes input:
+
+|                    | Default           | Better            | Best              |
+|--------------------|-------------------|-------------------|-------------------|
+| Without Dictionary | 22955767 (44.79%) | 20189613 (39.39%  | 19482828 (38.01%) |
+| With Dictionary    | 19654568 (38.35%) | 16289357 (31.78%) | 15184589 (29.63%) |
+| Saving/file        | 362 bytes         | 428 bytes         | 472 bytes         |
+
+
+### Creating Dictionaries
+
+There are no tools to create dictionaries in S2. 
+However, there are multiple ways to create a useful dictionary:
+
+#### Using a Sample File
+
+If your input is very uniform, you can just use a sample file as the dictionary.
+
+For example in the `github_users_sample_set` above, the average compression only goes up from 
+10.49% to 11.48% by using the first file as dictionary compared to using a dedicated dictionary.
+
+```Go
+    // Read a sample
+    sample, err := os.ReadFile("sample.json")
+
+    // Create a dictionary.
+    dict := s2.MakeDict(sample, nil)
+	
+    // b := dict.Bytes() will provide a dictionary that can be saved
+    // and reloaded with s2.NewDict(b).
+	
+    // To encode:
+    encoded := dict.Encode(nil, file)
+
+    // To decode:
+    decoded, err := dict.Decode(nil, file)
+```
+
+#### Using Zstandard
+
+Zstandard dictionaries can easily be converted to S2 dictionaries.
+
+This can be helpful to generate dictionaries for files that don't have a fixed structure.
+
+
+Example, with training set files  placed in `./training-set`: 
+
+`λ zstd -r --train-fastcover training-set/* --maxdict=65536 -o name.dict`
+
+This will create a dictionary of 64KB, that can be converted to a dictionary like this:
+
+```Go
+    // Decode the Zstandard dictionary.
+    insp, err := zstd.InspectDictionary(zdict)
+    if err != nil {
+        panic(err)
+    }
+	
+    // We are only interested in the contents.
+    // Assume that files start with "// Copyright (c) 2023".
+    // Search for the longest match for that.
+    // This may save a few bytes.
+    dict := s2.MakeDict(insp.Content(), []byte("// Copyright (c) 2023"))
+
+    // b := dict.Bytes() will provide a dictionary that can be saved
+    // and reloaded with s2.NewDict(b).
+
+    // We can now encode using this dictionary
+    encodedWithDict := dict.Encode(nil, payload)
+
+    // To decode content:
+    decoded, err := dict.Decode(nil, encodedWithDict)
+```
+
+It is recommended to save the dictionary returned by ` b:= dict.Bytes()`, since that will contain only the S2 dictionary.
+
+This dictionary can later be loaded using `s2.NewDict(b)`. The dictionary then no longer requires `zstd` to be initialized.
+
+Also note how `s2.MakeDict` allows you to search for a common starting sequence of your files.
+This can be omitted, at the expense of a few bytes.
+
 # Snappy Compatibility
 
 S2 now offers full compatibility with Snappy.
@@ -648,10 +728,10 @@ If you would like more control, you can use the s2 package as described below:
 Snappy compatible blocks can be generated with the S2 encoder. 
 Compression and speed is typically a bit better `MaxEncodedLen` is also smaller for smaller memory usage. Replace 
 
-| Snappy                     | S2 replacement          |
-|----------------------------|-------------------------|
-| snappy.Encode(...)         | s2.EncodeSnappy(...)   |
-| snappy.MaxEncodedLen(...)  | s2.MaxEncodedLen(...)   |
+| Snappy                    | S2 replacement        |
+|---------------------------|-----------------------|
+| snappy.Encode(...)        | s2.EncodeSnappy(...)  |
+| snappy.MaxEncodedLen(...) | s2.MaxEncodedLen(...) |
 
 `s2.EncodeSnappy` can be replaced with `s2.EncodeSnappyBetter` or `s2.EncodeSnappyBest` to get more efficiently compressed snappy compatible output. 
 
@@ -660,12 +740,12 @@ Compression and speed is typically a bit better `MaxEncodedLen` is also smaller
 Comparison of [`webdevdata.org-2015-01-07-subset`](https://files.klauspost.com/compress/webdevdata.org-2015-01-07-4GB-subset.7z),
 53927 files, total input size: 4,014,735,833 bytes. amd64, single goroutine used:
 
-| Encoder               | Size       | MB/s       | Reduction |
-|-----------------------|------------|------------|------------
-| snappy.Encode         | 1128706759 | 725.59     | 71.89%    |
-| s2.EncodeSnappy       | 1093823291 | **899.16** | 72.75%    |
-| s2.EncodeSnappyBetter | 1001158548 | 578.49     | 75.06%    |
-| s2.EncodeSnappyBest   | 944507998  | 66.00      | **76.47%**|
+| Encoder               | Size       | MB/s       | Reduction  |
+|-----------------------|------------|------------|------------|
+| snappy.Encode         | 1128706759 | 725.59     | 71.89%     |
+| s2.EncodeSnappy       | 1093823291 | **899.16** | 72.75%     |
+| s2.EncodeSnappyBetter | 1001158548 | 578.49     | 75.06%     |
+| s2.EncodeSnappyBest   | 944507998  | 66.00      | **76.47%** |
 
 ## Streams
 
@@ -835,6 +915,13 @@ This is done using the regular "Skip" function:
 
 This will ensure that we are at exactly the offset we want, and reading from `dec` will start at the requested offset.
 
+# Compact storage
+
+For compact storage [RemoveIndexHeaders](https://pkg.go.dev/github.com/klauspost/compress/s2#RemoveIndexHeaders) can be used to remove any redundant info from 
+a serialized index. If you remove the header it must be restored before [Loading](https://pkg.go.dev/github.com/klauspost/compress/s2#Index.Load).
+
+This is expected to save 20 bytes. These can be restored using [RestoreIndexHeaders](https://pkg.go.dev/github.com/klauspost/compress/s2#RestoreIndexHeaders). This removes a layer of security, but is the most compact representation. Returns nil if headers contains errors.
+
 ## Index Format:
 
 Each block is structured as a snappy skippable block, with the chunk ID 0x99.
@@ -844,20 +931,20 @@ The block can be read from the front, but contains information so it can be read
 Numbers are stored as fixed size little endian values or [zigzag encoded](https://developers.google.com/protocol-buffers/docs/encoding#signed_integers) [base 128 varints](https://developers.google.com/protocol-buffers/docs/encoding), 
 with un-encoded value length of 64 bits, unless other limits are specified. 
 
-| Content                                                                   | Format                                                                                                                      |
-|---------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
-| ID, `[1]byte`                                                           | Always 0x99.                                                                                                                  |
-| Data Length, `[3]byte`                                                  | 3 byte little-endian length of the chunk in bytes, following this.                                                            |
-| Header `[6]byte`                                                        | Header, must be `[115, 50, 105, 100, 120, 0]` or in text: "s2idx\x00".                                                        |
-| UncompressedSize, Varint                                                | Total Uncompressed size.                                                                                                      |
-| CompressedSize, Varint                                                  | Total Compressed size if known. Should be -1 if unknown.                                                                      |
-| EstBlockSize, Varint                                                    | Block Size, used for guessing uncompressed offsets. Must be >= 0.                                                             |
-| Entries, Varint                                                         | Number of Entries in index, must be < 65536 and >=0.                                                                          |
-| HasUncompressedOffsets `byte`                                           | 0 if no uncompressed offsets are present, 1 if present. Other values are invalid.                                             |
-| UncompressedOffsets, [Entries]VarInt                                    | Uncompressed offsets. See below how to decode.                                                                                |
-| CompressedOffsets, [Entries]VarInt                                      | Compressed offsets. See below how to decode.                                                                                  |
-| Block Size, `[4]byte`                                                   | Little Endian total encoded size (including header and trailer). Can be used for searching backwards to start of block.       |
-| Trailer `[6]byte`                                                       | Trailer, must be `[0, 120, 100, 105, 50, 115]` or in text: "\x00xdi2s". Can be used for identifying block from end of stream. |
+| Content                              | Format                                                                                                                        |
+|--------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|
+| ID, `[1]byte`                        | Always 0x99.                                                                                                                  |
+| Data Length, `[3]byte`               | 3 byte little-endian length of the chunk in bytes, following this.                                                            |
+| Header `[6]byte`                     | Header, must be `[115, 50, 105, 100, 120, 0]` or in text: "s2idx\x00".                                                        |
+| UncompressedSize, Varint             | Total Uncompressed size.                                                                                                      |
+| CompressedSize, Varint               | Total Compressed size if known. Should be -1 if unknown.                                                                      |
+| EstBlockSize, Varint                 | Block Size, used for guessing uncompressed offsets. Must be >= 0.                                                             |
+| Entries, Varint                      | Number of Entries in index, must be < 65536 and >=0.                                                                          |
+| HasUncompressedOffsets `byte`        | 0 if no uncompressed offsets are present, 1 if present. Other values are invalid.                                             |
+| UncompressedOffsets, [Entries]VarInt | Uncompressed offsets. See below how to decode.                                                                                |
+| CompressedOffsets, [Entries]VarInt   | Compressed offsets. See below how to decode.                                                                                  |
+| Block Size, `[4]byte`                | Little Endian total encoded size (including header and trailer). Can be used for searching backwards to start of block.       |
+| Trailer `[6]byte`                    | Trailer, must be `[0, 120, 100, 105, 50, 115]` or in text: "\x00xdi2s". Can be used for identifying block from end of stream. |
 
 For regular streams the uncompressed offsets are fully predictable,
 so `HasUncompressedOffsets` allows to specify that compressed blocks all have 
@@ -929,6 +1016,7 @@ To decode from any given uncompressed offset `(wantOffset)`:
 
 See [using indexes](https://github.com/klauspost/compress/tree/master/s2#using-indexes) for functions that perform the operations with a simpler interface.
 
+
 # Format Extensions
 
 * Frame [Stream identifier](https://github.com/google/snappy/blob/master/framing_format.txt#L68) changed from `sNaPpY` to `S2sTwO`.
@@ -951,13 +1039,80 @@ The length is specified by reading the 3-bit length specified in the tag and dec
 | 7      | 65540 + read 3 bytes |
 
 This allows any repeat offset + length to be represented by 2 to 5 bytes.
+It also allows to emit matches longer than 64 bytes with one copy + one repeat instead of several 64 byte copies.
 
 Lengths are stored as little endian values.
 
-The first copy of a block cannot be a repeat offset and the offset is not carried across blocks in streams.
+The first copy of a block cannot be a repeat offset and the offset is reset on every block in streams.
 
 Default streaming block size is 1MB.
 
+# Dictionary Encoding
+
+Adding dictionaries allow providing a custom dictionary that will serve as lookup in the beginning of blocks.
+
+A dictionary provides an initial repeat value that can be used to point to a common header.
+
+Other than that the dictionary contains values that can be used as back-references.
+
+Often used data should be placed at the *end* of the dictionary since offsets < 2048 bytes will be smaller.
+
+## Format
+
+Dictionary *content* must at least 16 bytes and less or equal to 64KiB (65536 bytes).
+
+Encoding: `[repeat value (uvarint)][dictionary content...]`
+
+Before the dictionary content, an unsigned base-128 (uvarint) encoded value specifying the initial repeat offset.
+This value is an offset into the dictionary content and not a back-reference offset,
+so setting this to 0 will make the repeat value point to the first value of the dictionary.
+
+The value must be less than the dictionary length-8
+
+## Encoding
+
+From the decoder point of view the dictionary content is seen as preceding the encoded content.
+
+`[dictionary content][decoded output]`
+
+Backreferences to the dictionary are encoded as ordinary backreferences that have an offset before the start of the decoded block.
+
+Matches copying from the dictionary are **not** allowed to cross from the dictionary into the decoded data.
+However, if a copy ends at the end of the dictionary the next repeat will point to the start of the decoded buffer, which is allowed.
+
+The first match can be a repeat value, which will use the repeat offset stored in the dictionary.
+
+When 64KB (65536 bytes) has been en/decoded it is no longer allowed to reference the dictionary, 
+neither by a copy nor repeat operations. 
+If the boundary is crossed while copying from the dictionary, the operation should complete, 
+but the next instruction is not allowed to reference the dictionary.
+
+Valid blocks encoded *without* a dictionary can be decoded with any dictionary. 
+There are no checks whether the supplied dictionary is the correct for a block.
+Because of this there is no overhead by using a dictionary.
+
+## Example
+
+This is the dictionary content. Elements are separated by `[]`.
+
+Dictionary: `[0x0a][Yesterday 25 bananas were added to Benjamins brown bag]`.
+
+Initial repeat offset is set at 10, which is the letter `2`.
+
+Encoded `[LIT "10"][REPEAT len=10][LIT "hich"][MATCH off=50 len=6][MATCH off=31 len=6][MATCH off=61 len=10]`
+
+Decoded: `[10][ bananas w][hich][ were ][brown ][were added]`
+
+Output: `10 bananas which were brown were added`
+
+
+## Streams
+
+For streams each block can use the dictionary.
+
+The dictionary cannot not currently be provided on the stream.
+
+
 # LICENSE
 
 This code is based on the [Snappy-Go](https://github.com/golang/snappy) implementation.
diff --git a/vendor/github.com/klauspost/compress/s2/decode.go b/vendor/github.com/klauspost/compress/s2/decode.go
index b5fa4d3f..b7c9adfd 100644
--- a/vendor/github.com/klauspost/compress/s2/decode.go
+++ b/vendor/github.com/klauspost/compress/s2/decode.go
@@ -11,7 +11,9 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"math"
 	"runtime"
+	"strconv"
 	"sync"
 )
 
@@ -719,7 +721,11 @@ func (r *Reader) Skip(n int64) error {
 			// decoded[i:j] contains decoded bytes that have not yet been passed on.
 			left := int64(r.j - r.i)
 			if left >= n {
-				r.i += int(n)
+				tmp := int64(r.i) + n
+				if tmp > math.MaxInt32 {
+					return errors.New("s2: internal overflow in skip")
+				}
+				r.i = int(tmp)
 				return nil
 			}
 			n -= int64(r.j - r.i)
@@ -875,15 +881,20 @@ func (r *Reader) Skip(n int64) error {
 // See Reader.ReadSeeker
 type ReadSeeker struct {
 	*Reader
+	readAtMu sync.Mutex
 }
 
-// ReadSeeker will return an io.ReadSeeker compatible version of the reader.
+// ReadSeeker will return an io.ReadSeeker and io.ReaderAt
+// compatible version of the reader.
 // If 'random' is specified the returned io.Seeker can be used for
 // random seeking, otherwise only forward seeking is supported.
 // Enabling random seeking requires the original input to support
 // the io.Seeker interface.
 // A custom index can be specified which will be used if supplied.
 // When using a custom index, it will not be read from the input stream.
+// The ReadAt position will affect regular reads and the current position of Seek.
+// So using Read after ReadAt will continue from where the ReadAt stopped.
+// No functions should be used concurrently.
 // The returned ReadSeeker contains a shallow reference to the existing Reader,
 // meaning changes performed to one is reflected in the other.
 func (r *Reader) ReadSeeker(random bool, index []byte) (*ReadSeeker, error) {
@@ -947,44 +958,61 @@ func (r *Reader) ReadSeeker(random bool, index []byte) (*ReadSeeker, error) {
 // Seek allows seeking in compressed data.
 func (r *ReadSeeker) Seek(offset int64, whence int) (int64, error) {
 	if r.err != nil {
-		return 0, r.err
-	}
-	if offset == 0 && whence == io.SeekCurrent {
-		return r.blockStart + int64(r.i), nil
-	}
-	if !r.readHeader {
-		// Make sure we read the header.
-		_, r.err = r.Read([]byte{})
-	}
-	rs, ok := r.r.(io.ReadSeeker)
-	if r.index == nil || !ok {
-		if whence == io.SeekCurrent && offset >= 0 {
-			err := r.Skip(offset)
-			return r.blockStart + int64(r.i), err
+		if !errors.Is(r.err, io.EOF) {
+			return 0, r.err
 		}
-		if whence == io.SeekStart && offset >= r.blockStart+int64(r.i) {
-			err := r.Skip(offset - r.blockStart - int64(r.i))
-			return r.blockStart + int64(r.i), err
-		}
-		return 0, ErrUnsupported
+		// Reset on EOF
+		r.err = nil
+	}
 
-	}
+	// Calculate absolute offset.
+	absOffset := offset
 
 	switch whence {
+	case io.SeekStart:
 	case io.SeekCurrent:
-		offset += r.blockStart + int64(r.i)
+		absOffset = r.blockStart + int64(r.i) + offset
 	case io.SeekEnd:
-		if offset > 0 {
-			return 0, errors.New("seek after end of file")
+		if r.index == nil {
+			return 0, ErrUnsupported
 		}
-		offset = r.index.TotalUncompressed + offset
+		absOffset = r.index.TotalUncompressed + offset
+	default:
+		r.err = ErrUnsupported
+		return 0, r.err
 	}
 
-	if offset < 0 {
+	if absOffset < 0 {
 		return 0, errors.New("seek before start of file")
 	}
 
-	c, u, err := r.index.Find(offset)
+	if !r.readHeader {
+		// Make sure we read the header.
+		_, r.err = r.Read([]byte{})
+		if r.err != nil {
+			return 0, r.err
+		}
+	}
+
+	// If we are inside current block no need to seek.
+	// This includes no offset changes.
+	if absOffset >= r.blockStart && absOffset < r.blockStart+int64(r.j) {
+		r.i = int(absOffset - r.blockStart)
+		return r.blockStart + int64(r.i), nil
+	}
+
+	rs, ok := r.r.(io.ReadSeeker)
+	if r.index == nil || !ok {
+		currOffset := r.blockStart + int64(r.i)
+		if absOffset >= currOffset {
+			err := r.Skip(absOffset - currOffset)
+			return r.blockStart + int64(r.i), err
+		}
+		return 0, ErrUnsupported
+	}
+
+	// We can seek and we have an index.
+	c, u, err := r.index.Find(absOffset)
 	if err != nil {
 		return r.blockStart + int64(r.i), err
 	}
@@ -995,12 +1023,57 @@ func (r *ReadSeeker) Seek(offset int64, whence int) (int64, error) {
 		return 0, err
 	}
 
-	r.i = r.j // Remove rest of current block.
-	if u < offset {
+	r.i = r.j                     // Remove rest of current block.
+	r.blockStart = u - int64(r.j) // Adjust current block start for accounting.
+	if u < absOffset {
 		// Forward inside block
-		return offset, r.Skip(offset - u)
+		return absOffset, r.Skip(absOffset - u)
 	}
-	return offset, nil
+	if u > absOffset {
+		return 0, fmt.Errorf("s2 seek: (internal error) u (%d) > absOffset (%d)", u, absOffset)
+	}
+	return absOffset, nil
+}
+
+// ReadAt reads len(p) bytes into p starting at offset off in the
+// underlying input source. It returns the number of bytes
+// read (0 <= n <= len(p)) and any error encountered.
+//
+// When ReadAt returns n < len(p), it returns a non-nil error
+// explaining why more bytes were not returned. In this respect,
+// ReadAt is stricter than Read.
+//
+// Even if ReadAt returns n < len(p), it may use all of p as scratch
+// space during the call. If some data is available but not len(p) bytes,
+// ReadAt blocks until either all the data is available or an error occurs.
+// In this respect ReadAt is different from Read.
+//
+// If the n = len(p) bytes returned by ReadAt are at the end of the
+// input source, ReadAt may return either err == EOF or err == nil.
+//
+// If ReadAt is reading from an input source with a seek offset,
+// ReadAt should not affect nor be affected by the underlying
+// seek offset.
+//
+// Clients of ReadAt can execute parallel ReadAt calls on the
+// same input source. This is however not recommended.
+func (r *ReadSeeker) ReadAt(p []byte, offset int64) (int, error) {
+	r.readAtMu.Lock()
+	defer r.readAtMu.Unlock()
+	_, err := r.Seek(offset, io.SeekStart)
+	if err != nil {
+		return 0, err
+	}
+	n := 0
+	for n < len(p) {
+		n2, err := r.Read(p[n:])
+		if err != nil {
+			// This will include io.EOF
+			return n + n2, err
+		}
+		n += n2
+	}
+	return n, nil
 }
 
 // ReadByte satisfies the io.ByteReader interface.
@@ -1039,3 +1112,370 @@ func (r *Reader) SkippableCB(id uint8, fn func(r io.Reader) error) error {
 	r.skippableCB[id] = fn
 	return nil
 }
+
+// s2DecodeDict writes the decoding of src to dst. It assumes that the varint-encoded
+// length of the decompressed bytes has already been read, and that len(dst)
+// equals that length.
+//
+// It returns 0 on success or a decodeErrCodeXxx error code on failure.
+func s2DecodeDict(dst, src []byte, dict *Dict) int {
+	if dict == nil {
+		return s2Decode(dst, src)
+	}
+	const debug = false
+	const debugErrs = debug
+
+	if debug {
+		fmt.Println("Starting decode, dst len:", len(dst))
+	}
+	var d, s, length int
+	offset := len(dict.dict) - dict.repeat
+
+	// As long as we can read at least 5 bytes...
+	for s < len(src)-5 {
+		// Removing bounds checks is SLOWER, when if doing
+		// in := src[s:s+5]
+		// Checked on Go 1.18
+		switch src[s] & 0x03 {
+		case tagLiteral:
+			x := uint32(src[s] >> 2)
+			switch {
+			case x < 60:
+				s++
+			case x == 60:
+				s += 2
+				x = uint32(src[s-1])
+			case x == 61:
+				in := src[s : s+3]
+				x = uint32(in[1]) | uint32(in[2])<<8
+				s += 3
+			case x == 62:
+				in := src[s : s+4]
+				// Load as 32 bit and shift down.
+				x = uint32(in[0]) | uint32(in[1])<<8 | uint32(in[2])<<16 | uint32(in[3])<<24
+				x >>= 8
+				s += 4
+			case x == 63:
+				in := src[s : s+5]
+				x = uint32(in[1]) | uint32(in[2])<<8 | uint32(in[3])<<16 | uint32(in[4])<<24
+				s += 5
+			}
+			length = int(x) + 1
+			if debug {
+				fmt.Println("literals, length:", length, "d-after:", d+length)
+			}
+			if length > len(dst)-d || length > len(src)-s || (strconv.IntSize == 32 && length <= 0) {
+				if debugErrs {
+					fmt.Println("corrupt literal: length:", length, "d-left:", len(dst)-d, "src-left:", len(src)-s)
+				}
+				return decodeErrCodeCorrupt
+			}
+
+			copy(dst[d:], src[s:s+length])
+			d += length
+			s += length
+			continue
+
+		case tagCopy1:
+			s += 2
+			toffset := int(uint32(src[s-2])&0xe0<<3 | uint32(src[s-1]))
+			length = int(src[s-2]) >> 2 & 0x7
+			if toffset == 0 {
+				if debug {
+					fmt.Print("(repeat) ")
+				}
+				// keep last offset
+				switch length {
+				case 5:
+					length = int(src[s]) + 4
+					s += 1
+				case 6:
+					in := src[s : s+2]
+					length = int(uint32(in[0])|(uint32(in[1])<<8)) + (1 << 8)
+					s += 2
+				case 7:
+					in := src[s : s+3]
+					length = int((uint32(in[2])<<16)|(uint32(in[1])<<8)|uint32(in[0])) + (1 << 16)
+					s += 3
+				default: // 0-> 4
+				}
+			} else {
+				offset = toffset
+			}
+			length += 4
+		case tagCopy2:
+			in := src[s : s+3]
+			offset = int(uint32(in[1]) | uint32(in[2])<<8)
+			length = 1 + int(in[0])>>2
+			s += 3
+
+		case tagCopy4:
+			in := src[s : s+5]
+			offset = int(uint32(in[1]) | uint32(in[2])<<8 | uint32(in[3])<<16 | uint32(in[4])<<24)
+			length = 1 + int(in[0])>>2
+			s += 5
+		}
+
+		if offset <= 0 || length > len(dst)-d {
+			if debugErrs {
+				fmt.Println("match error; offset:", offset, "length:", length, "dst-left:", len(dst)-d)
+			}
+			return decodeErrCodeCorrupt
+		}
+
+		// copy from dict
+		if d < offset {
+			if d > MaxDictSrcOffset {
+				if debugErrs {
+					fmt.Println("dict after", MaxDictSrcOffset, "d:", d, "offset:", offset, "length:", length)
+				}
+				return decodeErrCodeCorrupt
+			}
+			startOff := len(dict.dict) - offset + d
+			if startOff < 0 || startOff+length > len(dict.dict) {
+				if debugErrs {
+					fmt.Printf("offset (%d) + length (%d) bigger than dict (%d)\n", offset, length, len(dict.dict))
+				}
+				return decodeErrCodeCorrupt
+			}
+			if debug {
+				fmt.Println("dict copy, length:", length, "offset:", offset, "d-after:", d+length, "dict start offset:", startOff)
+			}
+			copy(dst[d:d+length], dict.dict[startOff:])
+			d += length
+			continue
+		}
+
+		if debug {
+			fmt.Println("copy, length:", length, "offset:", offset, "d-after:", d+length)
+		}
+
+		// Copy from an earlier sub-slice of dst to a later sub-slice.
+		// If no overlap, use the built-in copy:
+		if offset > length {
+			copy(dst[d:d+length], dst[d-offset:])
+			d += length
+			continue
+		}
+
+		// Unlike the built-in copy function, this byte-by-byte copy always runs
+		// forwards, even if the slices overlap. Conceptually, this is:
+		//
+		// d += forwardCopy(dst[d:d+length], dst[d-offset:])
+		//
+		// We align the slices into a and b and show the compiler they are the same size.
+		// This allows the loop to run without bounds checks.
+		a := dst[d : d+length]
+		b := dst[d-offset:]
+		b = b[:len(a)]
+		for i := range a {
+			a[i] = b[i]
+		}
+		d += length
+	}
+
+	// Remaining with extra checks...
+	for s < len(src) {
+		switch src[s] & 0x03 {
+		case tagLiteral:
+			x := uint32(src[s] >> 2)
+			switch {
+			case x < 60:
+				s++
+			case x == 60:
+				s += 2
+				if uint(s) > uint(len(src)) { // The uint conversions catch overflow from the previous line.
+					if debugErrs {
+						fmt.Println("src went oob")
+					}
+					return decodeErrCodeCorrupt
+				}
+				x = uint32(src[s-1])
+			case x == 61:
+				s += 3
+				if uint(s) > uint(len(src)) { // The uint conversions catch overflow from the previous line.
+					if debugErrs {
+						fmt.Println("src went oob")
+					}
+					return decodeErrCodeCorrupt
+				}
+				x = uint32(src[s-2]) | uint32(src[s-1])<<8
+			case x == 62:
+				s += 4
+				if uint(s) > uint(len(src)) { // The uint conversions catch overflow from the previous line.
+					if debugErrs {
+						fmt.Println("src went oob")
+					}
+					return decodeErrCodeCorrupt
+				}
+				x = uint32(src[s-3]) | uint32(src[s-2])<<8 | uint32(src[s-1])<<16
+			case x == 63:
+				s += 5
+				if uint(s) > uint(len(src)) { // The uint conversions catch overflow from the previous line.
+					if debugErrs {
+						fmt.Println("src went oob")
+					}
+					return decodeErrCodeCorrupt
+				}
+				x = uint32(src[s-4]) | uint32(src[s-3])<<8 | uint32(src[s-2])<<16 | uint32(src[s-1])<<24
+			}
+			length = int(x) + 1
+			if length > len(dst)-d || length > len(src)-s || (strconv.IntSize == 32 && length <= 0) {
+				if debugErrs {
+					fmt.Println("corrupt literal: length:", length, "d-left:", len(dst)-d, "src-left:", len(src)-s)
+				}
+				return decodeErrCodeCorrupt
+			}
+			if debug {
+				fmt.Println("literals, length:", length, "d-after:", d+length)
+			}
+
+			copy(dst[d:], src[s:s+length])
+			d += length
+			s += length
+			continue
+
+		case tagCopy1:
+			s += 2
+			if uint(s) > uint(len(src)) { // The uint conversions catch overflow from the previous line.
+				if debugErrs {
+					fmt.Println("src went oob")
+				}
+				return decodeErrCodeCorrupt
+			}
+			length = int(src[s-2]) >> 2 & 0x7
+			toffset := int(uint32(src[s-2])&0xe0<<3 | uint32(src[s-1]))
+			if toffset == 0 {
+				if debug {
+					fmt.Print("(repeat) ")
+				}
+				// keep last offset
+				switch length {
+				case 5:
+					s += 1
+					if uint(s) > uint(len(src)) { // The uint conversions catch overflow from the previous line.
+						if debugErrs {
+							fmt.Println("src went oob")
+						}
+						return decodeErrCodeCorrupt
+					}
+					length = int(uint32(src[s-1])) + 4
+				case 6:
+					s += 2
+					if uint(s) > uint(len(src)) { // The uint conversions catch overflow from the previous line.
+						if debugErrs {
+							fmt.Println("src went oob")
+						}
+						return decodeErrCodeCorrupt
+					}
+					length = int(uint32(src[s-2])|(uint32(src[s-1])<<8)) + (1 << 8)
+				case 7:
+					s += 3
+					if uint(s) > uint(len(src)) { // The uint conversions catch overflow from the previous line.
+						if debugErrs {
+							fmt.Println("src went oob")
+						}
+						return decodeErrCodeCorrupt
+					}
+					length = int(uint32(src[s-3])|(uint32(src[s-2])<<8)|(uint32(src[s-1])<<16)) + (1 << 16)
+				default: // 0-> 4
+				}
+			} else {
+				offset = toffset
+			}
+			length += 4
+		case tagCopy2:
+			s += 3
+			if uint(s) > uint(len(src)) { // The uint conversions catch overflow from the previous line.
+				if debugErrs {
+					fmt.Println("src went oob")
+				}
+				return decodeErrCodeCorrupt
+			}
+			length = 1 + int(src[s-3])>>2
+			offset = int(uint32(src[s-2]) | uint32(src[s-1])<<8)
+
+		case tagCopy4:
+			s += 5
+			if uint(s) > uint(len(src)) { // The uint conversions catch overflow from the previous line.
+				if debugErrs {
+					fmt.Println("src went oob")
+				}
+				return decodeErrCodeCorrupt
+			}
+			length = 1 + int(src[s-5])>>2
+			offset = int(uint32(src[s-4]) | uint32(src[s-3])<<8 | uint32(src[s-2])<<16 | uint32(src[s-1])<<24)
+		}
+
+		if offset <= 0 || length > len(dst)-d {
+			if debugErrs {
+				fmt.Println("match error; offset:", offset, "length:", length, "dst-left:", len(dst)-d)
+			}
+			return decodeErrCodeCorrupt
+		}
+
+		// copy from dict
+		if d < offset {
+			if d > MaxDictSrcOffset {
+				if debugErrs {
+					fmt.Println("dict after", MaxDictSrcOffset, "d:", d, "offset:", offset, "length:", length)
+				}
+				return decodeErrCodeCorrupt
+			}
+			rOff := len(dict.dict) - (offset - d)
+			if debug {
+				fmt.Println("starting dict entry from dict offset", len(dict.dict)-rOff)
+			}
+			if rOff+length > len(dict.dict) {
+				if debugErrs {
+					fmt.Println("err: END offset", rOff+length, "bigger than dict", len(dict.dict), "dict offset:", rOff, "length:", length)
+				}
+				return decodeErrCodeCorrupt
+			}
+			if rOff < 0 {
+				if debugErrs {
+					fmt.Println("err: START offset", rOff, "less than 0", len(dict.dict), "dict offset:", rOff, "length:", length)
+				}
+				return decodeErrCodeCorrupt
+			}
+			copy(dst[d:d+length], dict.dict[rOff:])
+			d += length
+			continue
+		}
+
+		if debug {
+			fmt.Println("copy, length:", length, "offset:", offset, "d-after:", d+length)
+		}
+
+		// Copy from an earlier sub-slice of dst to a later sub-slice.
+		// If no overlap, use the built-in copy:
+		if offset > length {
+			copy(dst[d:d+length], dst[d-offset:])
+			d += length
+			continue
+		}
+
+		// Unlike the built-in copy function, this byte-by-byte copy always runs
+		// forwards, even if the slices overlap. Conceptually, this is:
+		//
+		// d += forwardCopy(dst[d:d+length], dst[d-offset:])
+		//
+		// We align the slices into a and b and show the compiler they are the same size.
+		// This allows the loop to run without bounds checks.
+		a := dst[d : d+length]
+		b := dst[d-offset:]
+		b = b[:len(a)]
+		for i := range a {
+			a[i] = b[i]
+		}
+		d += length
+	}
+
+	if d != len(dst) {
+		if debugErrs {
+			fmt.Println("wanted length", len(dst), "got", d)
+		}
+		return decodeErrCodeCorrupt
+	}
+	return 0
+}
diff --git a/vendor/github.com/klauspost/compress/s2/decode_other.go b/vendor/github.com/klauspost/compress/s2/decode_other.go
index 1074ebd2..2cb55c2c 100644
--- a/vendor/github.com/klauspost/compress/s2/decode_other.go
+++ b/vendor/github.com/klauspost/compress/s2/decode_other.go
@@ -28,6 +28,9 @@ func s2Decode(dst, src []byte) int {
 
 	// As long as we can read at least 5 bytes...
 	for s < len(src)-5 {
+		// Removing bounds checks is SLOWER, when if doing
+		// in := src[s:s+5]
+		// Checked on Go 1.18
 		switch src[s] & 0x03 {
 		case tagLiteral:
 			x := uint32(src[s] >> 2)
@@ -38,17 +41,25 @@ func s2Decode(dst, src []byte) int {
 				s += 2
 				x = uint32(src[s-1])
 			case x == 61:
+				in := src[s : s+3]
+				x = uint32(in[1]) | uint32(in[2])<<8
 				s += 3
-				x = uint32(src[s-2]) | uint32(src[s-1])<<8
 			case x == 62:
+				in := src[s : s+4]
+				// Load as 32 bit and shift down.
+				x = uint32(in[0]) | uint32(in[1])<<8 | uint32(in[2])<<16 | uint32(in[3])<<24
+				x >>= 8
 				s += 4
-				x = uint32(src[s-3]) | uint32(src[s-2])<<8 | uint32(src[s-1])<<16
 			case x == 63:
+				in := src[s : s+5]
+				x = uint32(in[1]) | uint32(in[2])<<8 | uint32(in[3])<<16 | uint32(in[4])<<24
 				s += 5
-				x = uint32(src[s-4]) | uint32(src[s-3])<<8 | uint32(src[s-2])<<16 | uint32(src[s-1])<<24
 			}
 			length = int(x) + 1
 			if length > len(dst)-d || length > len(src)-s || (strconv.IntSize == 32 && length <= 0) {
+				if debug {
+					fmt.Println("corrupt: lit size", length)
+				}
 				return decodeErrCodeCorrupt
 			}
 			if debug {
@@ -62,8 +73,8 @@ func s2Decode(dst, src []byte) int {
 
 		case tagCopy1:
 			s += 2
-			length = int(src[s-2]) >> 2 & 0x7
 			toffset := int(uint32(src[s-2])&0xe0<<3 | uint32(src[s-1]))
+			length = int(src[s-2]) >> 2 & 0x7
 			if toffset == 0 {
 				if debug {
 					fmt.Print("(repeat) ")
@@ -71,14 +82,16 @@ func s2Decode(dst, src []byte) int {
 				// keep last offset
 				switch length {
 				case 5:
+					length = int(src[s]) + 4
 					s += 1
-					length = int(uint32(src[s-1])) + 4
 				case 6:
+					in := src[s : s+2]
+					length = int(uint32(in[0])|(uint32(in[1])<<8)) + (1 << 8)
 					s += 2
-					length = int(uint32(src[s-2])|(uint32(src[s-1])<<8)) + (1 << 8)
 				case 7:
+					in := src[s : s+3]
+					length = int((uint32(in[2])<<16)|(uint32(in[1])<<8)|uint32(in[0])) + (1 << 16)
 					s += 3
-					length = int(uint32(src[s-3])|(uint32(src[s-2])<<8)|(uint32(src[s-1])<<16)) + (1 << 16)
 				default: // 0-> 4
 				}
 			} else {
@@ -86,17 +99,23 @@ func s2Decode(dst, src []byte) int {
 			}
 			length += 4
 		case tagCopy2:
+			in := src[s : s+3]
+			offset = int(uint32(in[1]) | uint32(in[2])<<8)
+			length = 1 + int(in[0])>>2
 			s += 3
-			length = 1 + int(src[s-3])>>2
-			offset = int(uint32(src[s-2]) | uint32(src[s-1])<<8)
 
 		case tagCopy4:
+			in := src[s : s+5]
+			offset = int(uint32(in[1]) | uint32(in[2])<<8 | uint32(in[3])<<16 | uint32(in[4])<<24)
+			length = 1 + int(in[0])>>2
 			s += 5
-			length = 1 + int(src[s-5])>>2
-			offset = int(uint32(src[s-4]) | uint32(src[s-3])<<8 | uint32(src[s-2])<<16 | uint32(src[s-1])<<24)
 		}
 
 		if offset <= 0 || d < offset || length > len(dst)-d {
+			if debug {
+				fmt.Println("corrupt: match, length", length, "offset:", offset, "dst avail:", len(dst)-d, "dst pos:", d)
+			}
+
 			return decodeErrCodeCorrupt
 		}
 
@@ -163,6 +182,9 @@ func s2Decode(dst, src []byte) int {
 			}
 			length = int(x) + 1
 			if length > len(dst)-d || length > len(src)-s || (strconv.IntSize == 32 && length <= 0) {
+				if debug {
+					fmt.Println("corrupt: lit size", length)
+				}
 				return decodeErrCodeCorrupt
 			}
 			if debug {
@@ -229,6 +251,9 @@ func s2Decode(dst, src []byte) int {
 		}
 
 		if offset <= 0 || d < offset || length > len(dst)-d {
+			if debug {
+				fmt.Println("corrupt: match, length", length, "offset:", offset, "dst avail:", len(dst)-d, "dst pos:", d)
+			}
 			return decodeErrCodeCorrupt
 		}
 
diff --git a/vendor/github.com/klauspost/compress/s2/dict.go b/vendor/github.com/klauspost/compress/s2/dict.go
new file mode 100644
index 00000000..24f7ce80
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/s2/dict.go
@@ -0,0 +1,331 @@
+// Copyright (c) 2022+ Klaus Post. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package s2
+
+import (
+	"bytes"
+	"encoding/binary"
+	"sync"
+)
+
+const (
+	// MinDictSize is the minimum dictionary size when repeat has been read.
+	MinDictSize = 16
+
+	// MaxDictSize is the maximum dictionary size when repeat has been read.
+	MaxDictSize = 65536
+
+	// MaxDictSrcOffset is the maximum offset where a dictionary entry can start.
+	MaxDictSrcOffset = 65535
+)
+
+// Dict contains a dictionary that can be used for encoding and decoding s2
+type Dict struct {
+	dict   []byte
+	repeat int // Repeat as index of dict
+
+	fast, better, best sync.Once
+	fastTable          *[1 << 14]uint16
+
+	betterTableShort *[1 << 14]uint16
+	betterTableLong  *[1 << 17]uint16
+
+	bestTableShort *[1 << 16]uint32
+	bestTableLong  *[1 << 19]uint32
+}
+
+// NewDict will read a dictionary.
+// It will return nil if the dictionary is invalid.
+func NewDict(dict []byte) *Dict {
+	if len(dict) == 0 {
+		return nil
+	}
+	var d Dict
+	// Repeat is the first value of the dict
+	r, n := binary.Uvarint(dict)
+	if n <= 0 {
+		return nil
+	}
+	dict = dict[n:]
+	d.dict = dict
+	if cap(d.dict) < len(d.dict)+16 {
+		d.dict = append(make([]byte, 0, len(d.dict)+16), d.dict...)
+	}
+	if len(dict) < MinDictSize || len(dict) > MaxDictSize {
+		return nil
+	}
+	d.repeat = int(r)
+	if d.repeat > len(dict) {
+		return nil
+	}
+	return &d
+}
+
+// Bytes will return a serialized version of the dictionary.
+// The output can be sent to NewDict.
+func (d *Dict) Bytes() []byte {
+	dst := make([]byte, binary.MaxVarintLen16+len(d.dict))
+	return append(dst[:binary.PutUvarint(dst, uint64(d.repeat))], d.dict...)
+}
+
+// MakeDict will create a dictionary.
+// 'data' must be at least MinDictSize.
+// If data is longer than MaxDictSize only the last MaxDictSize bytes will be used.
+// If searchStart is set the start repeat value will be set to the last
+// match of this content.
+// If no matches are found, it will attempt to find shorter matches.
+// This content should match the typical start of a block.
+// If at least 4 bytes cannot be matched, repeat is set to start of block.
+func MakeDict(data []byte, searchStart []byte) *Dict {
+	if len(data) == 0 {
+		return nil
+	}
+	if len(data) > MaxDictSize {
+		data = data[len(data)-MaxDictSize:]
+	}
+	var d Dict
+	dict := data
+	d.dict = dict
+	if cap(d.dict) < len(d.dict)+16 {
+		d.dict = append(make([]byte, 0, len(d.dict)+16), d.dict...)
+	}
+	if len(dict) < MinDictSize {
+		return nil
+	}
+
+	// Find the longest match possible, last entry if multiple.
+	for s := len(searchStart); s > 4; s-- {
+		if idx := bytes.LastIndex(data, searchStart[:s]); idx >= 0 && idx <= len(data)-8 {
+			d.repeat = idx
+			break
+		}
+	}
+
+	return &d
+}
+
+// Encode returns the encoded form of src. The returned slice may be a sub-
+// slice of dst if dst was large enough to hold the entire encoded block.
+// Otherwise, a newly allocated slice will be returned.
+//
+// The dst and src must not overlap. It is valid to pass a nil dst.
+//
+// The blocks will require the same amount of memory to decode as encoding,
+// and does not make for concurrent decoding.
+// Also note that blocks do not contain CRC information, so corruption may be undetected.
+//
+// If you need to encode larger amounts of data, consider using
+// the streaming interface which gives all of these features.
+func (d *Dict) Encode(dst, src []byte) []byte {
+	if n := MaxEncodedLen(len(src)); n < 0 {
+		panic(ErrTooLarge)
+	} else if cap(dst) < n {
+		dst = make([]byte, n)
+	} else {
+		dst = dst[:n]
+	}
+
+	// The block starts with the varint-encoded length of the decompressed bytes.
+	dstP := binary.PutUvarint(dst, uint64(len(src)))
+
+	if len(src) == 0 {
+		return dst[:dstP]
+	}
+	if len(src) < minNonLiteralBlockSize {
+		dstP += emitLiteral(dst[dstP:], src)
+		return dst[:dstP]
+	}
+	n := encodeBlockDictGo(dst[dstP:], src, d)
+	if n > 0 {
+		dstP += n
+		return dst[:dstP]
+	}
+	// Not compressible
+	dstP += emitLiteral(dst[dstP:], src)
+	return dst[:dstP]
+}
+
+// EncodeBetter returns the encoded form of src. The returned slice may be a sub-
+// slice of dst if dst was large enough to hold the entire encoded block.
+// Otherwise, a newly allocated slice will be returned.
+//
+// EncodeBetter compresses better than Encode but typically with a
+// 10-40% speed decrease on both compression and decompression.
+//
+// The dst and src must not overlap. It is valid to pass a nil dst.
+//
+// The blocks will require the same amount of memory to decode as encoding,
+// and does not make for concurrent decoding.
+// Also note that blocks do not contain CRC information, so corruption may be undetected.
+//
+// If you need to encode larger amounts of data, consider using
+// the streaming interface which gives all of these features.
+func (d *Dict) EncodeBetter(dst, src []byte) []byte {
+	if n := MaxEncodedLen(len(src)); n < 0 {
+		panic(ErrTooLarge)
+	} else if len(dst) < n {
+		dst = make([]byte, n)
+	}
+
+	// The block starts with the varint-encoded length of the decompressed bytes.
+	dstP := binary.PutUvarint(dst, uint64(len(src)))
+
+	if len(src) == 0 {
+		return dst[:dstP]
+	}
+	if len(src) < minNonLiteralBlockSize {
+		dstP += emitLiteral(dst[dstP:], src)
+		return dst[:dstP]
+	}
+	n := encodeBlockBetterDict(dst[dstP:], src, d)
+	if n > 0 {
+		dstP += n
+		return dst[:dstP]
+	}
+	// Not compressible
+	dstP += emitLiteral(dst[dstP:], src)
+	return dst[:dstP]
+}
+
+// EncodeBest returns the encoded form of src. The returned slice may be a sub-
+// slice of dst if dst was large enough to hold the entire encoded block.
+// Otherwise, a newly allocated slice will be returned.
+//
+// EncodeBest compresses as good as reasonably possible but with a
+// big speed decrease.
+//
+// The dst and src must not overlap. It is valid to pass a nil dst.
+//
+// The blocks will require the same amount of memory to decode as encoding,
+// and does not make for concurrent decoding.
+// Also note that blocks do not contain CRC information, so corruption may be undetected.
+//
+// If you need to encode larger amounts of data, consider using
+// the streaming interface which gives all of these features.
+func (d *Dict) EncodeBest(dst, src []byte) []byte {
+	if n := MaxEncodedLen(len(src)); n < 0 {
+		panic(ErrTooLarge)
+	} else if len(dst) < n {
+		dst = make([]byte, n)
+	}
+
+	// The block starts with the varint-encoded length of the decompressed bytes.
+	dstP := binary.PutUvarint(dst, uint64(len(src)))
+
+	if len(src) == 0 {
+		return dst[:dstP]
+	}
+	if len(src) < minNonLiteralBlockSize {
+		dstP += emitLiteral(dst[dstP:], src)
+		return dst[:dstP]
+	}
+	n := encodeBlockBest(dst[dstP:], src, d)
+	if n > 0 {
+		dstP += n
+		return dst[:dstP]
+	}
+	// Not compressible
+	dstP += emitLiteral(dst[dstP:], src)
+	return dst[:dstP]
+}
+
+// Decode returns the decoded form of src. The returned slice may be a sub-
+// slice of dst if dst was large enough to hold the entire decoded block.
+// Otherwise, a newly allocated slice will be returned.
+//
+// The dst and src must not overlap. It is valid to pass a nil dst.
+func (d *Dict) Decode(dst, src []byte) ([]byte, error) {
+	dLen, s, err := decodedLen(src)
+	if err != nil {
+		return nil, err
+	}
+	if dLen <= cap(dst) {
+		dst = dst[:dLen]
+	} else {
+		dst = make([]byte, dLen)
+	}
+	if s2DecodeDict(dst, src[s:], d) != 0 {
+		return nil, ErrCorrupt
+	}
+	return dst, nil
+}
+
+func (d *Dict) initFast() {
+	d.fast.Do(func() {
+		const (
+			tableBits    = 14
+			maxTableSize = 1 << tableBits
+		)
+
+		var table [maxTableSize]uint16
+		// We stop so any entry of length 8 can always be read.
+		for i := 0; i < len(d.dict)-8-2; i += 3 {
+			x0 := load64(d.dict, i)
+			h0 := hash6(x0, tableBits)
+			h1 := hash6(x0>>8, tableBits)
+			h2 := hash6(x0>>16, tableBits)
+			table[h0] = uint16(i)
+			table[h1] = uint16(i + 1)
+			table[h2] = uint16(i + 2)
+		}
+		d.fastTable = &table
+	})
+}
+
+func (d *Dict) initBetter() {
+	d.better.Do(func() {
+		const (
+			// Long hash matches.
+			lTableBits    = 17
+			maxLTableSize = 1 << lTableBits
+
+			// Short hash matches.
+			sTableBits    = 14
+			maxSTableSize = 1 << sTableBits
+		)
+
+		var lTable [maxLTableSize]uint16
+		var sTable [maxSTableSize]uint16
+
+		// We stop so any entry of length 8 can always be read.
+		for i := 0; i < len(d.dict)-8; i++ {
+			cv := load64(d.dict, i)
+			lTable[hash7(cv, lTableBits)] = uint16(i)
+			sTable[hash4(cv, sTableBits)] = uint16(i)
+		}
+		d.betterTableShort = &sTable
+		d.betterTableLong = &lTable
+	})
+}
+
+func (d *Dict) initBest() {
+	d.best.Do(func() {
+		const (
+			// Long hash matches.
+			lTableBits    = 19
+			maxLTableSize = 1 << lTableBits
+
+			// Short hash matches.
+			sTableBits    = 16
+			maxSTableSize = 1 << sTableBits
+		)
+
+		var lTable [maxLTableSize]uint32
+		var sTable [maxSTableSize]uint32
+
+		// We stop so any entry of length 8 can always be read.
+		for i := 0; i < len(d.dict)-8; i++ {
+			cv := load64(d.dict, i)
+			hashL := hash8(cv, lTableBits)
+			hashS := hash4(cv, sTableBits)
+			candidateL := lTable[hashL]
+			candidateS := sTable[hashS]
+			lTable[hashL] = uint32(i) | candidateL<<16
+			sTable[hashS] = uint32(i) | candidateS<<16
+		}
+		d.bestTableShort = &sTable
+		d.bestTableLong = &lTable
+	})
+}
diff --git a/vendor/github.com/klauspost/compress/s2/encode.go b/vendor/github.com/klauspost/compress/s2/encode.go
index 1aefabf3..c2ca7236 100644
--- a/vendor/github.com/klauspost/compress/s2/encode.go
+++ b/vendor/github.com/klauspost/compress/s2/encode.go
@@ -58,6 +58,32 @@ func Encode(dst, src []byte) []byte {
 	return dst[:d]
 }
 
+// EstimateBlockSize will perform a very fast compression
+// without outputting the result and return the compressed output size.
+// The function returns -1 if no improvement could be achieved.
+// Using actual compression will most often produce better compression than the estimate.
+func EstimateBlockSize(src []byte) (d int) {
+	if len(src) < 6 || int64(len(src)) > 0xffffffff {
+		return -1
+	}
+	if len(src) <= 1024 {
+		d = calcBlockSizeSmall(src)
+	} else {
+		d = calcBlockSize(src)
+	}
+
+	if d == 0 {
+		return -1
+	}
+	// Size of the varint encoded block size.
+	d += (bits.Len64(uint64(len(src))) + 7) / 7
+
+	if d >= len(src) {
+		return -1
+	}
+	return d
+}
+
 // EncodeBetter returns the encoded form of src. The returned slice may be a sub-
 // slice of dst if dst was large enough to hold the entire encoded block.
 // Otherwise, a newly allocated slice will be returned.
@@ -132,7 +158,7 @@ func EncodeBest(dst, src []byte) []byte {
 		d += emitLiteral(dst[d:], src)
 		return dst[:d]
 	}
-	n := encodeBlockBest(dst[d:], src)
+	n := encodeBlockBest(dst[d:], src, nil)
 	if n > 0 {
 		d += n
 		return dst[:d]
@@ -404,10 +430,11 @@ type Writer struct {
 	buffers       sync.Pool
 	pad           int
 
-	writer   io.Writer
-	randSrc  io.Reader
-	writerWg sync.WaitGroup
-	index    Index
+	writer    io.Writer
+	randSrc   io.Reader
+	writerWg  sync.WaitGroup
+	index     Index
+	customEnc func(dst, src []byte) int
 
 	// wroteStreamHeader is whether we have written the stream header.
 	wroteStreamHeader bool
@@ -773,6 +800,9 @@ func (w *Writer) EncodeBuffer(buf []byte) (err error) {
 }
 
 func (w *Writer) encodeBlock(obuf, uncompressed []byte) int {
+	if w.customEnc != nil {
+		return w.customEnc(obuf, uncompressed)
+	}
 	if w.snappy {
 		switch w.level {
 		case levelFast:
@@ -790,7 +820,7 @@ func (w *Writer) encodeBlock(obuf, uncompressed []byte) int {
 	case levelBetter:
 		return encodeBlockBetter(obuf, uncompressed)
 	case levelBest:
-		return encodeBlockBest(obuf, uncompressed)
+		return encodeBlockBest(obuf, uncompressed, nil)
 	}
 	return 0
 }
@@ -1339,3 +1369,15 @@ func WriterFlushOnWrite() WriterOption {
 		return nil
 	}
 }
+
+// WriterCustomEncoder allows to override the encoder for blocks on the stream.
+// The function must compress 'src' into 'dst' and return the bytes used in dst as an integer.
+// Block size (initial varint) should not be added by the encoder.
+// Returning value 0 indicates the block could not be compressed.
+// The function should expect to be called concurrently.
+func WriterCustomEncoder(fn func(dst, src []byte) int) WriterOption {
+	return func(w *Writer) error {
+		w.customEnc = fn
+		return nil
+	}
+}
diff --git a/vendor/github.com/klauspost/compress/s2/encode_all.go b/vendor/github.com/klauspost/compress/s2/encode_all.go
index 8b16c38a..11657f09 100644
--- a/vendor/github.com/klauspost/compress/s2/encode_all.go
+++ b/vendor/github.com/klauspost/compress/s2/encode_all.go
@@ -8,6 +8,7 @@ package s2
 import (
 	"bytes"
 	"encoding/binary"
+	"fmt"
 	"math/bits"
 )
 
@@ -58,8 +59,9 @@ func encodeGo(dst, src []byte) []byte {
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src)) &&
-// 	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
 func encodeBlockGo(dst, src []byte) (d int) {
 	// Initialize the hash table.
 	const (
@@ -454,3 +456,594 @@ emitRemainder:
 	}
 	return d
 }
+
+// encodeBlockGo encodes a non-empty src to a guaranteed-large-enough dst. It
+// assumes that the varint-encoded length of the decompressed bytes has already
+// been written.
+//
+// It also assumes that:
+//
+//	len(dst) >= MaxEncodedLen(len(src)) &&
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+func encodeBlockDictGo(dst, src []byte, dict *Dict) (d int) {
+	// Initialize the hash table.
+	const (
+		tableBits    = 14
+		maxTableSize = 1 << tableBits
+		maxAhead     = 8 // maximum bytes ahead without checking sLimit
+
+		debug = false
+	)
+	dict.initFast()
+
+	var table [maxTableSize]uint32
+
+	// sLimit is when to stop looking for offset/length copies. The inputMargin
+	// lets us use a fast path for emitLiteral in the main loop, while we are
+	// looking for copies.
+	sLimit := len(src) - inputMargin
+	if sLimit > MaxDictSrcOffset-maxAhead {
+		sLimit = MaxDictSrcOffset - maxAhead
+	}
+
+	// Bail if we can't compress to at least this.
+	dstLimit := len(src) - len(src)>>5 - 5
+
+	// nextEmit is where in src the next emitLiteral should start from.
+	nextEmit := 0
+
+	// The encoded form can start with a dict entry (copy or repeat).
+	s := 0
+
+	// Convert dict repeat to offset
+	repeat := len(dict.dict) - dict.repeat
+	cv := load64(src, 0)
+
+	// While in dict
+searchDict:
+	for {
+		// Next src position to check
+		nextS := s + (s-nextEmit)>>6 + 4
+		hash0 := hash6(cv, tableBits)
+		hash1 := hash6(cv>>8, tableBits)
+		if nextS > sLimit {
+			if debug {
+				fmt.Println("slimit reached", s, nextS)
+			}
+			break searchDict
+		}
+		candidateDict := int(dict.fastTable[hash0])
+		candidateDict2 := int(dict.fastTable[hash1])
+		candidate2 := int(table[hash1])
+		candidate := int(table[hash0])
+		table[hash0] = uint32(s)
+		table[hash1] = uint32(s + 1)
+		hash2 := hash6(cv>>16, tableBits)
+
+		// Check repeat at offset checkRep.
+		const checkRep = 1
+
+		if repeat > s {
+			candidate := len(dict.dict) - repeat + s
+			if repeat-s >= 4 && uint32(cv) == load32(dict.dict, candidate) {
+				// Extend back
+				base := s
+				for i := candidate; base > nextEmit && i > 0 && dict.dict[i-1] == src[base-1]; {
+					i--
+					base--
+				}
+				d += emitLiteral(dst[d:], src[nextEmit:base])
+				if debug && nextEmit != base {
+					fmt.Println("emitted ", base-nextEmit, "literals")
+				}
+				s += 4
+				candidate += 4
+				for candidate < len(dict.dict)-8 && s <= len(src)-8 {
+					if diff := load64(src, s) ^ load64(dict.dict, candidate); diff != 0 {
+						s += bits.TrailingZeros64(diff) >> 3
+						break
+					}
+					s += 8
+					candidate += 8
+				}
+				d += emitRepeat(dst[d:], repeat, s-base)
+				if debug {
+					fmt.Println("emitted dict repeat length", s-base, "offset:", repeat, "s:", s)
+				}
+				nextEmit = s
+				if s >= sLimit {
+					break searchDict
+				}
+				cv = load64(src, s)
+				continue
+			}
+		} else if uint32(cv>>(checkRep*8)) == load32(src, s-repeat+checkRep) {
+			base := s + checkRep
+			// Extend back
+			for i := base - repeat; base > nextEmit && i > 0 && src[i-1] == src[base-1]; {
+				i--
+				base--
+			}
+			d += emitLiteral(dst[d:], src[nextEmit:base])
+			if debug && nextEmit != base {
+				fmt.Println("emitted ", base-nextEmit, "literals")
+			}
+
+			// Extend forward
+			candidate := s - repeat + 4 + checkRep
+			s += 4 + checkRep
+			for s <= sLimit {
+				if diff := load64(src, s) ^ load64(src, candidate); diff != 0 {
+					s += bits.TrailingZeros64(diff) >> 3
+					break
+				}
+				s += 8
+				candidate += 8
+			}
+			if debug {
+				// Validate match.
+				if s <= candidate {
+					panic("s <= candidate")
+				}
+				a := src[base:s]
+				b := src[base-repeat : base-repeat+(s-base)]
+				if !bytes.Equal(a, b) {
+					panic("mismatch")
+				}
+			}
+
+			if nextEmit > 0 {
+				// same as `add := emitCopy(dst[d:], repeat, s-base)` but skips storing offset.
+				d += emitRepeat(dst[d:], repeat, s-base)
+			} else {
+				// First match, cannot be repeat.
+				d += emitCopy(dst[d:], repeat, s-base)
+			}
+
+			nextEmit = s
+			if s >= sLimit {
+				break searchDict
+			}
+			if debug {
+				fmt.Println("emitted reg repeat", s-base, "s:", s)
+			}
+			cv = load64(src, s)
+			continue searchDict
+		}
+		if s == 0 {
+			cv = load64(src, nextS)
+			s = nextS
+			continue searchDict
+		}
+		// Start with table. These matches will always be closer.
+		if uint32(cv) == load32(src, candidate) {
+			goto emitMatch
+		}
+		candidate = int(table[hash2])
+		if uint32(cv>>8) == load32(src, candidate2) {
+			table[hash2] = uint32(s + 2)
+			candidate = candidate2
+			s++
+			goto emitMatch
+		}
+
+		// Check dict. Dicts have longer offsets, so we want longer matches.
+		if cv == load64(dict.dict, candidateDict) {
+			table[hash2] = uint32(s + 2)
+			goto emitDict
+		}
+
+		candidateDict = int(dict.fastTable[hash2])
+		// Check if upper 7 bytes match
+		if candidateDict2 >= 1 {
+			if cv^load64(dict.dict, candidateDict2-1) < (1 << 8) {
+				table[hash2] = uint32(s + 2)
+				candidateDict = candidateDict2
+				s++
+				goto emitDict
+			}
+		}
+
+		table[hash2] = uint32(s + 2)
+		if uint32(cv>>16) == load32(src, candidate) {
+			s += 2
+			goto emitMatch
+		}
+		if candidateDict >= 2 {
+			// Check if upper 6 bytes match
+			if cv^load64(dict.dict, candidateDict-2) < (1 << 16) {
+				s += 2
+				goto emitDict
+			}
+		}
+
+		cv = load64(src, nextS)
+		s = nextS
+		continue searchDict
+
+	emitDict:
+		{
+			if debug {
+				if load32(dict.dict, candidateDict) != load32(src, s) {
+					panic("dict emit mismatch")
+				}
+			}
+			// Extend backwards.
+			// The top bytes will be rechecked to get the full match.
+			for candidateDict > 0 && s > nextEmit && dict.dict[candidateDict-1] == src[s-1] {
+				candidateDict--
+				s--
+			}
+
+			// Bail if we exceed the maximum size.
+			if d+(s-nextEmit) > dstLimit {
+				return 0
+			}
+
+			// A 4-byte match has been found. We'll later see if more than 4 bytes
+			// match. But, prior to the match, src[nextEmit:s] are unmatched. Emit
+			// them as literal bytes.
+
+			d += emitLiteral(dst[d:], src[nextEmit:s])
+			if debug && nextEmit != s {
+				fmt.Println("emitted ", s-nextEmit, "literals")
+			}
+			{
+				// Invariant: we have a 4-byte match at s, and no need to emit any
+				// literal bytes prior to s.
+				base := s
+				repeat = s + (len(dict.dict)) - candidateDict
+
+				// Extend the 4-byte match as long as possible.
+				s += 4
+				candidateDict += 4
+				for s <= len(src)-8 && len(dict.dict)-candidateDict >= 8 {
+					if diff := load64(src, s) ^ load64(dict.dict, candidateDict); diff != 0 {
+						s += bits.TrailingZeros64(diff) >> 3
+						break
+					}
+					s += 8
+					candidateDict += 8
+				}
+
+				// Matches longer than 64 are split.
+				if s <= sLimit || s-base < 8 {
+					d += emitCopy(dst[d:], repeat, s-base)
+				} else {
+					// Split to ensure we don't start a copy within next block
+					d += emitCopy(dst[d:], repeat, 4)
+					d += emitRepeat(dst[d:], repeat, s-base-4)
+				}
+				if false {
+					// Validate match.
+					if s <= candidate {
+						panic("s <= candidate")
+					}
+					a := src[base:s]
+					b := dict.dict[base-repeat : base-repeat+(s-base)]
+					if !bytes.Equal(a, b) {
+						panic("mismatch")
+					}
+				}
+				if debug {
+					fmt.Println("emitted dict copy, length", s-base, "offset:", repeat, "s:", s)
+				}
+				nextEmit = s
+				if s >= sLimit {
+					break searchDict
+				}
+
+				if d > dstLimit {
+					// Do we have space for more, if not bail.
+					return 0
+				}
+
+				// Index and continue loop to try new candidate.
+				x := load64(src, s-2)
+				m2Hash := hash6(x, tableBits)
+				currHash := hash6(x>>8, tableBits)
+				candidate = int(table[currHash])
+				table[m2Hash] = uint32(s - 2)
+				table[currHash] = uint32(s - 1)
+				cv = load64(src, s)
+			}
+			continue
+		}
+	emitMatch:
+
+		// Extend backwards.
+		// The top bytes will be rechecked to get the full match.
+		for candidate > 0 && s > nextEmit && src[candidate-1] == src[s-1] {
+			candidate--
+			s--
+		}
+
+		// Bail if we exceed the maximum size.
+		if d+(s-nextEmit) > dstLimit {
+			return 0
+		}
+
+		// A 4-byte match has been found. We'll later see if more than 4 bytes
+		// match. But, prior to the match, src[nextEmit:s] are unmatched. Emit
+		// them as literal bytes.
+
+		d += emitLiteral(dst[d:], src[nextEmit:s])
+		if debug && nextEmit != s {
+			fmt.Println("emitted ", s-nextEmit, "literals")
+		}
+		// Call emitCopy, and then see if another emitCopy could be our next
+		// move. Repeat until we find no match for the input immediately after
+		// what was consumed by the last emitCopy call.
+		//
+		// If we exit this loop normally then we need to call emitLiteral next,
+		// though we don't yet know how big the literal will be. We handle that
+		// by proceeding to the next iteration of the main loop. We also can
+		// exit this loop via goto if we get close to exhausting the input.
+		for {
+			// Invariant: we have a 4-byte match at s, and no need to emit any
+			// literal bytes prior to s.
+			base := s
+			repeat = base - candidate
+
+			// Extend the 4-byte match as long as possible.
+			s += 4
+			candidate += 4
+			for s <= len(src)-8 {
+				if diff := load64(src, s) ^ load64(src, candidate); diff != 0 {
+					s += bits.TrailingZeros64(diff) >> 3
+					break
+				}
+				s += 8
+				candidate += 8
+			}
+
+			d += emitCopy(dst[d:], repeat, s-base)
+			if debug {
+				// Validate match.
+				if s <= candidate {
+					panic("s <= candidate")
+				}
+				a := src[base:s]
+				b := src[base-repeat : base-repeat+(s-base)]
+				if !bytes.Equal(a, b) {
+					panic("mismatch")
+				}
+			}
+			if debug {
+				fmt.Println("emitted src copy, length", s-base, "offset:", repeat, "s:", s)
+			}
+			nextEmit = s
+			if s >= sLimit {
+				break searchDict
+			}
+
+			if d > dstLimit {
+				// Do we have space for more, if not bail.
+				return 0
+			}
+			// Check for an immediate match, otherwise start search at s+1
+			x := load64(src, s-2)
+			m2Hash := hash6(x, tableBits)
+			currHash := hash6(x>>16, tableBits)
+			candidate = int(table[currHash])
+			table[m2Hash] = uint32(s - 2)
+			table[currHash] = uint32(s)
+			if debug && s == candidate {
+				panic("s == candidate")
+			}
+			if uint32(x>>16) != load32(src, candidate) {
+				cv = load64(src, s+1)
+				s++
+				break
+			}
+		}
+	}
+
+	// Search without dict:
+	if repeat > s {
+		repeat = 0
+	}
+
+	// No more dict
+	sLimit = len(src) - inputMargin
+	if s >= sLimit {
+		goto emitRemainder
+	}
+	if debug {
+		fmt.Println("non-dict matching at", s, "repeat:", repeat)
+	}
+	cv = load64(src, s)
+	if debug {
+		fmt.Println("now", s, "->", sLimit, "out:", d, "left:", len(src)-s, "nextemit:", nextEmit, "dstLimit:", dstLimit, "s:", s)
+	}
+	for {
+		candidate := 0
+		for {
+			// Next src position to check
+			nextS := s + (s-nextEmit)>>6 + 4
+			if nextS > sLimit {
+				goto emitRemainder
+			}
+			hash0 := hash6(cv, tableBits)
+			hash1 := hash6(cv>>8, tableBits)
+			candidate = int(table[hash0])
+			candidate2 := int(table[hash1])
+			table[hash0] = uint32(s)
+			table[hash1] = uint32(s + 1)
+			hash2 := hash6(cv>>16, tableBits)
+
+			// Check repeat at offset checkRep.
+			const checkRep = 1
+			if repeat > 0 && uint32(cv>>(checkRep*8)) == load32(src, s-repeat+checkRep) {
+				base := s + checkRep
+				// Extend back
+				for i := base - repeat; base > nextEmit && i > 0 && src[i-1] == src[base-1]; {
+					i--
+					base--
+				}
+				d += emitLiteral(dst[d:], src[nextEmit:base])
+				if debug && nextEmit != base {
+					fmt.Println("emitted ", base-nextEmit, "literals")
+				}
+				// Extend forward
+				candidate := s - repeat + 4 + checkRep
+				s += 4 + checkRep
+				for s <= sLimit {
+					if diff := load64(src, s) ^ load64(src, candidate); diff != 0 {
+						s += bits.TrailingZeros64(diff) >> 3
+						break
+					}
+					s += 8
+					candidate += 8
+				}
+				if debug {
+					// Validate match.
+					if s <= candidate {
+						panic("s <= candidate")
+					}
+					a := src[base:s]
+					b := src[base-repeat : base-repeat+(s-base)]
+					if !bytes.Equal(a, b) {
+						panic("mismatch")
+					}
+				}
+				if nextEmit > 0 {
+					// same as `add := emitCopy(dst[d:], repeat, s-base)` but skips storing offset.
+					d += emitRepeat(dst[d:], repeat, s-base)
+				} else {
+					// First match, cannot be repeat.
+					d += emitCopy(dst[d:], repeat, s-base)
+				}
+				if debug {
+					fmt.Println("emitted src repeat length", s-base, "offset:", repeat, "s:", s)
+				}
+				nextEmit = s
+				if s >= sLimit {
+					goto emitRemainder
+				}
+
+				cv = load64(src, s)
+				continue
+			}
+
+			if uint32(cv) == load32(src, candidate) {
+				break
+			}
+			candidate = int(table[hash2])
+			if uint32(cv>>8) == load32(src, candidate2) {
+				table[hash2] = uint32(s + 2)
+				candidate = candidate2
+				s++
+				break
+			}
+			table[hash2] = uint32(s + 2)
+			if uint32(cv>>16) == load32(src, candidate) {
+				s += 2
+				break
+			}
+
+			cv = load64(src, nextS)
+			s = nextS
+		}
+
+		// Extend backwards.
+		// The top bytes will be rechecked to get the full match.
+		for candidate > 0 && s > nextEmit && src[candidate-1] == src[s-1] {
+			candidate--
+			s--
+		}
+
+		// Bail if we exceed the maximum size.
+		if d+(s-nextEmit) > dstLimit {
+			return 0
+		}
+
+		// A 4-byte match has been found. We'll later see if more than 4 bytes
+		// match. But, prior to the match, src[nextEmit:s] are unmatched. Emit
+		// them as literal bytes.
+
+		d += emitLiteral(dst[d:], src[nextEmit:s])
+		if debug && nextEmit != s {
+			fmt.Println("emitted ", s-nextEmit, "literals")
+		}
+		// Call emitCopy, and then see if another emitCopy could be our next
+		// move. Repeat until we find no match for the input immediately after
+		// what was consumed by the last emitCopy call.
+		//
+		// If we exit this loop normally then we need to call emitLiteral next,
+		// though we don't yet know how big the literal will be. We handle that
+		// by proceeding to the next iteration of the main loop. We also can
+		// exit this loop via goto if we get close to exhausting the input.
+		for {
+			// Invariant: we have a 4-byte match at s, and no need to emit any
+			// literal bytes prior to s.
+			base := s
+			repeat = base - candidate
+
+			// Extend the 4-byte match as long as possible.
+			s += 4
+			candidate += 4
+			for s <= len(src)-8 {
+				if diff := load64(src, s) ^ load64(src, candidate); diff != 0 {
+					s += bits.TrailingZeros64(diff) >> 3
+					break
+				}
+				s += 8
+				candidate += 8
+			}
+
+			d += emitCopy(dst[d:], repeat, s-base)
+			if debug {
+				// Validate match.
+				if s <= candidate {
+					panic("s <= candidate")
+				}
+				a := src[base:s]
+				b := src[base-repeat : base-repeat+(s-base)]
+				if !bytes.Equal(a, b) {
+					panic("mismatch")
+				}
+			}
+			if debug {
+				fmt.Println("emitted src copy, length", s-base, "offset:", repeat, "s:", s)
+			}
+			nextEmit = s
+			if s >= sLimit {
+				goto emitRemainder
+			}
+
+			if d > dstLimit {
+				// Do we have space for more, if not bail.
+				return 0
+			}
+			// Check for an immediate match, otherwise start search at s+1
+			x := load64(src, s-2)
+			m2Hash := hash6(x, tableBits)
+			currHash := hash6(x>>16, tableBits)
+			candidate = int(table[currHash])
+			table[m2Hash] = uint32(s - 2)
+			table[currHash] = uint32(s)
+			if debug && s == candidate {
+				panic("s == candidate")
+			}
+			if uint32(x>>16) != load32(src, candidate) {
+				cv = load64(src, s+1)
+				s++
+				break
+			}
+		}
+	}
+
+emitRemainder:
+	if nextEmit < len(src) {
+		// Bail if we exceed the maximum size.
+		if d+len(src)-nextEmit > dstLimit {
+			return 0
+		}
+		d += emitLiteral(dst[d:], src[nextEmit:])
+		if debug && nextEmit != s {
+			fmt.Println("emitted ", len(src)-nextEmit, "literals")
+		}
+	}
+	return d
+}
diff --git a/vendor/github.com/klauspost/compress/s2/encode_amd64.go b/vendor/github.com/klauspost/compress/s2/encode_amd64.go
index e612225f..ebc332ad 100644
--- a/vendor/github.com/klauspost/compress/s2/encode_amd64.go
+++ b/vendor/github.com/klauspost/compress/s2/encode_amd64.go
@@ -3,13 +3,16 @@
 
 package s2
 
+const hasAmd64Asm = true
+
 // encodeBlock encodes a non-empty src to a guaranteed-large-enough dst. It
 // assumes that the varint-encoded length of the decompressed bytes has already
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src)) &&
-// 	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
 func encodeBlock(dst, src []byte) (d int) {
 	const (
 		// Use 12 bit table when less than...
@@ -43,8 +46,9 @@ func encodeBlock(dst, src []byte) (d int) {
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src)) &&
-// 	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
 func encodeBlockBetter(dst, src []byte) (d int) {
 	const (
 		// Use 12 bit table when less than...
@@ -78,8 +82,9 @@ func encodeBlockBetter(dst, src []byte) (d int) {
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src)) &&
-// 	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
 func encodeBlockSnappy(dst, src []byte) (d int) {
 	const (
 		// Use 12 bit table when less than...
@@ -112,8 +117,9 @@ func encodeBlockSnappy(dst, src []byte) (d int) {
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src)) &&
-// 	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
 func encodeBlockBetterSnappy(dst, src []byte) (d int) {
 	const (
 		// Use 12 bit table when less than...
diff --git a/vendor/github.com/klauspost/compress/s2/encode_best.go b/vendor/github.com/klauspost/compress/s2/encode_best.go
index 4bc80bc6..1d13e869 100644
--- a/vendor/github.com/klauspost/compress/s2/encode_best.go
+++ b/vendor/github.com/klauspost/compress/s2/encode_best.go
@@ -7,6 +7,7 @@ package s2
 
 import (
 	"fmt"
+	"math"
 	"math/bits"
 )
 
@@ -15,9 +16,10 @@ import (
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src)) &&
-// 	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
-func encodeBlockBest(dst, src []byte) (d int) {
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+func encodeBlockBest(dst, src []byte, dict *Dict) (d int) {
 	// Initialize the hash tables.
 	const (
 		// Long hash matches.
@@ -29,6 +31,8 @@ func encodeBlockBest(dst, src []byte) (d int) {
 		maxSTableSize = 1 << sTableBits
 
 		inputMargin = 8 + 2
+
+		debug = false
 	)
 
 	// sLimit is when to stop looking for offset/length copies. The inputMargin
@@ -38,6 +42,10 @@ func encodeBlockBest(dst, src []byte) (d int) {
 	if len(src) < minNonLiteralBlockSize {
 		return 0
 	}
+	sLimitDict := len(src) - inputMargin
+	if sLimitDict > MaxDictSrcOffset-inputMargin {
+		sLimitDict = MaxDictSrcOffset - inputMargin
+	}
 
 	var lTable [maxLTableSize]uint64
 	var sTable [maxSTableSize]uint64
@@ -51,10 +59,15 @@ func encodeBlockBest(dst, src []byte) (d int) {
 	// The encoded form must start with a literal, as there are no previous
 	// bytes to copy, so we start looking for hash matches at s == 1.
 	s := 1
+	repeat := 1
+	if dict != nil {
+		dict.initBest()
+		s = 0
+		repeat = len(dict.dict) - dict.repeat
+	}
 	cv := load64(src, s)
 
 	// We search for a repeat at -1, but don't output repeats when nextEmit == 0
-	repeat := 1
 	const lowbitMask = 0xffffffff
 	getCur := func(x uint64) int {
 		return int(x & lowbitMask)
@@ -66,11 +79,11 @@ func encodeBlockBest(dst, src []byte) (d int) {
 
 	for {
 		type match struct {
-			offset int
-			s      int
-			length int
-			score  int
-			rep    bool
+			offset    int
+			s         int
+			length    int
+			score     int
+			rep, dict bool
 		}
 		var best match
 		for {
@@ -84,6 +97,12 @@ func encodeBlockBest(dst, src []byte) (d int) {
 			if nextS > sLimit {
 				goto emitRemainder
 			}
+			if dict != nil && s >= MaxDictSrcOffset {
+				dict = nil
+				if repeat > s {
+					repeat = math.MinInt32
+				}
+			}
 			hashL := hash8(cv, lTableBits)
 			hashS := hash4(cv, sTableBits)
 			candidateL := lTable[hashL]
@@ -113,7 +132,15 @@ func encodeBlockBest(dst, src []byte) (d int) {
 				}
 				m := match{offset: offset, s: s, length: 4 + offset, rep: rep}
 				s += 4
-				for s <= sLimit {
+				for s < len(src) {
+					if len(src)-s < 8 {
+						if src[s] == src[m.length] {
+							m.length++
+							s++
+							continue
+						}
+						break
+					}
 					if diff := load64(src, s) ^ load64(src, m.length); diff != 0 {
 						m.length += bits.TrailingZeros64(diff) >> 3
 						break
@@ -129,6 +156,62 @@ func encodeBlockBest(dst, src []byte) (d int) {
 				}
 				return m
 			}
+			matchDict := func(candidate, s int, first uint32, rep bool) match {
+				// Calculate offset as if in continuous array with s
+				offset := -len(dict.dict) + candidate
+				if best.length != 0 && best.s-best.offset == s-offset && !rep {
+					// Don't retest if we have the same offset.
+					return match{offset: offset, s: s}
+				}
+
+				if load32(dict.dict, candidate) != first {
+					return match{offset: offset, s: s}
+				}
+				m := match{offset: offset, s: s, length: 4 + candidate, rep: rep, dict: true}
+				s += 4
+				if !rep {
+					for s < sLimitDict && m.length < len(dict.dict) {
+						if len(src)-s < 8 || len(dict.dict)-m.length < 8 {
+							if src[s] == dict.dict[m.length] {
+								m.length++
+								s++
+								continue
+							}
+							break
+						}
+						if diff := load64(src, s) ^ load64(dict.dict, m.length); diff != 0 {
+							m.length += bits.TrailingZeros64(diff) >> 3
+							break
+						}
+						s += 8
+						m.length += 8
+					}
+				} else {
+					for s < len(src) && m.length < len(dict.dict) {
+						if len(src)-s < 8 || len(dict.dict)-m.length < 8 {
+							if src[s] == dict.dict[m.length] {
+								m.length++
+								s++
+								continue
+							}
+							break
+						}
+						if diff := load64(src, s) ^ load64(dict.dict, m.length); diff != 0 {
+							m.length += bits.TrailingZeros64(diff) >> 3
+							break
+						}
+						s += 8
+						m.length += 8
+					}
+				}
+				m.length -= candidate
+				m.score = score(m)
+				if m.score <= -m.s {
+					// Eliminate if no savings, we might find a better one.
+					m.length = 0
+				}
+				return m
+			}
 
 			bestOf := func(a, b match) match {
 				if b.length == 0 {
@@ -145,45 +228,99 @@ func encodeBlockBest(dst, src []byte) (d int) {
 				return b
 			}
 
-			best = bestOf(matchAt(getCur(candidateL), s, uint32(cv), false), matchAt(getPrev(candidateL), s, uint32(cv), false))
-			best = bestOf(best, matchAt(getCur(candidateS), s, uint32(cv), false))
-			best = bestOf(best, matchAt(getPrev(candidateS), s, uint32(cv), false))
-
+			if s > 0 {
+				best = bestOf(matchAt(getCur(candidateL), s, uint32(cv), false), matchAt(getPrev(candidateL), s, uint32(cv), false))
+				best = bestOf(best, matchAt(getCur(candidateS), s, uint32(cv), false))
+				best = bestOf(best, matchAt(getPrev(candidateS), s, uint32(cv), false))
+			}
+			if dict != nil {
+				candidateL := dict.bestTableLong[hashL]
+				candidateS := dict.bestTableShort[hashS]
+				best = bestOf(best, matchDict(int(candidateL&0xffff), s, uint32(cv), false))
+				best = bestOf(best, matchDict(int(candidateL>>16), s, uint32(cv), false))
+				best = bestOf(best, matchDict(int(candidateS&0xffff), s, uint32(cv), false))
+				best = bestOf(best, matchDict(int(candidateS>>16), s, uint32(cv), false))
+			}
 			{
-				best = bestOf(best, matchAt(s-repeat+1, s+1, uint32(cv>>8), true))
+				if (dict == nil || repeat <= s) && repeat > 0 {
+					best = bestOf(best, matchAt(s-repeat+1, s+1, uint32(cv>>8), true))
+				} else if s-repeat < -4 && dict != nil {
+					candidate := len(dict.dict) - (repeat - s)
+					best = bestOf(best, matchDict(candidate, s, uint32(cv), true))
+					candidate++
+					best = bestOf(best, matchDict(candidate, s+1, uint32(cv>>8), true))
+				}
+
 				if best.length > 0 {
+					hashS := hash4(cv>>8, sTableBits)
 					// s+1
-					nextShort := sTable[hash4(cv>>8, sTableBits)]
+					nextShort := sTable[hashS]
 					s := s + 1
 					cv := load64(src, s)
-					nextLong := lTable[hash8(cv, lTableBits)]
+					hashL := hash8(cv, lTableBits)
+					nextLong := lTable[hashL]
 					best = bestOf(best, matchAt(getCur(nextShort), s, uint32(cv), false))
 					best = bestOf(best, matchAt(getPrev(nextShort), s, uint32(cv), false))
 					best = bestOf(best, matchAt(getCur(nextLong), s, uint32(cv), false))
 					best = bestOf(best, matchAt(getPrev(nextLong), s, uint32(cv), false))
-					// Repeat at + 2
-					best = bestOf(best, matchAt(s-repeat+1, s+1, uint32(cv>>8), true))
+
+					// Dict at + 1
+					if dict != nil {
+						candidateL := dict.bestTableLong[hashL]
+						candidateS := dict.bestTableShort[hashS]
+
+						best = bestOf(best, matchDict(int(candidateL&0xffff), s, uint32(cv), false))
+						best = bestOf(best, matchDict(int(candidateS&0xffff), s, uint32(cv), false))
+					}
 
 					// s+2
 					if true {
-						nextShort = sTable[hash4(cv>>8, sTableBits)]
+						hashS := hash4(cv>>8, sTableBits)
+
+						nextShort = sTable[hashS]
 						s++
 						cv = load64(src, s)
-						nextLong = lTable[hash8(cv, lTableBits)]
+						hashL := hash8(cv, lTableBits)
+						nextLong = lTable[hashL]
+
+						if (dict == nil || repeat <= s) && repeat > 0 {
+							// Repeat at + 2
+							best = bestOf(best, matchAt(s-repeat, s, uint32(cv), true))
+						} else if repeat-s > 4 && dict != nil {
+							candidate := len(dict.dict) - (repeat - s)
+							best = bestOf(best, matchDict(candidate, s, uint32(cv), true))
+						}
 						best = bestOf(best, matchAt(getCur(nextShort), s, uint32(cv), false))
 						best = bestOf(best, matchAt(getPrev(nextShort), s, uint32(cv), false))
 						best = bestOf(best, matchAt(getCur(nextLong), s, uint32(cv), false))
 						best = bestOf(best, matchAt(getPrev(nextLong), s, uint32(cv), false))
+
+						// Dict at +2
+						// Very small gain
+						if dict != nil {
+							candidateL := dict.bestTableLong[hashL]
+							candidateS := dict.bestTableShort[hashS]
+
+							best = bestOf(best, matchDict(int(candidateL&0xffff), s, uint32(cv), false))
+							best = bestOf(best, matchDict(int(candidateS&0xffff), s, uint32(cv), false))
+						}
 					}
 					// Search for a match at best match end, see if that is better.
-					if sAt := best.s + best.length; sAt < sLimit {
-						sBack := best.s
-						backL := best.length
+					// Allow some bytes at the beginning to mismatch.
+					// Sweet spot is around 1-2 bytes, but depends on input.
+					// The skipped bytes are tested in Extend backwards,
+					// and still picked up as part of the match if they do.
+					const skipBeginning = 2
+					const skipEnd = 1
+					if sAt := best.s + best.length - skipEnd; sAt < sLimit {
+
+						sBack := best.s + skipBeginning - skipEnd
+						backL := best.length - skipBeginning
 						// Load initial values
 						cv = load64(src, sBack)
-						// Search for mismatch
+
+						// Grab candidates...
 						next := lTable[hash8(load64(src, sAt), lTableBits)]
-						//next := sTable[hash4(load64(src, sAt), sTableBits)]
 
 						if checkAt := getCur(next) - backL; checkAt > 0 {
 							best = bestOf(best, matchAt(checkAt, sBack, uint32(cv), false))
@@ -191,6 +328,16 @@ func encodeBlockBest(dst, src []byte) (d int) {
 						if checkAt := getPrev(next) - backL; checkAt > 0 {
 							best = bestOf(best, matchAt(checkAt, sBack, uint32(cv), false))
 						}
+						// Disabled: Extremely small gain
+						if false {
+							next = sTable[hash4(load64(src, sAt), sTableBits)]
+							if checkAt := getCur(next) - backL; checkAt > 0 {
+								best = bestOf(best, matchAt(checkAt, sBack, uint32(cv), false))
+							}
+							if checkAt := getPrev(next) - backL; checkAt > 0 {
+								best = bestOf(best, matchAt(checkAt, sBack, uint32(cv), false))
+							}
+						}
 					}
 				}
 			}
@@ -209,7 +356,7 @@ func encodeBlockBest(dst, src []byte) (d int) {
 
 		// Extend backwards, not needed for repeats...
 		s = best.s
-		if !best.rep {
+		if !best.rep && !best.dict {
 			for best.offset > 0 && s > nextEmit && src[best.offset-1] == src[s-1] {
 				best.offset--
 				best.length++
@@ -226,7 +373,6 @@ func encodeBlockBest(dst, src []byte) (d int) {
 
 		base := s
 		offset := s - best.offset
-
 		s += best.length
 
 		if offset > 65535 && s-base <= 5 && !best.rep {
@@ -238,16 +384,28 @@ func encodeBlockBest(dst, src []byte) (d int) {
 			cv = load64(src, s)
 			continue
 		}
+		if debug && nextEmit != base {
+			fmt.Println("EMIT", base-nextEmit, "literals. base-after:", base)
+		}
 		d += emitLiteral(dst[d:], src[nextEmit:base])
 		if best.rep {
-			if nextEmit > 0 {
+			if nextEmit > 0 || best.dict {
+				if debug {
+					fmt.Println("REPEAT, length", best.length, "offset:", offset, "s-after:", s, "dict:", best.dict, "best:", best)
+				}
 				// same as `add := emitCopy(dst[d:], repeat, s-base)` but skips storing offset.
 				d += emitRepeat(dst[d:], offset, best.length)
 			} else {
-				// First match, cannot be repeat.
+				// First match without dict cannot be a repeat.
+				if debug {
+					fmt.Println("COPY, length", best.length, "offset:", offset, "s-after:", s, "dict:", best.dict, "best:", best)
+				}
 				d += emitCopy(dst[d:], offset, best.length)
 			}
 		} else {
+			if debug {
+				fmt.Println("COPY, length", best.length, "offset:", offset, "s-after:", s, "dict:", best.dict, "best:", best)
+			}
 			d += emitCopy(dst[d:], offset, best.length)
 		}
 		repeat = offset
@@ -278,6 +436,9 @@ emitRemainder:
 		if d+len(src)-nextEmit > dstLimit {
 			return 0
 		}
+		if debug && nextEmit != s {
+			fmt.Println("emitted ", len(src)-nextEmit, "literals")
+		}
 		d += emitLiteral(dst[d:], src[nextEmit:])
 	}
 	return d
@@ -288,8 +449,9 @@ emitRemainder:
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src)) &&
-// 	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
 func encodeBlockBestSnappy(dst, src []byte) (d int) {
 	// Initialize the hash tables.
 	const (
@@ -546,6 +708,7 @@ emitRemainder:
 // emitCopySize returns the size to encode the offset+length
 //
 // It assumes that:
+//
 //	1 <= offset && offset <= math.MaxUint32
 //	4 <= length && length <= 1 << 24
 func emitCopySize(offset, length int) int {
@@ -584,6 +747,7 @@ func emitCopySize(offset, length int) int {
 // emitCopyNoRepeatSize returns the size to encode the offset+length
 //
 // It assumes that:
+//
 //	1 <= offset && offset <= math.MaxUint32
 //	4 <= length && length <= 1 << 24
 func emitCopyNoRepeatSize(offset, length int) int {
@@ -621,7 +785,6 @@ func emitRepeatSize(offset, length int) int {
 	left := 0
 	if length > maxRepeat {
 		left = length - maxRepeat + 4
-		length = maxRepeat - 4
 	}
 	if left > 0 {
 		return 5 + emitRepeatSize(offset, left)
diff --git a/vendor/github.com/klauspost/compress/s2/encode_better.go b/vendor/github.com/klauspost/compress/s2/encode_better.go
index 943215b8..f46adb41 100644
--- a/vendor/github.com/klauspost/compress/s2/encode_better.go
+++ b/vendor/github.com/klauspost/compress/s2/encode_better.go
@@ -6,6 +6,8 @@
 package s2
 
 import (
+	"bytes"
+	"fmt"
 	"math/bits"
 )
 
@@ -42,8 +44,9 @@ func hash8(u uint64, h uint8) uint32 {
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src)) &&
-// 	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
 func encodeBlockBetterGo(dst, src []byte) (d int) {
 	// sLimit is when to stop looking for offset/length copies. The inputMargin
 	// lets us use a fast path for emitLiteral in the main loop, while we are
@@ -56,7 +59,7 @@ func encodeBlockBetterGo(dst, src []byte) (d int) {
 	// Initialize the hash tables.
 	const (
 		// Long hash matches.
-		lTableBits    = 16
+		lTableBits    = 17
 		maxLTableSize = 1 << lTableBits
 
 		// Short hash matches.
@@ -97,9 +100,26 @@ func encodeBlockBetterGo(dst, src []byte) (d int) {
 			lTable[hashL] = uint32(s)
 			sTable[hashS] = uint32(s)
 
+			valLong := load64(src, candidateL)
+			valShort := load64(src, candidateS)
+
+			// If long matches at least 8 bytes, use that.
+			if cv == valLong {
+				break
+			}
+			if cv == valShort {
+				candidateL = candidateS
+				break
+			}
+
 			// Check repeat at offset checkRep.
 			const checkRep = 1
-			if false && uint32(cv>>(checkRep*8)) == load32(src, s-repeat+checkRep) {
+			// Minimum length of a repeat. Tested with various values.
+			// While 4-5 offers improvements in some, 6 reduces
+			// regressions significantly.
+			const wantRepeatBytes = 6
+			const repeatMask = ((1 << (wantRepeatBytes * 8)) - 1) << (8 * checkRep)
+			if false && repeat > 0 && cv&repeatMask == load64(src, s-repeat)&repeatMask {
 				base := s + checkRep
 				// Extend back
 				for i := base - repeat; base > nextEmit && i > 0 && src[i-1] == src[base-1]; {
@@ -109,8 +129,8 @@ func encodeBlockBetterGo(dst, src []byte) (d int) {
 				d += emitLiteral(dst[d:], src[nextEmit:base])
 
 				// Extend forward
-				candidate := s - repeat + 4 + checkRep
-				s += 4 + checkRep
+				candidate := s - repeat + wantRepeatBytes + checkRep
+				s += wantRepeatBytes + checkRep
 				for s < len(src) {
 					if len(src)-s < 8 {
 						if src[s] == src[candidate] {
@@ -127,28 +147,40 @@ func encodeBlockBetterGo(dst, src []byte) (d int) {
 					s += 8
 					candidate += 8
 				}
-				if nextEmit > 0 {
-					// same as `add := emitCopy(dst[d:], repeat, s-base)` but skips storing offset.
-					d += emitRepeat(dst[d:], repeat, s-base)
-				} else {
-					// First match, cannot be repeat.
-					d += emitCopy(dst[d:], repeat, s-base)
-				}
+				// same as `add := emitCopy(dst[d:], repeat, s-base)` but skips storing offset.
+				d += emitRepeat(dst[d:], repeat, s-base)
 				nextEmit = s
 				if s >= sLimit {
 					goto emitRemainder
 				}
+				// Index in-between
+				index0 := base + 1
+				index1 := s - 2
+
+				cv = load64(src, s)
+				for index0 < index1 {
+					cv0 := load64(src, index0)
+					cv1 := load64(src, index1)
+					lTable[hash7(cv0, lTableBits)] = uint32(index0)
+					sTable[hash4(cv0>>8, sTableBits)] = uint32(index0 + 1)
+
+					lTable[hash7(cv1, lTableBits)] = uint32(index1)
+					sTable[hash4(cv1>>8, sTableBits)] = uint32(index1 + 1)
+					index0 += 2
+					index1 -= 2
+				}
 
 				cv = load64(src, s)
 				continue
 			}
 
-			if uint32(cv) == load32(src, candidateL) {
+			// Long likely matches 7, so take that.
+			if uint32(cv) == uint32(valLong) {
 				break
 			}
 
 			// Check our short candidate
-			if uint32(cv) == load32(src, candidateS) {
+			if uint32(cv) == uint32(valShort) {
 				// Try a long candidate at s+1
 				hashL = hash7(cv>>8, lTableBits)
 				candidateL = int(lTable[hashL])
@@ -227,21 +259,29 @@ func encodeBlockBetterGo(dst, src []byte) (d int) {
 			// Do we have space for more, if not bail.
 			return 0
 		}
-		// Index match start+1 (long) and start+2 (short)
+
+		// Index short & long
 		index0 := base + 1
-		// Index match end-2 (long) and end-1 (short)
 		index1 := s - 2
 
 		cv0 := load64(src, index0)
 		cv1 := load64(src, index1)
-		cv = load64(src, s)
 		lTable[hash7(cv0, lTableBits)] = uint32(index0)
-		lTable[hash7(cv0>>8, lTableBits)] = uint32(index0 + 1)
-		lTable[hash7(cv1, lTableBits)] = uint32(index1)
-		lTable[hash7(cv1>>8, lTableBits)] = uint32(index1 + 1)
 		sTable[hash4(cv0>>8, sTableBits)] = uint32(index0 + 1)
-		sTable[hash4(cv0>>16, sTableBits)] = uint32(index0 + 2)
+
+		lTable[hash7(cv1, lTableBits)] = uint32(index1)
 		sTable[hash4(cv1>>8, sTableBits)] = uint32(index1 + 1)
+		index0 += 1
+		index1 -= 1
+		cv = load64(src, s)
+
+		// index every second long in between.
+		for index0 < index1 {
+			lTable[hash7(load64(src, index0), lTableBits)] = uint32(index0)
+			lTable[hash7(load64(src, index1), lTableBits)] = uint32(index1)
+			index0 += 2
+			index1 -= 2
+		}
 	}
 
 emitRemainder:
@@ -260,8 +300,9 @@ emitRemainder:
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src)) &&
-// 	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
 func encodeBlockBetterSnappyGo(dst, src []byte) (d int) {
 	// sLimit is when to stop looking for offset/length copies. The inputMargin
 	// lets us use a fast path for emitLiteral in the main loop, while we are
@@ -402,21 +443,649 @@ func encodeBlockBetterSnappyGo(dst, src []byte) (d int) {
 			// Do we have space for more, if not bail.
 			return 0
 		}
-		// Index match start+1 (long) and start+2 (short)
+
+		// Index short & long
 		index0 := base + 1
-		// Index match end-2 (long) and end-1 (short)
 		index1 := s - 2
 
 		cv0 := load64(src, index0)
 		cv1 := load64(src, index1)
-		cv = load64(src, s)
 		lTable[hash7(cv0, lTableBits)] = uint32(index0)
-		lTable[hash7(cv0>>8, lTableBits)] = uint32(index0 + 1)
-		lTable[hash7(cv1, lTableBits)] = uint32(index1)
-		lTable[hash7(cv1>>8, lTableBits)] = uint32(index1 + 1)
 		sTable[hash4(cv0>>8, sTableBits)] = uint32(index0 + 1)
-		sTable[hash4(cv0>>16, sTableBits)] = uint32(index0 + 2)
+
+		lTable[hash7(cv1, lTableBits)] = uint32(index1)
 		sTable[hash4(cv1>>8, sTableBits)] = uint32(index1 + 1)
+		index0 += 1
+		index1 -= 1
+		cv = load64(src, s)
+
+		// index every second long in between.
+		for index0 < index1 {
+			lTable[hash7(load64(src, index0), lTableBits)] = uint32(index0)
+			lTable[hash7(load64(src, index1), lTableBits)] = uint32(index1)
+			index0 += 2
+			index1 -= 2
+		}
+	}
+
+emitRemainder:
+	if nextEmit < len(src) {
+		// Bail if we exceed the maximum size.
+		if d+len(src)-nextEmit > dstLimit {
+			return 0
+		}
+		d += emitLiteral(dst[d:], src[nextEmit:])
+	}
+	return d
+}
+
+// encodeBlockBetterDict encodes a non-empty src to a guaranteed-large-enough dst. It
+// assumes that the varint-encoded length of the decompressed bytes has already
+// been written.
+//
+// It also assumes that:
+//
+//	len(dst) >= MaxEncodedLen(len(src)) &&
+//	minNonLiteralBlockSize <= len(src) && len(src) <= maxBlockSize
+func encodeBlockBetterDict(dst, src []byte, dict *Dict) (d int) {
+	// sLimit is when to stop looking for offset/length copies. The inputMargin
+	// lets us use a fast path for emitLiteral in the main loop, while we are
+	// looking for copies.
+	// Initialize the hash tables.
+	const (
+		// Long hash matches.
+		lTableBits    = 17
+		maxLTableSize = 1 << lTableBits
+
+		// Short hash matches.
+		sTableBits    = 14
+		maxSTableSize = 1 << sTableBits
+
+		maxAhead = 8 // maximum bytes ahead without checking sLimit
+
+		debug = false
+	)
+
+	sLimit := len(src) - inputMargin
+	if sLimit > MaxDictSrcOffset-maxAhead {
+		sLimit = MaxDictSrcOffset - maxAhead
+	}
+	if len(src) < minNonLiteralBlockSize {
+		return 0
+	}
+
+	dict.initBetter()
+
+	var lTable [maxLTableSize]uint32
+	var sTable [maxSTableSize]uint32
+
+	// Bail if we can't compress to at least this.
+	dstLimit := len(src) - len(src)>>5 - 6
+
+	// nextEmit is where in src the next emitLiteral should start from.
+	nextEmit := 0
+
+	// The encoded form must start with a literal, as there are no previous
+	// bytes to copy, so we start looking for hash matches at s == 1.
+	s := 0
+	cv := load64(src, s)
+
+	// We initialize repeat to 0, so we never match on first attempt
+	repeat := len(dict.dict) - dict.repeat
+
+	// While in dict
+searchDict:
+	for {
+		candidateL := 0
+		nextS := 0
+		for {
+			// Next src position to check
+			nextS = s + (s-nextEmit)>>7 + 1
+			if nextS > sLimit {
+				break searchDict
+			}
+			hashL := hash7(cv, lTableBits)
+			hashS := hash4(cv, sTableBits)
+			candidateL = int(lTable[hashL])
+			candidateS := int(sTable[hashS])
+			dictL := int(dict.betterTableLong[hashL])
+			dictS := int(dict.betterTableShort[hashS])
+			lTable[hashL] = uint32(s)
+			sTable[hashS] = uint32(s)
+
+			valLong := load64(src, candidateL)
+			valShort := load64(src, candidateS)
+
+			// If long matches at least 8 bytes, use that.
+			if s != 0 {
+				if cv == valLong {
+					goto emitMatch
+				}
+				if cv == valShort {
+					candidateL = candidateS
+					goto emitMatch
+				}
+			}
+
+			// Check dict repeat.
+			if repeat >= s+4 {
+				candidate := len(dict.dict) - repeat + s
+				if candidate > 0 && uint32(cv) == load32(dict.dict, candidate) {
+					// Extend back
+					base := s
+					for i := candidate; base > nextEmit && i > 0 && dict.dict[i-1] == src[base-1]; {
+						i--
+						base--
+					}
+					d += emitLiteral(dst[d:], src[nextEmit:base])
+					if debug && nextEmit != base {
+						fmt.Println("emitted ", base-nextEmit, "literals")
+					}
+					s += 4
+					candidate += 4
+					for candidate < len(dict.dict)-8 && s <= len(src)-8 {
+						if diff := load64(src, s) ^ load64(dict.dict, candidate); diff != 0 {
+							s += bits.TrailingZeros64(diff) >> 3
+							break
+						}
+						s += 8
+						candidate += 8
+					}
+					d += emitRepeat(dst[d:], repeat, s-base)
+					if debug {
+						fmt.Println("emitted dict repeat length", s-base, "offset:", repeat, "s:", s)
+					}
+					nextEmit = s
+					if s >= sLimit {
+						break searchDict
+					}
+					cv = load64(src, s)
+					// Index in-between
+					index0 := base + 1
+					index1 := s - 2
+
+					cv = load64(src, s)
+					for index0 < index1 {
+						cv0 := load64(src, index0)
+						cv1 := load64(src, index1)
+						lTable[hash7(cv0, lTableBits)] = uint32(index0)
+						sTable[hash4(cv0>>8, sTableBits)] = uint32(index0 + 1)
+
+						lTable[hash7(cv1, lTableBits)] = uint32(index1)
+						sTable[hash4(cv1>>8, sTableBits)] = uint32(index1 + 1)
+						index0 += 2
+						index1 -= 2
+					}
+					continue
+				}
+			}
+			// Don't try to find match at s==0
+			if s == 0 {
+				cv = load64(src, nextS)
+				s = nextS
+				continue
+			}
+
+			// Long likely matches 7, so take that.
+			if uint32(cv) == uint32(valLong) {
+				goto emitMatch
+			}
+
+			// Long dict...
+			if uint32(cv) == load32(dict.dict, dictL) {
+				candidateL = dictL
+				goto emitDict
+			}
+
+			// Check our short candidate
+			if uint32(cv) == uint32(valShort) {
+				// Try a long candidate at s+1
+				hashL = hash7(cv>>8, lTableBits)
+				candidateL = int(lTable[hashL])
+				lTable[hashL] = uint32(s + 1)
+				if uint32(cv>>8) == load32(src, candidateL) {
+					s++
+					goto emitMatch
+				}
+				// Use our short candidate.
+				candidateL = candidateS
+				goto emitMatch
+			}
+			if uint32(cv) == load32(dict.dict, dictS) {
+				// Try a long candidate at s+1
+				hashL = hash7(cv>>8, lTableBits)
+				candidateL = int(lTable[hashL])
+				lTable[hashL] = uint32(s + 1)
+				if uint32(cv>>8) == load32(src, candidateL) {
+					s++
+					goto emitMatch
+				}
+				candidateL = dictS
+				goto emitDict
+			}
+			cv = load64(src, nextS)
+			s = nextS
+		}
+	emitDict:
+		{
+			if debug {
+				if load32(dict.dict, candidateL) != load32(src, s) {
+					panic("dict emit mismatch")
+				}
+			}
+			// Extend backwards.
+			// The top bytes will be rechecked to get the full match.
+			for candidateL > 0 && s > nextEmit && dict.dict[candidateL-1] == src[s-1] {
+				candidateL--
+				s--
+			}
+
+			// Bail if we exceed the maximum size.
+			if d+(s-nextEmit) > dstLimit {
+				return 0
+			}
+
+			// A 4-byte match has been found. We'll later see if more than 4 bytes
+			// match. But, prior to the match, src[nextEmit:s] are unmatched. Emit
+			// them as literal bytes.
+
+			d += emitLiteral(dst[d:], src[nextEmit:s])
+			if debug && nextEmit != s {
+				fmt.Println("emitted ", s-nextEmit, "literals")
+			}
+			{
+				// Invariant: we have a 4-byte match at s, and no need to emit any
+				// literal bytes prior to s.
+				base := s
+				offset := s + (len(dict.dict)) - candidateL
+
+				// Extend the 4-byte match as long as possible.
+				s += 4
+				candidateL += 4
+				for s <= len(src)-8 && len(dict.dict)-candidateL >= 8 {
+					if diff := load64(src, s) ^ load64(dict.dict, candidateL); diff != 0 {
+						s += bits.TrailingZeros64(diff) >> 3
+						break
+					}
+					s += 8
+					candidateL += 8
+				}
+
+				if repeat == offset {
+					if debug {
+						fmt.Println("emitted dict repeat, length", s-base, "offset:", offset, "s:", s, "dict offset:", candidateL)
+					}
+					d += emitRepeat(dst[d:], offset, s-base)
+				} else {
+					if debug {
+						fmt.Println("emitted dict copy, length", s-base, "offset:", offset, "s:", s, "dict offset:", candidateL)
+					}
+					// Matches longer than 64 are split.
+					if s <= sLimit || s-base < 8 {
+						d += emitCopy(dst[d:], offset, s-base)
+					} else {
+						// Split to ensure we don't start a copy within next block.
+						d += emitCopy(dst[d:], offset, 4)
+						d += emitRepeat(dst[d:], offset, s-base-4)
+					}
+					repeat = offset
+				}
+				if false {
+					// Validate match.
+					if s <= candidateL {
+						panic("s <= candidate")
+					}
+					a := src[base:s]
+					b := dict.dict[base-repeat : base-repeat+(s-base)]
+					if !bytes.Equal(a, b) {
+						panic("mismatch")
+					}
+				}
+
+				nextEmit = s
+				if s >= sLimit {
+					break searchDict
+				}
+
+				if d > dstLimit {
+					// Do we have space for more, if not bail.
+					return 0
+				}
+
+				// Index short & long
+				index0 := base + 1
+				index1 := s - 2
+
+				cv0 := load64(src, index0)
+				cv1 := load64(src, index1)
+				lTable[hash7(cv0, lTableBits)] = uint32(index0)
+				sTable[hash4(cv0>>8, sTableBits)] = uint32(index0 + 1)
+
+				lTable[hash7(cv1, lTableBits)] = uint32(index1)
+				sTable[hash4(cv1>>8, sTableBits)] = uint32(index1 + 1)
+				index0 += 1
+				index1 -= 1
+				cv = load64(src, s)
+
+				// index every second long in between.
+				for index0 < index1 {
+					lTable[hash7(load64(src, index0), lTableBits)] = uint32(index0)
+					lTable[hash7(load64(src, index1), lTableBits)] = uint32(index1)
+					index0 += 2
+					index1 -= 2
+				}
+			}
+			continue
+		}
+	emitMatch:
+
+		// Extend backwards
+		for candidateL > 0 && s > nextEmit && src[candidateL-1] == src[s-1] {
+			candidateL--
+			s--
+		}
+
+		// Bail if we exceed the maximum size.
+		if d+(s-nextEmit) > dstLimit {
+			return 0
+		}
+
+		base := s
+		offset := base - candidateL
+
+		// Extend the 4-byte match as long as possible.
+		s += 4
+		candidateL += 4
+		for s < len(src) {
+			if len(src)-s < 8 {
+				if src[s] == src[candidateL] {
+					s++
+					candidateL++
+					continue
+				}
+				break
+			}
+			if diff := load64(src, s) ^ load64(src, candidateL); diff != 0 {
+				s += bits.TrailingZeros64(diff) >> 3
+				break
+			}
+			s += 8
+			candidateL += 8
+		}
+
+		if offset > 65535 && s-base <= 5 && repeat != offset {
+			// Bail if the match is equal or worse to the encoding.
+			s = nextS + 1
+			if s >= sLimit {
+				goto emitRemainder
+			}
+			cv = load64(src, s)
+			continue
+		}
+
+		d += emitLiteral(dst[d:], src[nextEmit:base])
+		if debug && nextEmit != s {
+			fmt.Println("emitted ", s-nextEmit, "literals")
+		}
+		if repeat == offset {
+			if debug {
+				fmt.Println("emitted match repeat, length", s-base, "offset:", offset, "s:", s)
+			}
+			d += emitRepeat(dst[d:], offset, s-base)
+		} else {
+			if debug {
+				fmt.Println("emitted match copy, length", s-base, "offset:", offset, "s:", s)
+			}
+			d += emitCopy(dst[d:], offset, s-base)
+			repeat = offset
+		}
+
+		nextEmit = s
+		if s >= sLimit {
+			goto emitRemainder
+		}
+
+		if d > dstLimit {
+			// Do we have space for more, if not bail.
+			return 0
+		}
+
+		// Index short & long
+		index0 := base + 1
+		index1 := s - 2
+
+		cv0 := load64(src, index0)
+		cv1 := load64(src, index1)
+		lTable[hash7(cv0, lTableBits)] = uint32(index0)
+		sTable[hash4(cv0>>8, sTableBits)] = uint32(index0 + 1)
+
+		lTable[hash7(cv1, lTableBits)] = uint32(index1)
+		sTable[hash4(cv1>>8, sTableBits)] = uint32(index1 + 1)
+		index0 += 1
+		index1 -= 1
+		cv = load64(src, s)
+
+		// index every second long in between.
+		for index0 < index1 {
+			lTable[hash7(load64(src, index0), lTableBits)] = uint32(index0)
+			lTable[hash7(load64(src, index1), lTableBits)] = uint32(index1)
+			index0 += 2
+			index1 -= 2
+		}
+	}
+
+	// Search without dict:
+	if repeat > s {
+		repeat = 0
+	}
+
+	// No more dict
+	sLimit = len(src) - inputMargin
+	if s >= sLimit {
+		goto emitRemainder
+	}
+	cv = load64(src, s)
+	if debug {
+		fmt.Println("now", s, "->", sLimit, "out:", d, "left:", len(src)-s, "nextemit:", nextEmit, "dstLimit:", dstLimit, "s:", s)
+	}
+	for {
+		candidateL := 0
+		nextS := 0
+		for {
+			// Next src position to check
+			nextS = s + (s-nextEmit)>>7 + 1
+			if nextS > sLimit {
+				goto emitRemainder
+			}
+			hashL := hash7(cv, lTableBits)
+			hashS := hash4(cv, sTableBits)
+			candidateL = int(lTable[hashL])
+			candidateS := int(sTable[hashS])
+			lTable[hashL] = uint32(s)
+			sTable[hashS] = uint32(s)
+
+			valLong := load64(src, candidateL)
+			valShort := load64(src, candidateS)
+
+			// If long matches at least 8 bytes, use that.
+			if cv == valLong {
+				break
+			}
+			if cv == valShort {
+				candidateL = candidateS
+				break
+			}
+
+			// Check repeat at offset checkRep.
+			const checkRep = 1
+			// Minimum length of a repeat. Tested with various values.
+			// While 4-5 offers improvements in some, 6 reduces
+			// regressions significantly.
+			const wantRepeatBytes = 6
+			const repeatMask = ((1 << (wantRepeatBytes * 8)) - 1) << (8 * checkRep)
+			if false && repeat > 0 && cv&repeatMask == load64(src, s-repeat)&repeatMask {
+				base := s + checkRep
+				// Extend back
+				for i := base - repeat; base > nextEmit && i > 0 && src[i-1] == src[base-1]; {
+					i--
+					base--
+				}
+				d += emitLiteral(dst[d:], src[nextEmit:base])
+
+				// Extend forward
+				candidate := s - repeat + wantRepeatBytes + checkRep
+				s += wantRepeatBytes + checkRep
+				for s < len(src) {
+					if len(src)-s < 8 {
+						if src[s] == src[candidate] {
+							s++
+							candidate++
+							continue
+						}
+						break
+					}
+					if diff := load64(src, s) ^ load64(src, candidate); diff != 0 {
+						s += bits.TrailingZeros64(diff) >> 3
+						break
+					}
+					s += 8
+					candidate += 8
+				}
+				// same as `add := emitCopy(dst[d:], repeat, s-base)` but skips storing offset.
+				d += emitRepeat(dst[d:], repeat, s-base)
+				nextEmit = s
+				if s >= sLimit {
+					goto emitRemainder
+				}
+				// Index in-between
+				index0 := base + 1
+				index1 := s - 2
+
+				cv = load64(src, s)
+				for index0 < index1 {
+					cv0 := load64(src, index0)
+					cv1 := load64(src, index1)
+					lTable[hash7(cv0, lTableBits)] = uint32(index0)
+					sTable[hash4(cv0>>8, sTableBits)] = uint32(index0 + 1)
+
+					lTable[hash7(cv1, lTableBits)] = uint32(index1)
+					sTable[hash4(cv1>>8, sTableBits)] = uint32(index1 + 1)
+					index0 += 2
+					index1 -= 2
+				}
+
+				cv = load64(src, s)
+				continue
+			}
+
+			// Long likely matches 7, so take that.
+			if uint32(cv) == uint32(valLong) {
+				break
+			}
+
+			// Check our short candidate
+			if uint32(cv) == uint32(valShort) {
+				// Try a long candidate at s+1
+				hashL = hash7(cv>>8, lTableBits)
+				candidateL = int(lTable[hashL])
+				lTable[hashL] = uint32(s + 1)
+				if uint32(cv>>8) == load32(src, candidateL) {
+					s++
+					break
+				}
+				// Use our short candidate.
+				candidateL = candidateS
+				break
+			}
+
+			cv = load64(src, nextS)
+			s = nextS
+		}
+
+		// Extend backwards
+		for candidateL > 0 && s > nextEmit && src[candidateL-1] == src[s-1] {
+			candidateL--
+			s--
+		}
+
+		// Bail if we exceed the maximum size.
+		if d+(s-nextEmit) > dstLimit {
+			return 0
+		}
+
+		base := s
+		offset := base - candidateL
+
+		// Extend the 4-byte match as long as possible.
+		s += 4
+		candidateL += 4
+		for s < len(src) {
+			if len(src)-s < 8 {
+				if src[s] == src[candidateL] {
+					s++
+					candidateL++
+					continue
+				}
+				break
+			}
+			if diff := load64(src, s) ^ load64(src, candidateL); diff != 0 {
+				s += bits.TrailingZeros64(diff) >> 3
+				break
+			}
+			s += 8
+			candidateL += 8
+		}
+
+		if offset > 65535 && s-base <= 5 && repeat != offset {
+			// Bail if the match is equal or worse to the encoding.
+			s = nextS + 1
+			if s >= sLimit {
+				goto emitRemainder
+			}
+			cv = load64(src, s)
+			continue
+		}
+
+		d += emitLiteral(dst[d:], src[nextEmit:base])
+		if repeat == offset {
+			d += emitRepeat(dst[d:], offset, s-base)
+		} else {
+			d += emitCopy(dst[d:], offset, s-base)
+			repeat = offset
+		}
+
+		nextEmit = s
+		if s >= sLimit {
+			goto emitRemainder
+		}
+
+		if d > dstLimit {
+			// Do we have space for more, if not bail.
+			return 0
+		}
+
+		// Index short & long
+		index0 := base + 1
+		index1 := s - 2
+
+		cv0 := load64(src, index0)
+		cv1 := load64(src, index1)
+		lTable[hash7(cv0, lTableBits)] = uint32(index0)
+		sTable[hash4(cv0>>8, sTableBits)] = uint32(index0 + 1)
+
+		lTable[hash7(cv1, lTableBits)] = uint32(index1)
+		sTable[hash4(cv1>>8, sTableBits)] = uint32(index1 + 1)
+		index0 += 1
+		index1 -= 1
+		cv = load64(src, s)
+
+		// index every second long in between.
+		for index0 < index1 {
+			lTable[hash7(load64(src, index0), lTableBits)] = uint32(index0)
+			lTable[hash7(load64(src, index1), lTableBits)] = uint32(index1)
+			index0 += 2
+			index1 -= 2
+		}
 	}
 
 emitRemainder:
diff --git a/vendor/github.com/klauspost/compress/s2/encode_go.go b/vendor/github.com/klauspost/compress/s2/encode_go.go
index 94784b82..d7749d75 100644
--- a/vendor/github.com/klauspost/compress/s2/encode_go.go
+++ b/vendor/github.com/klauspost/compress/s2/encode_go.go
@@ -4,14 +4,18 @@
 package s2
 
 import (
+	"bytes"
 	"math/bits"
 )
 
+const hasAmd64Asm = false
+
 // encodeBlock encodes a non-empty src to a guaranteed-large-enough dst. It
 // assumes that the varint-encoded length of the decompressed bytes has already
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src))
 func encodeBlock(dst, src []byte) (d int) {
 	if len(src) < minNonLiteralBlockSize {
@@ -25,6 +29,7 @@ func encodeBlock(dst, src []byte) (d int) {
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src))
 func encodeBlockBetter(dst, src []byte) (d int) {
 	return encodeBlockBetterGo(dst, src)
@@ -35,6 +40,7 @@ func encodeBlockBetter(dst, src []byte) (d int) {
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src))
 func encodeBlockBetterSnappy(dst, src []byte) (d int) {
 	return encodeBlockBetterSnappyGo(dst, src)
@@ -45,6 +51,7 @@ func encodeBlockBetterSnappy(dst, src []byte) (d int) {
 // been written.
 //
 // It also assumes that:
+//
 //	len(dst) >= MaxEncodedLen(len(src))
 func encodeBlockSnappy(dst, src []byte) (d int) {
 	if len(src) < minNonLiteralBlockSize {
@@ -56,6 +63,7 @@ func encodeBlockSnappy(dst, src []byte) (d int) {
 // emitLiteral writes a literal chunk and returns the number of bytes written.
 //
 // It assumes that:
+//
 //	dst is long enough to hold the encoded bytes
 //	0 <= len(lit) && len(lit) <= math.MaxUint32
 func emitLiteral(dst, lit []byte) int {
@@ -146,6 +154,7 @@ func emitRepeat(dst []byte, offset, length int) int {
 // emitCopy writes a copy chunk and returns the number of bytes written.
 //
 // It assumes that:
+//
 //	dst is long enough to hold the encoded bytes
 //	1 <= offset && offset <= math.MaxUint32
 //	4 <= length && length <= 1 << 24
@@ -214,6 +223,7 @@ func emitCopy(dst []byte, offset, length int) int {
 // emitCopyNoRepeat writes a copy chunk and returns the number of bytes written.
 //
 // It assumes that:
+//
 //	dst is long enough to hold the encoded bytes
 //	1 <= offset && offset <= math.MaxUint32
 //	4 <= length && length <= 1 << 24
@@ -273,8 +283,8 @@ func emitCopyNoRepeat(dst []byte, offset, length int) int {
 // matchLen returns how many bytes match in a and b
 //
 // It assumes that:
-//   len(a) <= len(b)
 //
+//	len(a) <= len(b)
 func matchLen(a []byte, b []byte) int {
 	b = b[:len(a)]
 	var checked int
@@ -305,3 +315,405 @@ func matchLen(a []byte, b []byte) int {
 	}
 	return len(a) + checked
 }
+
+func calcBlockSize(src []byte) (d int) {
+	// Initialize the hash table.
+	const (
+		tableBits    = 13
+		maxTableSize = 1 << tableBits
+	)
+
+	var table [maxTableSize]uint32
+
+	// sLimit is when to stop looking for offset/length copies. The inputMargin
+	// lets us use a fast path for emitLiteral in the main loop, while we are
+	// looking for copies.
+	sLimit := len(src) - inputMargin
+
+	// Bail if we can't compress to at least this.
+	dstLimit := len(src) - len(src)>>5 - 5
+
+	// nextEmit is where in src the next emitLiteral should start from.
+	nextEmit := 0
+
+	// The encoded form must start with a literal, as there are no previous
+	// bytes to copy, so we start looking for hash matches at s == 1.
+	s := 1
+	cv := load64(src, s)
+
+	// We search for a repeat at -1, but don't output repeats when nextEmit == 0
+	repeat := 1
+
+	for {
+		candidate := 0
+		for {
+			// Next src position to check
+			nextS := s + (s-nextEmit)>>6 + 4
+			if nextS > sLimit {
+				goto emitRemainder
+			}
+			hash0 := hash6(cv, tableBits)
+			hash1 := hash6(cv>>8, tableBits)
+			candidate = int(table[hash0])
+			candidate2 := int(table[hash1])
+			table[hash0] = uint32(s)
+			table[hash1] = uint32(s + 1)
+			hash2 := hash6(cv>>16, tableBits)
+
+			// Check repeat at offset checkRep.
+			const checkRep = 1
+			if uint32(cv>>(checkRep*8)) == load32(src, s-repeat+checkRep) {
+				base := s + checkRep
+				// Extend back
+				for i := base - repeat; base > nextEmit && i > 0 && src[i-1] == src[base-1]; {
+					i--
+					base--
+				}
+				d += emitLiteralSize(src[nextEmit:base])
+
+				// Extend forward
+				candidate := s - repeat + 4 + checkRep
+				s += 4 + checkRep
+				for s <= sLimit {
+					if diff := load64(src, s) ^ load64(src, candidate); diff != 0 {
+						s += bits.TrailingZeros64(diff) >> 3
+						break
+					}
+					s += 8
+					candidate += 8
+				}
+
+				d += emitCopyNoRepeatSize(repeat, s-base)
+				nextEmit = s
+				if s >= sLimit {
+					goto emitRemainder
+				}
+
+				cv = load64(src, s)
+				continue
+			}
+
+			if uint32(cv) == load32(src, candidate) {
+				break
+			}
+			candidate = int(table[hash2])
+			if uint32(cv>>8) == load32(src, candidate2) {
+				table[hash2] = uint32(s + 2)
+				candidate = candidate2
+				s++
+				break
+			}
+			table[hash2] = uint32(s + 2)
+			if uint32(cv>>16) == load32(src, candidate) {
+				s += 2
+				break
+			}
+
+			cv = load64(src, nextS)
+			s = nextS
+		}
+
+		// Extend backwards
+		for candidate > 0 && s > nextEmit && src[candidate-1] == src[s-1] {
+			candidate--
+			s--
+		}
+
+		// Bail if we exceed the maximum size.
+		if d+(s-nextEmit) > dstLimit {
+			return 0
+		}
+
+		// A 4-byte match has been found. We'll later see if more than 4 bytes
+		// match. But, prior to the match, src[nextEmit:s] are unmatched. Emit
+		// them as literal bytes.
+
+		d += emitLiteralSize(src[nextEmit:s])
+
+		// Call emitCopy, and then see if another emitCopy could be our next
+		// move. Repeat until we find no match for the input immediately after
+		// what was consumed by the last emitCopy call.
+		//
+		// If we exit this loop normally then we need to call emitLiteral next,
+		// though we don't yet know how big the literal will be. We handle that
+		// by proceeding to the next iteration of the main loop. We also can
+		// exit this loop via goto if we get close to exhausting the input.
+		for {
+			// Invariant: we have a 4-byte match at s, and no need to emit any
+			// literal bytes prior to s.
+			base := s
+			repeat = base - candidate
+
+			// Extend the 4-byte match as long as possible.
+			s += 4
+			candidate += 4
+			for s <= len(src)-8 {
+				if diff := load64(src, s) ^ load64(src, candidate); diff != 0 {
+					s += bits.TrailingZeros64(diff) >> 3
+					break
+				}
+				s += 8
+				candidate += 8
+			}
+
+			d += emitCopyNoRepeatSize(repeat, s-base)
+			if false {
+				// Validate match.
+				a := src[base:s]
+				b := src[base-repeat : base-repeat+(s-base)]
+				if !bytes.Equal(a, b) {
+					panic("mismatch")
+				}
+			}
+
+			nextEmit = s
+			if s >= sLimit {
+				goto emitRemainder
+			}
+
+			if d > dstLimit {
+				// Do we have space for more, if not bail.
+				return 0
+			}
+			// Check for an immediate match, otherwise start search at s+1
+			x := load64(src, s-2)
+			m2Hash := hash6(x, tableBits)
+			currHash := hash6(x>>16, tableBits)
+			candidate = int(table[currHash])
+			table[m2Hash] = uint32(s - 2)
+			table[currHash] = uint32(s)
+			if uint32(x>>16) != load32(src, candidate) {
+				cv = load64(src, s+1)
+				s++
+				break
+			}
+		}
+	}
+
+emitRemainder:
+	if nextEmit < len(src) {
+		// Bail if we exceed the maximum size.
+		if d+len(src)-nextEmit > dstLimit {
+			return 0
+		}
+		d += emitLiteralSize(src[nextEmit:])
+	}
+	return d
+}
+
+func calcBlockSizeSmall(src []byte) (d int) {
+	// Initialize the hash table.
+	const (
+		tableBits    = 9
+		maxTableSize = 1 << tableBits
+	)
+
+	var table [maxTableSize]uint32
+
+	// sLimit is when to stop looking for offset/length copies. The inputMargin
+	// lets us use a fast path for emitLiteral in the main loop, while we are
+	// looking for copies.
+	sLimit := len(src) - inputMargin
+
+	// Bail if we can't compress to at least this.
+	dstLimit := len(src) - len(src)>>5 - 5
+
+	// nextEmit is where in src the next emitLiteral should start from.
+	nextEmit := 0
+
+	// The encoded form must start with a literal, as there are no previous
+	// bytes to copy, so we start looking for hash matches at s == 1.
+	s := 1
+	cv := load64(src, s)
+
+	// We search for a repeat at -1, but don't output repeats when nextEmit == 0
+	repeat := 1
+
+	for {
+		candidate := 0
+		for {
+			// Next src position to check
+			nextS := s + (s-nextEmit)>>6 + 4
+			if nextS > sLimit {
+				goto emitRemainder
+			}
+			hash0 := hash6(cv, tableBits)
+			hash1 := hash6(cv>>8, tableBits)
+			candidate = int(table[hash0])
+			candidate2 := int(table[hash1])
+			table[hash0] = uint32(s)
+			table[hash1] = uint32(s + 1)
+			hash2 := hash6(cv>>16, tableBits)
+
+			// Check repeat at offset checkRep.
+			const checkRep = 1
+			if uint32(cv>>(checkRep*8)) == load32(src, s-repeat+checkRep) {
+				base := s + checkRep
+				// Extend back
+				for i := base - repeat; base > nextEmit && i > 0 && src[i-1] == src[base-1]; {
+					i--
+					base--
+				}
+				d += emitLiteralSize(src[nextEmit:base])
+
+				// Extend forward
+				candidate := s - repeat + 4 + checkRep
+				s += 4 + checkRep
+				for s <= sLimit {
+					if diff := load64(src, s) ^ load64(src, candidate); diff != 0 {
+						s += bits.TrailingZeros64(diff) >> 3
+						break
+					}
+					s += 8
+					candidate += 8
+				}
+
+				d += emitCopyNoRepeatSize(repeat, s-base)
+				nextEmit = s
+				if s >= sLimit {
+					goto emitRemainder
+				}
+
+				cv = load64(src, s)
+				continue
+			}
+
+			if uint32(cv) == load32(src, candidate) {
+				break
+			}
+			candidate = int(table[hash2])
+			if uint32(cv>>8) == load32(src, candidate2) {
+				table[hash2] = uint32(s + 2)
+				candidate = candidate2
+				s++
+				break
+			}
+			table[hash2] = uint32(s + 2)
+			if uint32(cv>>16) == load32(src, candidate) {
+				s += 2
+				break
+			}
+
+			cv = load64(src, nextS)
+			s = nextS
+		}
+
+		// Extend backwards
+		for candidate > 0 && s > nextEmit && src[candidate-1] == src[s-1] {
+			candidate--
+			s--
+		}
+
+		// Bail if we exceed the maximum size.
+		if d+(s-nextEmit) > dstLimit {
+			return 0
+		}
+
+		// A 4-byte match has been found. We'll later see if more than 4 bytes
+		// match. But, prior to the match, src[nextEmit:s] are unmatched. Emit
+		// them as literal bytes.
+
+		d += emitLiteralSize(src[nextEmit:s])
+
+		// Call emitCopy, and then see if another emitCopy could be our next
+		// move. Repeat until we find no match for the input immediately after
+		// what was consumed by the last emitCopy call.
+		//
+		// If we exit this loop normally then we need to call emitLiteral next,
+		// though we don't yet know how big the literal will be. We handle that
+		// by proceeding to the next iteration of the main loop. We also can
+		// exit this loop via goto if we get close to exhausting the input.
+		for {
+			// Invariant: we have a 4-byte match at s, and no need to emit any
+			// literal bytes prior to s.
+			base := s
+			repeat = base - candidate
+
+			// Extend the 4-byte match as long as possible.
+			s += 4
+			candidate += 4
+			for s <= len(src)-8 {
+				if diff := load64(src, s) ^ load64(src, candidate); diff != 0 {
+					s += bits.TrailingZeros64(diff) >> 3
+					break
+				}
+				s += 8
+				candidate += 8
+			}
+
+			d += emitCopyNoRepeatSize(repeat, s-base)
+			if false {
+				// Validate match.
+				a := src[base:s]
+				b := src[base-repeat : base-repeat+(s-base)]
+				if !bytes.Equal(a, b) {
+					panic("mismatch")
+				}
+			}
+
+			nextEmit = s
+			if s >= sLimit {
+				goto emitRemainder
+			}
+
+			if d > dstLimit {
+				// Do we have space for more, if not bail.
+				return 0
+			}
+			// Check for an immediate match, otherwise start search at s+1
+			x := load64(src, s-2)
+			m2Hash := hash6(x, tableBits)
+			currHash := hash6(x>>16, tableBits)
+			candidate = int(table[currHash])
+			table[m2Hash] = uint32(s - 2)
+			table[currHash] = uint32(s)
+			if uint32(x>>16) != load32(src, candidate) {
+				cv = load64(src, s+1)
+				s++
+				break
+			}
+		}
+	}
+
+emitRemainder:
+	if nextEmit < len(src) {
+		// Bail if we exceed the maximum size.
+		if d+len(src)-nextEmit > dstLimit {
+			return 0
+		}
+		d += emitLiteralSize(src[nextEmit:])
+	}
+	return d
+}
+
+// emitLiteral writes a literal chunk and returns the number of bytes written.
+//
+// It assumes that:
+//
+//	dst is long enough to hold the encoded bytes
+//	0 <= len(lit) && len(lit) <= math.MaxUint32
+func emitLiteralSize(lit []byte) int {
+	if len(lit) == 0 {
+		return 0
+	}
+	switch {
+	case len(lit) <= 60:
+		return len(lit) + 1
+	case len(lit) <= 1<<8:
+		return len(lit) + 2
+	case len(lit) <= 1<<16:
+		return len(lit) + 3
+	case len(lit) <= 1<<24:
+		return len(lit) + 4
+	default:
+		return len(lit) + 5
+	}
+}
+
+func cvtLZ4BlockAsm(dst []byte, src []byte) (uncompressed int, dstUsed int) {
+	panic("cvtLZ4BlockAsm should be unreachable")
+}
+
+func cvtLZ4BlockSnappyAsm(dst []byte, src []byte) (uncompressed int, dstUsed int) {
+	panic("cvtLZ4BlockSnappyAsm should be unreachable")
+}
diff --git a/vendor/github.com/klauspost/compress/s2/encodeblock_amd64.go b/vendor/github.com/klauspost/compress/s2/encodeblock_amd64.go
index 88f27c09..9f3dc8c2 100644
--- a/vendor/github.com/klauspost/compress/s2/encodeblock_amd64.go
+++ b/vendor/github.com/klauspost/compress/s2/encodeblock_amd64.go
@@ -1,7 +1,6 @@
 // Code generated by command: go run gen.go -out ../encodeblock_amd64.s -stubs ../encodeblock_amd64.go -pkg=s2. DO NOT EDIT.
 
 //go:build !appengine && !noasm && gc && !noasm
-// +build !appengine,!noasm,gc,!noasm
 
 package s2
 
@@ -147,11 +146,26 @@ func encodeSnappyBetterBlockAsm10B(dst []byte, src []byte) int
 //go:noescape
 func encodeSnappyBetterBlockAsm8B(dst []byte, src []byte) int
 
+// calcBlockSize encodes a non-empty src to a guaranteed-large-enough dst.
+// Maximum input 4294967295 bytes.
+// It assumes that the varint-encoded length of the decompressed bytes has already been written.
+//
+//go:noescape
+func calcBlockSize(src []byte) int
+
+// calcBlockSizeSmall encodes a non-empty src to a guaranteed-large-enough dst.
+// Maximum input 1024 bytes.
+// It assumes that the varint-encoded length of the decompressed bytes has already been written.
+//
+//go:noescape
+func calcBlockSizeSmall(src []byte) int
+
 // emitLiteral writes a literal chunk and returns the number of bytes written.
 //
 // It assumes that:
-//   dst is long enough to hold the encoded bytes with margin of 0 bytes
-//   0 <= len(lit) && len(lit) <= math.MaxUint32
+//
+//	dst is long enough to hold the encoded bytes with margin of 0 bytes
+//	0 <= len(lit) && len(lit) <= math.MaxUint32
 //
 //go:noescape
 func emitLiteral(dst []byte, lit []byte) int
@@ -165,9 +179,10 @@ func emitRepeat(dst []byte, offset int, length int) int
 // emitCopy writes a copy chunk and returns the number of bytes written.
 //
 // It assumes that:
-//   dst is long enough to hold the encoded bytes
-//   1 <= offset && offset <= math.MaxUint32
-//   4 <= length && length <= 1 << 24
+//
+//	dst is long enough to hold the encoded bytes
+//	1 <= offset && offset <= math.MaxUint32
+//	4 <= length && length <= 1 << 24
 //
 //go:noescape
 func emitCopy(dst []byte, offset int, length int) int
@@ -175,9 +190,10 @@ func emitCopy(dst []byte, offset int, length int) int
 // emitCopyNoRepeat writes a copy chunk and returns the number of bytes written.
 //
 // It assumes that:
-//   dst is long enough to hold the encoded bytes
-//   1 <= offset && offset <= math.MaxUint32
-//   4 <= length && length <= 1 << 24
+//
+//	dst is long enough to hold the encoded bytes
+//	1 <= offset && offset <= math.MaxUint32
+//	4 <= length && length <= 1 << 24
 //
 //go:noescape
 func emitCopyNoRepeat(dst []byte, offset int, length int) int
@@ -185,7 +201,18 @@ func emitCopyNoRepeat(dst []byte, offset int, length int) int
 // matchLen returns how many bytes match in a and b
 //
 // It assumes that:
-//   len(a) <= len(b)
+//
+//	len(a) <= len(b)
 //
 //go:noescape
 func matchLen(a []byte, b []byte) int
+
+// cvtLZ4Block converts an LZ4 block to S2
+//
+//go:noescape
+func cvtLZ4BlockAsm(dst []byte, src []byte) (uncompressed int, dstUsed int)
+
+// cvtLZ4Block converts an LZ4 block to S2
+//
+//go:noescape
+func cvtLZ4BlockSnappyAsm(dst []byte, src []byte) (uncompressed int, dstUsed int)
diff --git a/vendor/github.com/klauspost/compress/s2/encodeblock_amd64.s b/vendor/github.com/klauspost/compress/s2/encodeblock_amd64.s
index 36915d94..19bd5237 100644
--- a/vendor/github.com/klauspost/compress/s2/encodeblock_amd64.s
+++ b/vendor/github.com/klauspost/compress/s2/encodeblock_amd64.s
@@ -1,7 +1,6 @@
 // Code generated by command: go run gen.go -out ../encodeblock_amd64.s -stubs ../encodeblock_amd64.go -pkg=s2. DO NOT EDIT.
 
 //go:build !appengine && !noasm && gc && !noasm
-// +build !appengine,!noasm,gc,!noasm
 
 #include "textflag.h"
 
@@ -37,8 +36,8 @@ zero_loop_encodeBlockAsm:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -48,781 +47,173 @@ zero_loop_encodeBlockAsm:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeBlockAsm:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x06, SI
-	LEAL  4(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x06, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeBlockAsm
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHRQ  $0x08, R11
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
 	SHLQ  $0x10, R10
-	IMULQ R9, R10
+	IMULQ R8, R10
 	SHRQ  $0x32, R10
-	SHLQ  $0x10, R11
-	IMULQ R9, R11
-	SHRQ  $0x32, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  24(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	LEAL  1(CX), R10
-	MOVL  R10, 24(SP)(R11*4)
-	MOVQ  DI, R10
-	SHRQ  $0x10, R10
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x32, R10
-	MOVL  CX, R9
-	SUBL  16(SP), R9
-	MOVL  1(DX)(R9*1), R11
-	MOVQ  DI, R9
-	SHRQ  $0x08, R9
-	CMPL  R9, R11
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
+	MOVL  CX, R8
+	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
 	JNE   no_repeat_found_encodeBlockAsm
-	LEAL  1(CX), DI
-	MOVL  12(SP), R8
-	MOVL  DI, SI
-	SUBL  16(SP), SI
+	LEAL  1(CX), SI
+	MOVL  12(SP), DI
+	MOVL  SI, BX
+	SUBL  16(SP), BX
 	JZ    repeat_extend_back_end_encodeBlockAsm
 
 repeat_extend_back_loop_encodeBlockAsm:
-	CMPL DI, R8
+	CMPL SI, DI
 	JLE  repeat_extend_back_end_encodeBlockAsm
-	MOVB -1(DX)(SI*1), BL
-	MOVB -1(DX)(DI*1), R9
-	CMPB BL, R9
+	MOVB -1(DX)(BX*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
 	JNE  repeat_extend_back_end_encodeBlockAsm
-	LEAL -1(DI), DI
-	DECL SI
+	LEAL -1(SI), SI
+	DECL BX
 	JNZ  repeat_extend_back_loop_encodeBlockAsm
 
 repeat_extend_back_end_encodeBlockAsm:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_repeat_emit_encodeBlockAsm
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_repeat_emit_encodeBlockAsm
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_repeat_emit_encodeBlockAsm
-	CMPL SI, $0x00010000
+	CMPL BX, $0x00010000
 	JLT  three_bytes_repeat_emit_encodeBlockAsm
-	CMPL SI, $0x01000000
+	CMPL BX, $0x01000000
 	JLT  four_bytes_repeat_emit_encodeBlockAsm
 	MOVB $0xfc, (AX)
-	MOVL SI, 1(AX)
+	MOVL BX, 1(AX)
 	ADDQ $0x05, AX
 	JMP  memmove_long_repeat_emit_encodeBlockAsm
 
 four_bytes_repeat_emit_encodeBlockAsm:
-	MOVL SI, R11
-	SHRL $0x10, R11
+	MOVL BX, R10
+	SHRL $0x10, R10
 	MOVB $0xf8, (AX)
-	MOVW SI, 1(AX)
-	MOVB R11, 3(AX)
+	MOVW BX, 1(AX)
+	MOVB R10, 3(AX)
 	ADDQ $0x04, AX
 	JMP  memmove_long_repeat_emit_encodeBlockAsm
 
 three_bytes_repeat_emit_encodeBlockAsm:
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_repeat_emit_encodeBlockAsm
 
 two_bytes_repeat_emit_encodeBlockAsm:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_repeat_emit_encodeBlockAsm
 	JMP  memmove_long_repeat_emit_encodeBlockAsm
 
 one_byte_repeat_emit_encodeBlockAsm:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_repeat_emit_encodeBlockAsm:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_repeat_emit_encodeBlockAsm_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_repeat_emit_encodeBlockAsm_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_repeat_emit_encodeBlockAsm_memmove_move_17through32
 	JMP  emit_lit_memmove_repeat_emit_encodeBlockAsm_memmove_move_33through64
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm_memmove_move_8:
-	MOVQ (R10), R11
-	MOVQ R11, (AX)
+	MOVQ (R9), R10
+	MOVQ R10, (AX)
 	JMP  memmove_end_copy_repeat_emit_encodeBlockAsm
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_repeat_emit_encodeBlockAsm
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_repeat_emit_encodeBlockAsm
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_repeat_emit_encodeBlockAsm:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_repeat_emit_encodeBlockAsm
 
 memmove_long_repeat_emit_encodeBlockAsm:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R12
-	SHRQ  $0x05, R12
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R13
-	SUBQ  R11, R13
-	DECQ  R12
-	JA    emit_lit_memmove_long_repeat_emit_encodeBlockAsmlarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R13*1), R11
-	LEAQ  -32(AX)(R13*1), R14
-
-emit_lit_memmove_long_repeat_emit_encodeBlockAsmlarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R14)
-	MOVOA X5, 16(R14)
-	ADDQ  $0x20, R14
-	ADDQ  $0x20, R11
-	ADDQ  $0x20, R13
-	DECQ  R12
-	JNA   emit_lit_memmove_long_repeat_emit_encodeBlockAsmlarge_big_loop_back
-
-emit_lit_memmove_long_repeat_emit_encodeBlockAsmlarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R13*1), X4
-	MOVOU -16(R10)(R13*1), X5
-	MOVOA X4, -32(AX)(R13*1)
-	MOVOA X5, -16(AX)(R13*1)
-	ADDQ  $0x20, R13
-	CMPQ  R9, R13
-	JAE   emit_lit_memmove_long_repeat_emit_encodeBlockAsmlarge_forward_sse_loop_32
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
-
-emit_literal_done_repeat_emit_encodeBlockAsm:
-	ADDL $0x05, CX
-	MOVL CX, SI
-	SUBL 16(SP), SI
-	MOVQ src_len+32(FP), R9
-	SUBL CX, R9
-	LEAQ (DX)(CX*1), R10
-	LEAQ (DX)(SI*1), SI
-
-	// matchLen
-	XORL R12, R12
-	CMPL R9, $0x08
-	JL   matchlen_match4_repeat_extend_encodeBlockAsm
-
-matchlen_loopback_repeat_extend_encodeBlockAsm:
-	MOVQ  (R10)(R12*1), R11
-	XORQ  (SI)(R12*1), R11
-	TESTQ R11, R11
-	JZ    matchlen_loop_repeat_extend_encodeBlockAsm
-
-#ifdef GOAMD64_v3
-	TZCNTQ R11, R11
-
-#else
-	BSFQ R11, R11
-
-#endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
-	JMP  repeat_extend_forward_end_encodeBlockAsm
-
-matchlen_loop_repeat_extend_encodeBlockAsm:
-	LEAL -8(R9), R9
-	LEAL 8(R12), R12
-	CMPL R9, $0x08
-	JGE  matchlen_loopback_repeat_extend_encodeBlockAsm
-	JZ   repeat_extend_forward_end_encodeBlockAsm
-
-matchlen_match4_repeat_extend_encodeBlockAsm:
-	CMPL R9, $0x04
-	JL   matchlen_match2_repeat_extend_encodeBlockAsm
-	MOVL (R10)(R12*1), R11
-	CMPL (SI)(R12*1), R11
-	JNE  matchlen_match2_repeat_extend_encodeBlockAsm
-	SUBL $0x04, R9
-	LEAL 4(R12), R12
-
-matchlen_match2_repeat_extend_encodeBlockAsm:
-	CMPL R9, $0x02
-	JL   matchlen_match1_repeat_extend_encodeBlockAsm
-	MOVW (R10)(R12*1), R11
-	CMPW (SI)(R12*1), R11
-	JNE  matchlen_match1_repeat_extend_encodeBlockAsm
-	SUBL $0x02, R9
-	LEAL 2(R12), R12
-
-matchlen_match1_repeat_extend_encodeBlockAsm:
-	CMPL R9, $0x01
-	JL   repeat_extend_forward_end_encodeBlockAsm
-	MOVB (R10)(R12*1), R11
-	CMPB (SI)(R12*1), R11
-	JNE  repeat_extend_forward_end_encodeBlockAsm
-	LEAL 1(R12), R12
-
-repeat_extend_forward_end_encodeBlockAsm:
-	ADDL  R12, CX
-	MOVL  CX, SI
-	SUBL  DI, SI
-	MOVL  16(SP), DI
-	TESTL R8, R8
-	JZ    repeat_as_copy_encodeBlockAsm
-
-	// emitRepeat
-emit_repeat_again_match_repeat_encodeBlockAsm:
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
-	JLE  repeat_two_match_repeat_encodeBlockAsm
-	CMPL R8, $0x0c
-	JGE  cant_repeat_two_offset_match_repeat_encodeBlockAsm
-	CMPL DI, $0x00000800
-	JLT  repeat_two_offset_match_repeat_encodeBlockAsm
-
-cant_repeat_two_offset_match_repeat_encodeBlockAsm:
-	CMPL SI, $0x00000104
-	JLT  repeat_three_match_repeat_encodeBlockAsm
-	CMPL SI, $0x00010100
-	JLT  repeat_four_match_repeat_encodeBlockAsm
-	CMPL SI, $0x0100ffff
-	JLT  repeat_five_match_repeat_encodeBlockAsm
-	LEAL -16842747(SI), SI
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
-	MOVB $0xff, 4(AX)
-	ADDQ $0x05, AX
-	JMP  emit_repeat_again_match_repeat_encodeBlockAsm
-
-repeat_five_match_repeat_encodeBlockAsm:
-	LEAL -65536(SI), SI
-	MOVL SI, DI
-	MOVW $0x001d, (AX)
-	MOVW SI, 2(AX)
-	SARL $0x10, DI
-	MOVB DI, 4(AX)
-	ADDQ $0x05, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_four_match_repeat_encodeBlockAsm:
-	LEAL -256(SI), SI
-	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
-	ADDQ $0x04, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_three_match_repeat_encodeBlockAsm:
-	LEAL -4(SI), SI
-	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
-	ADDQ $0x03, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_two_match_repeat_encodeBlockAsm:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_two_offset_match_repeat_encodeBlockAsm:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_as_copy_encodeBlockAsm:
-	// emitCopy
-	CMPL DI, $0x00010000
-	JL   two_byte_offset_repeat_as_copy_encodeBlockAsm
-
-four_bytes_loop_back_repeat_as_copy_encodeBlockAsm:
-	CMPL SI, $0x40
-	JLE  four_bytes_remain_repeat_as_copy_encodeBlockAsm
-	MOVB $0xff, (AX)
-	MOVL DI, 1(AX)
-	LEAL -64(SI), SI
-	ADDQ $0x05, AX
-	CMPL SI, $0x04
-	JL   four_bytes_remain_repeat_as_copy_encodeBlockAsm
-
-	// emitRepeat
-emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy:
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
-	JLE  repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy
-	CMPL R8, $0x0c
-	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy
-	CMPL DI, $0x00000800
-	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy
-
-cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy:
-	CMPL SI, $0x00000104
-	JLT  repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy
-	CMPL SI, $0x00010100
-	JLT  repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy
-	CMPL SI, $0x0100ffff
-	JLT  repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy
-	LEAL -16842747(SI), SI
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
-	MOVB $0xff, 4(AX)
-	ADDQ $0x05, AX
-	JMP  emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy
-
-repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy:
-	LEAL -65536(SI), SI
-	MOVL SI, DI
-	MOVW $0x001d, (AX)
-	MOVW SI, 2(AX)
-	SARL $0x10, DI
-	MOVB DI, 4(AX)
-	ADDQ $0x05, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy:
-	LEAL -256(SI), SI
-	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
-	ADDQ $0x04, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy:
-	LEAL -4(SI), SI
-	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
-	ADDQ $0x03, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-	JMP four_bytes_loop_back_repeat_as_copy_encodeBlockAsm
-
-four_bytes_remain_repeat_as_copy_encodeBlockAsm:
-	TESTL SI, SI
-	JZ    repeat_end_emit_encodeBlockAsm
-	MOVB  $0x03, BL
-	LEAL  -4(BX)(SI*4), SI
-	MOVB  SI, (AX)
-	MOVL  DI, 1(AX)
-	ADDQ  $0x05, AX
-	JMP   repeat_end_emit_encodeBlockAsm
-
-two_byte_offset_repeat_as_copy_encodeBlockAsm:
-	CMPL SI, $0x40
-	JLE  two_byte_offset_short_repeat_as_copy_encodeBlockAsm
-	CMPL DI, $0x00000800
-	JAE  long_offset_short_repeat_as_copy_encodeBlockAsm
-	MOVL $0x00000001, R8
-	LEAL 16(R8), R8
-	MOVB DI, 1(AX)
-	MOVL DI, R9
-	SHRL $0x08, R9
-	SHLL $0x05, R9
-	ORL  R9, R8
-	MOVB R8, (AX)
-	ADDQ $0x02, AX
-	SUBL $0x08, SI
-
-	// emitRepeat
-	LEAL -4(SI), SI
-	JMP  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
-
-emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
-	JLE  repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
-	CMPL R8, $0x0c
-	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
-	CMPL DI, $0x00000800
-	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
-
-cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
-	CMPL SI, $0x00000104
-	JLT  repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
-	CMPL SI, $0x00010100
-	JLT  repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
-	CMPL SI, $0x0100ffff
-	JLT  repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
-	LEAL -16842747(SI), SI
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
-	MOVB $0xff, 4(AX)
-	ADDQ $0x05, AX
-	JMP  emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
-
-repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
-	LEAL -65536(SI), SI
-	MOVL SI, DI
-	MOVW $0x001d, (AX)
-	MOVW SI, 2(AX)
-	SARL $0x10, DI
-	MOVB DI, 4(AX)
-	ADDQ $0x05, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
-	LEAL -256(SI), SI
-	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
-	ADDQ $0x04, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
-	LEAL -4(SI), SI
-	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
-	ADDQ $0x03, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-long_offset_short_repeat_as_copy_encodeBlockAsm:
-	MOVB $0xee, (AX)
-	MOVW DI, 1(AX)
-	LEAL -60(SI), SI
-	ADDQ $0x03, AX
-
-	// emitRepeat
-emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy_short:
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
-	JLE  repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy_short
-	CMPL R8, $0x0c
-	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short
-	CMPL DI, $0x00000800
-	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short
-
-cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short:
-	CMPL SI, $0x00000104
-	JLT  repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy_short
-	CMPL SI, $0x00010100
-	JLT  repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy_short
-	CMPL SI, $0x0100ffff
-	JLT  repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy_short
-	LEAL -16842747(SI), SI
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
-	MOVB $0xff, 4(AX)
-	ADDQ $0x05, AX
-	JMP  emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy_short
-
-repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy_short:
-	LEAL -65536(SI), SI
-	MOVL SI, DI
-	MOVW $0x001d, (AX)
-	MOVW SI, 2(AX)
-	SARL $0x10, DI
-	MOVB DI, 4(AX)
-	ADDQ $0x05, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy_short:
-	LEAL -256(SI), SI
-	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
-	ADDQ $0x04, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy_short:
-	LEAL -4(SI), SI
-	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
-	ADDQ $0x03, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy_short:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-	JMP two_byte_offset_repeat_as_copy_encodeBlockAsm
-
-two_byte_offset_short_repeat_as_copy_encodeBlockAsm:
-	CMPL SI, $0x0c
-	JGE  emit_copy_three_repeat_as_copy_encodeBlockAsm
-	CMPL DI, $0x00000800
-	JGE  emit_copy_three_repeat_as_copy_encodeBlockAsm
-	MOVB $0x01, BL
-	LEAL -16(BX)(SI*4), SI
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeBlockAsm
-
-emit_copy_three_repeat_as_copy_encodeBlockAsm:
-	MOVB $0x02, BL
-	LEAL -4(BX)(SI*4), SI
-	MOVB SI, (AX)
-	MOVW DI, 1(AX)
-	ADDQ $0x03, AX
-
-repeat_end_emit_encodeBlockAsm:
-	MOVL CX, 12(SP)
-	JMP  search_loop_encodeBlockAsm
-
-no_repeat_found_encodeBlockAsm:
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate_match_encodeBlockAsm
-	SHRQ $0x08, DI
-	MOVL 24(SP)(R10*4), SI
-	LEAL 2(CX), R9
-	CMPL (DX)(R8*1), DI
-	JEQ  candidate2_match_encodeBlockAsm
-	MOVL R9, 24(SP)(R10*4)
-	SHRQ $0x08, DI
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate3_match_encodeBlockAsm
-	MOVL 20(SP), CX
-	JMP  search_loop_encodeBlockAsm
-
-candidate3_match_encodeBlockAsm:
-	ADDL $0x02, CX
-	JMP  candidate_match_encodeBlockAsm
-
-candidate2_match_encodeBlockAsm:
-	MOVL R9, 24(SP)(R10*4)
-	INCL CX
-	MOVL R8, SI
-
-candidate_match_encodeBlockAsm:
-	MOVL  12(SP), DI
-	TESTL SI, SI
-	JZ    match_extend_back_end_encodeBlockAsm
-
-match_extend_back_loop_encodeBlockAsm:
-	CMPL CX, DI
-	JLE  match_extend_back_end_encodeBlockAsm
-	MOVB -1(DX)(SI*1), BL
-	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
-	JNE  match_extend_back_end_encodeBlockAsm
-	LEAL -1(CX), CX
-	DECL SI
-	JZ   match_extend_back_end_encodeBlockAsm
-	JMP  match_extend_back_loop_encodeBlockAsm
-
-match_extend_back_end_encodeBlockAsm:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 5(AX)(DI*1), DI
-	CMPQ DI, (SP)
-	JL   match_dst_size_check_encodeBlockAsm
-	MOVQ $0x00000000, ret+48(FP)
-	RET
-
-match_dst_size_check_encodeBlockAsm:
-	MOVL CX, DI
-	MOVL 12(SP), R8
-	CMPL R8, DI
-	JEQ  emit_literal_done_match_emit_encodeBlockAsm
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(R8*1), DI
-	SUBL R8, R9
-	LEAL -1(R9), R8
-	CMPL R8, $0x3c
-	JLT  one_byte_match_emit_encodeBlockAsm
-	CMPL R8, $0x00000100
-	JLT  two_bytes_match_emit_encodeBlockAsm
-	CMPL R8, $0x00010000
-	JLT  three_bytes_match_emit_encodeBlockAsm
-	CMPL R8, $0x01000000
-	JLT  four_bytes_match_emit_encodeBlockAsm
-	MOVB $0xfc, (AX)
-	MOVL R8, 1(AX)
-	ADDQ $0x05, AX
-	JMP  memmove_long_match_emit_encodeBlockAsm
-
-four_bytes_match_emit_encodeBlockAsm:
-	MOVL R8, R10
-	SHRL $0x10, R10
-	MOVB $0xf8, (AX)
-	MOVW R8, 1(AX)
-	MOVB R10, 3(AX)
-	ADDQ $0x04, AX
-	JMP  memmove_long_match_emit_encodeBlockAsm
-
-three_bytes_match_emit_encodeBlockAsm:
-	MOVB $0xf4, (AX)
-	MOVW R8, 1(AX)
-	ADDQ $0x03, AX
-	JMP  memmove_long_match_emit_encodeBlockAsm
-
-two_bytes_match_emit_encodeBlockAsm:
-	MOVB $0xf0, (AX)
-	MOVB R8, 1(AX)
-	ADDQ $0x02, AX
-	CMPL R8, $0x40
-	JL   memmove_match_emit_encodeBlockAsm
-	JMP  memmove_long_match_emit_encodeBlockAsm
-
-one_byte_match_emit_encodeBlockAsm:
-	SHLB $0x02, R8
-	MOVB R8, (AX)
-	ADDQ $0x01, AX
-
-memmove_match_emit_encodeBlockAsm:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveShort
-	CMPQ R9, $0x08
-	JLE  emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_8
-	CMPQ R9, $0x10
-	JBE  emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_8through16
-	CMPQ R9, $0x20
-	JBE  emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_17through32
-	JMP  emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_33through64
-
-emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_8:
-	MOVQ (DI), R10
-	MOVQ R10, (AX)
-	JMP  memmove_end_copy_match_emit_encodeBlockAsm
-
-emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_8through16:
-	MOVQ (DI), R10
-	MOVQ -8(DI)(R9*1), DI
-	MOVQ R10, (AX)
-	MOVQ DI, -8(AX)(R9*1)
-	JMP  memmove_end_copy_match_emit_encodeBlockAsm
-
-emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_17through32:
-	MOVOU (DI), X0
-	MOVOU -16(DI)(R9*1), X1
-	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
-	JMP   memmove_end_copy_match_emit_encodeBlockAsm
-
-emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_33through64:
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-
-memmove_end_copy_match_emit_encodeBlockAsm:
-	MOVQ R8, AX
-	JMP  emit_literal_done_match_emit_encodeBlockAsm
-
-memmove_long_match_emit_encodeBlockAsm:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveLong
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVQ  R9, R11
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R11
 	SHRQ  $0x05, R11
 	MOVQ  AX, R10
 	ANDL  $0x0000001f, R10
 	MOVQ  $0x00000040, R12
 	SUBQ  R10, R12
 	DECQ  R11
-	JA    emit_lit_memmove_long_match_emit_encodeBlockAsmlarge_forward_sse_loop_32
-	LEAQ  -32(DI)(R12*1), R10
+	JA    emit_lit_memmove_long_repeat_emit_encodeBlockAsmlarge_forward_sse_loop_32
+	LEAQ  -32(R9)(R12*1), R10
 	LEAQ  -32(AX)(R12*1), R13
 
-emit_lit_memmove_long_match_emit_encodeBlockAsmlarge_big_loop_back:
+emit_lit_memmove_long_repeat_emit_encodeBlockAsmlarge_big_loop_back:
 	MOVOU (R10), X4
 	MOVOU 16(R10), X5
 	MOVOA X4, (R13)
@@ -831,192 +222,254 @@ emit_lit_memmove_long_match_emit_encodeBlockAsmlarge_big_loop_back:
 	ADDQ  $0x20, R10
 	ADDQ  $0x20, R12
 	DECQ  R11
-	JNA   emit_lit_memmove_long_match_emit_encodeBlockAsmlarge_big_loop_back
+	JNA   emit_lit_memmove_long_repeat_emit_encodeBlockAsmlarge_big_loop_back
 
-emit_lit_memmove_long_match_emit_encodeBlockAsmlarge_forward_sse_loop_32:
-	MOVOU -32(DI)(R12*1), X4
-	MOVOU -16(DI)(R12*1), X5
+emit_lit_memmove_long_repeat_emit_encodeBlockAsmlarge_forward_sse_loop_32:
+	MOVOU -32(R9)(R12*1), X4
+	MOVOU -16(R9)(R12*1), X5
 	MOVOA X4, -32(AX)(R12*1)
 	MOVOA X5, -16(AX)(R12*1)
 	ADDQ  $0x20, R12
-	CMPQ  R9, R12
-	JAE   emit_lit_memmove_long_match_emit_encodeBlockAsmlarge_forward_sse_loop_32
+	CMPQ  R8, R12
+	JAE   emit_lit_memmove_long_repeat_emit_encodeBlockAsmlarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  R8, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
-emit_literal_done_match_emit_encodeBlockAsm:
-match_nolit_loop_encodeBlockAsm:
-	MOVL CX, DI
-	SUBL SI, DI
-	MOVL DI, 16(SP)
-	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), DI
-	SUBL CX, DI
-	LEAQ (DX)(CX*1), R8
-	LEAQ (DX)(SI*1), SI
+emit_literal_done_repeat_emit_encodeBlockAsm:
+	ADDL $0x05, CX
+	MOVL CX, BX
+	SUBL 16(SP), BX
+	MOVQ src_len+32(FP), R8
+	SUBL CX, R8
+	LEAQ (DX)(CX*1), R9
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
-	XORL R10, R10
-	CMPL DI, $0x08
-	JL   matchlen_match4_match_nolit_encodeBlockAsm
+	XORL R11, R11
+	CMPL R8, $0x08
+	JL   matchlen_match4_repeat_extend_encodeBlockAsm
 
-matchlen_loopback_match_nolit_encodeBlockAsm:
-	MOVQ  (R8)(R10*1), R9
-	XORQ  (SI)(R10*1), R9
-	TESTQ R9, R9
-	JZ    matchlen_loop_match_nolit_encodeBlockAsm
+matchlen_loopback_repeat_extend_encodeBlockAsm:
+	MOVQ  (R9)(R11*1), R10
+	XORQ  (BX)(R11*1), R10
+	TESTQ R10, R10
+	JZ    matchlen_loop_repeat_extend_encodeBlockAsm
 
 #ifdef GOAMD64_v3
-	TZCNTQ R9, R9
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R9, R9
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R9
-	LEAL (R10)(R9*1), R10
-	JMP  match_nolit_end_encodeBlockAsm
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
+	JMP  repeat_extend_forward_end_encodeBlockAsm
 
-matchlen_loop_match_nolit_encodeBlockAsm:
-	LEAL -8(DI), DI
-	LEAL 8(R10), R10
-	CMPL DI, $0x08
-	JGE  matchlen_loopback_match_nolit_encodeBlockAsm
-	JZ   match_nolit_end_encodeBlockAsm
+matchlen_loop_repeat_extend_encodeBlockAsm:
+	LEAL -8(R8), R8
+	LEAL 8(R11), R11
+	CMPL R8, $0x08
+	JGE  matchlen_loopback_repeat_extend_encodeBlockAsm
+	JZ   repeat_extend_forward_end_encodeBlockAsm
 
-matchlen_match4_match_nolit_encodeBlockAsm:
-	CMPL DI, $0x04
-	JL   matchlen_match2_match_nolit_encodeBlockAsm
-	MOVL (R8)(R10*1), R9
-	CMPL (SI)(R10*1), R9
-	JNE  matchlen_match2_match_nolit_encodeBlockAsm
-	SUBL $0x04, DI
-	LEAL 4(R10), R10
+matchlen_match4_repeat_extend_encodeBlockAsm:
+	CMPL R8, $0x04
+	JL   matchlen_match2_repeat_extend_encodeBlockAsm
+	MOVL (R9)(R11*1), R10
+	CMPL (BX)(R11*1), R10
+	JNE  matchlen_match2_repeat_extend_encodeBlockAsm
+	SUBL $0x04, R8
+	LEAL 4(R11), R11
 
-matchlen_match2_match_nolit_encodeBlockAsm:
-	CMPL DI, $0x02
-	JL   matchlen_match1_match_nolit_encodeBlockAsm
-	MOVW (R8)(R10*1), R9
-	CMPW (SI)(R10*1), R9
-	JNE  matchlen_match1_match_nolit_encodeBlockAsm
-	SUBL $0x02, DI
-	LEAL 2(R10), R10
+matchlen_match2_repeat_extend_encodeBlockAsm:
+	CMPL R8, $0x02
+	JL   matchlen_match1_repeat_extend_encodeBlockAsm
+	MOVW (R9)(R11*1), R10
+	CMPW (BX)(R11*1), R10
+	JNE  matchlen_match1_repeat_extend_encodeBlockAsm
+	SUBL $0x02, R8
+	LEAL 2(R11), R11
 
-matchlen_match1_match_nolit_encodeBlockAsm:
-	CMPL DI, $0x01
-	JL   match_nolit_end_encodeBlockAsm
-	MOVB (R8)(R10*1), R9
-	CMPB (SI)(R10*1), R9
-	JNE  match_nolit_end_encodeBlockAsm
-	LEAL 1(R10), R10
+matchlen_match1_repeat_extend_encodeBlockAsm:
+	CMPL R8, $0x01
+	JL   repeat_extend_forward_end_encodeBlockAsm
+	MOVB (R9)(R11*1), R10
+	CMPB (BX)(R11*1), R10
+	JNE  repeat_extend_forward_end_encodeBlockAsm
+	LEAL 1(R11), R11
 
-match_nolit_end_encodeBlockAsm:
-	ADDL R10, CX
-	MOVL 16(SP), SI
-	ADDL $0x04, R10
-	MOVL CX, 12(SP)
-
-	// emitCopy
-	CMPL SI, $0x00010000
-	JL   two_byte_offset_match_nolit_encodeBlockAsm
-
-four_bytes_loop_back_match_nolit_encodeBlockAsm:
-	CMPL R10, $0x40
-	JLE  four_bytes_remain_match_nolit_encodeBlockAsm
-	MOVB $0xff, (AX)
-	MOVL SI, 1(AX)
-	LEAL -64(R10), R10
-	ADDQ $0x05, AX
-	CMPL R10, $0x04
-	JL   four_bytes_remain_match_nolit_encodeBlockAsm
+repeat_extend_forward_end_encodeBlockAsm:
+	ADDL  R11, CX
+	MOVL  CX, BX
+	SUBL  SI, BX
+	MOVL  16(SP), SI
+	TESTL DI, DI
+	JZ    repeat_as_copy_encodeBlockAsm
 
 	// emitRepeat
-emit_repeat_again_match_nolit_encodeBlockAsm_emit_copy:
-	MOVL R10, DI
-	LEAL -4(R10), R10
+emit_repeat_again_match_repeat_encodeBlockAsm:
+	MOVL BX, DI
+	LEAL -4(BX), BX
 	CMPL DI, $0x08
-	JLE  repeat_two_match_nolit_encodeBlockAsm_emit_copy
+	JLE  repeat_two_match_repeat_encodeBlockAsm
 	CMPL DI, $0x0c
-	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy
+	JGE  cant_repeat_two_offset_match_repeat_encodeBlockAsm
 	CMPL SI, $0x00000800
-	JLT  repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy
+	JLT  repeat_two_offset_match_repeat_encodeBlockAsm
 
-cant_repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy:
-	CMPL R10, $0x00000104
-	JLT  repeat_three_match_nolit_encodeBlockAsm_emit_copy
-	CMPL R10, $0x00010100
-	JLT  repeat_four_match_nolit_encodeBlockAsm_emit_copy
-	CMPL R10, $0x0100ffff
-	JLT  repeat_five_match_nolit_encodeBlockAsm_emit_copy
-	LEAL -16842747(R10), R10
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
+cant_repeat_two_offset_match_repeat_encodeBlockAsm:
+	CMPL BX, $0x00000104
+	JLT  repeat_three_match_repeat_encodeBlockAsm
+	CMPL BX, $0x00010100
+	JLT  repeat_four_match_repeat_encodeBlockAsm
+	CMPL BX, $0x0100ffff
+	JLT  repeat_five_match_repeat_encodeBlockAsm
+	LEAL -16842747(BX), BX
+	MOVL $0xfffb001d, (AX)
 	MOVB $0xff, 4(AX)
 	ADDQ $0x05, AX
-	JMP  emit_repeat_again_match_nolit_encodeBlockAsm_emit_copy
+	JMP  emit_repeat_again_match_repeat_encodeBlockAsm
 
-repeat_five_match_nolit_encodeBlockAsm_emit_copy:
-	LEAL -65536(R10), R10
-	MOVL R10, SI
+repeat_five_match_repeat_encodeBlockAsm:
+	LEAL -65536(BX), BX
+	MOVL BX, SI
 	MOVW $0x001d, (AX)
-	MOVW R10, 2(AX)
+	MOVW BX, 2(AX)
 	SARL $0x10, SI
 	MOVB SI, 4(AX)
 	ADDQ $0x05, AX
-	JMP  match_nolit_emitcopy_end_encodeBlockAsm
+	JMP  repeat_end_emit_encodeBlockAsm
 
-repeat_four_match_nolit_encodeBlockAsm_emit_copy:
-	LEAL -256(R10), R10
+repeat_four_match_repeat_encodeBlockAsm:
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
-	JMP  match_nolit_emitcopy_end_encodeBlockAsm
+	JMP  repeat_end_emit_encodeBlockAsm
 
-repeat_three_match_nolit_encodeBlockAsm_emit_copy:
-	LEAL -4(R10), R10
+repeat_three_match_repeat_encodeBlockAsm:
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
-	JMP  match_nolit_emitcopy_end_encodeBlockAsm
+	JMP  repeat_end_emit_encodeBlockAsm
 
-repeat_two_match_nolit_encodeBlockAsm_emit_copy:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+repeat_two_match_repeat_encodeBlockAsm:
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
-	JMP  match_nolit_emitcopy_end_encodeBlockAsm
+	JMP  repeat_end_emit_encodeBlockAsm
 
-repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy:
+repeat_two_offset_match_repeat_encodeBlockAsm:
 	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
+	LEAL 1(DI)(BX*4), BX
 	MOVB SI, 1(AX)
 	SARL $0x08, SI
 	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
-	JMP  match_nolit_emitcopy_end_encodeBlockAsm
-	JMP four_bytes_loop_back_match_nolit_encodeBlockAsm
+	JMP  repeat_end_emit_encodeBlockAsm
 
-four_bytes_remain_match_nolit_encodeBlockAsm:
-	TESTL R10, R10
-	JZ    match_nolit_emitcopy_end_encodeBlockAsm
-	MOVB  $0x03, BL
-	LEAL  -4(BX)(R10*4), R10
-	MOVB  R10, (AX)
+repeat_as_copy_encodeBlockAsm:
+	// emitCopy
+	CMPL SI, $0x00010000
+	JL   two_byte_offset_repeat_as_copy_encodeBlockAsm
+	CMPL BX, $0x40
+	JLE  four_bytes_remain_repeat_as_copy_encodeBlockAsm
+	MOVB $0xff, (AX)
+	MOVL SI, 1(AX)
+	LEAL -64(BX), BX
+	ADDQ $0x05, AX
+	CMPL BX, $0x04
+	JL   four_bytes_remain_repeat_as_copy_encodeBlockAsm
+
+	// emitRepeat
+emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy:
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
+	JLE  repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy
+	CMPL DI, $0x0c
+	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy
+	CMPL SI, $0x00000800
+	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy
+
+cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy:
+	CMPL BX, $0x00000104
+	JLT  repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy
+	CMPL BX, $0x00010100
+	JLT  repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy
+	CMPL BX, $0x0100ffff
+	JLT  repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy
+	LEAL -16842747(BX), BX
+	MOVL $0xfffb001d, (AX)
+	MOVB $0xff, 4(AX)
+	ADDQ $0x05, AX
+	JMP  emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy
+
+repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy:
+	LEAL -65536(BX), BX
+	MOVL BX, SI
+	MOVW $0x001d, (AX)
+	MOVW BX, 2(AX)
+	SARL $0x10, SI
+	MOVB SI, 4(AX)
+	ADDQ $0x05, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy:
+	LEAL -256(BX), BX
+	MOVW $0x0019, (AX)
+	MOVW BX, 2(AX)
+	ADDQ $0x04, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy:
+	LEAL -4(BX), BX
+	MOVW $0x0015, (AX)
+	MOVB BL, 2(AX)
+	ADDQ $0x03, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy:
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy:
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+four_bytes_remain_repeat_as_copy_encodeBlockAsm:
+	TESTL BX, BX
+	JZ    repeat_end_emit_encodeBlockAsm
+	XORL  DI, DI
+	LEAL  -1(DI)(BX*4), BX
+	MOVB  BL, (AX)
 	MOVL  SI, 1(AX)
 	ADDQ  $0x05, AX
-	JMP   match_nolit_emitcopy_end_encodeBlockAsm
+	JMP   repeat_end_emit_encodeBlockAsm
 
-two_byte_offset_match_nolit_encodeBlockAsm:
-	CMPL R10, $0x40
-	JLE  two_byte_offset_short_match_nolit_encodeBlockAsm
+two_byte_offset_repeat_as_copy_encodeBlockAsm:
+	CMPL BX, $0x40
+	JLE  two_byte_offset_short_repeat_as_copy_encodeBlockAsm
 	CMPL SI, $0x00000800
-	JAE  long_offset_short_match_nolit_encodeBlockAsm
+	JAE  long_offset_short_repeat_as_copy_encodeBlockAsm
 	MOVL $0x00000001, DI
 	LEAL 16(DI), DI
 	MOVB SI, 1(AX)
@@ -1026,200 +479,731 @@ two_byte_offset_match_nolit_encodeBlockAsm:
 	ORL  R8, DI
 	MOVB DI, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, R10
+	SUBL $0x08, BX
 
 	// emitRepeat
-	LEAL -4(R10), R10
+	LEAL -4(BX), BX
+	JMP  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
+
+emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
+	JLE  repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
+	CMPL DI, $0x0c
+	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
+	CMPL SI, $0x00000800
+	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
+
+cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
+	CMPL BX, $0x00000104
+	JLT  repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
+	CMPL BX, $0x00010100
+	JLT  repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
+	CMPL BX, $0x0100ffff
+	JLT  repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
+	LEAL -16842747(BX), BX
+	MOVL $0xfffb001d, (AX)
+	MOVB $0xff, 4(AX)
+	ADDQ $0x05, AX
+	JMP  emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b
+
+repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
+	LEAL -65536(BX), BX
+	MOVL BX, SI
+	MOVW $0x001d, (AX)
+	MOVW BX, 2(AX)
+	SARL $0x10, SI
+	MOVB SI, 4(AX)
+	ADDQ $0x05, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
+	LEAL -256(BX), BX
+	MOVW $0x0019, (AX)
+	MOVW BX, 2(AX)
+	ADDQ $0x04, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
+	LEAL -4(BX), BX
+	MOVW $0x0015, (AX)
+	MOVB BL, 2(AX)
+	ADDQ $0x03, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short_2b:
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+long_offset_short_repeat_as_copy_encodeBlockAsm:
+	MOVB $0xee, (AX)
+	MOVW SI, 1(AX)
+	LEAL -60(BX), BX
+	ADDQ $0x03, AX
+
+	// emitRepeat
+emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy_short:
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
+	JLE  repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy_short
+	CMPL DI, $0x0c
+	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short
+	CMPL SI, $0x00000800
+	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short
+
+cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short:
+	CMPL BX, $0x00000104
+	JLT  repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy_short
+	CMPL BX, $0x00010100
+	JLT  repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy_short
+	CMPL BX, $0x0100ffff
+	JLT  repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy_short
+	LEAL -16842747(BX), BX
+	MOVL $0xfffb001d, (AX)
+	MOVB $0xff, 4(AX)
+	ADDQ $0x05, AX
+	JMP  emit_repeat_again_repeat_as_copy_encodeBlockAsm_emit_copy_short
+
+repeat_five_repeat_as_copy_encodeBlockAsm_emit_copy_short:
+	LEAL -65536(BX), BX
+	MOVL BX, SI
+	MOVW $0x001d, (AX)
+	MOVW BX, 2(AX)
+	SARL $0x10, SI
+	MOVB SI, 4(AX)
+	ADDQ $0x05, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_four_repeat_as_copy_encodeBlockAsm_emit_copy_short:
+	LEAL -256(BX), BX
+	MOVW $0x0019, (AX)
+	MOVW BX, 2(AX)
+	ADDQ $0x04, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_three_repeat_as_copy_encodeBlockAsm_emit_copy_short:
+	LEAL -4(BX), BX
+	MOVW $0x0015, (AX)
+	MOVB BL, 2(AX)
+	ADDQ $0x03, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_two_repeat_as_copy_encodeBlockAsm_emit_copy_short:
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+repeat_two_offset_repeat_as_copy_encodeBlockAsm_emit_copy_short:
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+two_byte_offset_short_repeat_as_copy_encodeBlockAsm:
+	MOVL BX, DI
+	SHLL $0x02, DI
+	CMPL BX, $0x0c
+	JGE  emit_copy_three_repeat_as_copy_encodeBlockAsm
+	CMPL SI, $0x00000800
+	JGE  emit_copy_three_repeat_as_copy_encodeBlockAsm
+	LEAL -15(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeBlockAsm
+
+emit_copy_three_repeat_as_copy_encodeBlockAsm:
+	LEAL -2(DI), DI
+	MOVB DI, (AX)
+	MOVW SI, 1(AX)
+	ADDQ $0x03, AX
+
+repeat_end_emit_encodeBlockAsm:
+	MOVL CX, 12(SP)
+	JMP  search_loop_encodeBlockAsm
+
+no_repeat_found_encodeBlockAsm:
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate_match_encodeBlockAsm
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
+	JEQ  candidate2_match_encodeBlockAsm
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate3_match_encodeBlockAsm
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeBlockAsm
+
+candidate3_match_encodeBlockAsm:
+	ADDL $0x02, CX
+	JMP  candidate_match_encodeBlockAsm
+
+candidate2_match_encodeBlockAsm:
+	MOVL R8, 24(SP)(R9*4)
+	INCL CX
+	MOVL DI, BX
+
+candidate_match_encodeBlockAsm:
+	MOVL  12(SP), SI
+	TESTL BX, BX
+	JZ    match_extend_back_end_encodeBlockAsm
+
+match_extend_back_loop_encodeBlockAsm:
+	CMPL CX, SI
+	JLE  match_extend_back_end_encodeBlockAsm
+	MOVB -1(DX)(BX*1), DI
+	MOVB -1(DX)(CX*1), R8
+	CMPB DI, R8
+	JNE  match_extend_back_end_encodeBlockAsm
+	LEAL -1(CX), CX
+	DECL BX
+	JZ   match_extend_back_end_encodeBlockAsm
+	JMP  match_extend_back_loop_encodeBlockAsm
+
+match_extend_back_end_encodeBlockAsm:
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 5(AX)(SI*1), SI
+	CMPQ SI, (SP)
+	JL   match_dst_size_check_encodeBlockAsm
+	MOVQ $0x00000000, ret+48(FP)
+	RET
+
+match_dst_size_check_encodeBlockAsm:
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
+	JEQ  emit_literal_done_match_emit_encodeBlockAsm
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), DI
+	CMPL DI, $0x3c
+	JLT  one_byte_match_emit_encodeBlockAsm
+	CMPL DI, $0x00000100
+	JLT  two_bytes_match_emit_encodeBlockAsm
+	CMPL DI, $0x00010000
+	JLT  three_bytes_match_emit_encodeBlockAsm
+	CMPL DI, $0x01000000
+	JLT  four_bytes_match_emit_encodeBlockAsm
+	MOVB $0xfc, (AX)
+	MOVL DI, 1(AX)
+	ADDQ $0x05, AX
+	JMP  memmove_long_match_emit_encodeBlockAsm
+
+four_bytes_match_emit_encodeBlockAsm:
+	MOVL DI, R9
+	SHRL $0x10, R9
+	MOVB $0xf8, (AX)
+	MOVW DI, 1(AX)
+	MOVB R9, 3(AX)
+	ADDQ $0x04, AX
+	JMP  memmove_long_match_emit_encodeBlockAsm
+
+three_bytes_match_emit_encodeBlockAsm:
+	MOVB $0xf4, (AX)
+	MOVW DI, 1(AX)
+	ADDQ $0x03, AX
+	JMP  memmove_long_match_emit_encodeBlockAsm
+
+two_bytes_match_emit_encodeBlockAsm:
+	MOVB $0xf0, (AX)
+	MOVB DI, 1(AX)
+	ADDQ $0x02, AX
+	CMPL DI, $0x40
+	JL   memmove_match_emit_encodeBlockAsm
+	JMP  memmove_long_match_emit_encodeBlockAsm
+
+one_byte_match_emit_encodeBlockAsm:
+	SHLB $0x02, DI
+	MOVB DI, (AX)
+	ADDQ $0x01, AX
+
+memmove_match_emit_encodeBlockAsm:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveShort
+	CMPQ R8, $0x08
+	JLE  emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_8
+	CMPQ R8, $0x10
+	JBE  emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_8through16
+	CMPQ R8, $0x20
+	JBE  emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_17through32
+	JMP  emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_33through64
+
+emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_8:
+	MOVQ (SI), R9
+	MOVQ R9, (AX)
+	JMP  memmove_end_copy_match_emit_encodeBlockAsm
+
+emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_8through16:
+	MOVQ (SI), R9
+	MOVQ -8(SI)(R8*1), SI
+	MOVQ R9, (AX)
+	MOVQ SI, -8(AX)(R8*1)
+	JMP  memmove_end_copy_match_emit_encodeBlockAsm
+
+emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_17through32:
+	MOVOU (SI), X0
+	MOVOU -16(SI)(R8*1), X1
+	MOVOU X0, (AX)
+	MOVOU X1, -16(AX)(R8*1)
+	JMP   memmove_end_copy_match_emit_encodeBlockAsm
+
+emit_lit_memmove_match_emit_encodeBlockAsm_memmove_move_33through64:
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+
+memmove_end_copy_match_emit_encodeBlockAsm:
+	MOVQ DI, AX
+	JMP  emit_literal_done_match_emit_encodeBlockAsm
+
+memmove_long_match_emit_encodeBlockAsm:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveLong
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVQ  R8, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
+	JA    emit_lit_memmove_long_match_emit_encodeBlockAsmlarge_forward_sse_loop_32
+	LEAQ  -32(SI)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
+
+emit_lit_memmove_long_match_emit_encodeBlockAsmlarge_big_loop_back:
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
+	ADDQ  $0x20, R12
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
+	JNA   emit_lit_memmove_long_match_emit_encodeBlockAsmlarge_big_loop_back
+
+emit_lit_memmove_long_match_emit_encodeBlockAsmlarge_forward_sse_loop_32:
+	MOVOU -32(SI)(R11*1), X4
+	MOVOU -16(SI)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  R8, R11
+	JAE   emit_lit_memmove_long_match_emit_encodeBlockAsmlarge_forward_sse_loop_32
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  DI, AX
+
+emit_literal_done_match_emit_encodeBlockAsm:
+match_nolit_loop_encodeBlockAsm:
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
+	ADDL $0x04, CX
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
+
+	// matchLen
+	XORL R9, R9
+	CMPL SI, $0x08
+	JL   matchlen_match4_match_nolit_encodeBlockAsm
+
+matchlen_loopback_match_nolit_encodeBlockAsm:
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
+	JZ    matchlen_loop_match_nolit_encodeBlockAsm
+
+#ifdef GOAMD64_v3
+	TZCNTQ R8, R8
+
+#else
+	BSFQ R8, R8
+
+#endif
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
+	JMP  match_nolit_end_encodeBlockAsm
+
+matchlen_loop_match_nolit_encodeBlockAsm:
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
+	JGE  matchlen_loopback_match_nolit_encodeBlockAsm
+	JZ   match_nolit_end_encodeBlockAsm
+
+matchlen_match4_match_nolit_encodeBlockAsm:
+	CMPL SI, $0x04
+	JL   matchlen_match2_match_nolit_encodeBlockAsm
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
+	JNE  matchlen_match2_match_nolit_encodeBlockAsm
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
+
+matchlen_match2_match_nolit_encodeBlockAsm:
+	CMPL SI, $0x02
+	JL   matchlen_match1_match_nolit_encodeBlockAsm
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
+	JNE  matchlen_match1_match_nolit_encodeBlockAsm
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
+
+matchlen_match1_match_nolit_encodeBlockAsm:
+	CMPL SI, $0x01
+	JL   match_nolit_end_encodeBlockAsm
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
+	JNE  match_nolit_end_encodeBlockAsm
+	LEAL 1(R9), R9
+
+match_nolit_end_encodeBlockAsm:
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
+	MOVL CX, 12(SP)
+
+	// emitCopy
+	CMPL BX, $0x00010000
+	JL   two_byte_offset_match_nolit_encodeBlockAsm
+	CMPL R9, $0x40
+	JLE  four_bytes_remain_match_nolit_encodeBlockAsm
+	MOVB $0xff, (AX)
+	MOVL BX, 1(AX)
+	LEAL -64(R9), R9
+	ADDQ $0x05, AX
+	CMPL R9, $0x04
+	JL   four_bytes_remain_match_nolit_encodeBlockAsm
+
+	// emitRepeat
+emit_repeat_again_match_nolit_encodeBlockAsm_emit_copy:
+	MOVL R9, SI
+	LEAL -4(R9), R9
+	CMPL SI, $0x08
+	JLE  repeat_two_match_nolit_encodeBlockAsm_emit_copy
+	CMPL SI, $0x0c
+	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy
+	CMPL BX, $0x00000800
+	JLT  repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy
+
+cant_repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy:
+	CMPL R9, $0x00000104
+	JLT  repeat_three_match_nolit_encodeBlockAsm_emit_copy
+	CMPL R9, $0x00010100
+	JLT  repeat_four_match_nolit_encodeBlockAsm_emit_copy
+	CMPL R9, $0x0100ffff
+	JLT  repeat_five_match_nolit_encodeBlockAsm_emit_copy
+	LEAL -16842747(R9), R9
+	MOVL $0xfffb001d, (AX)
+	MOVB $0xff, 4(AX)
+	ADDQ $0x05, AX
+	JMP  emit_repeat_again_match_nolit_encodeBlockAsm_emit_copy
+
+repeat_five_match_nolit_encodeBlockAsm_emit_copy:
+	LEAL -65536(R9), R9
+	MOVL R9, BX
+	MOVW $0x001d, (AX)
+	MOVW R9, 2(AX)
+	SARL $0x10, BX
+	MOVB BL, 4(AX)
+	ADDQ $0x05, AX
+	JMP  match_nolit_emitcopy_end_encodeBlockAsm
+
+repeat_four_match_nolit_encodeBlockAsm_emit_copy:
+	LEAL -256(R9), R9
+	MOVW $0x0019, (AX)
+	MOVW R9, 2(AX)
+	ADDQ $0x04, AX
+	JMP  match_nolit_emitcopy_end_encodeBlockAsm
+
+repeat_three_match_nolit_encodeBlockAsm_emit_copy:
+	LEAL -4(R9), R9
+	MOVW $0x0015, (AX)
+	MOVB R9, 2(AX)
+	ADDQ $0x03, AX
+	JMP  match_nolit_emitcopy_end_encodeBlockAsm
+
+repeat_two_match_nolit_encodeBlockAsm_emit_copy:
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
+	ADDQ $0x02, AX
+	JMP  match_nolit_emitcopy_end_encodeBlockAsm
+
+repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy:
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
+	ADDQ $0x02, AX
+	JMP  match_nolit_emitcopy_end_encodeBlockAsm
+
+four_bytes_remain_match_nolit_encodeBlockAsm:
+	TESTL R9, R9
+	JZ    match_nolit_emitcopy_end_encodeBlockAsm
+	XORL  SI, SI
+	LEAL  -1(SI)(R9*4), R9
+	MOVB  R9, (AX)
+	MOVL  BX, 1(AX)
+	ADDQ  $0x05, AX
+	JMP   match_nolit_emitcopy_end_encodeBlockAsm
+
+two_byte_offset_match_nolit_encodeBlockAsm:
+	CMPL R9, $0x40
+	JLE  two_byte_offset_short_match_nolit_encodeBlockAsm
+	CMPL BX, $0x00000800
+	JAE  long_offset_short_match_nolit_encodeBlockAsm
+	MOVL $0x00000001, SI
+	LEAL 16(SI), SI
+	MOVB BL, 1(AX)
+	MOVL BX, DI
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, SI
+	MOVB SI, (AX)
+	ADDQ $0x02, AX
+	SUBL $0x08, R9
+
+	// emitRepeat
+	LEAL -4(R9), R9
 	JMP  cant_repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy_short_2b
 
 emit_repeat_again_match_nolit_encodeBlockAsm_emit_copy_short_2b:
-	MOVL R10, DI
-	LEAL -4(R10), R10
-	CMPL DI, $0x08
+	MOVL R9, SI
+	LEAL -4(R9), R9
+	CMPL SI, $0x08
 	JLE  repeat_two_match_nolit_encodeBlockAsm_emit_copy_short_2b
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy_short_2b
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy_short_2b
 
 cant_repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy_short_2b:
-	CMPL R10, $0x00000104
+	CMPL R9, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBlockAsm_emit_copy_short_2b
-	CMPL R10, $0x00010100
+	CMPL R9, $0x00010100
 	JLT  repeat_four_match_nolit_encodeBlockAsm_emit_copy_short_2b
-	CMPL R10, $0x0100ffff
+	CMPL R9, $0x0100ffff
 	JLT  repeat_five_match_nolit_encodeBlockAsm_emit_copy_short_2b
-	LEAL -16842747(R10), R10
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
+	LEAL -16842747(R9), R9
+	MOVL $0xfffb001d, (AX)
 	MOVB $0xff, 4(AX)
 	ADDQ $0x05, AX
 	JMP  emit_repeat_again_match_nolit_encodeBlockAsm_emit_copy_short_2b
 
 repeat_five_match_nolit_encodeBlockAsm_emit_copy_short_2b:
-	LEAL -65536(R10), R10
-	MOVL R10, SI
+	LEAL -65536(R9), R9
+	MOVL R9, BX
 	MOVW $0x001d, (AX)
-	MOVW R10, 2(AX)
-	SARL $0x10, SI
-	MOVB SI, 4(AX)
+	MOVW R9, 2(AX)
+	SARL $0x10, BX
+	MOVB BL, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm
 
 repeat_four_match_nolit_encodeBlockAsm_emit_copy_short_2b:
-	LEAL -256(R10), R10
+	LEAL -256(R9), R9
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW R9, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm
 
 repeat_three_match_nolit_encodeBlockAsm_emit_copy_short_2b:
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB R9, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm
 
 repeat_two_match_nolit_encodeBlockAsm_emit_copy_short_2b:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm
 
 repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy_short_2b:
-	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
-	MOVB SI, 1(AX)
-	SARL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm
 
 long_offset_short_match_nolit_encodeBlockAsm:
 	MOVB $0xee, (AX)
-	MOVW SI, 1(AX)
-	LEAL -60(R10), R10
+	MOVW BX, 1(AX)
+	LEAL -60(R9), R9
 	ADDQ $0x03, AX
 
 	// emitRepeat
 emit_repeat_again_match_nolit_encodeBlockAsm_emit_copy_short:
-	MOVL R10, DI
-	LEAL -4(R10), R10
-	CMPL DI, $0x08
+	MOVL R9, SI
+	LEAL -4(R9), R9
+	CMPL SI, $0x08
 	JLE  repeat_two_match_nolit_encodeBlockAsm_emit_copy_short
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy_short
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy_short
 
 cant_repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy_short:
-	CMPL R10, $0x00000104
+	CMPL R9, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBlockAsm_emit_copy_short
-	CMPL R10, $0x00010100
+	CMPL R9, $0x00010100
 	JLT  repeat_four_match_nolit_encodeBlockAsm_emit_copy_short
-	CMPL R10, $0x0100ffff
+	CMPL R9, $0x0100ffff
 	JLT  repeat_five_match_nolit_encodeBlockAsm_emit_copy_short
-	LEAL -16842747(R10), R10
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
+	LEAL -16842747(R9), R9
+	MOVL $0xfffb001d, (AX)
 	MOVB $0xff, 4(AX)
 	ADDQ $0x05, AX
 	JMP  emit_repeat_again_match_nolit_encodeBlockAsm_emit_copy_short
 
 repeat_five_match_nolit_encodeBlockAsm_emit_copy_short:
-	LEAL -65536(R10), R10
-	MOVL R10, SI
+	LEAL -65536(R9), R9
+	MOVL R9, BX
 	MOVW $0x001d, (AX)
-	MOVW R10, 2(AX)
-	SARL $0x10, SI
-	MOVB SI, 4(AX)
+	MOVW R9, 2(AX)
+	SARL $0x10, BX
+	MOVB BL, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm
 
 repeat_four_match_nolit_encodeBlockAsm_emit_copy_short:
-	LEAL -256(R10), R10
+	LEAL -256(R9), R9
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW R9, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm
 
 repeat_three_match_nolit_encodeBlockAsm_emit_copy_short:
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB R9, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm
 
 repeat_two_match_nolit_encodeBlockAsm_emit_copy_short:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm
 
 repeat_two_offset_match_nolit_encodeBlockAsm_emit_copy_short:
-	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
-	MOVB SI, 1(AX)
-	SARL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm
-	JMP two_byte_offset_match_nolit_encodeBlockAsm
 
 two_byte_offset_short_match_nolit_encodeBlockAsm:
-	CMPL R10, $0x0c
+	MOVL R9, SI
+	SHLL $0x02, SI
+	CMPL R9, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeBlockAsm
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeBlockAsm
-	MOVB $0x01, BL
-	LEAL -16(BX)(R10*4), R10
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	LEAL -15(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm
 
 emit_copy_three_match_nolit_encodeBlockAsm:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R10*4), R10
-	MOVB R10, (AX)
-	MOVW SI, 1(AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeBlockAsm:
 	CMPL CX, 8(SP)
 	JGE  emit_remainder_encodeBlockAsm
-	MOVQ -2(DX)(CX*1), DI
+	MOVQ -2(DX)(CX*1), SI
 	CMPQ AX, (SP)
 	JL   match_nolit_dst_ok_encodeBlockAsm
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_nolit_dst_ok_encodeBlockAsm:
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  DI, R8
-	SHRQ  $0x10, DI
-	MOVQ  DI, SI
-	SHLQ  $0x10, R8
-	IMULQ R9, R8
-	SHRQ  $0x32, R8
-	SHLQ  $0x10, SI
-	IMULQ R9, SI
-	SHRQ  $0x32, SI
-	LEAL  -2(CX), R9
-	LEAQ  24(SP)(SI*4), R10
-	MOVL  (R10), SI
-	MOVL  R9, 24(SP)(R8*4)
-	MOVL  CX, (R10)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x10, DI
+	IMULQ R8, DI
+	SHRQ  $0x32, DI
+	SHLQ  $0x10, BX
+	IMULQ R8, BX
+	SHRQ  $0x32, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
 	JEQ   match_nolit_loop_encodeBlockAsm
 	INCL  CX
 	JMP   search_loop_encodeBlockAsm
@@ -1423,8 +1407,8 @@ zero_loop_encodeBlockAsm4MB:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -1434,555 +1418,551 @@ zero_loop_encodeBlockAsm4MB:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeBlockAsm4MB:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x06, SI
-	LEAL  4(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x06, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeBlockAsm4MB
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHRQ  $0x08, R11
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
 	SHLQ  $0x10, R10
-	IMULQ R9, R10
+	IMULQ R8, R10
 	SHRQ  $0x32, R10
-	SHLQ  $0x10, R11
-	IMULQ R9, R11
-	SHRQ  $0x32, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  24(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	LEAL  1(CX), R10
-	MOVL  R10, 24(SP)(R11*4)
-	MOVQ  DI, R10
-	SHRQ  $0x10, R10
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x32, R10
-	MOVL  CX, R9
-	SUBL  16(SP), R9
-	MOVL  1(DX)(R9*1), R11
-	MOVQ  DI, R9
-	SHRQ  $0x08, R9
-	CMPL  R9, R11
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
+	MOVL  CX, R8
+	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
 	JNE   no_repeat_found_encodeBlockAsm4MB
-	LEAL  1(CX), DI
-	MOVL  12(SP), R8
-	MOVL  DI, SI
-	SUBL  16(SP), SI
+	LEAL  1(CX), SI
+	MOVL  12(SP), DI
+	MOVL  SI, BX
+	SUBL  16(SP), BX
 	JZ    repeat_extend_back_end_encodeBlockAsm4MB
 
 repeat_extend_back_loop_encodeBlockAsm4MB:
-	CMPL DI, R8
+	CMPL SI, DI
 	JLE  repeat_extend_back_end_encodeBlockAsm4MB
-	MOVB -1(DX)(SI*1), BL
-	MOVB -1(DX)(DI*1), R9
-	CMPB BL, R9
+	MOVB -1(DX)(BX*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
 	JNE  repeat_extend_back_end_encodeBlockAsm4MB
-	LEAL -1(DI), DI
-	DECL SI
+	LEAL -1(SI), SI
+	DECL BX
 	JNZ  repeat_extend_back_loop_encodeBlockAsm4MB
 
 repeat_extend_back_end_encodeBlockAsm4MB:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_repeat_emit_encodeBlockAsm4MB
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_repeat_emit_encodeBlockAsm4MB
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_repeat_emit_encodeBlockAsm4MB
-	CMPL SI, $0x00010000
+	CMPL BX, $0x00010000
 	JLT  three_bytes_repeat_emit_encodeBlockAsm4MB
-	MOVL SI, R11
-	SHRL $0x10, R11
+	MOVL BX, R10
+	SHRL $0x10, R10
 	MOVB $0xf8, (AX)
-	MOVW SI, 1(AX)
-	MOVB R11, 3(AX)
+	MOVW BX, 1(AX)
+	MOVB R10, 3(AX)
 	ADDQ $0x04, AX
 	JMP  memmove_long_repeat_emit_encodeBlockAsm4MB
 
 three_bytes_repeat_emit_encodeBlockAsm4MB:
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_repeat_emit_encodeBlockAsm4MB
 
 two_bytes_repeat_emit_encodeBlockAsm4MB:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_repeat_emit_encodeBlockAsm4MB
 	JMP  memmove_long_repeat_emit_encodeBlockAsm4MB
 
 one_byte_repeat_emit_encodeBlockAsm4MB:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_repeat_emit_encodeBlockAsm4MB:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_repeat_emit_encodeBlockAsm4MB_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_repeat_emit_encodeBlockAsm4MB_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_repeat_emit_encodeBlockAsm4MB_memmove_move_17through32
 	JMP  emit_lit_memmove_repeat_emit_encodeBlockAsm4MB_memmove_move_33through64
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm4MB_memmove_move_8:
-	MOVQ (R10), R11
-	MOVQ R11, (AX)
+	MOVQ (R9), R10
+	MOVQ R10, (AX)
 	JMP  memmove_end_copy_repeat_emit_encodeBlockAsm4MB
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm4MB_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_repeat_emit_encodeBlockAsm4MB
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm4MB_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_repeat_emit_encodeBlockAsm4MB
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm4MB_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_repeat_emit_encodeBlockAsm4MB:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_repeat_emit_encodeBlockAsm4MB
 
 memmove_long_repeat_emit_encodeBlockAsm4MB:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R12
-	SHRQ  $0x05, R12
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R13
-	SUBQ  R11, R13
-	DECQ  R12
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R11
+	SHRQ  $0x05, R11
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R12
+	SUBQ  R10, R12
+	DECQ  R11
 	JA    emit_lit_memmove_long_repeat_emit_encodeBlockAsm4MBlarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R13*1), R11
-	LEAQ  -32(AX)(R13*1), R14
+	LEAQ  -32(R9)(R12*1), R10
+	LEAQ  -32(AX)(R12*1), R13
 
 emit_lit_memmove_long_repeat_emit_encodeBlockAsm4MBlarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R14)
-	MOVOA X5, 16(R14)
-	ADDQ  $0x20, R14
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R13)
+	MOVOA X5, 16(R13)
 	ADDQ  $0x20, R13
-	DECQ  R12
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R12
+	DECQ  R11
 	JNA   emit_lit_memmove_long_repeat_emit_encodeBlockAsm4MBlarge_big_loop_back
 
 emit_lit_memmove_long_repeat_emit_encodeBlockAsm4MBlarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R13*1), X4
-	MOVOU -16(R10)(R13*1), X5
-	MOVOA X4, -32(AX)(R13*1)
-	MOVOA X5, -16(AX)(R13*1)
-	ADDQ  $0x20, R13
-	CMPQ  R9, R13
+	MOVOU -32(R9)(R12*1), X4
+	MOVOU -16(R9)(R12*1), X5
+	MOVOA X4, -32(AX)(R12*1)
+	MOVOA X5, -16(AX)(R12*1)
+	ADDQ  $0x20, R12
+	CMPQ  R8, R12
 	JAE   emit_lit_memmove_long_repeat_emit_encodeBlockAsm4MBlarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_repeat_emit_encodeBlockAsm4MB:
 	ADDL $0x05, CX
-	MOVL CX, SI
-	SUBL 16(SP), SI
-	MOVQ src_len+32(FP), R9
-	SUBL CX, R9
-	LEAQ (DX)(CX*1), R10
-	LEAQ (DX)(SI*1), SI
+	MOVL CX, BX
+	SUBL 16(SP), BX
+	MOVQ src_len+32(FP), R8
+	SUBL CX, R8
+	LEAQ (DX)(CX*1), R9
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
-	XORL R12, R12
-	CMPL R9, $0x08
+	XORL R11, R11
+	CMPL R8, $0x08
 	JL   matchlen_match4_repeat_extend_encodeBlockAsm4MB
 
 matchlen_loopback_repeat_extend_encodeBlockAsm4MB:
-	MOVQ  (R10)(R12*1), R11
-	XORQ  (SI)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R9)(R11*1), R10
+	XORQ  (BX)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_repeat_extend_encodeBlockAsm4MB
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  repeat_extend_forward_end_encodeBlockAsm4MB
 
 matchlen_loop_repeat_extend_encodeBlockAsm4MB:
-	LEAL -8(R9), R9
-	LEAL 8(R12), R12
-	CMPL R9, $0x08
+	LEAL -8(R8), R8
+	LEAL 8(R11), R11
+	CMPL R8, $0x08
 	JGE  matchlen_loopback_repeat_extend_encodeBlockAsm4MB
 	JZ   repeat_extend_forward_end_encodeBlockAsm4MB
 
 matchlen_match4_repeat_extend_encodeBlockAsm4MB:
-	CMPL R9, $0x04
+	CMPL R8, $0x04
 	JL   matchlen_match2_repeat_extend_encodeBlockAsm4MB
-	MOVL (R10)(R12*1), R11
-	CMPL (SI)(R12*1), R11
+	MOVL (R9)(R11*1), R10
+	CMPL (BX)(R11*1), R10
 	JNE  matchlen_match2_repeat_extend_encodeBlockAsm4MB
-	SUBL $0x04, R9
-	LEAL 4(R12), R12
+	SUBL $0x04, R8
+	LEAL 4(R11), R11
 
 matchlen_match2_repeat_extend_encodeBlockAsm4MB:
-	CMPL R9, $0x02
+	CMPL R8, $0x02
 	JL   matchlen_match1_repeat_extend_encodeBlockAsm4MB
-	MOVW (R10)(R12*1), R11
-	CMPW (SI)(R12*1), R11
+	MOVW (R9)(R11*1), R10
+	CMPW (BX)(R11*1), R10
 	JNE  matchlen_match1_repeat_extend_encodeBlockAsm4MB
-	SUBL $0x02, R9
-	LEAL 2(R12), R12
+	SUBL $0x02, R8
+	LEAL 2(R11), R11
 
 matchlen_match1_repeat_extend_encodeBlockAsm4MB:
-	CMPL R9, $0x01
+	CMPL R8, $0x01
 	JL   repeat_extend_forward_end_encodeBlockAsm4MB
-	MOVB (R10)(R12*1), R11
-	CMPB (SI)(R12*1), R11
+	MOVB (R9)(R11*1), R10
+	CMPB (BX)(R11*1), R10
 	JNE  repeat_extend_forward_end_encodeBlockAsm4MB
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 repeat_extend_forward_end_encodeBlockAsm4MB:
-	ADDL  R12, CX
-	MOVL  CX, SI
-	SUBL  DI, SI
-	MOVL  16(SP), DI
-	TESTL R8, R8
+	ADDL  R11, CX
+	MOVL  CX, BX
+	SUBL  SI, BX
+	MOVL  16(SP), SI
+	TESTL DI, DI
 	JZ    repeat_as_copy_encodeBlockAsm4MB
 
 	// emitRepeat
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
 	JLE  repeat_two_match_repeat_encodeBlockAsm4MB
-	CMPL R8, $0x0c
+	CMPL DI, $0x0c
 	JGE  cant_repeat_two_offset_match_repeat_encodeBlockAsm4MB
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JLT  repeat_two_offset_match_repeat_encodeBlockAsm4MB
 
 cant_repeat_two_offset_match_repeat_encodeBlockAsm4MB:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_match_repeat_encodeBlockAsm4MB
-	CMPL SI, $0x00010100
+	CMPL BX, $0x00010100
 	JLT  repeat_four_match_repeat_encodeBlockAsm4MB
-	LEAL -65536(SI), SI
-	MOVL SI, DI
+	LEAL -65536(BX), BX
+	MOVL BX, SI
 	MOVW $0x001d, (AX)
-	MOVW SI, 2(AX)
-	SARL $0x10, DI
-	MOVB DI, 4(AX)
+	MOVW BX, 2(AX)
+	SARL $0x10, SI
+	MOVB SI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_four_match_repeat_encodeBlockAsm4MB:
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_three_match_repeat_encodeBlockAsm4MB:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_two_match_repeat_encodeBlockAsm4MB:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_two_offset_match_repeat_encodeBlockAsm4MB:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_as_copy_encodeBlockAsm4MB:
 	// emitCopy
-	CMPL DI, $0x00010000
+	CMPL SI, $0x00010000
 	JL   two_byte_offset_repeat_as_copy_encodeBlockAsm4MB
-
-four_bytes_loop_back_repeat_as_copy_encodeBlockAsm4MB:
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JLE  four_bytes_remain_repeat_as_copy_encodeBlockAsm4MB
 	MOVB $0xff, (AX)
-	MOVL DI, 1(AX)
-	LEAL -64(SI), SI
+	MOVL SI, 1(AX)
+	LEAL -64(BX), BX
 	ADDQ $0x05, AX
-	CMPL SI, $0x04
+	CMPL BX, $0x04
 	JL   four_bytes_remain_repeat_as_copy_encodeBlockAsm4MB
 
 	// emitRepeat
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
 	JLE  repeat_two_repeat_as_copy_encodeBlockAsm4MB_emit_copy
-	CMPL R8, $0x0c
+	CMPL DI, $0x0c
 	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy
 
 cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_repeat_as_copy_encodeBlockAsm4MB_emit_copy
-	CMPL SI, $0x00010100
+	CMPL BX, $0x00010100
 	JLT  repeat_four_repeat_as_copy_encodeBlockAsm4MB_emit_copy
-	LEAL -65536(SI), SI
-	MOVL SI, DI
+	LEAL -65536(BX), BX
+	MOVL BX, SI
 	MOVW $0x001d, (AX)
-	MOVW SI, 2(AX)
-	SARL $0x10, DI
-	MOVB DI, 4(AX)
+	MOVW BX, 2(AX)
+	SARL $0x10, SI
+	MOVB SI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_four_repeat_as_copy_encodeBlockAsm4MB_emit_copy:
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_three_repeat_as_copy_encodeBlockAsm4MB_emit_copy:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_two_repeat_as_copy_encodeBlockAsm4MB_emit_copy:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
-	JMP four_bytes_loop_back_repeat_as_copy_encodeBlockAsm4MB
 
 four_bytes_remain_repeat_as_copy_encodeBlockAsm4MB:
-	TESTL SI, SI
+	TESTL BX, BX
 	JZ    repeat_end_emit_encodeBlockAsm4MB
-	MOVB  $0x03, BL
-	LEAL  -4(BX)(SI*4), SI
-	MOVB  SI, (AX)
-	MOVL  DI, 1(AX)
+	XORL  DI, DI
+	LEAL  -1(DI)(BX*4), BX
+	MOVB  BL, (AX)
+	MOVL  SI, 1(AX)
 	ADDQ  $0x05, AX
 	JMP   repeat_end_emit_encodeBlockAsm4MB
 
 two_byte_offset_repeat_as_copy_encodeBlockAsm4MB:
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JLE  two_byte_offset_short_repeat_as_copy_encodeBlockAsm4MB
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JAE  long_offset_short_repeat_as_copy_encodeBlockAsm4MB
-	MOVL $0x00000001, R8
-	LEAL 16(R8), R8
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, R8
-	MOVB R8, (AX)
+	MOVL $0x00000001, DI
+	LEAL 16(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, SI
+	SUBL $0x08, BX
 
 	// emitRepeat
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	JMP  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short_2b
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
 	JLE  repeat_two_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short_2b
-	CMPL R8, $0x0c
+	CMPL DI, $0x0c
 	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short_2b
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short_2b
 
 cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short_2b:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short_2b
-	CMPL SI, $0x00010100
+	CMPL BX, $0x00010100
 	JLT  repeat_four_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short_2b
-	LEAL -65536(SI), SI
-	MOVL SI, DI
+	LEAL -65536(BX), BX
+	MOVL BX, SI
 	MOVW $0x001d, (AX)
-	MOVW SI, 2(AX)
-	SARL $0x10, DI
-	MOVB DI, 4(AX)
+	MOVW BX, 2(AX)
+	SARL $0x10, SI
+	MOVB SI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_four_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short_2b:
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_three_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short_2b:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_two_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short_2b:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short_2b:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 long_offset_short_repeat_as_copy_encodeBlockAsm4MB:
 	MOVB $0xee, (AX)
-	MOVW DI, 1(AX)
-	LEAL -60(SI), SI
+	MOVW SI, 1(AX)
+	LEAL -60(BX), BX
 	ADDQ $0x03, AX
 
 	// emitRepeat
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
 	JLE  repeat_two_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short
-	CMPL R8, $0x0c
+	CMPL DI, $0x0c
 	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short
 
 cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short
-	CMPL SI, $0x00010100
+	CMPL BX, $0x00010100
 	JLT  repeat_four_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short
-	LEAL -65536(SI), SI
-	MOVL SI, DI
+	LEAL -65536(BX), BX
+	MOVL BX, SI
 	MOVW $0x001d, (AX)
-	MOVW SI, 2(AX)
-	SARL $0x10, DI
-	MOVB DI, 4(AX)
+	MOVW BX, 2(AX)
+	SARL $0x10, SI
+	MOVB SI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_four_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short:
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_three_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_two_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 repeat_two_offset_repeat_as_copy_encodeBlockAsm4MB_emit_copy_short:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
-	JMP two_byte_offset_repeat_as_copy_encodeBlockAsm4MB
 
 two_byte_offset_short_repeat_as_copy_encodeBlockAsm4MB:
-	CMPL SI, $0x0c
+	MOVL BX, DI
+	SHLL $0x02, DI
+	CMPL BX, $0x0c
 	JGE  emit_copy_three_repeat_as_copy_encodeBlockAsm4MB
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JGE  emit_copy_three_repeat_as_copy_encodeBlockAsm4MB
-	MOVB $0x01, BL
-	LEAL -16(BX)(SI*4), SI
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	LEAL -15(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm4MB
 
 emit_copy_three_repeat_as_copy_encodeBlockAsm4MB:
-	MOVB $0x02, BL
-	LEAL -4(BX)(SI*4), SI
-	MOVB SI, (AX)
-	MOVW DI, 1(AX)
+	LEAL -2(DI), DI
+	MOVB DI, (AX)
+	MOVW SI, 1(AX)
 	ADDQ $0x03, AX
 
 repeat_end_emit_encodeBlockAsm4MB:
@@ -1990,16 +1970,16 @@ repeat_end_emit_encodeBlockAsm4MB:
 	JMP  search_loop_encodeBlockAsm4MB
 
 no_repeat_found_encodeBlockAsm4MB:
-	CMPL (DX)(SI*1), DI
+	CMPL (DX)(BX*1), SI
 	JEQ  candidate_match_encodeBlockAsm4MB
-	SHRQ $0x08, DI
-	MOVL 24(SP)(R10*4), SI
-	LEAL 2(CX), R9
-	CMPL (DX)(R8*1), DI
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
 	JEQ  candidate2_match_encodeBlockAsm4MB
-	MOVL R9, 24(SP)(R10*4)
-	SHRQ $0x08, DI
-	CMPL (DX)(SI*1), DI
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
 	JEQ  candidate3_match_encodeBlockAsm4MB
 	MOVL 20(SP), CX
 	JMP  search_loop_encodeBlockAsm4MB
@@ -2009,506 +1989,502 @@ candidate3_match_encodeBlockAsm4MB:
 	JMP  candidate_match_encodeBlockAsm4MB
 
 candidate2_match_encodeBlockAsm4MB:
-	MOVL R9, 24(SP)(R10*4)
+	MOVL R8, 24(SP)(R9*4)
 	INCL CX
-	MOVL R8, SI
+	MOVL DI, BX
 
 candidate_match_encodeBlockAsm4MB:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeBlockAsm4MB
 
 match_extend_back_loop_encodeBlockAsm4MB:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeBlockAsm4MB
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeBlockAsm4MB
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeBlockAsm4MB
 	JMP  match_extend_back_loop_encodeBlockAsm4MB
 
 match_extend_back_end_encodeBlockAsm4MB:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 4(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 4(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeBlockAsm4MB
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeBlockAsm4MB:
-	MOVL CX, DI
-	MOVL 12(SP), R8
-	CMPL R8, DI
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
 	JEQ  emit_literal_done_match_emit_encodeBlockAsm4MB
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(R8*1), DI
-	SUBL R8, R9
-	LEAL -1(R9), R8
-	CMPL R8, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), DI
+	CMPL DI, $0x3c
 	JLT  one_byte_match_emit_encodeBlockAsm4MB
-	CMPL R8, $0x00000100
+	CMPL DI, $0x00000100
 	JLT  two_bytes_match_emit_encodeBlockAsm4MB
-	CMPL R8, $0x00010000
+	CMPL DI, $0x00010000
 	JLT  three_bytes_match_emit_encodeBlockAsm4MB
-	MOVL R8, R10
-	SHRL $0x10, R10
+	MOVL DI, R9
+	SHRL $0x10, R9
 	MOVB $0xf8, (AX)
-	MOVW R8, 1(AX)
-	MOVB R10, 3(AX)
+	MOVW DI, 1(AX)
+	MOVB R9, 3(AX)
 	ADDQ $0x04, AX
 	JMP  memmove_long_match_emit_encodeBlockAsm4MB
 
 three_bytes_match_emit_encodeBlockAsm4MB:
 	MOVB $0xf4, (AX)
-	MOVW R8, 1(AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeBlockAsm4MB
 
 two_bytes_match_emit_encodeBlockAsm4MB:
 	MOVB $0xf0, (AX)
-	MOVB R8, 1(AX)
+	MOVB DI, 1(AX)
 	ADDQ $0x02, AX
-	CMPL R8, $0x40
+	CMPL DI, $0x40
 	JL   memmove_match_emit_encodeBlockAsm4MB
 	JMP  memmove_long_match_emit_encodeBlockAsm4MB
 
 one_byte_match_emit_encodeBlockAsm4MB:
-	SHLB $0x02, R8
-	MOVB R8, (AX)
+	SHLB $0x02, DI
+	MOVB DI, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeBlockAsm4MB:
-	LEAQ (AX)(R9*1), R8
+	LEAQ (AX)(R8*1), DI
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_match_emit_encodeBlockAsm4MB_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeBlockAsm4MB_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeBlockAsm4MB_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeBlockAsm4MB_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeBlockAsm4MB_memmove_move_8:
-	MOVQ (DI), R10
-	MOVQ R10, (AX)
+	MOVQ (SI), R9
+	MOVQ R9, (AX)
 	JMP  memmove_end_copy_match_emit_encodeBlockAsm4MB
 
 emit_lit_memmove_match_emit_encodeBlockAsm4MB_memmove_move_8through16:
-	MOVQ (DI), R10
-	MOVQ -8(DI)(R9*1), DI
-	MOVQ R10, (AX)
-	MOVQ DI, -8(AX)(R9*1)
+	MOVQ (SI), R9
+	MOVQ -8(SI)(R8*1), SI
+	MOVQ R9, (AX)
+	MOVQ SI, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBlockAsm4MB
 
 emit_lit_memmove_match_emit_encodeBlockAsm4MB_memmove_move_17through32:
-	MOVOU (DI), X0
-	MOVOU -16(DI)(R9*1), X1
+	MOVOU (SI), X0
+	MOVOU -16(SI)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeBlockAsm4MB
 
 emit_lit_memmove_match_emit_encodeBlockAsm4MB_memmove_move_33through64:
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeBlockAsm4MB:
-	MOVQ R8, AX
+	MOVQ DI, AX
 	JMP  emit_literal_done_match_emit_encodeBlockAsm4MB
 
 memmove_long_match_emit_encodeBlockAsm4MB:
-	LEAQ (AX)(R9*1), R8
+	LEAQ (AX)(R8*1), DI
 
 	// genMemMoveLong
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVQ  R9, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVQ  R8, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
 	JA    emit_lit_memmove_long_match_emit_encodeBlockAsm4MBlarge_forward_sse_loop_32
-	LEAQ  -32(DI)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
+	LEAQ  -32(SI)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
 
 emit_lit_memmove_long_match_emit_encodeBlockAsm4MBlarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
 	ADDQ  $0x20, R12
-	DECQ  R11
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
 	JNA   emit_lit_memmove_long_match_emit_encodeBlockAsm4MBlarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeBlockAsm4MBlarge_forward_sse_loop_32:
-	MOVOU -32(DI)(R12*1), X4
-	MOVOU -16(DI)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R9, R12
+	MOVOU -32(SI)(R11*1), X4
+	MOVOU -16(SI)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  R8, R11
 	JAE   emit_lit_memmove_long_match_emit_encodeBlockAsm4MBlarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  R8, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  DI, AX
 
 emit_literal_done_match_emit_encodeBlockAsm4MB:
 match_nolit_loop_encodeBlockAsm4MB:
-	MOVL CX, DI
-	SUBL SI, DI
-	MOVL DI, 16(SP)
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), DI
-	SUBL CX, DI
-	LEAQ (DX)(CX*1), R8
-	LEAQ (DX)(SI*1), SI
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
-	XORL R10, R10
-	CMPL DI, $0x08
+	XORL R9, R9
+	CMPL SI, $0x08
 	JL   matchlen_match4_match_nolit_encodeBlockAsm4MB
 
 matchlen_loopback_match_nolit_encodeBlockAsm4MB:
-	MOVQ  (R8)(R10*1), R9
-	XORQ  (SI)(R10*1), R9
-	TESTQ R9, R9
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
 	JZ    matchlen_loop_match_nolit_encodeBlockAsm4MB
 
 #ifdef GOAMD64_v3
-	TZCNTQ R9, R9
+	TZCNTQ R8, R8
 
 #else
-	BSFQ R9, R9
+	BSFQ R8, R8
 
 #endif
-	SARQ $0x03, R9
-	LEAL (R10)(R9*1), R10
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
 	JMP  match_nolit_end_encodeBlockAsm4MB
 
 matchlen_loop_match_nolit_encodeBlockAsm4MB:
-	LEAL -8(DI), DI
-	LEAL 8(R10), R10
-	CMPL DI, $0x08
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeBlockAsm4MB
 	JZ   match_nolit_end_encodeBlockAsm4MB
 
 matchlen_match4_match_nolit_encodeBlockAsm4MB:
-	CMPL DI, $0x04
+	CMPL SI, $0x04
 	JL   matchlen_match2_match_nolit_encodeBlockAsm4MB
-	MOVL (R8)(R10*1), R9
-	CMPL (SI)(R10*1), R9
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
 	JNE  matchlen_match2_match_nolit_encodeBlockAsm4MB
-	SUBL $0x04, DI
-	LEAL 4(R10), R10
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
 
 matchlen_match2_match_nolit_encodeBlockAsm4MB:
-	CMPL DI, $0x02
+	CMPL SI, $0x02
 	JL   matchlen_match1_match_nolit_encodeBlockAsm4MB
-	MOVW (R8)(R10*1), R9
-	CMPW (SI)(R10*1), R9
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
 	JNE  matchlen_match1_match_nolit_encodeBlockAsm4MB
-	SUBL $0x02, DI
-	LEAL 2(R10), R10
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
 
 matchlen_match1_match_nolit_encodeBlockAsm4MB:
-	CMPL DI, $0x01
+	CMPL SI, $0x01
 	JL   match_nolit_end_encodeBlockAsm4MB
-	MOVB (R8)(R10*1), R9
-	CMPB (SI)(R10*1), R9
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
 	JNE  match_nolit_end_encodeBlockAsm4MB
-	LEAL 1(R10), R10
+	LEAL 1(R9), R9
 
 match_nolit_end_encodeBlockAsm4MB:
-	ADDL R10, CX
-	MOVL 16(SP), SI
-	ADDL $0x04, R10
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
 	MOVL CX, 12(SP)
 
 	// emitCopy
-	CMPL SI, $0x00010000
+	CMPL BX, $0x00010000
 	JL   two_byte_offset_match_nolit_encodeBlockAsm4MB
-
-four_bytes_loop_back_match_nolit_encodeBlockAsm4MB:
-	CMPL R10, $0x40
+	CMPL R9, $0x40
 	JLE  four_bytes_remain_match_nolit_encodeBlockAsm4MB
 	MOVB $0xff, (AX)
-	MOVL SI, 1(AX)
-	LEAL -64(R10), R10
+	MOVL BX, 1(AX)
+	LEAL -64(R9), R9
 	ADDQ $0x05, AX
-	CMPL R10, $0x04
+	CMPL R9, $0x04
 	JL   four_bytes_remain_match_nolit_encodeBlockAsm4MB
 
 	// emitRepeat
-	MOVL R10, DI
-	LEAL -4(R10), R10
-	CMPL DI, $0x08
+	MOVL R9, SI
+	LEAL -4(R9), R9
+	CMPL SI, $0x08
 	JLE  repeat_two_match_nolit_encodeBlockAsm4MB_emit_copy
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy
 
 cant_repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy:
-	CMPL R10, $0x00000104
+	CMPL R9, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBlockAsm4MB_emit_copy
-	CMPL R10, $0x00010100
+	CMPL R9, $0x00010100
 	JLT  repeat_four_match_nolit_encodeBlockAsm4MB_emit_copy
-	LEAL -65536(R10), R10
-	MOVL R10, SI
+	LEAL -65536(R9), R9
+	MOVL R9, BX
 	MOVW $0x001d, (AX)
-	MOVW R10, 2(AX)
-	SARL $0x10, SI
-	MOVB SI, 4(AX)
+	MOVW R9, 2(AX)
+	SARL $0x10, BX
+	MOVB BL, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_four_match_nolit_encodeBlockAsm4MB_emit_copy:
-	LEAL -256(R10), R10
+	LEAL -256(R9), R9
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW R9, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_three_match_nolit_encodeBlockAsm4MB_emit_copy:
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB R9, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_two_match_nolit_encodeBlockAsm4MB_emit_copy:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy:
-	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
-	MOVB SI, 1(AX)
-	SARL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
-	JMP four_bytes_loop_back_match_nolit_encodeBlockAsm4MB
 
 four_bytes_remain_match_nolit_encodeBlockAsm4MB:
-	TESTL R10, R10
+	TESTL R9, R9
 	JZ    match_nolit_emitcopy_end_encodeBlockAsm4MB
-	MOVB  $0x03, BL
-	LEAL  -4(BX)(R10*4), R10
-	MOVB  R10, (AX)
-	MOVL  SI, 1(AX)
+	XORL  SI, SI
+	LEAL  -1(SI)(R9*4), R9
+	MOVB  R9, (AX)
+	MOVL  BX, 1(AX)
 	ADDQ  $0x05, AX
 	JMP   match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 two_byte_offset_match_nolit_encodeBlockAsm4MB:
-	CMPL R10, $0x40
+	CMPL R9, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeBlockAsm4MB
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JAE  long_offset_short_match_nolit_encodeBlockAsm4MB
-	MOVL $0x00000001, DI
-	LEAL 16(DI), DI
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, DI
-	MOVB DI, (AX)
+	MOVL $0x00000001, SI
+	LEAL 16(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, R10
+	SUBL $0x08, R9
 
 	// emitRepeat
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	JMP  cant_repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy_short_2b
-	MOVL R10, DI
-	LEAL -4(R10), R10
-	CMPL DI, $0x08
+	MOVL R9, SI
+	LEAL -4(R9), R9
+	CMPL SI, $0x08
 	JLE  repeat_two_match_nolit_encodeBlockAsm4MB_emit_copy_short_2b
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy_short_2b
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy_short_2b
 
 cant_repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy_short_2b:
-	CMPL R10, $0x00000104
+	CMPL R9, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBlockAsm4MB_emit_copy_short_2b
-	CMPL R10, $0x00010100
+	CMPL R9, $0x00010100
 	JLT  repeat_four_match_nolit_encodeBlockAsm4MB_emit_copy_short_2b
-	LEAL -65536(R10), R10
-	MOVL R10, SI
+	LEAL -65536(R9), R9
+	MOVL R9, BX
 	MOVW $0x001d, (AX)
-	MOVW R10, 2(AX)
-	SARL $0x10, SI
-	MOVB SI, 4(AX)
+	MOVW R9, 2(AX)
+	SARL $0x10, BX
+	MOVB BL, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_four_match_nolit_encodeBlockAsm4MB_emit_copy_short_2b:
-	LEAL -256(R10), R10
+	LEAL -256(R9), R9
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW R9, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_three_match_nolit_encodeBlockAsm4MB_emit_copy_short_2b:
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB R9, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_two_match_nolit_encodeBlockAsm4MB_emit_copy_short_2b:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy_short_2b:
-	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
-	MOVB SI, 1(AX)
-	SARL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 long_offset_short_match_nolit_encodeBlockAsm4MB:
 	MOVB $0xee, (AX)
-	MOVW SI, 1(AX)
-	LEAL -60(R10), R10
+	MOVW BX, 1(AX)
+	LEAL -60(R9), R9
 	ADDQ $0x03, AX
 
 	// emitRepeat
-	MOVL R10, DI
-	LEAL -4(R10), R10
-	CMPL DI, $0x08
+	MOVL R9, SI
+	LEAL -4(R9), R9
+	CMPL SI, $0x08
 	JLE  repeat_two_match_nolit_encodeBlockAsm4MB_emit_copy_short
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy_short
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy_short
 
 cant_repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy_short:
-	CMPL R10, $0x00000104
+	CMPL R9, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBlockAsm4MB_emit_copy_short
-	CMPL R10, $0x00010100
+	CMPL R9, $0x00010100
 	JLT  repeat_four_match_nolit_encodeBlockAsm4MB_emit_copy_short
-	LEAL -65536(R10), R10
-	MOVL R10, SI
+	LEAL -65536(R9), R9
+	MOVL R9, BX
 	MOVW $0x001d, (AX)
-	MOVW R10, 2(AX)
-	SARL $0x10, SI
-	MOVB SI, 4(AX)
+	MOVW R9, 2(AX)
+	SARL $0x10, BX
+	MOVB BL, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_four_match_nolit_encodeBlockAsm4MB_emit_copy_short:
-	LEAL -256(R10), R10
+	LEAL -256(R9), R9
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW R9, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_three_match_nolit_encodeBlockAsm4MB_emit_copy_short:
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB R9, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_two_match_nolit_encodeBlockAsm4MB_emit_copy_short:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 repeat_two_offset_match_nolit_encodeBlockAsm4MB_emit_copy_short:
-	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
-	MOVB SI, 1(AX)
-	SARL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
-	JMP two_byte_offset_match_nolit_encodeBlockAsm4MB
 
 two_byte_offset_short_match_nolit_encodeBlockAsm4MB:
-	CMPL R10, $0x0c
+	MOVL R9, SI
+	SHLL $0x02, SI
+	CMPL R9, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeBlockAsm4MB
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeBlockAsm4MB
-	MOVB $0x01, BL
-	LEAL -16(BX)(R10*4), R10
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	LEAL -15(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm4MB
 
 emit_copy_three_match_nolit_encodeBlockAsm4MB:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R10*4), R10
-	MOVB R10, (AX)
-	MOVW SI, 1(AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeBlockAsm4MB:
 	CMPL CX, 8(SP)
 	JGE  emit_remainder_encodeBlockAsm4MB
-	MOVQ -2(DX)(CX*1), DI
+	MOVQ -2(DX)(CX*1), SI
 	CMPQ AX, (SP)
 	JL   match_nolit_dst_ok_encodeBlockAsm4MB
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_nolit_dst_ok_encodeBlockAsm4MB:
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  DI, R8
-	SHRQ  $0x10, DI
-	MOVQ  DI, SI
-	SHLQ  $0x10, R8
-	IMULQ R9, R8
-	SHRQ  $0x32, R8
-	SHLQ  $0x10, SI
-	IMULQ R9, SI
-	SHRQ  $0x32, SI
-	LEAL  -2(CX), R9
-	LEAQ  24(SP)(SI*4), R10
-	MOVL  (R10), SI
-	MOVL  R9, 24(SP)(R8*4)
-	MOVL  CX, (R10)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x10, DI
+	IMULQ R8, DI
+	SHRQ  $0x32, DI
+	SHLQ  $0x10, BX
+	IMULQ R8, BX
+	SHRQ  $0x32, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
 	JEQ   match_nolit_loop_encodeBlockAsm4MB
 	INCL  CX
 	JMP   search_loop_encodeBlockAsm4MB
@@ -2704,8 +2680,8 @@ zero_loop_encodeBlockAsm12B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -2715,428 +2691,426 @@ zero_loop_encodeBlockAsm12B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeBlockAsm12B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x05, SI
-	LEAL  4(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x05, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeBlockAsm12B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x000000cf1bbcdcbb, R9
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHRQ  $0x08, R11
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x000000cf1bbcdcbb, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x18, R9
+	IMULQ R8, R9
+	SHRQ  $0x34, R9
 	SHLQ  $0x18, R10
-	IMULQ R9, R10
+	IMULQ R8, R10
 	SHRQ  $0x34, R10
-	SHLQ  $0x18, R11
-	IMULQ R9, R11
-	SHRQ  $0x34, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  24(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	LEAL  1(CX), R10
-	MOVL  R10, 24(SP)(R11*4)
-	MOVQ  DI, R10
-	SHRQ  $0x10, R10
-	SHLQ  $0x18, R10
-	IMULQ R9, R10
-	SHRQ  $0x34, R10
-	MOVL  CX, R9
-	SUBL  16(SP), R9
-	MOVL  1(DX)(R9*1), R11
-	MOVQ  DI, R9
-	SHRQ  $0x08, R9
-	CMPL  R9, R11
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x18, R9
+	IMULQ R8, R9
+	SHRQ  $0x34, R9
+	MOVL  CX, R8
+	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
 	JNE   no_repeat_found_encodeBlockAsm12B
-	LEAL  1(CX), DI
-	MOVL  12(SP), R8
-	MOVL  DI, SI
-	SUBL  16(SP), SI
+	LEAL  1(CX), SI
+	MOVL  12(SP), DI
+	MOVL  SI, BX
+	SUBL  16(SP), BX
 	JZ    repeat_extend_back_end_encodeBlockAsm12B
 
 repeat_extend_back_loop_encodeBlockAsm12B:
-	CMPL DI, R8
+	CMPL SI, DI
 	JLE  repeat_extend_back_end_encodeBlockAsm12B
-	MOVB -1(DX)(SI*1), BL
-	MOVB -1(DX)(DI*1), R9
-	CMPB BL, R9
+	MOVB -1(DX)(BX*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
 	JNE  repeat_extend_back_end_encodeBlockAsm12B
-	LEAL -1(DI), DI
-	DECL SI
+	LEAL -1(SI), SI
+	DECL BX
 	JNZ  repeat_extend_back_loop_encodeBlockAsm12B
 
 repeat_extend_back_end_encodeBlockAsm12B:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_repeat_emit_encodeBlockAsm12B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_repeat_emit_encodeBlockAsm12B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_repeat_emit_encodeBlockAsm12B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_repeat_emit_encodeBlockAsm12B
 
 two_bytes_repeat_emit_encodeBlockAsm12B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_repeat_emit_encodeBlockAsm12B
 	JMP  memmove_long_repeat_emit_encodeBlockAsm12B
 
 one_byte_repeat_emit_encodeBlockAsm12B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_repeat_emit_encodeBlockAsm12B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_repeat_emit_encodeBlockAsm12B_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_repeat_emit_encodeBlockAsm12B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_repeat_emit_encodeBlockAsm12B_memmove_move_17through32
 	JMP  emit_lit_memmove_repeat_emit_encodeBlockAsm12B_memmove_move_33through64
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm12B_memmove_move_8:
-	MOVQ (R10), R11
-	MOVQ R11, (AX)
+	MOVQ (R9), R10
+	MOVQ R10, (AX)
 	JMP  memmove_end_copy_repeat_emit_encodeBlockAsm12B
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm12B_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_repeat_emit_encodeBlockAsm12B
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm12B_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_repeat_emit_encodeBlockAsm12B
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm12B_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_repeat_emit_encodeBlockAsm12B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_repeat_emit_encodeBlockAsm12B
 
 memmove_long_repeat_emit_encodeBlockAsm12B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R12
-	SHRQ  $0x05, R12
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R13
-	SUBQ  R11, R13
-	DECQ  R12
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R11
+	SHRQ  $0x05, R11
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R12
+	SUBQ  R10, R12
+	DECQ  R11
 	JA    emit_lit_memmove_long_repeat_emit_encodeBlockAsm12Blarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R13*1), R11
-	LEAQ  -32(AX)(R13*1), R14
+	LEAQ  -32(R9)(R12*1), R10
+	LEAQ  -32(AX)(R12*1), R13
 
 emit_lit_memmove_long_repeat_emit_encodeBlockAsm12Blarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R14)
-	MOVOA X5, 16(R14)
-	ADDQ  $0x20, R14
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R13)
+	MOVOA X5, 16(R13)
 	ADDQ  $0x20, R13
-	DECQ  R12
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R12
+	DECQ  R11
 	JNA   emit_lit_memmove_long_repeat_emit_encodeBlockAsm12Blarge_big_loop_back
 
 emit_lit_memmove_long_repeat_emit_encodeBlockAsm12Blarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R13*1), X4
-	MOVOU -16(R10)(R13*1), X5
-	MOVOA X4, -32(AX)(R13*1)
-	MOVOA X5, -16(AX)(R13*1)
-	ADDQ  $0x20, R13
-	CMPQ  R9, R13
+	MOVOU -32(R9)(R12*1), X4
+	MOVOU -16(R9)(R12*1), X5
+	MOVOA X4, -32(AX)(R12*1)
+	MOVOA X5, -16(AX)(R12*1)
+	ADDQ  $0x20, R12
+	CMPQ  R8, R12
 	JAE   emit_lit_memmove_long_repeat_emit_encodeBlockAsm12Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_repeat_emit_encodeBlockAsm12B:
 	ADDL $0x05, CX
-	MOVL CX, SI
-	SUBL 16(SP), SI
-	MOVQ src_len+32(FP), R9
-	SUBL CX, R9
-	LEAQ (DX)(CX*1), R10
-	LEAQ (DX)(SI*1), SI
+	MOVL CX, BX
+	SUBL 16(SP), BX
+	MOVQ src_len+32(FP), R8
+	SUBL CX, R8
+	LEAQ (DX)(CX*1), R9
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
-	XORL R12, R12
-	CMPL R9, $0x08
+	XORL R11, R11
+	CMPL R8, $0x08
 	JL   matchlen_match4_repeat_extend_encodeBlockAsm12B
 
 matchlen_loopback_repeat_extend_encodeBlockAsm12B:
-	MOVQ  (R10)(R12*1), R11
-	XORQ  (SI)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R9)(R11*1), R10
+	XORQ  (BX)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_repeat_extend_encodeBlockAsm12B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  repeat_extend_forward_end_encodeBlockAsm12B
 
 matchlen_loop_repeat_extend_encodeBlockAsm12B:
-	LEAL -8(R9), R9
-	LEAL 8(R12), R12
-	CMPL R9, $0x08
+	LEAL -8(R8), R8
+	LEAL 8(R11), R11
+	CMPL R8, $0x08
 	JGE  matchlen_loopback_repeat_extend_encodeBlockAsm12B
 	JZ   repeat_extend_forward_end_encodeBlockAsm12B
 
 matchlen_match4_repeat_extend_encodeBlockAsm12B:
-	CMPL R9, $0x04
+	CMPL R8, $0x04
 	JL   matchlen_match2_repeat_extend_encodeBlockAsm12B
-	MOVL (R10)(R12*1), R11
-	CMPL (SI)(R12*1), R11
+	MOVL (R9)(R11*1), R10
+	CMPL (BX)(R11*1), R10
 	JNE  matchlen_match2_repeat_extend_encodeBlockAsm12B
-	SUBL $0x04, R9
-	LEAL 4(R12), R12
+	SUBL $0x04, R8
+	LEAL 4(R11), R11
 
 matchlen_match2_repeat_extend_encodeBlockAsm12B:
-	CMPL R9, $0x02
+	CMPL R8, $0x02
 	JL   matchlen_match1_repeat_extend_encodeBlockAsm12B
-	MOVW (R10)(R12*1), R11
-	CMPW (SI)(R12*1), R11
+	MOVW (R9)(R11*1), R10
+	CMPW (BX)(R11*1), R10
 	JNE  matchlen_match1_repeat_extend_encodeBlockAsm12B
-	SUBL $0x02, R9
-	LEAL 2(R12), R12
+	SUBL $0x02, R8
+	LEAL 2(R11), R11
 
 matchlen_match1_repeat_extend_encodeBlockAsm12B:
-	CMPL R9, $0x01
+	CMPL R8, $0x01
 	JL   repeat_extend_forward_end_encodeBlockAsm12B
-	MOVB (R10)(R12*1), R11
-	CMPB (SI)(R12*1), R11
+	MOVB (R9)(R11*1), R10
+	CMPB (BX)(R11*1), R10
 	JNE  repeat_extend_forward_end_encodeBlockAsm12B
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 repeat_extend_forward_end_encodeBlockAsm12B:
-	ADDL  R12, CX
-	MOVL  CX, SI
-	SUBL  DI, SI
-	MOVL  16(SP), DI
-	TESTL R8, R8
+	ADDL  R11, CX
+	MOVL  CX, BX
+	SUBL  SI, BX
+	MOVL  16(SP), SI
+	TESTL DI, DI
 	JZ    repeat_as_copy_encodeBlockAsm12B
 
 	// emitRepeat
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
 	JLE  repeat_two_match_repeat_encodeBlockAsm12B
-	CMPL R8, $0x0c
+	CMPL DI, $0x0c
 	JGE  cant_repeat_two_offset_match_repeat_encodeBlockAsm12B
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JLT  repeat_two_offset_match_repeat_encodeBlockAsm12B
 
 cant_repeat_two_offset_match_repeat_encodeBlockAsm12B:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_match_repeat_encodeBlockAsm12B
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 repeat_three_match_repeat_encodeBlockAsm12B:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 repeat_two_match_repeat_encodeBlockAsm12B:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 repeat_two_offset_match_repeat_encodeBlockAsm12B:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 repeat_as_copy_encodeBlockAsm12B:
 	// emitCopy
-two_byte_offset_repeat_as_copy_encodeBlockAsm12B:
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JLE  two_byte_offset_short_repeat_as_copy_encodeBlockAsm12B
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JAE  long_offset_short_repeat_as_copy_encodeBlockAsm12B
-	MOVL $0x00000001, R8
-	LEAL 16(R8), R8
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, R8
-	MOVB R8, (AX)
+	MOVL $0x00000001, DI
+	LEAL 16(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, SI
+	SUBL $0x08, BX
 
 	// emitRepeat
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	JMP  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm12B_emit_copy_short_2b
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
 	JLE  repeat_two_repeat_as_copy_encodeBlockAsm12B_emit_copy_short_2b
-	CMPL R8, $0x0c
+	CMPL DI, $0x0c
 	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm12B_emit_copy_short_2b
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm12B_emit_copy_short_2b
 
 cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm12B_emit_copy_short_2b:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_repeat_as_copy_encodeBlockAsm12B_emit_copy_short_2b
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 repeat_three_repeat_as_copy_encodeBlockAsm12B_emit_copy_short_2b:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 repeat_two_repeat_as_copy_encodeBlockAsm12B_emit_copy_short_2b:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 repeat_two_offset_repeat_as_copy_encodeBlockAsm12B_emit_copy_short_2b:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 long_offset_short_repeat_as_copy_encodeBlockAsm12B:
 	MOVB $0xee, (AX)
-	MOVW DI, 1(AX)
-	LEAL -60(SI), SI
+	MOVW SI, 1(AX)
+	LEAL -60(BX), BX
 	ADDQ $0x03, AX
 
 	// emitRepeat
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
 	JLE  repeat_two_repeat_as_copy_encodeBlockAsm12B_emit_copy_short
-	CMPL R8, $0x0c
+	CMPL DI, $0x0c
 	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm12B_emit_copy_short
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm12B_emit_copy_short
 
 cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm12B_emit_copy_short:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_repeat_as_copy_encodeBlockAsm12B_emit_copy_short
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 repeat_three_repeat_as_copy_encodeBlockAsm12B_emit_copy_short:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 repeat_two_repeat_as_copy_encodeBlockAsm12B_emit_copy_short:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 repeat_two_offset_repeat_as_copy_encodeBlockAsm12B_emit_copy_short:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
-	JMP two_byte_offset_repeat_as_copy_encodeBlockAsm12B
 
 two_byte_offset_short_repeat_as_copy_encodeBlockAsm12B:
-	CMPL SI, $0x0c
+	MOVL BX, DI
+	SHLL $0x02, DI
+	CMPL BX, $0x0c
 	JGE  emit_copy_three_repeat_as_copy_encodeBlockAsm12B
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JGE  emit_copy_three_repeat_as_copy_encodeBlockAsm12B
-	MOVB $0x01, BL
-	LEAL -16(BX)(SI*4), SI
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	LEAL -15(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm12B
 
 emit_copy_three_repeat_as_copy_encodeBlockAsm12B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(SI*4), SI
-	MOVB SI, (AX)
-	MOVW DI, 1(AX)
+	LEAL -2(DI), DI
+	MOVB DI, (AX)
+	MOVW SI, 1(AX)
 	ADDQ $0x03, AX
 
 repeat_end_emit_encodeBlockAsm12B:
@@ -3144,16 +3118,16 @@ repeat_end_emit_encodeBlockAsm12B:
 	JMP  search_loop_encodeBlockAsm12B
 
 no_repeat_found_encodeBlockAsm12B:
-	CMPL (DX)(SI*1), DI
+	CMPL (DX)(BX*1), SI
 	JEQ  candidate_match_encodeBlockAsm12B
-	SHRQ $0x08, DI
-	MOVL 24(SP)(R10*4), SI
-	LEAL 2(CX), R9
-	CMPL (DX)(R8*1), DI
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
 	JEQ  candidate2_match_encodeBlockAsm12B
-	MOVL R9, 24(SP)(R10*4)
-	SHRQ $0x08, DI
-	CMPL (DX)(SI*1), DI
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
 	JEQ  candidate3_match_encodeBlockAsm12B
 	MOVL 20(SP), CX
 	JMP  search_loop_encodeBlockAsm12B
@@ -3163,391 +3137,389 @@ candidate3_match_encodeBlockAsm12B:
 	JMP  candidate_match_encodeBlockAsm12B
 
 candidate2_match_encodeBlockAsm12B:
-	MOVL R9, 24(SP)(R10*4)
+	MOVL R8, 24(SP)(R9*4)
 	INCL CX
-	MOVL R8, SI
+	MOVL DI, BX
 
 candidate_match_encodeBlockAsm12B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeBlockAsm12B
 
 match_extend_back_loop_encodeBlockAsm12B:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeBlockAsm12B
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeBlockAsm12B
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeBlockAsm12B
 	JMP  match_extend_back_loop_encodeBlockAsm12B
 
 match_extend_back_end_encodeBlockAsm12B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeBlockAsm12B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeBlockAsm12B:
-	MOVL CX, DI
-	MOVL 12(SP), R8
-	CMPL R8, DI
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
 	JEQ  emit_literal_done_match_emit_encodeBlockAsm12B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(R8*1), DI
-	SUBL R8, R9
-	LEAL -1(R9), R8
-	CMPL R8, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), DI
+	CMPL DI, $0x3c
 	JLT  one_byte_match_emit_encodeBlockAsm12B
-	CMPL R8, $0x00000100
+	CMPL DI, $0x00000100
 	JLT  two_bytes_match_emit_encodeBlockAsm12B
 	MOVB $0xf4, (AX)
-	MOVW R8, 1(AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeBlockAsm12B
 
 two_bytes_match_emit_encodeBlockAsm12B:
 	MOVB $0xf0, (AX)
-	MOVB R8, 1(AX)
+	MOVB DI, 1(AX)
 	ADDQ $0x02, AX
-	CMPL R8, $0x40
+	CMPL DI, $0x40
 	JL   memmove_match_emit_encodeBlockAsm12B
 	JMP  memmove_long_match_emit_encodeBlockAsm12B
 
 one_byte_match_emit_encodeBlockAsm12B:
-	SHLB $0x02, R8
-	MOVB R8, (AX)
+	SHLB $0x02, DI
+	MOVB DI, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeBlockAsm12B:
-	LEAQ (AX)(R9*1), R8
+	LEAQ (AX)(R8*1), DI
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_match_emit_encodeBlockAsm12B_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeBlockAsm12B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeBlockAsm12B_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeBlockAsm12B_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeBlockAsm12B_memmove_move_8:
-	MOVQ (DI), R10
-	MOVQ R10, (AX)
+	MOVQ (SI), R9
+	MOVQ R9, (AX)
 	JMP  memmove_end_copy_match_emit_encodeBlockAsm12B
 
 emit_lit_memmove_match_emit_encodeBlockAsm12B_memmove_move_8through16:
-	MOVQ (DI), R10
-	MOVQ -8(DI)(R9*1), DI
-	MOVQ R10, (AX)
-	MOVQ DI, -8(AX)(R9*1)
+	MOVQ (SI), R9
+	MOVQ -8(SI)(R8*1), SI
+	MOVQ R9, (AX)
+	MOVQ SI, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBlockAsm12B
 
 emit_lit_memmove_match_emit_encodeBlockAsm12B_memmove_move_17through32:
-	MOVOU (DI), X0
-	MOVOU -16(DI)(R9*1), X1
+	MOVOU (SI), X0
+	MOVOU -16(SI)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeBlockAsm12B
 
 emit_lit_memmove_match_emit_encodeBlockAsm12B_memmove_move_33through64:
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeBlockAsm12B:
-	MOVQ R8, AX
+	MOVQ DI, AX
 	JMP  emit_literal_done_match_emit_encodeBlockAsm12B
 
 memmove_long_match_emit_encodeBlockAsm12B:
-	LEAQ (AX)(R9*1), R8
+	LEAQ (AX)(R8*1), DI
 
 	// genMemMoveLong
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVQ  R9, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVQ  R8, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
 	JA    emit_lit_memmove_long_match_emit_encodeBlockAsm12Blarge_forward_sse_loop_32
-	LEAQ  -32(DI)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
+	LEAQ  -32(SI)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
 
 emit_lit_memmove_long_match_emit_encodeBlockAsm12Blarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
 	ADDQ  $0x20, R12
-	DECQ  R11
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
 	JNA   emit_lit_memmove_long_match_emit_encodeBlockAsm12Blarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeBlockAsm12Blarge_forward_sse_loop_32:
-	MOVOU -32(DI)(R12*1), X4
-	MOVOU -16(DI)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R9, R12
+	MOVOU -32(SI)(R11*1), X4
+	MOVOU -16(SI)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  R8, R11
 	JAE   emit_lit_memmove_long_match_emit_encodeBlockAsm12Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  R8, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  DI, AX
 
 emit_literal_done_match_emit_encodeBlockAsm12B:
 match_nolit_loop_encodeBlockAsm12B:
-	MOVL CX, DI
-	SUBL SI, DI
-	MOVL DI, 16(SP)
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), DI
-	SUBL CX, DI
-	LEAQ (DX)(CX*1), R8
-	LEAQ (DX)(SI*1), SI
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
-	XORL R10, R10
-	CMPL DI, $0x08
+	XORL R9, R9
+	CMPL SI, $0x08
 	JL   matchlen_match4_match_nolit_encodeBlockAsm12B
 
 matchlen_loopback_match_nolit_encodeBlockAsm12B:
-	MOVQ  (R8)(R10*1), R9
-	XORQ  (SI)(R10*1), R9
-	TESTQ R9, R9
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
 	JZ    matchlen_loop_match_nolit_encodeBlockAsm12B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R9, R9
+	TZCNTQ R8, R8
 
 #else
-	BSFQ R9, R9
+	BSFQ R8, R8
 
 #endif
-	SARQ $0x03, R9
-	LEAL (R10)(R9*1), R10
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
 	JMP  match_nolit_end_encodeBlockAsm12B
 
 matchlen_loop_match_nolit_encodeBlockAsm12B:
-	LEAL -8(DI), DI
-	LEAL 8(R10), R10
-	CMPL DI, $0x08
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeBlockAsm12B
 	JZ   match_nolit_end_encodeBlockAsm12B
 
 matchlen_match4_match_nolit_encodeBlockAsm12B:
-	CMPL DI, $0x04
+	CMPL SI, $0x04
 	JL   matchlen_match2_match_nolit_encodeBlockAsm12B
-	MOVL (R8)(R10*1), R9
-	CMPL (SI)(R10*1), R9
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
 	JNE  matchlen_match2_match_nolit_encodeBlockAsm12B
-	SUBL $0x04, DI
-	LEAL 4(R10), R10
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
 
 matchlen_match2_match_nolit_encodeBlockAsm12B:
-	CMPL DI, $0x02
+	CMPL SI, $0x02
 	JL   matchlen_match1_match_nolit_encodeBlockAsm12B
-	MOVW (R8)(R10*1), R9
-	CMPW (SI)(R10*1), R9
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
 	JNE  matchlen_match1_match_nolit_encodeBlockAsm12B
-	SUBL $0x02, DI
-	LEAL 2(R10), R10
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
 
 matchlen_match1_match_nolit_encodeBlockAsm12B:
-	CMPL DI, $0x01
+	CMPL SI, $0x01
 	JL   match_nolit_end_encodeBlockAsm12B
-	MOVB (R8)(R10*1), R9
-	CMPB (SI)(R10*1), R9
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
 	JNE  match_nolit_end_encodeBlockAsm12B
-	LEAL 1(R10), R10
+	LEAL 1(R9), R9
 
 match_nolit_end_encodeBlockAsm12B:
-	ADDL R10, CX
-	MOVL 16(SP), SI
-	ADDL $0x04, R10
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
 	MOVL CX, 12(SP)
 
 	// emitCopy
-two_byte_offset_match_nolit_encodeBlockAsm12B:
-	CMPL R10, $0x40
+	CMPL R9, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeBlockAsm12B
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JAE  long_offset_short_match_nolit_encodeBlockAsm12B
-	MOVL $0x00000001, DI
-	LEAL 16(DI), DI
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, DI
-	MOVB DI, (AX)
+	MOVL $0x00000001, SI
+	LEAL 16(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, R10
+	SUBL $0x08, R9
 
 	// emitRepeat
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	JMP  cant_repeat_two_offset_match_nolit_encodeBlockAsm12B_emit_copy_short_2b
-	MOVL R10, DI
-	LEAL -4(R10), R10
-	CMPL DI, $0x08
+	MOVL R9, SI
+	LEAL -4(R9), R9
+	CMPL SI, $0x08
 	JLE  repeat_two_match_nolit_encodeBlockAsm12B_emit_copy_short_2b
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm12B_emit_copy_short_2b
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBlockAsm12B_emit_copy_short_2b
 
 cant_repeat_two_offset_match_nolit_encodeBlockAsm12B_emit_copy_short_2b:
-	CMPL R10, $0x00000104
+	CMPL R9, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBlockAsm12B_emit_copy_short_2b
-	LEAL -256(R10), R10
+	LEAL -256(R9), R9
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW R9, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm12B
 
 repeat_three_match_nolit_encodeBlockAsm12B_emit_copy_short_2b:
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB R9, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm12B
 
 repeat_two_match_nolit_encodeBlockAsm12B_emit_copy_short_2b:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm12B
 
 repeat_two_offset_match_nolit_encodeBlockAsm12B_emit_copy_short_2b:
-	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
-	MOVB SI, 1(AX)
-	SARL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm12B
 
 long_offset_short_match_nolit_encodeBlockAsm12B:
 	MOVB $0xee, (AX)
-	MOVW SI, 1(AX)
-	LEAL -60(R10), R10
+	MOVW BX, 1(AX)
+	LEAL -60(R9), R9
 	ADDQ $0x03, AX
 
 	// emitRepeat
-	MOVL R10, DI
-	LEAL -4(R10), R10
-	CMPL DI, $0x08
+	MOVL R9, SI
+	LEAL -4(R9), R9
+	CMPL SI, $0x08
 	JLE  repeat_two_match_nolit_encodeBlockAsm12B_emit_copy_short
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm12B_emit_copy_short
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBlockAsm12B_emit_copy_short
 
 cant_repeat_two_offset_match_nolit_encodeBlockAsm12B_emit_copy_short:
-	CMPL R10, $0x00000104
+	CMPL R9, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBlockAsm12B_emit_copy_short
-	LEAL -256(R10), R10
+	LEAL -256(R9), R9
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW R9, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm12B
 
 repeat_three_match_nolit_encodeBlockAsm12B_emit_copy_short:
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB R9, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm12B
 
 repeat_two_match_nolit_encodeBlockAsm12B_emit_copy_short:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm12B
 
 repeat_two_offset_match_nolit_encodeBlockAsm12B_emit_copy_short:
-	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
-	MOVB SI, 1(AX)
-	SARL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm12B
-	JMP two_byte_offset_match_nolit_encodeBlockAsm12B
 
 two_byte_offset_short_match_nolit_encodeBlockAsm12B:
-	CMPL R10, $0x0c
+	MOVL R9, SI
+	SHLL $0x02, SI
+	CMPL R9, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeBlockAsm12B
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeBlockAsm12B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R10*4), R10
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	LEAL -15(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm12B
 
 emit_copy_three_match_nolit_encodeBlockAsm12B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R10*4), R10
-	MOVB R10, (AX)
-	MOVW SI, 1(AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeBlockAsm12B:
 	CMPL CX, 8(SP)
 	JGE  emit_remainder_encodeBlockAsm12B
-	MOVQ -2(DX)(CX*1), DI
+	MOVQ -2(DX)(CX*1), SI
 	CMPQ AX, (SP)
 	JL   match_nolit_dst_ok_encodeBlockAsm12B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_nolit_dst_ok_encodeBlockAsm12B:
-	MOVQ  $0x000000cf1bbcdcbb, R9
-	MOVQ  DI, R8
-	SHRQ  $0x10, DI
-	MOVQ  DI, SI
-	SHLQ  $0x18, R8
-	IMULQ R9, R8
-	SHRQ  $0x34, R8
-	SHLQ  $0x18, SI
-	IMULQ R9, SI
-	SHRQ  $0x34, SI
-	LEAL  -2(CX), R9
-	LEAQ  24(SP)(SI*4), R10
-	MOVL  (R10), SI
-	MOVL  R9, 24(SP)(R8*4)
-	MOVL  CX, (R10)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  $0x000000cf1bbcdcbb, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x18, DI
+	IMULQ R8, DI
+	SHRQ  $0x34, DI
+	SHLQ  $0x18, BX
+	IMULQ R8, BX
+	SHRQ  $0x34, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
 	JEQ   match_nolit_loop_encodeBlockAsm12B
 	INCL  CX
 	JMP   search_loop_encodeBlockAsm12B
@@ -3732,8 +3704,8 @@ zero_loop_encodeBlockAsm10B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -3743,428 +3715,426 @@ zero_loop_encodeBlockAsm10B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeBlockAsm10B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x05, SI
-	LEAL  4(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x05, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeBlockAsm10B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x9e3779b1, R9
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHRQ  $0x08, R11
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x9e3779b1, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x20, R9
+	IMULQ R8, R9
+	SHRQ  $0x36, R9
 	SHLQ  $0x20, R10
-	IMULQ R9, R10
+	IMULQ R8, R10
 	SHRQ  $0x36, R10
-	SHLQ  $0x20, R11
-	IMULQ R9, R11
-	SHRQ  $0x36, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  24(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	LEAL  1(CX), R10
-	MOVL  R10, 24(SP)(R11*4)
-	MOVQ  DI, R10
-	SHRQ  $0x10, R10
-	SHLQ  $0x20, R10
-	IMULQ R9, R10
-	SHRQ  $0x36, R10
-	MOVL  CX, R9
-	SUBL  16(SP), R9
-	MOVL  1(DX)(R9*1), R11
-	MOVQ  DI, R9
-	SHRQ  $0x08, R9
-	CMPL  R9, R11
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x20, R9
+	IMULQ R8, R9
+	SHRQ  $0x36, R9
+	MOVL  CX, R8
+	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
 	JNE   no_repeat_found_encodeBlockAsm10B
-	LEAL  1(CX), DI
-	MOVL  12(SP), R8
-	MOVL  DI, SI
-	SUBL  16(SP), SI
+	LEAL  1(CX), SI
+	MOVL  12(SP), DI
+	MOVL  SI, BX
+	SUBL  16(SP), BX
 	JZ    repeat_extend_back_end_encodeBlockAsm10B
 
 repeat_extend_back_loop_encodeBlockAsm10B:
-	CMPL DI, R8
+	CMPL SI, DI
 	JLE  repeat_extend_back_end_encodeBlockAsm10B
-	MOVB -1(DX)(SI*1), BL
-	MOVB -1(DX)(DI*1), R9
-	CMPB BL, R9
+	MOVB -1(DX)(BX*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
 	JNE  repeat_extend_back_end_encodeBlockAsm10B
-	LEAL -1(DI), DI
-	DECL SI
+	LEAL -1(SI), SI
+	DECL BX
 	JNZ  repeat_extend_back_loop_encodeBlockAsm10B
 
 repeat_extend_back_end_encodeBlockAsm10B:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_repeat_emit_encodeBlockAsm10B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_repeat_emit_encodeBlockAsm10B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_repeat_emit_encodeBlockAsm10B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_repeat_emit_encodeBlockAsm10B
 
 two_bytes_repeat_emit_encodeBlockAsm10B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_repeat_emit_encodeBlockAsm10B
 	JMP  memmove_long_repeat_emit_encodeBlockAsm10B
 
 one_byte_repeat_emit_encodeBlockAsm10B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_repeat_emit_encodeBlockAsm10B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_repeat_emit_encodeBlockAsm10B_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_repeat_emit_encodeBlockAsm10B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_repeat_emit_encodeBlockAsm10B_memmove_move_17through32
 	JMP  emit_lit_memmove_repeat_emit_encodeBlockAsm10B_memmove_move_33through64
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm10B_memmove_move_8:
-	MOVQ (R10), R11
-	MOVQ R11, (AX)
+	MOVQ (R9), R10
+	MOVQ R10, (AX)
 	JMP  memmove_end_copy_repeat_emit_encodeBlockAsm10B
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm10B_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_repeat_emit_encodeBlockAsm10B
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm10B_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_repeat_emit_encodeBlockAsm10B
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm10B_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_repeat_emit_encodeBlockAsm10B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_repeat_emit_encodeBlockAsm10B
 
 memmove_long_repeat_emit_encodeBlockAsm10B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R12
-	SHRQ  $0x05, R12
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R13
-	SUBQ  R11, R13
-	DECQ  R12
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R11
+	SHRQ  $0x05, R11
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R12
+	SUBQ  R10, R12
+	DECQ  R11
 	JA    emit_lit_memmove_long_repeat_emit_encodeBlockAsm10Blarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R13*1), R11
-	LEAQ  -32(AX)(R13*1), R14
+	LEAQ  -32(R9)(R12*1), R10
+	LEAQ  -32(AX)(R12*1), R13
 
 emit_lit_memmove_long_repeat_emit_encodeBlockAsm10Blarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R14)
-	MOVOA X5, 16(R14)
-	ADDQ  $0x20, R14
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R13)
+	MOVOA X5, 16(R13)
 	ADDQ  $0x20, R13
-	DECQ  R12
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R12
+	DECQ  R11
 	JNA   emit_lit_memmove_long_repeat_emit_encodeBlockAsm10Blarge_big_loop_back
 
 emit_lit_memmove_long_repeat_emit_encodeBlockAsm10Blarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R13*1), X4
-	MOVOU -16(R10)(R13*1), X5
-	MOVOA X4, -32(AX)(R13*1)
-	MOVOA X5, -16(AX)(R13*1)
-	ADDQ  $0x20, R13
-	CMPQ  R9, R13
+	MOVOU -32(R9)(R12*1), X4
+	MOVOU -16(R9)(R12*1), X5
+	MOVOA X4, -32(AX)(R12*1)
+	MOVOA X5, -16(AX)(R12*1)
+	ADDQ  $0x20, R12
+	CMPQ  R8, R12
 	JAE   emit_lit_memmove_long_repeat_emit_encodeBlockAsm10Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_repeat_emit_encodeBlockAsm10B:
 	ADDL $0x05, CX
-	MOVL CX, SI
-	SUBL 16(SP), SI
-	MOVQ src_len+32(FP), R9
-	SUBL CX, R9
-	LEAQ (DX)(CX*1), R10
-	LEAQ (DX)(SI*1), SI
+	MOVL CX, BX
+	SUBL 16(SP), BX
+	MOVQ src_len+32(FP), R8
+	SUBL CX, R8
+	LEAQ (DX)(CX*1), R9
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
-	XORL R12, R12
-	CMPL R9, $0x08
+	XORL R11, R11
+	CMPL R8, $0x08
 	JL   matchlen_match4_repeat_extend_encodeBlockAsm10B
 
 matchlen_loopback_repeat_extend_encodeBlockAsm10B:
-	MOVQ  (R10)(R12*1), R11
-	XORQ  (SI)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R9)(R11*1), R10
+	XORQ  (BX)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_repeat_extend_encodeBlockAsm10B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  repeat_extend_forward_end_encodeBlockAsm10B
 
 matchlen_loop_repeat_extend_encodeBlockAsm10B:
-	LEAL -8(R9), R9
-	LEAL 8(R12), R12
-	CMPL R9, $0x08
+	LEAL -8(R8), R8
+	LEAL 8(R11), R11
+	CMPL R8, $0x08
 	JGE  matchlen_loopback_repeat_extend_encodeBlockAsm10B
 	JZ   repeat_extend_forward_end_encodeBlockAsm10B
 
 matchlen_match4_repeat_extend_encodeBlockAsm10B:
-	CMPL R9, $0x04
+	CMPL R8, $0x04
 	JL   matchlen_match2_repeat_extend_encodeBlockAsm10B
-	MOVL (R10)(R12*1), R11
-	CMPL (SI)(R12*1), R11
+	MOVL (R9)(R11*1), R10
+	CMPL (BX)(R11*1), R10
 	JNE  matchlen_match2_repeat_extend_encodeBlockAsm10B
-	SUBL $0x04, R9
-	LEAL 4(R12), R12
+	SUBL $0x04, R8
+	LEAL 4(R11), R11
 
 matchlen_match2_repeat_extend_encodeBlockAsm10B:
-	CMPL R9, $0x02
+	CMPL R8, $0x02
 	JL   matchlen_match1_repeat_extend_encodeBlockAsm10B
-	MOVW (R10)(R12*1), R11
-	CMPW (SI)(R12*1), R11
+	MOVW (R9)(R11*1), R10
+	CMPW (BX)(R11*1), R10
 	JNE  matchlen_match1_repeat_extend_encodeBlockAsm10B
-	SUBL $0x02, R9
-	LEAL 2(R12), R12
+	SUBL $0x02, R8
+	LEAL 2(R11), R11
 
 matchlen_match1_repeat_extend_encodeBlockAsm10B:
-	CMPL R9, $0x01
+	CMPL R8, $0x01
 	JL   repeat_extend_forward_end_encodeBlockAsm10B
-	MOVB (R10)(R12*1), R11
-	CMPB (SI)(R12*1), R11
+	MOVB (R9)(R11*1), R10
+	CMPB (BX)(R11*1), R10
 	JNE  repeat_extend_forward_end_encodeBlockAsm10B
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 repeat_extend_forward_end_encodeBlockAsm10B:
-	ADDL  R12, CX
-	MOVL  CX, SI
-	SUBL  DI, SI
-	MOVL  16(SP), DI
-	TESTL R8, R8
+	ADDL  R11, CX
+	MOVL  CX, BX
+	SUBL  SI, BX
+	MOVL  16(SP), SI
+	TESTL DI, DI
 	JZ    repeat_as_copy_encodeBlockAsm10B
 
 	// emitRepeat
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
 	JLE  repeat_two_match_repeat_encodeBlockAsm10B
-	CMPL R8, $0x0c
+	CMPL DI, $0x0c
 	JGE  cant_repeat_two_offset_match_repeat_encodeBlockAsm10B
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JLT  repeat_two_offset_match_repeat_encodeBlockAsm10B
 
 cant_repeat_two_offset_match_repeat_encodeBlockAsm10B:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_match_repeat_encodeBlockAsm10B
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 repeat_three_match_repeat_encodeBlockAsm10B:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 repeat_two_match_repeat_encodeBlockAsm10B:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 repeat_two_offset_match_repeat_encodeBlockAsm10B:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 repeat_as_copy_encodeBlockAsm10B:
 	// emitCopy
-two_byte_offset_repeat_as_copy_encodeBlockAsm10B:
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JLE  two_byte_offset_short_repeat_as_copy_encodeBlockAsm10B
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JAE  long_offset_short_repeat_as_copy_encodeBlockAsm10B
-	MOVL $0x00000001, R8
-	LEAL 16(R8), R8
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, R8
-	MOVB R8, (AX)
+	MOVL $0x00000001, DI
+	LEAL 16(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, SI
+	SUBL $0x08, BX
 
 	// emitRepeat
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	JMP  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm10B_emit_copy_short_2b
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
 	JLE  repeat_two_repeat_as_copy_encodeBlockAsm10B_emit_copy_short_2b
-	CMPL R8, $0x0c
+	CMPL DI, $0x0c
 	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm10B_emit_copy_short_2b
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm10B_emit_copy_short_2b
 
 cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm10B_emit_copy_short_2b:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_repeat_as_copy_encodeBlockAsm10B_emit_copy_short_2b
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 repeat_three_repeat_as_copy_encodeBlockAsm10B_emit_copy_short_2b:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 repeat_two_repeat_as_copy_encodeBlockAsm10B_emit_copy_short_2b:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 repeat_two_offset_repeat_as_copy_encodeBlockAsm10B_emit_copy_short_2b:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 long_offset_short_repeat_as_copy_encodeBlockAsm10B:
 	MOVB $0xee, (AX)
-	MOVW DI, 1(AX)
-	LEAL -60(SI), SI
+	MOVW SI, 1(AX)
+	LEAL -60(BX), BX
 	ADDQ $0x03, AX
 
 	// emitRepeat
-	MOVL SI, R8
-	LEAL -4(SI), SI
-	CMPL R8, $0x08
+	MOVL BX, DI
+	LEAL -4(BX), BX
+	CMPL DI, $0x08
 	JLE  repeat_two_repeat_as_copy_encodeBlockAsm10B_emit_copy_short
-	CMPL R8, $0x0c
+	CMPL DI, $0x0c
 	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm10B_emit_copy_short
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JLT  repeat_two_offset_repeat_as_copy_encodeBlockAsm10B_emit_copy_short
 
 cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm10B_emit_copy_short:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_repeat_as_copy_encodeBlockAsm10B_emit_copy_short
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 repeat_three_repeat_as_copy_encodeBlockAsm10B_emit_copy_short:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 repeat_two_repeat_as_copy_encodeBlockAsm10B_emit_copy_short:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 repeat_two_offset_repeat_as_copy_encodeBlockAsm10B_emit_copy_short:
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
-	JMP two_byte_offset_repeat_as_copy_encodeBlockAsm10B
 
 two_byte_offset_short_repeat_as_copy_encodeBlockAsm10B:
-	CMPL SI, $0x0c
+	MOVL BX, DI
+	SHLL $0x02, DI
+	CMPL BX, $0x0c
 	JGE  emit_copy_three_repeat_as_copy_encodeBlockAsm10B
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JGE  emit_copy_three_repeat_as_copy_encodeBlockAsm10B
-	MOVB $0x01, BL
-	LEAL -16(BX)(SI*4), SI
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	LEAL -15(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm10B
 
 emit_copy_three_repeat_as_copy_encodeBlockAsm10B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(SI*4), SI
-	MOVB SI, (AX)
-	MOVW DI, 1(AX)
+	LEAL -2(DI), DI
+	MOVB DI, (AX)
+	MOVW SI, 1(AX)
 	ADDQ $0x03, AX
 
 repeat_end_emit_encodeBlockAsm10B:
@@ -4172,16 +4142,16 @@ repeat_end_emit_encodeBlockAsm10B:
 	JMP  search_loop_encodeBlockAsm10B
 
 no_repeat_found_encodeBlockAsm10B:
-	CMPL (DX)(SI*1), DI
+	CMPL (DX)(BX*1), SI
 	JEQ  candidate_match_encodeBlockAsm10B
-	SHRQ $0x08, DI
-	MOVL 24(SP)(R10*4), SI
-	LEAL 2(CX), R9
-	CMPL (DX)(R8*1), DI
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
 	JEQ  candidate2_match_encodeBlockAsm10B
-	MOVL R9, 24(SP)(R10*4)
-	SHRQ $0x08, DI
-	CMPL (DX)(SI*1), DI
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
 	JEQ  candidate3_match_encodeBlockAsm10B
 	MOVL 20(SP), CX
 	JMP  search_loop_encodeBlockAsm10B
@@ -4191,391 +4161,389 @@ candidate3_match_encodeBlockAsm10B:
 	JMP  candidate_match_encodeBlockAsm10B
 
 candidate2_match_encodeBlockAsm10B:
-	MOVL R9, 24(SP)(R10*4)
+	MOVL R8, 24(SP)(R9*4)
 	INCL CX
-	MOVL R8, SI
+	MOVL DI, BX
 
 candidate_match_encodeBlockAsm10B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeBlockAsm10B
 
 match_extend_back_loop_encodeBlockAsm10B:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeBlockAsm10B
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeBlockAsm10B
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeBlockAsm10B
 	JMP  match_extend_back_loop_encodeBlockAsm10B
 
 match_extend_back_end_encodeBlockAsm10B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeBlockAsm10B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeBlockAsm10B:
-	MOVL CX, DI
-	MOVL 12(SP), R8
-	CMPL R8, DI
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
 	JEQ  emit_literal_done_match_emit_encodeBlockAsm10B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(R8*1), DI
-	SUBL R8, R9
-	LEAL -1(R9), R8
-	CMPL R8, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), DI
+	CMPL DI, $0x3c
 	JLT  one_byte_match_emit_encodeBlockAsm10B
-	CMPL R8, $0x00000100
+	CMPL DI, $0x00000100
 	JLT  two_bytes_match_emit_encodeBlockAsm10B
 	MOVB $0xf4, (AX)
-	MOVW R8, 1(AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeBlockAsm10B
 
 two_bytes_match_emit_encodeBlockAsm10B:
 	MOVB $0xf0, (AX)
-	MOVB R8, 1(AX)
+	MOVB DI, 1(AX)
 	ADDQ $0x02, AX
-	CMPL R8, $0x40
+	CMPL DI, $0x40
 	JL   memmove_match_emit_encodeBlockAsm10B
 	JMP  memmove_long_match_emit_encodeBlockAsm10B
 
 one_byte_match_emit_encodeBlockAsm10B:
-	SHLB $0x02, R8
-	MOVB R8, (AX)
+	SHLB $0x02, DI
+	MOVB DI, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeBlockAsm10B:
-	LEAQ (AX)(R9*1), R8
+	LEAQ (AX)(R8*1), DI
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_match_emit_encodeBlockAsm10B_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeBlockAsm10B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeBlockAsm10B_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeBlockAsm10B_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeBlockAsm10B_memmove_move_8:
-	MOVQ (DI), R10
-	MOVQ R10, (AX)
+	MOVQ (SI), R9
+	MOVQ R9, (AX)
 	JMP  memmove_end_copy_match_emit_encodeBlockAsm10B
 
 emit_lit_memmove_match_emit_encodeBlockAsm10B_memmove_move_8through16:
-	MOVQ (DI), R10
-	MOVQ -8(DI)(R9*1), DI
-	MOVQ R10, (AX)
-	MOVQ DI, -8(AX)(R9*1)
+	MOVQ (SI), R9
+	MOVQ -8(SI)(R8*1), SI
+	MOVQ R9, (AX)
+	MOVQ SI, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBlockAsm10B
 
 emit_lit_memmove_match_emit_encodeBlockAsm10B_memmove_move_17through32:
-	MOVOU (DI), X0
-	MOVOU -16(DI)(R9*1), X1
+	MOVOU (SI), X0
+	MOVOU -16(SI)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeBlockAsm10B
 
 emit_lit_memmove_match_emit_encodeBlockAsm10B_memmove_move_33through64:
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeBlockAsm10B:
-	MOVQ R8, AX
+	MOVQ DI, AX
 	JMP  emit_literal_done_match_emit_encodeBlockAsm10B
 
 memmove_long_match_emit_encodeBlockAsm10B:
-	LEAQ (AX)(R9*1), R8
+	LEAQ (AX)(R8*1), DI
 
 	// genMemMoveLong
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVQ  R9, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVQ  R8, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
 	JA    emit_lit_memmove_long_match_emit_encodeBlockAsm10Blarge_forward_sse_loop_32
-	LEAQ  -32(DI)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
+	LEAQ  -32(SI)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
 
 emit_lit_memmove_long_match_emit_encodeBlockAsm10Blarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
 	ADDQ  $0x20, R12
-	DECQ  R11
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
 	JNA   emit_lit_memmove_long_match_emit_encodeBlockAsm10Blarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeBlockAsm10Blarge_forward_sse_loop_32:
-	MOVOU -32(DI)(R12*1), X4
-	MOVOU -16(DI)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R9, R12
+	MOVOU -32(SI)(R11*1), X4
+	MOVOU -16(SI)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  R8, R11
 	JAE   emit_lit_memmove_long_match_emit_encodeBlockAsm10Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  R8, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  DI, AX
 
 emit_literal_done_match_emit_encodeBlockAsm10B:
 match_nolit_loop_encodeBlockAsm10B:
-	MOVL CX, DI
-	SUBL SI, DI
-	MOVL DI, 16(SP)
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), DI
-	SUBL CX, DI
-	LEAQ (DX)(CX*1), R8
-	LEAQ (DX)(SI*1), SI
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
-	XORL R10, R10
-	CMPL DI, $0x08
+	XORL R9, R9
+	CMPL SI, $0x08
 	JL   matchlen_match4_match_nolit_encodeBlockAsm10B
 
 matchlen_loopback_match_nolit_encodeBlockAsm10B:
-	MOVQ  (R8)(R10*1), R9
-	XORQ  (SI)(R10*1), R9
-	TESTQ R9, R9
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
 	JZ    matchlen_loop_match_nolit_encodeBlockAsm10B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R9, R9
+	TZCNTQ R8, R8
 
 #else
-	BSFQ R9, R9
+	BSFQ R8, R8
 
 #endif
-	SARQ $0x03, R9
-	LEAL (R10)(R9*1), R10
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
 	JMP  match_nolit_end_encodeBlockAsm10B
 
 matchlen_loop_match_nolit_encodeBlockAsm10B:
-	LEAL -8(DI), DI
-	LEAL 8(R10), R10
-	CMPL DI, $0x08
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeBlockAsm10B
 	JZ   match_nolit_end_encodeBlockAsm10B
 
 matchlen_match4_match_nolit_encodeBlockAsm10B:
-	CMPL DI, $0x04
+	CMPL SI, $0x04
 	JL   matchlen_match2_match_nolit_encodeBlockAsm10B
-	MOVL (R8)(R10*1), R9
-	CMPL (SI)(R10*1), R9
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
 	JNE  matchlen_match2_match_nolit_encodeBlockAsm10B
-	SUBL $0x04, DI
-	LEAL 4(R10), R10
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
 
 matchlen_match2_match_nolit_encodeBlockAsm10B:
-	CMPL DI, $0x02
+	CMPL SI, $0x02
 	JL   matchlen_match1_match_nolit_encodeBlockAsm10B
-	MOVW (R8)(R10*1), R9
-	CMPW (SI)(R10*1), R9
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
 	JNE  matchlen_match1_match_nolit_encodeBlockAsm10B
-	SUBL $0x02, DI
-	LEAL 2(R10), R10
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
 
 matchlen_match1_match_nolit_encodeBlockAsm10B:
-	CMPL DI, $0x01
+	CMPL SI, $0x01
 	JL   match_nolit_end_encodeBlockAsm10B
-	MOVB (R8)(R10*1), R9
-	CMPB (SI)(R10*1), R9
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
 	JNE  match_nolit_end_encodeBlockAsm10B
-	LEAL 1(R10), R10
+	LEAL 1(R9), R9
 
 match_nolit_end_encodeBlockAsm10B:
-	ADDL R10, CX
-	MOVL 16(SP), SI
-	ADDL $0x04, R10
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
 	MOVL CX, 12(SP)
 
 	// emitCopy
-two_byte_offset_match_nolit_encodeBlockAsm10B:
-	CMPL R10, $0x40
+	CMPL R9, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeBlockAsm10B
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JAE  long_offset_short_match_nolit_encodeBlockAsm10B
-	MOVL $0x00000001, DI
-	LEAL 16(DI), DI
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, DI
-	MOVB DI, (AX)
+	MOVL $0x00000001, SI
+	LEAL 16(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, R10
+	SUBL $0x08, R9
 
 	// emitRepeat
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	JMP  cant_repeat_two_offset_match_nolit_encodeBlockAsm10B_emit_copy_short_2b
-	MOVL R10, DI
-	LEAL -4(R10), R10
-	CMPL DI, $0x08
+	MOVL R9, SI
+	LEAL -4(R9), R9
+	CMPL SI, $0x08
 	JLE  repeat_two_match_nolit_encodeBlockAsm10B_emit_copy_short_2b
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm10B_emit_copy_short_2b
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBlockAsm10B_emit_copy_short_2b
 
 cant_repeat_two_offset_match_nolit_encodeBlockAsm10B_emit_copy_short_2b:
-	CMPL R10, $0x00000104
+	CMPL R9, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBlockAsm10B_emit_copy_short_2b
-	LEAL -256(R10), R10
+	LEAL -256(R9), R9
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW R9, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm10B
 
 repeat_three_match_nolit_encodeBlockAsm10B_emit_copy_short_2b:
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB R9, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm10B
 
 repeat_two_match_nolit_encodeBlockAsm10B_emit_copy_short_2b:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm10B
 
 repeat_two_offset_match_nolit_encodeBlockAsm10B_emit_copy_short_2b:
-	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
-	MOVB SI, 1(AX)
-	SARL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm10B
 
 long_offset_short_match_nolit_encodeBlockAsm10B:
 	MOVB $0xee, (AX)
-	MOVW SI, 1(AX)
-	LEAL -60(R10), R10
+	MOVW BX, 1(AX)
+	LEAL -60(R9), R9
 	ADDQ $0x03, AX
 
 	// emitRepeat
-	MOVL R10, DI
-	LEAL -4(R10), R10
-	CMPL DI, $0x08
+	MOVL R9, SI
+	LEAL -4(R9), R9
+	CMPL SI, $0x08
 	JLE  repeat_two_match_nolit_encodeBlockAsm10B_emit_copy_short
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm10B_emit_copy_short
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBlockAsm10B_emit_copy_short
 
 cant_repeat_two_offset_match_nolit_encodeBlockAsm10B_emit_copy_short:
-	CMPL R10, $0x00000104
+	CMPL R9, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBlockAsm10B_emit_copy_short
-	LEAL -256(R10), R10
+	LEAL -256(R9), R9
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW R9, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm10B
 
 repeat_three_match_nolit_encodeBlockAsm10B_emit_copy_short:
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB R9, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm10B
 
 repeat_two_match_nolit_encodeBlockAsm10B_emit_copy_short:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm10B
 
 repeat_two_offset_match_nolit_encodeBlockAsm10B_emit_copy_short:
-	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
-	MOVB SI, 1(AX)
-	SARL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm10B
-	JMP two_byte_offset_match_nolit_encodeBlockAsm10B
 
 two_byte_offset_short_match_nolit_encodeBlockAsm10B:
-	CMPL R10, $0x0c
+	MOVL R9, SI
+	SHLL $0x02, SI
+	CMPL R9, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeBlockAsm10B
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeBlockAsm10B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R10*4), R10
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	LEAL -15(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm10B
 
 emit_copy_three_match_nolit_encodeBlockAsm10B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R10*4), R10
-	MOVB R10, (AX)
-	MOVW SI, 1(AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeBlockAsm10B:
 	CMPL CX, 8(SP)
 	JGE  emit_remainder_encodeBlockAsm10B
-	MOVQ -2(DX)(CX*1), DI
+	MOVQ -2(DX)(CX*1), SI
 	CMPQ AX, (SP)
 	JL   match_nolit_dst_ok_encodeBlockAsm10B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_nolit_dst_ok_encodeBlockAsm10B:
-	MOVQ  $0x9e3779b1, R9
-	MOVQ  DI, R8
-	SHRQ  $0x10, DI
-	MOVQ  DI, SI
-	SHLQ  $0x20, R8
-	IMULQ R9, R8
-	SHRQ  $0x36, R8
-	SHLQ  $0x20, SI
-	IMULQ R9, SI
-	SHRQ  $0x36, SI
-	LEAL  -2(CX), R9
-	LEAQ  24(SP)(SI*4), R10
-	MOVL  (R10), SI
-	MOVL  R9, 24(SP)(R8*4)
-	MOVL  CX, (R10)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  $0x9e3779b1, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x20, DI
+	IMULQ R8, DI
+	SHRQ  $0x36, DI
+	SHLQ  $0x20, BX
+	IMULQ R8, BX
+	SHRQ  $0x36, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
 	JEQ   match_nolit_loop_encodeBlockAsm10B
 	INCL  CX
 	JMP   search_loop_encodeBlockAsm10B
@@ -4760,8 +4728,8 @@ zero_loop_encodeBlockAsm8B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -4771,414 +4739,412 @@ zero_loop_encodeBlockAsm8B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeBlockAsm8B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x04, SI
-	LEAL  4(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x04, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeBlockAsm8B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x9e3779b1, R9
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHRQ  $0x08, R11
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x9e3779b1, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x20, R9
+	IMULQ R8, R9
+	SHRQ  $0x38, R9
 	SHLQ  $0x20, R10
-	IMULQ R9, R10
+	IMULQ R8, R10
 	SHRQ  $0x38, R10
-	SHLQ  $0x20, R11
-	IMULQ R9, R11
-	SHRQ  $0x38, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  24(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	LEAL  1(CX), R10
-	MOVL  R10, 24(SP)(R11*4)
-	MOVQ  DI, R10
-	SHRQ  $0x10, R10
-	SHLQ  $0x20, R10
-	IMULQ R9, R10
-	SHRQ  $0x38, R10
-	MOVL  CX, R9
-	SUBL  16(SP), R9
-	MOVL  1(DX)(R9*1), R11
-	MOVQ  DI, R9
-	SHRQ  $0x08, R9
-	CMPL  R9, R11
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x20, R9
+	IMULQ R8, R9
+	SHRQ  $0x38, R9
+	MOVL  CX, R8
+	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
 	JNE   no_repeat_found_encodeBlockAsm8B
-	LEAL  1(CX), DI
-	MOVL  12(SP), R8
-	MOVL  DI, SI
-	SUBL  16(SP), SI
+	LEAL  1(CX), SI
+	MOVL  12(SP), DI
+	MOVL  SI, BX
+	SUBL  16(SP), BX
 	JZ    repeat_extend_back_end_encodeBlockAsm8B
 
 repeat_extend_back_loop_encodeBlockAsm8B:
-	CMPL DI, R8
+	CMPL SI, DI
 	JLE  repeat_extend_back_end_encodeBlockAsm8B
-	MOVB -1(DX)(SI*1), BL
-	MOVB -1(DX)(DI*1), R9
-	CMPB BL, R9
+	MOVB -1(DX)(BX*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
 	JNE  repeat_extend_back_end_encodeBlockAsm8B
-	LEAL -1(DI), DI
-	DECL SI
+	LEAL -1(SI), SI
+	DECL BX
 	JNZ  repeat_extend_back_loop_encodeBlockAsm8B
 
 repeat_extend_back_end_encodeBlockAsm8B:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_repeat_emit_encodeBlockAsm8B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_repeat_emit_encodeBlockAsm8B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_repeat_emit_encodeBlockAsm8B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_repeat_emit_encodeBlockAsm8B
 
 two_bytes_repeat_emit_encodeBlockAsm8B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_repeat_emit_encodeBlockAsm8B
 	JMP  memmove_long_repeat_emit_encodeBlockAsm8B
 
 one_byte_repeat_emit_encodeBlockAsm8B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_repeat_emit_encodeBlockAsm8B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_repeat_emit_encodeBlockAsm8B_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_repeat_emit_encodeBlockAsm8B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_repeat_emit_encodeBlockAsm8B_memmove_move_17through32
 	JMP  emit_lit_memmove_repeat_emit_encodeBlockAsm8B_memmove_move_33through64
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm8B_memmove_move_8:
-	MOVQ (R10), R11
-	MOVQ R11, (AX)
+	MOVQ (R9), R10
+	MOVQ R10, (AX)
 	JMP  memmove_end_copy_repeat_emit_encodeBlockAsm8B
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm8B_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_repeat_emit_encodeBlockAsm8B
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm8B_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_repeat_emit_encodeBlockAsm8B
 
 emit_lit_memmove_repeat_emit_encodeBlockAsm8B_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_repeat_emit_encodeBlockAsm8B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_repeat_emit_encodeBlockAsm8B
 
 memmove_long_repeat_emit_encodeBlockAsm8B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R12
-	SHRQ  $0x05, R12
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R13
-	SUBQ  R11, R13
-	DECQ  R12
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R11
+	SHRQ  $0x05, R11
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R12
+	SUBQ  R10, R12
+	DECQ  R11
 	JA    emit_lit_memmove_long_repeat_emit_encodeBlockAsm8Blarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R13*1), R11
-	LEAQ  -32(AX)(R13*1), R14
+	LEAQ  -32(R9)(R12*1), R10
+	LEAQ  -32(AX)(R12*1), R13
 
 emit_lit_memmove_long_repeat_emit_encodeBlockAsm8Blarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R14)
-	MOVOA X5, 16(R14)
-	ADDQ  $0x20, R14
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R13)
+	MOVOA X5, 16(R13)
 	ADDQ  $0x20, R13
-	DECQ  R12
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R12
+	DECQ  R11
 	JNA   emit_lit_memmove_long_repeat_emit_encodeBlockAsm8Blarge_big_loop_back
 
 emit_lit_memmove_long_repeat_emit_encodeBlockAsm8Blarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R13*1), X4
-	MOVOU -16(R10)(R13*1), X5
-	MOVOA X4, -32(AX)(R13*1)
-	MOVOA X5, -16(AX)(R13*1)
-	ADDQ  $0x20, R13
-	CMPQ  R9, R13
+	MOVOU -32(R9)(R12*1), X4
+	MOVOU -16(R9)(R12*1), X5
+	MOVOA X4, -32(AX)(R12*1)
+	MOVOA X5, -16(AX)(R12*1)
+	ADDQ  $0x20, R12
+	CMPQ  R8, R12
 	JAE   emit_lit_memmove_long_repeat_emit_encodeBlockAsm8Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_repeat_emit_encodeBlockAsm8B:
 	ADDL $0x05, CX
-	MOVL CX, SI
-	SUBL 16(SP), SI
-	MOVQ src_len+32(FP), R9
-	SUBL CX, R9
-	LEAQ (DX)(CX*1), R10
-	LEAQ (DX)(SI*1), SI
+	MOVL CX, BX
+	SUBL 16(SP), BX
+	MOVQ src_len+32(FP), R8
+	SUBL CX, R8
+	LEAQ (DX)(CX*1), R9
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
-	XORL R12, R12
-	CMPL R9, $0x08
+	XORL R11, R11
+	CMPL R8, $0x08
 	JL   matchlen_match4_repeat_extend_encodeBlockAsm8B
 
 matchlen_loopback_repeat_extend_encodeBlockAsm8B:
-	MOVQ  (R10)(R12*1), R11
-	XORQ  (SI)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R9)(R11*1), R10
+	XORQ  (BX)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_repeat_extend_encodeBlockAsm8B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  repeat_extend_forward_end_encodeBlockAsm8B
 
 matchlen_loop_repeat_extend_encodeBlockAsm8B:
-	LEAL -8(R9), R9
-	LEAL 8(R12), R12
-	CMPL R9, $0x08
+	LEAL -8(R8), R8
+	LEAL 8(R11), R11
+	CMPL R8, $0x08
 	JGE  matchlen_loopback_repeat_extend_encodeBlockAsm8B
 	JZ   repeat_extend_forward_end_encodeBlockAsm8B
 
 matchlen_match4_repeat_extend_encodeBlockAsm8B:
-	CMPL R9, $0x04
+	CMPL R8, $0x04
 	JL   matchlen_match2_repeat_extend_encodeBlockAsm8B
-	MOVL (R10)(R12*1), R11
-	CMPL (SI)(R12*1), R11
+	MOVL (R9)(R11*1), R10
+	CMPL (BX)(R11*1), R10
 	JNE  matchlen_match2_repeat_extend_encodeBlockAsm8B
-	SUBL $0x04, R9
-	LEAL 4(R12), R12
+	SUBL $0x04, R8
+	LEAL 4(R11), R11
 
 matchlen_match2_repeat_extend_encodeBlockAsm8B:
-	CMPL R9, $0x02
+	CMPL R8, $0x02
 	JL   matchlen_match1_repeat_extend_encodeBlockAsm8B
-	MOVW (R10)(R12*1), R11
-	CMPW (SI)(R12*1), R11
+	MOVW (R9)(R11*1), R10
+	CMPW (BX)(R11*1), R10
 	JNE  matchlen_match1_repeat_extend_encodeBlockAsm8B
-	SUBL $0x02, R9
-	LEAL 2(R12), R12
+	SUBL $0x02, R8
+	LEAL 2(R11), R11
 
 matchlen_match1_repeat_extend_encodeBlockAsm8B:
-	CMPL R9, $0x01
+	CMPL R8, $0x01
 	JL   repeat_extend_forward_end_encodeBlockAsm8B
-	MOVB (R10)(R12*1), R11
-	CMPB (SI)(R12*1), R11
+	MOVB (R9)(R11*1), R10
+	CMPB (BX)(R11*1), R10
 	JNE  repeat_extend_forward_end_encodeBlockAsm8B
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 repeat_extend_forward_end_encodeBlockAsm8B:
-	ADDL  R12, CX
-	MOVL  CX, SI
-	SUBL  DI, SI
-	MOVL  16(SP), DI
-	TESTL R8, R8
+	ADDL  R11, CX
+	MOVL  CX, BX
+	SUBL  SI, BX
+	MOVL  16(SP), SI
+	TESTL DI, DI
 	JZ    repeat_as_copy_encodeBlockAsm8B
 
 	// emitRepeat
-	MOVL SI, DI
-	LEAL -4(SI), SI
-	CMPL DI, $0x08
+	MOVL BX, SI
+	LEAL -4(BX), BX
+	CMPL SI, $0x08
 	JLE  repeat_two_match_repeat_encodeBlockAsm8B
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_match_repeat_encodeBlockAsm8B
 
 cant_repeat_two_offset_match_repeat_encodeBlockAsm8B:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_match_repeat_encodeBlockAsm8B
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
 
 repeat_three_match_repeat_encodeBlockAsm8B:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
 
 repeat_two_match_repeat_encodeBlockAsm8B:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
 
 repeat_as_copy_encodeBlockAsm8B:
 	// emitCopy
-two_byte_offset_repeat_as_copy_encodeBlockAsm8B:
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JLE  two_byte_offset_short_repeat_as_copy_encodeBlockAsm8B
-	CMPL DI, $0x00000800
+	CMPL SI, $0x00000800
 	JAE  long_offset_short_repeat_as_copy_encodeBlockAsm8B
-	MOVL $0x00000001, R8
-	LEAL 16(R8), R8
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, R8
-	MOVB R8, (AX)
+	MOVL $0x00000001, DI
+	LEAL 16(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, SI
+	SUBL $0x08, BX
 
 	// emitRepeat
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	JMP  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm8B_emit_copy_short_2b
-	MOVL SI, DI
-	LEAL -4(SI), SI
-	CMPL DI, $0x08
+	MOVL BX, SI
+	LEAL -4(BX), BX
+	CMPL SI, $0x08
 	JLE  repeat_two_repeat_as_copy_encodeBlockAsm8B_emit_copy_short_2b
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm8B_emit_copy_short_2b
 
 cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm8B_emit_copy_short_2b:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_repeat_as_copy_encodeBlockAsm8B_emit_copy_short_2b
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
 
 repeat_three_repeat_as_copy_encodeBlockAsm8B_emit_copy_short_2b:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
 
 repeat_two_repeat_as_copy_encodeBlockAsm8B_emit_copy_short_2b:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
 
 long_offset_short_repeat_as_copy_encodeBlockAsm8B:
 	MOVB $0xee, (AX)
-	MOVW DI, 1(AX)
-	LEAL -60(SI), SI
+	MOVW SI, 1(AX)
+	LEAL -60(BX), BX
 	ADDQ $0x03, AX
 
 	// emitRepeat
-	MOVL SI, DI
-	LEAL -4(SI), SI
-	CMPL DI, $0x08
+	MOVL BX, SI
+	LEAL -4(BX), BX
+	CMPL SI, $0x08
 	JLE  repeat_two_repeat_as_copy_encodeBlockAsm8B_emit_copy_short
-	CMPL DI, $0x0c
+	CMPL SI, $0x0c
 	JGE  cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm8B_emit_copy_short
 
 cant_repeat_two_offset_repeat_as_copy_encodeBlockAsm8B_emit_copy_short:
-	CMPL SI, $0x00000104
+	CMPL BX, $0x00000104
 	JLT  repeat_three_repeat_as_copy_encodeBlockAsm8B_emit_copy_short
-	LEAL -256(SI), SI
+	LEAL -256(BX), BX
 	MOVW $0x0019, (AX)
-	MOVW SI, 2(AX)
+	MOVW BX, 2(AX)
 	ADDQ $0x04, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
 
 repeat_three_repeat_as_copy_encodeBlockAsm8B_emit_copy_short:
-	LEAL -4(SI), SI
+	LEAL -4(BX), BX
 	MOVW $0x0015, (AX)
-	MOVB SI, 2(AX)
+	MOVB BL, 2(AX)
 	ADDQ $0x03, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
 
 repeat_two_repeat_as_copy_encodeBlockAsm8B_emit_copy_short:
-	SHLL $0x02, SI
-	ORL  $0x01, SI
-	MOVW SI, (AX)
+	SHLL $0x02, BX
+	ORL  $0x01, BX
+	MOVW BX, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
-	XORQ R8, R8
-	LEAL 1(R8)(SI*4), SI
-	MOVB DI, 1(AX)
-	SARL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	XORQ DI, DI
+	LEAL 1(DI)(BX*4), BX
+	MOVB SI, 1(AX)
+	SARL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
-	JMP two_byte_offset_repeat_as_copy_encodeBlockAsm8B
 
 two_byte_offset_short_repeat_as_copy_encodeBlockAsm8B:
-	CMPL SI, $0x0c
+	MOVL BX, DI
+	SHLL $0x02, DI
+	CMPL BX, $0x0c
 	JGE  emit_copy_three_repeat_as_copy_encodeBlockAsm8B
-	MOVB $0x01, BL
-	LEAL -16(BX)(SI*4), SI
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
+	LEAL -15(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
 	ADDQ $0x02, AX
 	JMP  repeat_end_emit_encodeBlockAsm8B
 
 emit_copy_three_repeat_as_copy_encodeBlockAsm8B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(SI*4), SI
-	MOVB SI, (AX)
-	MOVW DI, 1(AX)
+	LEAL -2(DI), DI
+	MOVB DI, (AX)
+	MOVW SI, 1(AX)
 	ADDQ $0x03, AX
 
 repeat_end_emit_encodeBlockAsm8B:
@@ -5186,16 +5152,16 @@ repeat_end_emit_encodeBlockAsm8B:
 	JMP  search_loop_encodeBlockAsm8B
 
 no_repeat_found_encodeBlockAsm8B:
-	CMPL (DX)(SI*1), DI
+	CMPL (DX)(BX*1), SI
 	JEQ  candidate_match_encodeBlockAsm8B
-	SHRQ $0x08, DI
-	MOVL 24(SP)(R10*4), SI
-	LEAL 2(CX), R9
-	CMPL (DX)(R8*1), DI
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
 	JEQ  candidate2_match_encodeBlockAsm8B
-	MOVL R9, 24(SP)(R10*4)
-	SHRQ $0x08, DI
-	CMPL (DX)(SI*1), DI
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
 	JEQ  candidate3_match_encodeBlockAsm8B
 	MOVL 20(SP), CX
 	JMP  search_loop_encodeBlockAsm8B
@@ -5205,381 +5171,379 @@ candidate3_match_encodeBlockAsm8B:
 	JMP  candidate_match_encodeBlockAsm8B
 
 candidate2_match_encodeBlockAsm8B:
-	MOVL R9, 24(SP)(R10*4)
+	MOVL R8, 24(SP)(R9*4)
 	INCL CX
-	MOVL R8, SI
+	MOVL DI, BX
 
 candidate_match_encodeBlockAsm8B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeBlockAsm8B
 
 match_extend_back_loop_encodeBlockAsm8B:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeBlockAsm8B
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeBlockAsm8B
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeBlockAsm8B
 	JMP  match_extend_back_loop_encodeBlockAsm8B
 
 match_extend_back_end_encodeBlockAsm8B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeBlockAsm8B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeBlockAsm8B:
-	MOVL CX, DI
-	MOVL 12(SP), R8
-	CMPL R8, DI
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
 	JEQ  emit_literal_done_match_emit_encodeBlockAsm8B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(R8*1), DI
-	SUBL R8, R9
-	LEAL -1(R9), R8
-	CMPL R8, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), DI
+	CMPL DI, $0x3c
 	JLT  one_byte_match_emit_encodeBlockAsm8B
-	CMPL R8, $0x00000100
+	CMPL DI, $0x00000100
 	JLT  two_bytes_match_emit_encodeBlockAsm8B
 	MOVB $0xf4, (AX)
-	MOVW R8, 1(AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeBlockAsm8B
 
 two_bytes_match_emit_encodeBlockAsm8B:
 	MOVB $0xf0, (AX)
-	MOVB R8, 1(AX)
+	MOVB DI, 1(AX)
 	ADDQ $0x02, AX
-	CMPL R8, $0x40
+	CMPL DI, $0x40
 	JL   memmove_match_emit_encodeBlockAsm8B
 	JMP  memmove_long_match_emit_encodeBlockAsm8B
 
 one_byte_match_emit_encodeBlockAsm8B:
-	SHLB $0x02, R8
-	MOVB R8, (AX)
+	SHLB $0x02, DI
+	MOVB DI, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeBlockAsm8B:
-	LEAQ (AX)(R9*1), R8
+	LEAQ (AX)(R8*1), DI
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_match_emit_encodeBlockAsm8B_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeBlockAsm8B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeBlockAsm8B_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeBlockAsm8B_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeBlockAsm8B_memmove_move_8:
-	MOVQ (DI), R10
-	MOVQ R10, (AX)
+	MOVQ (SI), R9
+	MOVQ R9, (AX)
 	JMP  memmove_end_copy_match_emit_encodeBlockAsm8B
 
 emit_lit_memmove_match_emit_encodeBlockAsm8B_memmove_move_8through16:
-	MOVQ (DI), R10
-	MOVQ -8(DI)(R9*1), DI
-	MOVQ R10, (AX)
-	MOVQ DI, -8(AX)(R9*1)
+	MOVQ (SI), R9
+	MOVQ -8(SI)(R8*1), SI
+	MOVQ R9, (AX)
+	MOVQ SI, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBlockAsm8B
 
 emit_lit_memmove_match_emit_encodeBlockAsm8B_memmove_move_17through32:
-	MOVOU (DI), X0
-	MOVOU -16(DI)(R9*1), X1
+	MOVOU (SI), X0
+	MOVOU -16(SI)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeBlockAsm8B
 
 emit_lit_memmove_match_emit_encodeBlockAsm8B_memmove_move_33through64:
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeBlockAsm8B:
-	MOVQ R8, AX
+	MOVQ DI, AX
 	JMP  emit_literal_done_match_emit_encodeBlockAsm8B
 
 memmove_long_match_emit_encodeBlockAsm8B:
-	LEAQ (AX)(R9*1), R8
+	LEAQ (AX)(R8*1), DI
 
 	// genMemMoveLong
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVQ  R9, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVQ  R8, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
 	JA    emit_lit_memmove_long_match_emit_encodeBlockAsm8Blarge_forward_sse_loop_32
-	LEAQ  -32(DI)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
+	LEAQ  -32(SI)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
 
 emit_lit_memmove_long_match_emit_encodeBlockAsm8Blarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
 	ADDQ  $0x20, R12
-	DECQ  R11
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
 	JNA   emit_lit_memmove_long_match_emit_encodeBlockAsm8Blarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeBlockAsm8Blarge_forward_sse_loop_32:
-	MOVOU -32(DI)(R12*1), X4
-	MOVOU -16(DI)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R9, R12
+	MOVOU -32(SI)(R11*1), X4
+	MOVOU -16(SI)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  R8, R11
 	JAE   emit_lit_memmove_long_match_emit_encodeBlockAsm8Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  R8, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  DI, AX
 
 emit_literal_done_match_emit_encodeBlockAsm8B:
 match_nolit_loop_encodeBlockAsm8B:
-	MOVL CX, DI
-	SUBL SI, DI
-	MOVL DI, 16(SP)
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), DI
-	SUBL CX, DI
-	LEAQ (DX)(CX*1), R8
-	LEAQ (DX)(SI*1), SI
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
-	XORL R10, R10
-	CMPL DI, $0x08
+	XORL R9, R9
+	CMPL SI, $0x08
 	JL   matchlen_match4_match_nolit_encodeBlockAsm8B
 
 matchlen_loopback_match_nolit_encodeBlockAsm8B:
-	MOVQ  (R8)(R10*1), R9
-	XORQ  (SI)(R10*1), R9
-	TESTQ R9, R9
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
 	JZ    matchlen_loop_match_nolit_encodeBlockAsm8B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R9, R9
+	TZCNTQ R8, R8
 
 #else
-	BSFQ R9, R9
+	BSFQ R8, R8
 
 #endif
-	SARQ $0x03, R9
-	LEAL (R10)(R9*1), R10
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
 	JMP  match_nolit_end_encodeBlockAsm8B
 
 matchlen_loop_match_nolit_encodeBlockAsm8B:
-	LEAL -8(DI), DI
-	LEAL 8(R10), R10
-	CMPL DI, $0x08
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeBlockAsm8B
 	JZ   match_nolit_end_encodeBlockAsm8B
 
 matchlen_match4_match_nolit_encodeBlockAsm8B:
-	CMPL DI, $0x04
+	CMPL SI, $0x04
 	JL   matchlen_match2_match_nolit_encodeBlockAsm8B
-	MOVL (R8)(R10*1), R9
-	CMPL (SI)(R10*1), R9
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
 	JNE  matchlen_match2_match_nolit_encodeBlockAsm8B
-	SUBL $0x04, DI
-	LEAL 4(R10), R10
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
 
 matchlen_match2_match_nolit_encodeBlockAsm8B:
-	CMPL DI, $0x02
+	CMPL SI, $0x02
 	JL   matchlen_match1_match_nolit_encodeBlockAsm8B
-	MOVW (R8)(R10*1), R9
-	CMPW (SI)(R10*1), R9
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
 	JNE  matchlen_match1_match_nolit_encodeBlockAsm8B
-	SUBL $0x02, DI
-	LEAL 2(R10), R10
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
 
 matchlen_match1_match_nolit_encodeBlockAsm8B:
-	CMPL DI, $0x01
+	CMPL SI, $0x01
 	JL   match_nolit_end_encodeBlockAsm8B
-	MOVB (R8)(R10*1), R9
-	CMPB (SI)(R10*1), R9
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
 	JNE  match_nolit_end_encodeBlockAsm8B
-	LEAL 1(R10), R10
+	LEAL 1(R9), R9
 
 match_nolit_end_encodeBlockAsm8B:
-	ADDL R10, CX
-	MOVL 16(SP), SI
-	ADDL $0x04, R10
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
 	MOVL CX, 12(SP)
 
 	// emitCopy
-two_byte_offset_match_nolit_encodeBlockAsm8B:
-	CMPL R10, $0x40
+	CMPL R9, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeBlockAsm8B
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JAE  long_offset_short_match_nolit_encodeBlockAsm8B
-	MOVL $0x00000001, DI
-	LEAL 16(DI), DI
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, DI
-	MOVB DI, (AX)
+	MOVL $0x00000001, SI
+	LEAL 16(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, R10
+	SUBL $0x08, R9
 
 	// emitRepeat
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	JMP  cant_repeat_two_offset_match_nolit_encodeBlockAsm8B_emit_copy_short_2b
-	MOVL R10, SI
-	LEAL -4(R10), R10
-	CMPL SI, $0x08
+	MOVL R9, BX
+	LEAL -4(R9), R9
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBlockAsm8B_emit_copy_short_2b
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm8B_emit_copy_short_2b
 
 cant_repeat_two_offset_match_nolit_encodeBlockAsm8B_emit_copy_short_2b:
-	CMPL R10, $0x00000104
+	CMPL R9, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBlockAsm8B_emit_copy_short_2b
-	LEAL -256(R10), R10
+	LEAL -256(R9), R9
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW R9, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm8B
 
 repeat_three_match_nolit_encodeBlockAsm8B_emit_copy_short_2b:
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB R9, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm8B
 
 repeat_two_match_nolit_encodeBlockAsm8B_emit_copy_short_2b:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm8B
-	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
-	MOVB SI, 1(AX)
-	SARL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm8B
 
 long_offset_short_match_nolit_encodeBlockAsm8B:
 	MOVB $0xee, (AX)
-	MOVW SI, 1(AX)
-	LEAL -60(R10), R10
+	MOVW BX, 1(AX)
+	LEAL -60(R9), R9
 	ADDQ $0x03, AX
 
 	// emitRepeat
-	MOVL R10, SI
-	LEAL -4(R10), R10
-	CMPL SI, $0x08
+	MOVL R9, BX
+	LEAL -4(R9), R9
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBlockAsm8B_emit_copy_short
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBlockAsm8B_emit_copy_short
 
 cant_repeat_two_offset_match_nolit_encodeBlockAsm8B_emit_copy_short:
-	CMPL R10, $0x00000104
+	CMPL R9, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBlockAsm8B_emit_copy_short
-	LEAL -256(R10), R10
+	LEAL -256(R9), R9
 	MOVW $0x0019, (AX)
-	MOVW R10, 2(AX)
+	MOVW R9, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm8B
 
 repeat_three_match_nolit_encodeBlockAsm8B_emit_copy_short:
-	LEAL -4(R10), R10
+	LEAL -4(R9), R9
 	MOVW $0x0015, (AX)
-	MOVB R10, 2(AX)
+	MOVB R9, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm8B
 
 repeat_two_match_nolit_encodeBlockAsm8B_emit_copy_short:
-	SHLL $0x02, R10
-	ORL  $0x01, R10
-	MOVW R10, (AX)
+	SHLL $0x02, R9
+	ORL  $0x01, R9
+	MOVW R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm8B
-	XORQ DI, DI
-	LEAL 1(DI)(R10*4), R10
-	MOVB SI, 1(AX)
-	SARL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	XORQ SI, SI
+	LEAL 1(SI)(R9*4), R9
+	MOVB BL, 1(AX)
+	SARL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, R9
+	MOVB R9, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm8B
-	JMP two_byte_offset_match_nolit_encodeBlockAsm8B
 
 two_byte_offset_short_match_nolit_encodeBlockAsm8B:
-	CMPL R10, $0x0c
+	MOVL R9, SI
+	SHLL $0x02, SI
+	CMPL R9, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeBlockAsm8B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R10*4), R10
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	LEAL -15(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBlockAsm8B
 
 emit_copy_three_match_nolit_encodeBlockAsm8B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R10*4), R10
-	MOVB R10, (AX)
-	MOVW SI, 1(AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeBlockAsm8B:
 	CMPL CX, 8(SP)
 	JGE  emit_remainder_encodeBlockAsm8B
-	MOVQ -2(DX)(CX*1), DI
+	MOVQ -2(DX)(CX*1), SI
 	CMPQ AX, (SP)
 	JL   match_nolit_dst_ok_encodeBlockAsm8B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_nolit_dst_ok_encodeBlockAsm8B:
-	MOVQ  $0x9e3779b1, R9
-	MOVQ  DI, R8
-	SHRQ  $0x10, DI
-	MOVQ  DI, SI
-	SHLQ  $0x20, R8
-	IMULQ R9, R8
-	SHRQ  $0x38, R8
-	SHLQ  $0x20, SI
-	IMULQ R9, SI
-	SHRQ  $0x38, SI
-	LEAL  -2(CX), R9
-	LEAQ  24(SP)(SI*4), R10
-	MOVL  (R10), SI
-	MOVL  R9, 24(SP)(R8*4)
-	MOVL  CX, (R10)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  $0x9e3779b1, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x20, DI
+	IMULQ R8, DI
+	SHRQ  $0x38, DI
+	SHLQ  $0x20, BX
+	IMULQ R8, BX
+	SHRQ  $0x38, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
 	JEQ   match_nolit_loop_encodeBlockAsm8B
 	INCL  CX
 	JMP   search_loop_encodeBlockAsm8B
@@ -5743,9 +5707,9 @@ emit_literal_done_emit_remainder_encodeBlockAsm8B:
 
 // func encodeBetterBlockAsm(dst []byte, src []byte) int
 // Requires: BMI, SSE2
-TEXT ·encodeBetterBlockAsm(SB), $327704-56
+TEXT ·encodeBetterBlockAsm(SB), $589848-56
 	MOVQ dst_base+0(FP), AX
-	MOVQ $0x00000a00, CX
+	MOVQ $0x00001200, CX
 	LEAQ 24(SP), DX
 	PXOR X0, X0
 
@@ -5764,8 +5728,8 @@ zero_loop_encodeBetterBlockAsm:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -6(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -5775,808 +5739,810 @@ zero_loop_encodeBetterBlockAsm:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeBetterBlockAsm:
-	MOVL CX, SI
-	SUBL 12(SP), SI
-	SHRL $0x07, SI
-	CMPL SI, $0x63
+	MOVL CX, BX
+	SUBL 12(SP), BX
+	SHRL $0x07, BX
+	CMPL BX, $0x63
 	JLE  check_maxskip_ok_encodeBetterBlockAsm
-	LEAL 100(CX), SI
+	LEAL 100(CX), BX
 	JMP  check_maxskip_cont_encodeBetterBlockAsm
 
 check_maxskip_ok_encodeBetterBlockAsm:
-	LEAL 1(CX)(SI*1), SI
+	LEAL 1(CX)(BX*1), BX
 
 check_maxskip_cont_encodeBetterBlockAsm:
-	CMPL  SI, 8(SP)
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeBetterBlockAsm
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x00cf1bbcdcbfa563, R9
-	MOVQ  $0x9e3779b1, SI
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHLQ  $0x08, R10
-	IMULQ R9, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x20, R11
-	IMULQ SI, R11
-	SHRQ  $0x32, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  262168(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	MOVL  CX, 262168(SP)(R11*4)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x00cf1bbcdcbfa563, R8
+	MOVQ  $0x9e3779b1, BX
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHLQ  $0x08, R9
+	IMULQ R8, R9
+	SHRQ  $0x2f, R9
+	SHLQ  $0x20, R10
+	IMULQ BX, R10
+	SHRQ  $0x32, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  524312(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	MOVL  CX, 524312(SP)(R10*4)
+	MOVQ  (DX)(BX*1), R9
+	MOVQ  (DX)(DI*1), R10
+	CMPQ  R9, SI
 	JEQ   candidate_match_encodeBetterBlockAsm
-	CMPL  (DX)(R8*1), DI
-	JEQ   candidateS_match_encodeBetterBlockAsm
-	MOVL  20(SP), CX
-	JMP   search_loop_encodeBetterBlockAsm
+	CMPQ  R10, SI
+	JNE   no_short_found_encodeBetterBlockAsm
+	MOVL  DI, BX
+	JMP   candidate_match_encodeBetterBlockAsm
+
+no_short_found_encodeBetterBlockAsm:
+	CMPL R9, SI
+	JEQ  candidate_match_encodeBetterBlockAsm
+	CMPL R10, SI
+	JEQ  candidateS_match_encodeBetterBlockAsm
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeBetterBlockAsm
 
 candidateS_match_encodeBetterBlockAsm:
-	SHRQ  $0x08, DI
-	MOVQ  DI, R10
-	SHLQ  $0x08, R10
-	IMULQ R9, R10
-	SHRQ  $0x30, R10
-	MOVL  24(SP)(R10*4), SI
+	SHRQ  $0x08, SI
+	MOVQ  SI, R9
+	SHLQ  $0x08, R9
+	IMULQ R8, R9
+	SHRQ  $0x2f, R9
+	MOVL  24(SP)(R9*4), BX
 	INCL  CX
-	MOVL  CX, 24(SP)(R10*4)
-	CMPL  (DX)(SI*1), DI
+	MOVL  CX, 24(SP)(R9*4)
+	CMPL  (DX)(BX*1), SI
 	JEQ   candidate_match_encodeBetterBlockAsm
 	DECL  CX
-	MOVL  R8, SI
+	MOVL  DI, BX
 
 candidate_match_encodeBetterBlockAsm:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeBetterBlockAsm
 
 match_extend_back_loop_encodeBetterBlockAsm:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeBetterBlockAsm
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeBetterBlockAsm
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeBetterBlockAsm
 	JMP  match_extend_back_loop_encodeBetterBlockAsm
 
 match_extend_back_end_encodeBetterBlockAsm:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 5(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 5(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeBetterBlockAsm
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeBetterBlockAsm:
-	MOVL CX, DI
+	MOVL CX, SI
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), R10
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), R9
 
 	// matchLen
-	XORL R12, R12
-	CMPL R8, $0x08
+	XORL R11, R11
+	CMPL DI, $0x08
 	JL   matchlen_match4_match_nolit_encodeBetterBlockAsm
 
 matchlen_loopback_match_nolit_encodeBetterBlockAsm:
-	MOVQ  (R9)(R12*1), R11
-	XORQ  (R10)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R8)(R11*1), R10
+	XORQ  (R9)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_match_nolit_encodeBetterBlockAsm
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  match_nolit_end_encodeBetterBlockAsm
 
 matchlen_loop_match_nolit_encodeBetterBlockAsm:
-	LEAL -8(R8), R8
-	LEAL 8(R12), R12
-	CMPL R8, $0x08
+	LEAL -8(DI), DI
+	LEAL 8(R11), R11
+	CMPL DI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeBetterBlockAsm
 	JZ   match_nolit_end_encodeBetterBlockAsm
 
 matchlen_match4_match_nolit_encodeBetterBlockAsm:
-	CMPL R8, $0x04
+	CMPL DI, $0x04
 	JL   matchlen_match2_match_nolit_encodeBetterBlockAsm
-	MOVL (R9)(R12*1), R11
-	CMPL (R10)(R12*1), R11
+	MOVL (R8)(R11*1), R10
+	CMPL (R9)(R11*1), R10
 	JNE  matchlen_match2_match_nolit_encodeBetterBlockAsm
-	SUBL $0x04, R8
-	LEAL 4(R12), R12
+	SUBL $0x04, DI
+	LEAL 4(R11), R11
 
 matchlen_match2_match_nolit_encodeBetterBlockAsm:
-	CMPL R8, $0x02
+	CMPL DI, $0x02
 	JL   matchlen_match1_match_nolit_encodeBetterBlockAsm
-	MOVW (R9)(R12*1), R11
-	CMPW (R10)(R12*1), R11
+	MOVW (R8)(R11*1), R10
+	CMPW (R9)(R11*1), R10
 	JNE  matchlen_match1_match_nolit_encodeBetterBlockAsm
-	SUBL $0x02, R8
-	LEAL 2(R12), R12
+	SUBL $0x02, DI
+	LEAL 2(R11), R11
 
 matchlen_match1_match_nolit_encodeBetterBlockAsm:
-	CMPL R8, $0x01
+	CMPL DI, $0x01
 	JL   match_nolit_end_encodeBetterBlockAsm
-	MOVB (R9)(R12*1), R11
-	CMPB (R10)(R12*1), R11
+	MOVB (R8)(R11*1), R10
+	CMPB (R9)(R11*1), R10
 	JNE  match_nolit_end_encodeBetterBlockAsm
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 match_nolit_end_encodeBetterBlockAsm:
-	MOVL CX, R8
-	SUBL SI, R8
+	MOVL CX, DI
+	SUBL BX, DI
 
 	// Check if repeat
-	CMPL 16(SP), R8
+	CMPL 16(SP), DI
 	JEQ  match_is_repeat_encodeBetterBlockAsm
-	CMPL R12, $0x01
+	CMPL R11, $0x01
 	JG   match_length_ok_encodeBetterBlockAsm
-	CMPL R8, $0x0000ffff
+	CMPL DI, $0x0000ffff
 	JLE  match_length_ok_encodeBetterBlockAsm
 	MOVL 20(SP), CX
 	INCL CX
 	JMP  search_loop_encodeBetterBlockAsm
 
 match_length_ok_encodeBetterBlockAsm:
-	MOVL R8, 16(SP)
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL DI, 16(SP)
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_encodeBetterBlockAsm
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_encodeBetterBlockAsm
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_encodeBetterBlockAsm
-	CMPL SI, $0x00010000
+	CMPL BX, $0x00010000
 	JLT  three_bytes_match_emit_encodeBetterBlockAsm
-	CMPL SI, $0x01000000
+	CMPL BX, $0x01000000
 	JLT  four_bytes_match_emit_encodeBetterBlockAsm
 	MOVB $0xfc, (AX)
-	MOVL SI, 1(AX)
+	MOVL BX, 1(AX)
 	ADDQ $0x05, AX
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm
 
 four_bytes_match_emit_encodeBetterBlockAsm:
-	MOVL SI, R11
-	SHRL $0x10, R11
+	MOVL BX, R10
+	SHRL $0x10, R10
 	MOVB $0xf8, (AX)
-	MOVW SI, 1(AX)
-	MOVB R11, 3(AX)
+	MOVW BX, 1(AX)
+	MOVB R10, 3(AX)
 	ADDQ $0x04, AX
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm
 
 three_bytes_match_emit_encodeBetterBlockAsm:
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm
 
 two_bytes_match_emit_encodeBetterBlockAsm:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_encodeBetterBlockAsm
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm
 
 one_byte_match_emit_encodeBetterBlockAsm:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeBetterBlockAsm:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x04
+	CMPQ R8, $0x04
 	JLE  emit_lit_memmove_match_emit_encodeBetterBlockAsm_memmove_move_4
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JB   emit_lit_memmove_match_emit_encodeBetterBlockAsm_memmove_move_4through7
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeBetterBlockAsm_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeBetterBlockAsm_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeBetterBlockAsm_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm_memmove_move_4:
-	MOVL (R10), R11
-	MOVL R11, (AX)
+	MOVL (R9), R10
+	MOVL R10, (AX)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm_memmove_move_4through7:
-	MOVL (R10), R11
-	MOVL -4(R10)(R9*1), R10
-	MOVL R11, (AX)
-	MOVL R10, -4(AX)(R9*1)
+	MOVL (R9), R10
+	MOVL -4(R9)(R8*1), R9
+	MOVL R10, (AX)
+	MOVL R9, -4(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeBetterBlockAsm
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeBetterBlockAsm:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_encodeBetterBlockAsm
 
 memmove_long_match_emit_encodeBetterBlockAsm:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_encodeBetterBlockAsmlarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_encodeBetterBlockAsmlarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_encodeBetterBlockAsmlarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeBetterBlockAsmlarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_encodeBetterBlockAsmlarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_encodeBetterBlockAsm:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitCopy
-	CMPL R8, $0x00010000
+	CMPL DI, $0x00010000
 	JL   two_byte_offset_match_nolit_encodeBetterBlockAsm
-
-four_bytes_loop_back_match_nolit_encodeBetterBlockAsm:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  four_bytes_remain_match_nolit_encodeBetterBlockAsm
 	MOVB $0xff, (AX)
-	MOVL R8, 1(AX)
-	LEAL -64(R12), R12
+	MOVL DI, 1(AX)
+	LEAL -64(R11), R11
 	ADDQ $0x05, AX
-	CMPL R12, $0x04
+	CMPL R11, $0x04
 	JL   four_bytes_remain_match_nolit_encodeBetterBlockAsm
 
 	// emitRepeat
 emit_repeat_again_match_nolit_encodeBetterBlockAsm_emit_copy:
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBetterBlockAsm_emit_copy
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy
 
 cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBetterBlockAsm_emit_copy
-	CMPL R12, $0x00010100
+	CMPL R11, $0x00010100
 	JLT  repeat_four_match_nolit_encodeBetterBlockAsm_emit_copy
-	CMPL R12, $0x0100ffff
+	CMPL R11, $0x0100ffff
 	JLT  repeat_five_match_nolit_encodeBetterBlockAsm_emit_copy
-	LEAL -16842747(R12), R12
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
+	LEAL -16842747(R11), R11
+	MOVL $0xfffb001d, (AX)
 	MOVB $0xff, 4(AX)
 	ADDQ $0x05, AX
 	JMP  emit_repeat_again_match_nolit_encodeBetterBlockAsm_emit_copy
 
 repeat_five_match_nolit_encodeBetterBlockAsm_emit_copy:
-	LEAL -65536(R12), R12
-	MOVL R12, R8
+	LEAL -65536(R11), R11
+	MOVL R11, DI
 	MOVW $0x001d, (AX)
-	MOVW R12, 2(AX)
-	SARL $0x10, R8
-	MOVB R8, 4(AX)
+	MOVW R11, 2(AX)
+	SARL $0x10, DI
+	MOVB DI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_four_match_nolit_encodeBetterBlockAsm_emit_copy:
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_three_match_nolit_encodeBetterBlockAsm_emit_copy:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_two_match_nolit_encodeBetterBlockAsm_emit_copy:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
-	JMP four_bytes_loop_back_match_nolit_encodeBetterBlockAsm
 
 four_bytes_remain_match_nolit_encodeBetterBlockAsm:
-	TESTL R12, R12
+	TESTL R11, R11
 	JZ    match_nolit_emitcopy_end_encodeBetterBlockAsm
-	MOVB  $0x03, BL
-	LEAL  -4(BX)(R12*4), R12
-	MOVB  R12, (AX)
-	MOVL  R8, 1(AX)
+	XORL  BX, BX
+	LEAL  -1(BX)(R11*4), R11
+	MOVB  R11, (AX)
+	MOVL  DI, 1(AX)
 	ADDQ  $0x05, AX
 	JMP   match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 two_byte_offset_match_nolit_encodeBetterBlockAsm:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeBetterBlockAsm
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JAE  long_offset_short_match_nolit_encodeBetterBlockAsm
-	MOVL $0x00000001, SI
-	LEAL 16(SI), SI
-	MOVB R8, 1(AX)
-	MOVL R8, R9
-	SHRL $0x08, R9
-	SHLL $0x05, R9
-	ORL  R9, SI
-	MOVB SI, (AX)
+	MOVL $0x00000001, BX
+	LEAL 16(BX), BX
+	MOVB DI, 1(AX)
+	MOVL DI, R8
+	SHRL $0x08, R8
+	SHLL $0x05, R8
+	ORL  R8, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, R12
+	SUBL $0x08, R11
 
 	// emitRepeat
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	JMP  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b
 
 emit_repeat_again_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b:
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b
 
 cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b
-	CMPL R12, $0x00010100
+	CMPL R11, $0x00010100
 	JLT  repeat_four_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b
-	CMPL R12, $0x0100ffff
+	CMPL R11, $0x0100ffff
 	JLT  repeat_five_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b
-	LEAL -16842747(R12), R12
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
+	LEAL -16842747(R11), R11
+	MOVL $0xfffb001d, (AX)
 	MOVB $0xff, 4(AX)
 	ADDQ $0x05, AX
 	JMP  emit_repeat_again_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b
 
 repeat_five_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b:
-	LEAL -65536(R12), R12
-	MOVL R12, R8
+	LEAL -65536(R11), R11
+	MOVL R11, DI
 	MOVW $0x001d, (AX)
-	MOVW R12, 2(AX)
-	SARL $0x10, R8
-	MOVB R8, 4(AX)
+	MOVW R11, 2(AX)
+	SARL $0x10, DI
+	MOVB DI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_four_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b:
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_three_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_two_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy_short_2b:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 long_offset_short_match_nolit_encodeBetterBlockAsm:
 	MOVB $0xee, (AX)
-	MOVW R8, 1(AX)
-	LEAL -60(R12), R12
+	MOVW DI, 1(AX)
+	LEAL -60(R11), R11
 	ADDQ $0x03, AX
 
 	// emitRepeat
 emit_repeat_again_match_nolit_encodeBetterBlockAsm_emit_copy_short:
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBetterBlockAsm_emit_copy_short
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy_short
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy_short
 
 cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy_short:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBetterBlockAsm_emit_copy_short
-	CMPL R12, $0x00010100
+	CMPL R11, $0x00010100
 	JLT  repeat_four_match_nolit_encodeBetterBlockAsm_emit_copy_short
-	CMPL R12, $0x0100ffff
+	CMPL R11, $0x0100ffff
 	JLT  repeat_five_match_nolit_encodeBetterBlockAsm_emit_copy_short
-	LEAL -16842747(R12), R12
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
+	LEAL -16842747(R11), R11
+	MOVL $0xfffb001d, (AX)
 	MOVB $0xff, 4(AX)
 	ADDQ $0x05, AX
 	JMP  emit_repeat_again_match_nolit_encodeBetterBlockAsm_emit_copy_short
 
 repeat_five_match_nolit_encodeBetterBlockAsm_emit_copy_short:
-	LEAL -65536(R12), R12
-	MOVL R12, R8
+	LEAL -65536(R11), R11
+	MOVL R11, DI
 	MOVW $0x001d, (AX)
-	MOVW R12, 2(AX)
-	SARL $0x10, R8
-	MOVB R8, 4(AX)
+	MOVW R11, 2(AX)
+	SARL $0x10, DI
+	MOVB DI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_four_match_nolit_encodeBetterBlockAsm_emit_copy_short:
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_three_match_nolit_encodeBetterBlockAsm_emit_copy_short:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_two_match_nolit_encodeBetterBlockAsm_emit_copy_short:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_two_offset_match_nolit_encodeBetterBlockAsm_emit_copy_short:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
-	JMP two_byte_offset_match_nolit_encodeBetterBlockAsm
 
 two_byte_offset_short_match_nolit_encodeBetterBlockAsm:
-	CMPL R12, $0x0c
+	MOVL R11, BX
+	SHLL $0x02, BX
+	CMPL R11, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeBetterBlockAsm
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeBetterBlockAsm
-	MOVB $0x01, BL
-	LEAL -16(BX)(R12*4), R12
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	LEAL -15(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 emit_copy_three_match_nolit_encodeBetterBlockAsm:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R12*4), R12
-	MOVB R12, (AX)
-	MOVW R8, 1(AX)
+	LEAL -2(BX), BX
+	MOVB BL, (AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 match_is_repeat_encodeBetterBlockAsm:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_repeat_encodeBetterBlockAsm
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_repeat_encodeBetterBlockAsm
-	CMPL SI, $0x00010000
+	CMPL BX, $0x00010000
 	JLT  three_bytes_match_emit_repeat_encodeBetterBlockAsm
-	CMPL SI, $0x01000000
+	CMPL BX, $0x01000000
 	JLT  four_bytes_match_emit_repeat_encodeBetterBlockAsm
 	MOVB $0xfc, (AX)
-	MOVL SI, 1(AX)
+	MOVL BX, 1(AX)
 	ADDQ $0x05, AX
 	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm
 
 four_bytes_match_emit_repeat_encodeBetterBlockAsm:
-	MOVL SI, R11
-	SHRL $0x10, R11
+	MOVL BX, R10
+	SHRL $0x10, R10
 	MOVB $0xf8, (AX)
-	MOVW SI, 1(AX)
-	MOVB R11, 3(AX)
+	MOVW BX, 1(AX)
+	MOVB R10, 3(AX)
 	ADDQ $0x04, AX
 	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm
 
 three_bytes_match_emit_repeat_encodeBetterBlockAsm:
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm
 
 two_bytes_match_emit_repeat_encodeBetterBlockAsm:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_repeat_encodeBetterBlockAsm
 	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm
 
 one_byte_match_emit_repeat_encodeBetterBlockAsm:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_repeat_encodeBetterBlockAsm:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x04
+	CMPQ R8, $0x04
 	JLE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm_memmove_move_4
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JB   emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm_memmove_move_4through7
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm_memmove_move_33through64
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm_memmove_move_4:
-	MOVL (R10), R11
-	MOVL R11, (AX)
+	MOVL (R9), R10
+	MOVL R10, (AX)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm_memmove_move_4through7:
-	MOVL (R10), R11
-	MOVL -4(R10)(R9*1), R10
-	MOVL R11, (AX)
-	MOVL R10, -4(AX)(R9*1)
+	MOVL (R9), R10
+	MOVL -4(R9)(R8*1), R9
+	MOVL R10, (AX)
+	MOVL R9, -4(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm
 
 memmove_long_match_emit_repeat_encodeBetterBlockAsm:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsmlarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsmlarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsmlarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsmlarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsmlarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_repeat_encodeBetterBlockAsm:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitRepeat
 emit_repeat_again_match_nolit_repeat_encodeBetterBlockAsm:
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_repeat_encodeBetterBlockAsm
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm
 
 cant_repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_repeat_encodeBetterBlockAsm
-	CMPL R12, $0x00010100
+	CMPL R11, $0x00010100
 	JLT  repeat_four_match_nolit_repeat_encodeBetterBlockAsm
-	CMPL R12, $0x0100ffff
+	CMPL R11, $0x0100ffff
 	JLT  repeat_five_match_nolit_repeat_encodeBetterBlockAsm
-	LEAL -16842747(R12), R12
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
+	LEAL -16842747(R11), R11
+	MOVL $0xfffb001d, (AX)
 	MOVB $0xff, 4(AX)
 	ADDQ $0x05, AX
 	JMP  emit_repeat_again_match_nolit_repeat_encodeBetterBlockAsm
 
 repeat_five_match_nolit_repeat_encodeBetterBlockAsm:
-	LEAL -65536(R12), R12
-	MOVL R12, R8
+	LEAL -65536(R11), R11
+	MOVL R11, DI
 	MOVW $0x001d, (AX)
-	MOVW R12, 2(AX)
-	SARL $0x10, R8
-	MOVB R8, 4(AX)
+	MOVW R11, 2(AX)
+	SARL $0x10, DI
+	MOVB DI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_four_match_nolit_repeat_encodeBetterBlockAsm:
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_three_match_nolit_repeat_encodeBetterBlockAsm:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_two_match_nolit_repeat_encodeBetterBlockAsm:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm
 
 repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 
 match_nolit_emitcopy_end_encodeBetterBlockAsm:
@@ -6588,54 +6554,51 @@ match_nolit_emitcopy_end_encodeBetterBlockAsm:
 	RET
 
 match_nolit_dst_ok_encodeBetterBlockAsm:
-	MOVQ  $0x00cf1bbcdcbfa563, SI
-	MOVQ  $0x9e3779b1, R8
-	INCL  DI
-	MOVQ  (DX)(DI*1), R9
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	MOVQ  R9, R12
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	SHRQ  $0x10, R12
-	LEAL  1(DI), R14
-	LEAL  2(DI), R15
-	MOVQ  -2(DX)(CX*1), R9
-	SHLQ  $0x08, R10
-	IMULQ SI, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x08, R13
-	IMULQ SI, R13
-	SHRQ  $0x30, R13
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x32, R11
+	MOVQ  $0x00cf1bbcdcbfa563, BX
+	MOVQ  $0x9e3779b1, DI
+	LEAQ  1(SI), SI
+	LEAQ  -2(CX), R8
+	MOVQ  (DX)(SI*1), R9
+	MOVQ  1(DX)(SI*1), R10
+	MOVQ  (DX)(R8*1), R11
+	MOVQ  1(DX)(R8*1), R12
+	SHLQ  $0x08, R9
+	IMULQ BX, R9
+	SHRQ  $0x2f, R9
+	SHLQ  $0x20, R10
+	IMULQ DI, R10
+	SHRQ  $0x32, R10
+	SHLQ  $0x08, R11
+	IMULQ BX, R11
+	SHRQ  $0x2f, R11
 	SHLQ  $0x20, R12
-	IMULQ R8, R12
+	IMULQ DI, R12
 	SHRQ  $0x32, R12
-	MOVL  DI, 24(SP)(R10*4)
-	MOVL  R14, 24(SP)(R13*4)
-	MOVL  R14, 262168(SP)(R11*4)
-	MOVL  R15, 262168(SP)(R12*4)
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	LEAL  -2(CX), R9
-	LEAL  -1(CX), DI
-	SHLQ  $0x08, R10
-	IMULQ SI, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x32, R11
-	SHLQ  $0x08, R13
-	IMULQ SI, R13
-	SHRQ  $0x30, R13
-	MOVL  R9, 24(SP)(R10*4)
-	MOVL  DI, 262168(SP)(R11*4)
-	MOVL  DI, 24(SP)(R13*4)
-	JMP   search_loop_encodeBetterBlockAsm
+	LEAQ  1(SI), DI
+	LEAQ  1(R8), R13
+	MOVL  SI, 24(SP)(R9*4)
+	MOVL  R8, 24(SP)(R11*4)
+	MOVL  DI, 524312(SP)(R10*4)
+	MOVL  R13, 524312(SP)(R12*4)
+	ADDQ  $0x01, SI
+	SUBQ  $0x01, R8
+
+index_loop_encodeBetterBlockAsm:
+	CMPQ  SI, R8
+	JAE   search_loop_encodeBetterBlockAsm
+	MOVQ  (DX)(SI*1), DI
+	MOVQ  (DX)(R8*1), R9
+	SHLQ  $0x08, DI
+	IMULQ BX, DI
+	SHRQ  $0x2f, DI
+	SHLQ  $0x08, R9
+	IMULQ BX, R9
+	SHRQ  $0x2f, R9
+	MOVL  SI, 24(SP)(DI*4)
+	MOVL  R8, 24(SP)(R9*4)
+	ADDQ  $0x02, SI
+	SUBQ  $0x02, R8
+	JMP   index_loop_encodeBetterBlockAsm
 
 emit_remainder_encodeBetterBlockAsm:
 	MOVQ src_len+32(FP), CX
@@ -6815,9 +6778,9 @@ emit_literal_done_emit_remainder_encodeBetterBlockAsm:
 
 // func encodeBetterBlockAsm4MB(dst []byte, src []byte) int
 // Requires: BMI, SSE2
-TEXT ·encodeBetterBlockAsm4MB(SB), $327704-56
+TEXT ·encodeBetterBlockAsm4MB(SB), $589848-56
 	MOVQ dst_base+0(FP), AX
-	MOVQ $0x00000a00, CX
+	MOVQ $0x00001200, CX
 	LEAQ 24(SP), DX
 	PXOR X0, X0
 
@@ -6836,8 +6799,8 @@ zero_loop_encodeBetterBlockAsm4MB:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -6(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -6847,746 +6810,752 @@ zero_loop_encodeBetterBlockAsm4MB:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeBetterBlockAsm4MB:
-	MOVL CX, SI
-	SUBL 12(SP), SI
-	SHRL $0x07, SI
-	CMPL SI, $0x63
+	MOVL CX, BX
+	SUBL 12(SP), BX
+	SHRL $0x07, BX
+	CMPL BX, $0x63
 	JLE  check_maxskip_ok_encodeBetterBlockAsm4MB
-	LEAL 100(CX), SI
+	LEAL 100(CX), BX
 	JMP  check_maxskip_cont_encodeBetterBlockAsm4MB
 
 check_maxskip_ok_encodeBetterBlockAsm4MB:
-	LEAL 1(CX)(SI*1), SI
+	LEAL 1(CX)(BX*1), BX
 
 check_maxskip_cont_encodeBetterBlockAsm4MB:
-	CMPL  SI, 8(SP)
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeBetterBlockAsm4MB
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x00cf1bbcdcbfa563, R9
-	MOVQ  $0x9e3779b1, SI
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHLQ  $0x08, R10
-	IMULQ R9, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x20, R11
-	IMULQ SI, R11
-	SHRQ  $0x32, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  262168(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	MOVL  CX, 262168(SP)(R11*4)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x00cf1bbcdcbfa563, R8
+	MOVQ  $0x9e3779b1, BX
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHLQ  $0x08, R9
+	IMULQ R8, R9
+	SHRQ  $0x2f, R9
+	SHLQ  $0x20, R10
+	IMULQ BX, R10
+	SHRQ  $0x32, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  524312(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	MOVL  CX, 524312(SP)(R10*4)
+	MOVQ  (DX)(BX*1), R9
+	MOVQ  (DX)(DI*1), R10
+	CMPQ  R9, SI
 	JEQ   candidate_match_encodeBetterBlockAsm4MB
-	CMPL  (DX)(R8*1), DI
-	JEQ   candidateS_match_encodeBetterBlockAsm4MB
-	MOVL  20(SP), CX
-	JMP   search_loop_encodeBetterBlockAsm4MB
+	CMPQ  R10, SI
+	JNE   no_short_found_encodeBetterBlockAsm4MB
+	MOVL  DI, BX
+	JMP   candidate_match_encodeBetterBlockAsm4MB
+
+no_short_found_encodeBetterBlockAsm4MB:
+	CMPL R9, SI
+	JEQ  candidate_match_encodeBetterBlockAsm4MB
+	CMPL R10, SI
+	JEQ  candidateS_match_encodeBetterBlockAsm4MB
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeBetterBlockAsm4MB
 
 candidateS_match_encodeBetterBlockAsm4MB:
-	SHRQ  $0x08, DI
-	MOVQ  DI, R10
-	SHLQ  $0x08, R10
-	IMULQ R9, R10
-	SHRQ  $0x30, R10
-	MOVL  24(SP)(R10*4), SI
+	SHRQ  $0x08, SI
+	MOVQ  SI, R9
+	SHLQ  $0x08, R9
+	IMULQ R8, R9
+	SHRQ  $0x2f, R9
+	MOVL  24(SP)(R9*4), BX
 	INCL  CX
-	MOVL  CX, 24(SP)(R10*4)
-	CMPL  (DX)(SI*1), DI
+	MOVL  CX, 24(SP)(R9*4)
+	CMPL  (DX)(BX*1), SI
 	JEQ   candidate_match_encodeBetterBlockAsm4MB
 	DECL  CX
-	MOVL  R8, SI
+	MOVL  DI, BX
 
 candidate_match_encodeBetterBlockAsm4MB:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeBetterBlockAsm4MB
 
 match_extend_back_loop_encodeBetterBlockAsm4MB:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeBetterBlockAsm4MB
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeBetterBlockAsm4MB
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeBetterBlockAsm4MB
 	JMP  match_extend_back_loop_encodeBetterBlockAsm4MB
 
 match_extend_back_end_encodeBetterBlockAsm4MB:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 4(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 4(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeBetterBlockAsm4MB
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeBetterBlockAsm4MB:
-	MOVL CX, DI
+	MOVL CX, SI
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), R10
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), R9
 
 	// matchLen
-	XORL R12, R12
-	CMPL R8, $0x08
+	XORL R11, R11
+	CMPL DI, $0x08
 	JL   matchlen_match4_match_nolit_encodeBetterBlockAsm4MB
 
 matchlen_loopback_match_nolit_encodeBetterBlockAsm4MB:
-	MOVQ  (R9)(R12*1), R11
-	XORQ  (R10)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R8)(R11*1), R10
+	XORQ  (R9)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_match_nolit_encodeBetterBlockAsm4MB
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  match_nolit_end_encodeBetterBlockAsm4MB
 
 matchlen_loop_match_nolit_encodeBetterBlockAsm4MB:
-	LEAL -8(R8), R8
-	LEAL 8(R12), R12
-	CMPL R8, $0x08
+	LEAL -8(DI), DI
+	LEAL 8(R11), R11
+	CMPL DI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeBetterBlockAsm4MB
 	JZ   match_nolit_end_encodeBetterBlockAsm4MB
 
 matchlen_match4_match_nolit_encodeBetterBlockAsm4MB:
-	CMPL R8, $0x04
+	CMPL DI, $0x04
 	JL   matchlen_match2_match_nolit_encodeBetterBlockAsm4MB
-	MOVL (R9)(R12*1), R11
-	CMPL (R10)(R12*1), R11
+	MOVL (R8)(R11*1), R10
+	CMPL (R9)(R11*1), R10
 	JNE  matchlen_match2_match_nolit_encodeBetterBlockAsm4MB
-	SUBL $0x04, R8
-	LEAL 4(R12), R12
+	SUBL $0x04, DI
+	LEAL 4(R11), R11
 
 matchlen_match2_match_nolit_encodeBetterBlockAsm4MB:
-	CMPL R8, $0x02
+	CMPL DI, $0x02
 	JL   matchlen_match1_match_nolit_encodeBetterBlockAsm4MB
-	MOVW (R9)(R12*1), R11
-	CMPW (R10)(R12*1), R11
+	MOVW (R8)(R11*1), R10
+	CMPW (R9)(R11*1), R10
 	JNE  matchlen_match1_match_nolit_encodeBetterBlockAsm4MB
-	SUBL $0x02, R8
-	LEAL 2(R12), R12
+	SUBL $0x02, DI
+	LEAL 2(R11), R11
 
 matchlen_match1_match_nolit_encodeBetterBlockAsm4MB:
-	CMPL R8, $0x01
+	CMPL DI, $0x01
 	JL   match_nolit_end_encodeBetterBlockAsm4MB
-	MOVB (R9)(R12*1), R11
-	CMPB (R10)(R12*1), R11
+	MOVB (R8)(R11*1), R10
+	CMPB (R9)(R11*1), R10
 	JNE  match_nolit_end_encodeBetterBlockAsm4MB
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 match_nolit_end_encodeBetterBlockAsm4MB:
-	MOVL CX, R8
-	SUBL SI, R8
+	MOVL CX, DI
+	SUBL BX, DI
 
 	// Check if repeat
-	CMPL 16(SP), R8
+	CMPL 16(SP), DI
 	JEQ  match_is_repeat_encodeBetterBlockAsm4MB
-	CMPL R12, $0x01
+	CMPL R11, $0x01
 	JG   match_length_ok_encodeBetterBlockAsm4MB
-	CMPL R8, $0x0000ffff
+	CMPL DI, $0x0000ffff
 	JLE  match_length_ok_encodeBetterBlockAsm4MB
 	MOVL 20(SP), CX
 	INCL CX
 	JMP  search_loop_encodeBetterBlockAsm4MB
 
 match_length_ok_encodeBetterBlockAsm4MB:
-	MOVL R8, 16(SP)
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL DI, 16(SP)
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_encodeBetterBlockAsm4MB
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_encodeBetterBlockAsm4MB
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_encodeBetterBlockAsm4MB
-	CMPL SI, $0x00010000
+	CMPL BX, $0x00010000
 	JLT  three_bytes_match_emit_encodeBetterBlockAsm4MB
-	MOVL SI, R11
-	SHRL $0x10, R11
+	MOVL BX, R10
+	SHRL $0x10, R10
 	MOVB $0xf8, (AX)
-	MOVW SI, 1(AX)
-	MOVB R11, 3(AX)
+	MOVW BX, 1(AX)
+	MOVB R10, 3(AX)
 	ADDQ $0x04, AX
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm4MB
 
 three_bytes_match_emit_encodeBetterBlockAsm4MB:
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm4MB
 
 two_bytes_match_emit_encodeBetterBlockAsm4MB:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_encodeBetterBlockAsm4MB
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm4MB
 
 one_byte_match_emit_encodeBetterBlockAsm4MB:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeBetterBlockAsm4MB:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x04
+	CMPQ R8, $0x04
 	JLE  emit_lit_memmove_match_emit_encodeBetterBlockAsm4MB_memmove_move_4
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JB   emit_lit_memmove_match_emit_encodeBetterBlockAsm4MB_memmove_move_4through7
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeBetterBlockAsm4MB_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeBetterBlockAsm4MB_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeBetterBlockAsm4MB_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm4MB_memmove_move_4:
-	MOVL (R10), R11
-	MOVL R11, (AX)
+	MOVL (R9), R10
+	MOVL R10, (AX)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm4MB
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm4MB_memmove_move_4through7:
-	MOVL (R10), R11
-	MOVL -4(R10)(R9*1), R10
-	MOVL R11, (AX)
-	MOVL R10, -4(AX)(R9*1)
+	MOVL (R9), R10
+	MOVL -4(R9)(R8*1), R9
+	MOVL R10, (AX)
+	MOVL R9, -4(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm4MB
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm4MB_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm4MB
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm4MB_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeBetterBlockAsm4MB
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm4MB_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeBetterBlockAsm4MB:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_encodeBetterBlockAsm4MB
 
 memmove_long_match_emit_encodeBetterBlockAsm4MB:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_encodeBetterBlockAsm4MBlarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_encodeBetterBlockAsm4MBlarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_encodeBetterBlockAsm4MBlarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeBetterBlockAsm4MBlarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_encodeBetterBlockAsm4MBlarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_encodeBetterBlockAsm4MB:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitCopy
-	CMPL R8, $0x00010000
+	CMPL DI, $0x00010000
 	JL   two_byte_offset_match_nolit_encodeBetterBlockAsm4MB
-
-four_bytes_loop_back_match_nolit_encodeBetterBlockAsm4MB:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  four_bytes_remain_match_nolit_encodeBetterBlockAsm4MB
 	MOVB $0xff, (AX)
-	MOVL R8, 1(AX)
-	LEAL -64(R12), R12
+	MOVL DI, 1(AX)
+	LEAL -64(R11), R11
 	ADDQ $0x05, AX
-	CMPL R12, $0x04
+	CMPL R11, $0x04
 	JL   four_bytes_remain_match_nolit_encodeBetterBlockAsm4MB
 
 	// emitRepeat
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBetterBlockAsm4MB_emit_copy
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy
 
 cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBetterBlockAsm4MB_emit_copy
-	CMPL R12, $0x00010100
+	CMPL R11, $0x00010100
 	JLT  repeat_four_match_nolit_encodeBetterBlockAsm4MB_emit_copy
-	LEAL -65536(R12), R12
-	MOVL R12, R8
+	LEAL -65536(R11), R11
+	MOVL R11, DI
 	MOVW $0x001d, (AX)
-	MOVW R12, 2(AX)
-	SARL $0x10, R8
-	MOVB R8, 4(AX)
+	MOVW R11, 2(AX)
+	SARL $0x10, DI
+	MOVB DI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_four_match_nolit_encodeBetterBlockAsm4MB_emit_copy:
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_three_match_nolit_encodeBetterBlockAsm4MB_emit_copy:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_two_match_nolit_encodeBetterBlockAsm4MB_emit_copy:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
-	JMP four_bytes_loop_back_match_nolit_encodeBetterBlockAsm4MB
 
 four_bytes_remain_match_nolit_encodeBetterBlockAsm4MB:
-	TESTL R12, R12
+	TESTL R11, R11
 	JZ    match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
-	MOVB  $0x03, BL
-	LEAL  -4(BX)(R12*4), R12
-	MOVB  R12, (AX)
-	MOVL  R8, 1(AX)
+	XORL  BX, BX
+	LEAL  -1(BX)(R11*4), R11
+	MOVB  R11, (AX)
+	MOVL  DI, 1(AX)
 	ADDQ  $0x05, AX
 	JMP   match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 two_byte_offset_match_nolit_encodeBetterBlockAsm4MB:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeBetterBlockAsm4MB
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JAE  long_offset_short_match_nolit_encodeBetterBlockAsm4MB
-	MOVL $0x00000001, SI
-	LEAL 16(SI), SI
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, SI
-	MOVB SI, (AX)
+	MOVL $0x00000001, BX
+	LEAL 16(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, R12
+	SUBL $0x08, R11
 
 	// emitRepeat
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	JMP  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short_2b
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short_2b
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short_2b
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short_2b
 
 cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short_2b:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short_2b
-	CMPL R12, $0x00010100
+	CMPL R11, $0x00010100
 	JLT  repeat_four_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short_2b
-	LEAL -65536(R12), R12
-	MOVL R12, R8
+	LEAL -65536(R11), R11
+	MOVL R11, DI
 	MOVW $0x001d, (AX)
-	MOVW R12, 2(AX)
-	SARL $0x10, R8
-	MOVB R8, 4(AX)
+	MOVW R11, 2(AX)
+	SARL $0x10, DI
+	MOVB DI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_four_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short_2b:
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_three_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short_2b:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_two_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short_2b:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short_2b:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 long_offset_short_match_nolit_encodeBetterBlockAsm4MB:
 	MOVB $0xee, (AX)
-	MOVW R8, 1(AX)
-	LEAL -60(R12), R12
+	MOVW DI, 1(AX)
+	LEAL -60(R11), R11
 	ADDQ $0x03, AX
 
 	// emitRepeat
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short
 
 cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short
-	CMPL R12, $0x00010100
+	CMPL R11, $0x00010100
 	JLT  repeat_four_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short
-	LEAL -65536(R12), R12
-	MOVL R12, R8
+	LEAL -65536(R11), R11
+	MOVL R11, DI
 	MOVW $0x001d, (AX)
-	MOVW R12, 2(AX)
-	SARL $0x10, R8
-	MOVB R8, 4(AX)
+	MOVW R11, 2(AX)
+	SARL $0x10, DI
+	MOVB DI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_four_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short:
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_three_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_two_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_two_offset_match_nolit_encodeBetterBlockAsm4MB_emit_copy_short:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
-	JMP two_byte_offset_match_nolit_encodeBetterBlockAsm4MB
 
 two_byte_offset_short_match_nolit_encodeBetterBlockAsm4MB:
-	CMPL R12, $0x0c
+	MOVL R11, BX
+	SHLL $0x02, BX
+	CMPL R11, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeBetterBlockAsm4MB
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeBetterBlockAsm4MB
-	MOVB $0x01, BL
-	LEAL -16(BX)(R12*4), R12
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	LEAL -15(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 emit_copy_three_match_nolit_encodeBetterBlockAsm4MB:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R12*4), R12
-	MOVB R12, (AX)
-	MOVW R8, 1(AX)
+	LEAL -2(BX), BX
+	MOVB BL, (AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 match_is_repeat_encodeBetterBlockAsm4MB:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm4MB
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_repeat_encodeBetterBlockAsm4MB
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_repeat_encodeBetterBlockAsm4MB
-	CMPL SI, $0x00010000
+	CMPL BX, $0x00010000
 	JLT  three_bytes_match_emit_repeat_encodeBetterBlockAsm4MB
-	MOVL SI, R11
-	SHRL $0x10, R11
+	MOVL BX, R10
+	SHRL $0x10, R10
 	MOVB $0xf8, (AX)
-	MOVW SI, 1(AX)
-	MOVB R11, 3(AX)
+	MOVW BX, 1(AX)
+	MOVB R10, 3(AX)
 	ADDQ $0x04, AX
 	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm4MB
 
 three_bytes_match_emit_repeat_encodeBetterBlockAsm4MB:
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm4MB
 
 two_bytes_match_emit_repeat_encodeBetterBlockAsm4MB:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_repeat_encodeBetterBlockAsm4MB
 	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm4MB
 
 one_byte_match_emit_repeat_encodeBetterBlockAsm4MB:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_repeat_encodeBetterBlockAsm4MB:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x04
+	CMPQ R8, $0x04
 	JLE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm4MB_memmove_move_4
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JB   emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm4MB_memmove_move_4through7
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm4MB_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm4MB_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm4MB_memmove_move_33through64
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm4MB_memmove_move_4:
-	MOVL (R10), R11
-	MOVL R11, (AX)
+	MOVL (R9), R10
+	MOVL R10, (AX)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm4MB
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm4MB_memmove_move_4through7:
-	MOVL (R10), R11
-	MOVL -4(R10)(R9*1), R10
-	MOVL R11, (AX)
-	MOVL R10, -4(AX)(R9*1)
+	MOVL (R9), R10
+	MOVL -4(R9)(R8*1), R9
+	MOVL R10, (AX)
+	MOVL R9, -4(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm4MB
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm4MB_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm4MB
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm4MB_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm4MB
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm4MB_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm4MB:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm4MB
 
 memmove_long_match_emit_repeat_encodeBetterBlockAsm4MB:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm4MBlarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm4MBlarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm4MBlarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm4MBlarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm4MBlarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_repeat_encodeBetterBlockAsm4MB:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitRepeat
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_repeat_encodeBetterBlockAsm4MB
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm4MB
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm4MB
 
 cant_repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm4MB:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_repeat_encodeBetterBlockAsm4MB
-	CMPL R12, $0x00010100
+	CMPL R11, $0x00010100
 	JLT  repeat_four_match_nolit_repeat_encodeBetterBlockAsm4MB
-	LEAL -65536(R12), R12
-	MOVL R12, R8
+	LEAL -65536(R11), R11
+	MOVL R11, DI
 	MOVW $0x001d, (AX)
-	MOVW R12, 2(AX)
-	SARL $0x10, R8
-	MOVB R8, 4(AX)
+	MOVW R11, 2(AX)
+	SARL $0x10, DI
+	MOVB DI, 4(AX)
 	ADDQ $0x05, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_four_match_nolit_repeat_encodeBetterBlockAsm4MB:
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_three_match_nolit_repeat_encodeBetterBlockAsm4MB:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_two_match_nolit_repeat_encodeBetterBlockAsm4MB:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm4MB
 
 repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm4MB:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 
 match_nolit_emitcopy_end_encodeBetterBlockAsm4MB:
@@ -7598,54 +7567,51 @@ match_nolit_emitcopy_end_encodeBetterBlockAsm4MB:
 	RET
 
 match_nolit_dst_ok_encodeBetterBlockAsm4MB:
-	MOVQ  $0x00cf1bbcdcbfa563, SI
-	MOVQ  $0x9e3779b1, R8
-	INCL  DI
-	MOVQ  (DX)(DI*1), R9
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	MOVQ  R9, R12
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	SHRQ  $0x10, R12
-	LEAL  1(DI), R14
-	LEAL  2(DI), R15
-	MOVQ  -2(DX)(CX*1), R9
-	SHLQ  $0x08, R10
-	IMULQ SI, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x08, R13
-	IMULQ SI, R13
-	SHRQ  $0x30, R13
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x32, R11
+	MOVQ  $0x00cf1bbcdcbfa563, BX
+	MOVQ  $0x9e3779b1, DI
+	LEAQ  1(SI), SI
+	LEAQ  -2(CX), R8
+	MOVQ  (DX)(SI*1), R9
+	MOVQ  1(DX)(SI*1), R10
+	MOVQ  (DX)(R8*1), R11
+	MOVQ  1(DX)(R8*1), R12
+	SHLQ  $0x08, R9
+	IMULQ BX, R9
+	SHRQ  $0x2f, R9
+	SHLQ  $0x20, R10
+	IMULQ DI, R10
+	SHRQ  $0x32, R10
+	SHLQ  $0x08, R11
+	IMULQ BX, R11
+	SHRQ  $0x2f, R11
 	SHLQ  $0x20, R12
-	IMULQ R8, R12
+	IMULQ DI, R12
 	SHRQ  $0x32, R12
-	MOVL  DI, 24(SP)(R10*4)
-	MOVL  R14, 24(SP)(R13*4)
-	MOVL  R14, 262168(SP)(R11*4)
-	MOVL  R15, 262168(SP)(R12*4)
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	LEAL  -2(CX), R9
-	LEAL  -1(CX), DI
-	SHLQ  $0x08, R10
-	IMULQ SI, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x32, R11
-	SHLQ  $0x08, R13
-	IMULQ SI, R13
-	SHRQ  $0x30, R13
-	MOVL  R9, 24(SP)(R10*4)
-	MOVL  DI, 262168(SP)(R11*4)
-	MOVL  DI, 24(SP)(R13*4)
-	JMP   search_loop_encodeBetterBlockAsm4MB
+	LEAQ  1(SI), DI
+	LEAQ  1(R8), R13
+	MOVL  SI, 24(SP)(R9*4)
+	MOVL  R8, 24(SP)(R11*4)
+	MOVL  DI, 524312(SP)(R10*4)
+	MOVL  R13, 524312(SP)(R12*4)
+	ADDQ  $0x01, SI
+	SUBQ  $0x01, R8
+
+index_loop_encodeBetterBlockAsm4MB:
+	CMPQ  SI, R8
+	JAE   search_loop_encodeBetterBlockAsm4MB
+	MOVQ  (DX)(SI*1), DI
+	MOVQ  (DX)(R8*1), R9
+	SHLQ  $0x08, DI
+	IMULQ BX, DI
+	SHRQ  $0x2f, DI
+	SHLQ  $0x08, R9
+	IMULQ BX, R9
+	SHRQ  $0x2f, R9
+	MOVL  SI, 24(SP)(DI*4)
+	MOVL  R8, 24(SP)(R9*4)
+	ADDQ  $0x02, SI
+	SUBQ  $0x02, R8
+	JMP   index_loop_encodeBetterBlockAsm4MB
 
 emit_remainder_encodeBetterBlockAsm4MB:
 	MOVQ src_len+32(FP), CX
@@ -7838,8 +7804,8 @@ zero_loop_encodeBetterBlockAsm12B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -6(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -7849,591 +7815,599 @@ zero_loop_encodeBetterBlockAsm12B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeBetterBlockAsm12B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x06, SI
-	LEAL  1(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x06, BX
+	LEAL  1(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeBetterBlockAsm12B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  $0x9e3779b1, SI
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x32, R10
-	SHLQ  $0x20, R11
-	IMULQ SI, R11
-	SHRQ  $0x34, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  65560(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	MOVL  CX, 65560(SP)(R11*4)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  $0x9e3779b1, BX
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
+	SHLQ  $0x20, R10
+	IMULQ BX, R10
+	SHRQ  $0x34, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  65560(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	MOVL  CX, 65560(SP)(R10*4)
+	MOVQ  (DX)(BX*1), R9
+	MOVQ  (DX)(DI*1), R10
+	CMPQ  R9, SI
 	JEQ   candidate_match_encodeBetterBlockAsm12B
-	CMPL  (DX)(R8*1), DI
-	JEQ   candidateS_match_encodeBetterBlockAsm12B
-	MOVL  20(SP), CX
-	JMP   search_loop_encodeBetterBlockAsm12B
+	CMPQ  R10, SI
+	JNE   no_short_found_encodeBetterBlockAsm12B
+	MOVL  DI, BX
+	JMP   candidate_match_encodeBetterBlockAsm12B
+
+no_short_found_encodeBetterBlockAsm12B:
+	CMPL R9, SI
+	JEQ  candidate_match_encodeBetterBlockAsm12B
+	CMPL R10, SI
+	JEQ  candidateS_match_encodeBetterBlockAsm12B
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeBetterBlockAsm12B
 
 candidateS_match_encodeBetterBlockAsm12B:
-	SHRQ  $0x08, DI
-	MOVQ  DI, R10
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x32, R10
-	MOVL  24(SP)(R10*4), SI
+	SHRQ  $0x08, SI
+	MOVQ  SI, R9
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
+	MOVL  24(SP)(R9*4), BX
 	INCL  CX
-	MOVL  CX, 24(SP)(R10*4)
-	CMPL  (DX)(SI*1), DI
+	MOVL  CX, 24(SP)(R9*4)
+	CMPL  (DX)(BX*1), SI
 	JEQ   candidate_match_encodeBetterBlockAsm12B
 	DECL  CX
-	MOVL  R8, SI
+	MOVL  DI, BX
 
 candidate_match_encodeBetterBlockAsm12B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeBetterBlockAsm12B
 
 match_extend_back_loop_encodeBetterBlockAsm12B:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeBetterBlockAsm12B
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeBetterBlockAsm12B
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeBetterBlockAsm12B
 	JMP  match_extend_back_loop_encodeBetterBlockAsm12B
 
 match_extend_back_end_encodeBetterBlockAsm12B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeBetterBlockAsm12B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeBetterBlockAsm12B:
-	MOVL CX, DI
+	MOVL CX, SI
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), R10
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), R9
 
 	// matchLen
-	XORL R12, R12
-	CMPL R8, $0x08
+	XORL R11, R11
+	CMPL DI, $0x08
 	JL   matchlen_match4_match_nolit_encodeBetterBlockAsm12B
 
 matchlen_loopback_match_nolit_encodeBetterBlockAsm12B:
-	MOVQ  (R9)(R12*1), R11
-	XORQ  (R10)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R8)(R11*1), R10
+	XORQ  (R9)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_match_nolit_encodeBetterBlockAsm12B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  match_nolit_end_encodeBetterBlockAsm12B
 
 matchlen_loop_match_nolit_encodeBetterBlockAsm12B:
-	LEAL -8(R8), R8
-	LEAL 8(R12), R12
-	CMPL R8, $0x08
+	LEAL -8(DI), DI
+	LEAL 8(R11), R11
+	CMPL DI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeBetterBlockAsm12B
 	JZ   match_nolit_end_encodeBetterBlockAsm12B
 
 matchlen_match4_match_nolit_encodeBetterBlockAsm12B:
-	CMPL R8, $0x04
+	CMPL DI, $0x04
 	JL   matchlen_match2_match_nolit_encodeBetterBlockAsm12B
-	MOVL (R9)(R12*1), R11
-	CMPL (R10)(R12*1), R11
+	MOVL (R8)(R11*1), R10
+	CMPL (R9)(R11*1), R10
 	JNE  matchlen_match2_match_nolit_encodeBetterBlockAsm12B
-	SUBL $0x04, R8
-	LEAL 4(R12), R12
+	SUBL $0x04, DI
+	LEAL 4(R11), R11
 
 matchlen_match2_match_nolit_encodeBetterBlockAsm12B:
-	CMPL R8, $0x02
+	CMPL DI, $0x02
 	JL   matchlen_match1_match_nolit_encodeBetterBlockAsm12B
-	MOVW (R9)(R12*1), R11
-	CMPW (R10)(R12*1), R11
+	MOVW (R8)(R11*1), R10
+	CMPW (R9)(R11*1), R10
 	JNE  matchlen_match1_match_nolit_encodeBetterBlockAsm12B
-	SUBL $0x02, R8
-	LEAL 2(R12), R12
+	SUBL $0x02, DI
+	LEAL 2(R11), R11
 
 matchlen_match1_match_nolit_encodeBetterBlockAsm12B:
-	CMPL R8, $0x01
+	CMPL DI, $0x01
 	JL   match_nolit_end_encodeBetterBlockAsm12B
-	MOVB (R9)(R12*1), R11
-	CMPB (R10)(R12*1), R11
+	MOVB (R8)(R11*1), R10
+	CMPB (R9)(R11*1), R10
 	JNE  match_nolit_end_encodeBetterBlockAsm12B
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 match_nolit_end_encodeBetterBlockAsm12B:
-	MOVL CX, R8
-	SUBL SI, R8
+	MOVL CX, DI
+	SUBL BX, DI
 
 	// Check if repeat
-	CMPL 16(SP), R8
+	CMPL 16(SP), DI
 	JEQ  match_is_repeat_encodeBetterBlockAsm12B
-	MOVL R8, 16(SP)
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL DI, 16(SP)
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_encodeBetterBlockAsm12B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_encodeBetterBlockAsm12B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_encodeBetterBlockAsm12B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm12B
 
 two_bytes_match_emit_encodeBetterBlockAsm12B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_encodeBetterBlockAsm12B
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm12B
 
 one_byte_match_emit_encodeBetterBlockAsm12B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeBetterBlockAsm12B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x04
+	CMPQ R8, $0x04
 	JLE  emit_lit_memmove_match_emit_encodeBetterBlockAsm12B_memmove_move_4
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JB   emit_lit_memmove_match_emit_encodeBetterBlockAsm12B_memmove_move_4through7
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeBetterBlockAsm12B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeBetterBlockAsm12B_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeBetterBlockAsm12B_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm12B_memmove_move_4:
-	MOVL (R10), R11
-	MOVL R11, (AX)
+	MOVL (R9), R10
+	MOVL R10, (AX)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm12B
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm12B_memmove_move_4through7:
-	MOVL (R10), R11
-	MOVL -4(R10)(R9*1), R10
-	MOVL R11, (AX)
-	MOVL R10, -4(AX)(R9*1)
+	MOVL (R9), R10
+	MOVL -4(R9)(R8*1), R9
+	MOVL R10, (AX)
+	MOVL R9, -4(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm12B
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm12B_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm12B
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm12B_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeBetterBlockAsm12B
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm12B_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeBetterBlockAsm12B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_encodeBetterBlockAsm12B
 
 memmove_long_match_emit_encodeBetterBlockAsm12B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_encodeBetterBlockAsm12Blarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_encodeBetterBlockAsm12Blarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_encodeBetterBlockAsm12Blarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeBetterBlockAsm12Blarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_encodeBetterBlockAsm12Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_encodeBetterBlockAsm12B:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitCopy
-two_byte_offset_match_nolit_encodeBetterBlockAsm12B:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeBetterBlockAsm12B
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JAE  long_offset_short_match_nolit_encodeBetterBlockAsm12B
-	MOVL $0x00000001, SI
-	LEAL 16(SI), SI
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, SI
-	MOVB SI, (AX)
+	MOVL $0x00000001, BX
+	LEAL 16(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, R12
+	SUBL $0x08, R11
 
 	// emitRepeat
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	JMP  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm12B_emit_copy_short_2b
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBetterBlockAsm12B_emit_copy_short_2b
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm12B_emit_copy_short_2b
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBetterBlockAsm12B_emit_copy_short_2b
 
 cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm12B_emit_copy_short_2b:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBetterBlockAsm12B_emit_copy_short_2b
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 repeat_three_match_nolit_encodeBetterBlockAsm12B_emit_copy_short_2b:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 repeat_two_match_nolit_encodeBetterBlockAsm12B_emit_copy_short_2b:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 repeat_two_offset_match_nolit_encodeBetterBlockAsm12B_emit_copy_short_2b:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 long_offset_short_match_nolit_encodeBetterBlockAsm12B:
 	MOVB $0xee, (AX)
-	MOVW R8, 1(AX)
-	LEAL -60(R12), R12
+	MOVW DI, 1(AX)
+	LEAL -60(R11), R11
 	ADDQ $0x03, AX
 
 	// emitRepeat
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBetterBlockAsm12B_emit_copy_short
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm12B_emit_copy_short
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBetterBlockAsm12B_emit_copy_short
 
 cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm12B_emit_copy_short:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBetterBlockAsm12B_emit_copy_short
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 repeat_three_match_nolit_encodeBetterBlockAsm12B_emit_copy_short:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 repeat_two_match_nolit_encodeBetterBlockAsm12B_emit_copy_short:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 repeat_two_offset_match_nolit_encodeBetterBlockAsm12B_emit_copy_short:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
-	JMP two_byte_offset_match_nolit_encodeBetterBlockAsm12B
 
 two_byte_offset_short_match_nolit_encodeBetterBlockAsm12B:
-	CMPL R12, $0x0c
+	MOVL R11, BX
+	SHLL $0x02, BX
+	CMPL R11, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeBetterBlockAsm12B
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeBetterBlockAsm12B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R12*4), R12
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	LEAL -15(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 emit_copy_three_match_nolit_encodeBetterBlockAsm12B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R12*4), R12
-	MOVB R12, (AX)
-	MOVW R8, 1(AX)
+	LEAL -2(BX), BX
+	MOVB BL, (AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 match_is_repeat_encodeBetterBlockAsm12B:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm12B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_repeat_encodeBetterBlockAsm12B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_repeat_encodeBetterBlockAsm12B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm12B
 
 two_bytes_match_emit_repeat_encodeBetterBlockAsm12B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_repeat_encodeBetterBlockAsm12B
 	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm12B
 
 one_byte_match_emit_repeat_encodeBetterBlockAsm12B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_repeat_encodeBetterBlockAsm12B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x04
+	CMPQ R8, $0x04
 	JLE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm12B_memmove_move_4
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JB   emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm12B_memmove_move_4through7
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm12B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm12B_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm12B_memmove_move_33through64
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm12B_memmove_move_4:
-	MOVL (R10), R11
-	MOVL R11, (AX)
+	MOVL (R9), R10
+	MOVL R10, (AX)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm12B
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm12B_memmove_move_4through7:
-	MOVL (R10), R11
-	MOVL -4(R10)(R9*1), R10
-	MOVL R11, (AX)
-	MOVL R10, -4(AX)(R9*1)
+	MOVL (R9), R10
+	MOVL -4(R9)(R8*1), R9
+	MOVL R10, (AX)
+	MOVL R9, -4(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm12B
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm12B_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm12B
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm12B_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm12B
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm12B_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm12B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm12B
 
 memmove_long_match_emit_repeat_encodeBetterBlockAsm12B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm12Blarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm12Blarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm12Blarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm12Blarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm12Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_repeat_encodeBetterBlockAsm12B:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitRepeat
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_repeat_encodeBetterBlockAsm12B
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm12B
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm12B
 
 cant_repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm12B:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_repeat_encodeBetterBlockAsm12B
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 repeat_three_match_nolit_repeat_encodeBetterBlockAsm12B:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 repeat_two_match_nolit_repeat_encodeBetterBlockAsm12B:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm12B
 
 repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm12B:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 
 match_nolit_emitcopy_end_encodeBetterBlockAsm12B:
@@ -8445,54 +8419,51 @@ match_nolit_emitcopy_end_encodeBetterBlockAsm12B:
 	RET
 
 match_nolit_dst_ok_encodeBetterBlockAsm12B:
-	MOVQ  $0x0000cf1bbcdcbf9b, SI
-	MOVQ  $0x9e3779b1, R8
-	INCL  DI
-	MOVQ  (DX)(DI*1), R9
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	MOVQ  R9, R12
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	SHRQ  $0x10, R12
-	LEAL  1(DI), R14
-	LEAL  2(DI), R15
-	MOVQ  -2(DX)(CX*1), R9
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x32, R10
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x32, R13
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x34, R11
+	MOVQ  $0x0000cf1bbcdcbf9b, BX
+	MOVQ  $0x9e3779b1, DI
+	LEAQ  1(SI), SI
+	LEAQ  -2(CX), R8
+	MOVQ  (DX)(SI*1), R9
+	MOVQ  1(DX)(SI*1), R10
+	MOVQ  (DX)(R8*1), R11
+	MOVQ  1(DX)(R8*1), R12
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x32, R9
+	SHLQ  $0x20, R10
+	IMULQ DI, R10
+	SHRQ  $0x34, R10
+	SHLQ  $0x10, R11
+	IMULQ BX, R11
+	SHRQ  $0x32, R11
 	SHLQ  $0x20, R12
-	IMULQ R8, R12
+	IMULQ DI, R12
 	SHRQ  $0x34, R12
-	MOVL  DI, 24(SP)(R10*4)
-	MOVL  R14, 24(SP)(R13*4)
-	MOVL  R14, 65560(SP)(R11*4)
-	MOVL  R15, 65560(SP)(R12*4)
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	LEAL  -2(CX), R9
-	LEAL  -1(CX), DI
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x32, R10
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x34, R11
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x32, R13
-	MOVL  R9, 24(SP)(R10*4)
-	MOVL  DI, 65560(SP)(R11*4)
-	MOVL  DI, 24(SP)(R13*4)
-	JMP   search_loop_encodeBetterBlockAsm12B
+	LEAQ  1(SI), DI
+	LEAQ  1(R8), R13
+	MOVL  SI, 24(SP)(R9*4)
+	MOVL  R8, 24(SP)(R11*4)
+	MOVL  DI, 65560(SP)(R10*4)
+	MOVL  R13, 65560(SP)(R12*4)
+	ADDQ  $0x01, SI
+	SUBQ  $0x01, R8
+
+index_loop_encodeBetterBlockAsm12B:
+	CMPQ  SI, R8
+	JAE   search_loop_encodeBetterBlockAsm12B
+	MOVQ  (DX)(SI*1), DI
+	MOVQ  (DX)(R8*1), R9
+	SHLQ  $0x10, DI
+	IMULQ BX, DI
+	SHRQ  $0x32, DI
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x32, R9
+	MOVL  SI, 24(SP)(DI*4)
+	MOVL  R8, 24(SP)(R9*4)
+	ADDQ  $0x02, SI
+	SUBQ  $0x02, R8
+	JMP   index_loop_encodeBetterBlockAsm12B
 
 emit_remainder_encodeBetterBlockAsm12B:
 	MOVQ src_len+32(FP), CX
@@ -8674,8 +8645,8 @@ zero_loop_encodeBetterBlockAsm10B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -6(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -8685,591 +8656,599 @@ zero_loop_encodeBetterBlockAsm10B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeBetterBlockAsm10B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x05, SI
-	LEAL  1(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x05, BX
+	LEAL  1(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeBetterBlockAsm10B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  $0x9e3779b1, SI
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x34, R10
-	SHLQ  $0x20, R11
-	IMULQ SI, R11
-	SHRQ  $0x36, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  16408(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	MOVL  CX, 16408(SP)(R11*4)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  $0x9e3779b1, BX
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x34, R9
+	SHLQ  $0x20, R10
+	IMULQ BX, R10
+	SHRQ  $0x36, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  16408(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	MOVL  CX, 16408(SP)(R10*4)
+	MOVQ  (DX)(BX*1), R9
+	MOVQ  (DX)(DI*1), R10
+	CMPQ  R9, SI
 	JEQ   candidate_match_encodeBetterBlockAsm10B
-	CMPL  (DX)(R8*1), DI
-	JEQ   candidateS_match_encodeBetterBlockAsm10B
-	MOVL  20(SP), CX
-	JMP   search_loop_encodeBetterBlockAsm10B
+	CMPQ  R10, SI
+	JNE   no_short_found_encodeBetterBlockAsm10B
+	MOVL  DI, BX
+	JMP   candidate_match_encodeBetterBlockAsm10B
+
+no_short_found_encodeBetterBlockAsm10B:
+	CMPL R9, SI
+	JEQ  candidate_match_encodeBetterBlockAsm10B
+	CMPL R10, SI
+	JEQ  candidateS_match_encodeBetterBlockAsm10B
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeBetterBlockAsm10B
 
 candidateS_match_encodeBetterBlockAsm10B:
-	SHRQ  $0x08, DI
-	MOVQ  DI, R10
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x34, R10
-	MOVL  24(SP)(R10*4), SI
+	SHRQ  $0x08, SI
+	MOVQ  SI, R9
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x34, R9
+	MOVL  24(SP)(R9*4), BX
 	INCL  CX
-	MOVL  CX, 24(SP)(R10*4)
-	CMPL  (DX)(SI*1), DI
+	MOVL  CX, 24(SP)(R9*4)
+	CMPL  (DX)(BX*1), SI
 	JEQ   candidate_match_encodeBetterBlockAsm10B
 	DECL  CX
-	MOVL  R8, SI
+	MOVL  DI, BX
 
 candidate_match_encodeBetterBlockAsm10B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeBetterBlockAsm10B
 
 match_extend_back_loop_encodeBetterBlockAsm10B:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeBetterBlockAsm10B
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeBetterBlockAsm10B
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeBetterBlockAsm10B
 	JMP  match_extend_back_loop_encodeBetterBlockAsm10B
 
 match_extend_back_end_encodeBetterBlockAsm10B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeBetterBlockAsm10B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeBetterBlockAsm10B:
-	MOVL CX, DI
+	MOVL CX, SI
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), R10
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), R9
 
 	// matchLen
-	XORL R12, R12
-	CMPL R8, $0x08
+	XORL R11, R11
+	CMPL DI, $0x08
 	JL   matchlen_match4_match_nolit_encodeBetterBlockAsm10B
 
 matchlen_loopback_match_nolit_encodeBetterBlockAsm10B:
-	MOVQ  (R9)(R12*1), R11
-	XORQ  (R10)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R8)(R11*1), R10
+	XORQ  (R9)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_match_nolit_encodeBetterBlockAsm10B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  match_nolit_end_encodeBetterBlockAsm10B
 
 matchlen_loop_match_nolit_encodeBetterBlockAsm10B:
-	LEAL -8(R8), R8
-	LEAL 8(R12), R12
-	CMPL R8, $0x08
+	LEAL -8(DI), DI
+	LEAL 8(R11), R11
+	CMPL DI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeBetterBlockAsm10B
 	JZ   match_nolit_end_encodeBetterBlockAsm10B
 
 matchlen_match4_match_nolit_encodeBetterBlockAsm10B:
-	CMPL R8, $0x04
+	CMPL DI, $0x04
 	JL   matchlen_match2_match_nolit_encodeBetterBlockAsm10B
-	MOVL (R9)(R12*1), R11
-	CMPL (R10)(R12*1), R11
+	MOVL (R8)(R11*1), R10
+	CMPL (R9)(R11*1), R10
 	JNE  matchlen_match2_match_nolit_encodeBetterBlockAsm10B
-	SUBL $0x04, R8
-	LEAL 4(R12), R12
+	SUBL $0x04, DI
+	LEAL 4(R11), R11
 
 matchlen_match2_match_nolit_encodeBetterBlockAsm10B:
-	CMPL R8, $0x02
+	CMPL DI, $0x02
 	JL   matchlen_match1_match_nolit_encodeBetterBlockAsm10B
-	MOVW (R9)(R12*1), R11
-	CMPW (R10)(R12*1), R11
+	MOVW (R8)(R11*1), R10
+	CMPW (R9)(R11*1), R10
 	JNE  matchlen_match1_match_nolit_encodeBetterBlockAsm10B
-	SUBL $0x02, R8
-	LEAL 2(R12), R12
+	SUBL $0x02, DI
+	LEAL 2(R11), R11
 
 matchlen_match1_match_nolit_encodeBetterBlockAsm10B:
-	CMPL R8, $0x01
+	CMPL DI, $0x01
 	JL   match_nolit_end_encodeBetterBlockAsm10B
-	MOVB (R9)(R12*1), R11
-	CMPB (R10)(R12*1), R11
+	MOVB (R8)(R11*1), R10
+	CMPB (R9)(R11*1), R10
 	JNE  match_nolit_end_encodeBetterBlockAsm10B
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 match_nolit_end_encodeBetterBlockAsm10B:
-	MOVL CX, R8
-	SUBL SI, R8
+	MOVL CX, DI
+	SUBL BX, DI
 
 	// Check if repeat
-	CMPL 16(SP), R8
+	CMPL 16(SP), DI
 	JEQ  match_is_repeat_encodeBetterBlockAsm10B
-	MOVL R8, 16(SP)
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL DI, 16(SP)
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_encodeBetterBlockAsm10B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_encodeBetterBlockAsm10B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_encodeBetterBlockAsm10B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm10B
 
 two_bytes_match_emit_encodeBetterBlockAsm10B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_encodeBetterBlockAsm10B
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm10B
 
 one_byte_match_emit_encodeBetterBlockAsm10B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeBetterBlockAsm10B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x04
+	CMPQ R8, $0x04
 	JLE  emit_lit_memmove_match_emit_encodeBetterBlockAsm10B_memmove_move_4
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JB   emit_lit_memmove_match_emit_encodeBetterBlockAsm10B_memmove_move_4through7
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeBetterBlockAsm10B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeBetterBlockAsm10B_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeBetterBlockAsm10B_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm10B_memmove_move_4:
-	MOVL (R10), R11
-	MOVL R11, (AX)
+	MOVL (R9), R10
+	MOVL R10, (AX)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm10B
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm10B_memmove_move_4through7:
-	MOVL (R10), R11
-	MOVL -4(R10)(R9*1), R10
-	MOVL R11, (AX)
-	MOVL R10, -4(AX)(R9*1)
+	MOVL (R9), R10
+	MOVL -4(R9)(R8*1), R9
+	MOVL R10, (AX)
+	MOVL R9, -4(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm10B
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm10B_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm10B
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm10B_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeBetterBlockAsm10B
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm10B_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeBetterBlockAsm10B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_encodeBetterBlockAsm10B
 
 memmove_long_match_emit_encodeBetterBlockAsm10B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_encodeBetterBlockAsm10Blarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_encodeBetterBlockAsm10Blarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_encodeBetterBlockAsm10Blarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeBetterBlockAsm10Blarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_encodeBetterBlockAsm10Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_encodeBetterBlockAsm10B:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitCopy
-two_byte_offset_match_nolit_encodeBetterBlockAsm10B:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeBetterBlockAsm10B
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JAE  long_offset_short_match_nolit_encodeBetterBlockAsm10B
-	MOVL $0x00000001, SI
-	LEAL 16(SI), SI
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, SI
-	MOVB SI, (AX)
+	MOVL $0x00000001, BX
+	LEAL 16(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
-	SUBL $0x08, R12
+	SUBL $0x08, R11
 
 	// emitRepeat
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	JMP  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm10B_emit_copy_short_2b
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBetterBlockAsm10B_emit_copy_short_2b
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm10B_emit_copy_short_2b
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBetterBlockAsm10B_emit_copy_short_2b
 
 cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm10B_emit_copy_short_2b:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBetterBlockAsm10B_emit_copy_short_2b
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 repeat_three_match_nolit_encodeBetterBlockAsm10B_emit_copy_short_2b:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 repeat_two_match_nolit_encodeBetterBlockAsm10B_emit_copy_short_2b:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 repeat_two_offset_match_nolit_encodeBetterBlockAsm10B_emit_copy_short_2b:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 long_offset_short_match_nolit_encodeBetterBlockAsm10B:
 	MOVB $0xee, (AX)
-	MOVW R8, 1(AX)
-	LEAL -60(R12), R12
+	MOVW DI, 1(AX)
+	LEAL -60(R11), R11
 	ADDQ $0x03, AX
 
 	// emitRepeat
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_encodeBetterBlockAsm10B_emit_copy_short
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm10B_emit_copy_short
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_encodeBetterBlockAsm10B_emit_copy_short
 
 cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm10B_emit_copy_short:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_encodeBetterBlockAsm10B_emit_copy_short
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 repeat_three_match_nolit_encodeBetterBlockAsm10B_emit_copy_short:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 repeat_two_match_nolit_encodeBetterBlockAsm10B_emit_copy_short:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 repeat_two_offset_match_nolit_encodeBetterBlockAsm10B_emit_copy_short:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
-	JMP two_byte_offset_match_nolit_encodeBetterBlockAsm10B
 
 two_byte_offset_short_match_nolit_encodeBetterBlockAsm10B:
-	CMPL R12, $0x0c
+	MOVL R11, BX
+	SHLL $0x02, BX
+	CMPL R11, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeBetterBlockAsm10B
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeBetterBlockAsm10B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R12*4), R12
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	LEAL -15(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 emit_copy_three_match_nolit_encodeBetterBlockAsm10B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R12*4), R12
-	MOVB R12, (AX)
-	MOVW R8, 1(AX)
+	LEAL -2(BX), BX
+	MOVB BL, (AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 match_is_repeat_encodeBetterBlockAsm10B:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm10B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_repeat_encodeBetterBlockAsm10B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_repeat_encodeBetterBlockAsm10B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm10B
 
 two_bytes_match_emit_repeat_encodeBetterBlockAsm10B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_repeat_encodeBetterBlockAsm10B
 	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm10B
 
 one_byte_match_emit_repeat_encodeBetterBlockAsm10B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_repeat_encodeBetterBlockAsm10B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x04
+	CMPQ R8, $0x04
 	JLE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm10B_memmove_move_4
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JB   emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm10B_memmove_move_4through7
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm10B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm10B_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm10B_memmove_move_33through64
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm10B_memmove_move_4:
-	MOVL (R10), R11
-	MOVL R11, (AX)
+	MOVL (R9), R10
+	MOVL R10, (AX)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm10B
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm10B_memmove_move_4through7:
-	MOVL (R10), R11
-	MOVL -4(R10)(R9*1), R10
-	MOVL R11, (AX)
-	MOVL R10, -4(AX)(R9*1)
+	MOVL (R9), R10
+	MOVL -4(R9)(R8*1), R9
+	MOVL R10, (AX)
+	MOVL R9, -4(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm10B
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm10B_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm10B
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm10B_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm10B
 
 emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm10B_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm10B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm10B
 
 memmove_long_match_emit_repeat_encodeBetterBlockAsm10B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm10Blarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm10Blarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm10Blarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm10Blarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm10Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_repeat_encodeBetterBlockAsm10B:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitRepeat
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_repeat_encodeBetterBlockAsm10B
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm10B
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JLT  repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm10B
 
 cant_repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm10B:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_repeat_encodeBetterBlockAsm10B
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 repeat_three_match_nolit_repeat_encodeBetterBlockAsm10B:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 repeat_two_match_nolit_repeat_encodeBetterBlockAsm10B:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm10B
 
 repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm10B:
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 
 match_nolit_emitcopy_end_encodeBetterBlockAsm10B:
@@ -9281,54 +9260,51 @@ match_nolit_emitcopy_end_encodeBetterBlockAsm10B:
 	RET
 
 match_nolit_dst_ok_encodeBetterBlockAsm10B:
-	MOVQ  $0x0000cf1bbcdcbf9b, SI
-	MOVQ  $0x9e3779b1, R8
-	INCL  DI
-	MOVQ  (DX)(DI*1), R9
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	MOVQ  R9, R12
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	SHRQ  $0x10, R12
-	LEAL  1(DI), R14
-	LEAL  2(DI), R15
-	MOVQ  -2(DX)(CX*1), R9
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x34, R10
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x34, R13
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x36, R11
+	MOVQ  $0x0000cf1bbcdcbf9b, BX
+	MOVQ  $0x9e3779b1, DI
+	LEAQ  1(SI), SI
+	LEAQ  -2(CX), R8
+	MOVQ  (DX)(SI*1), R9
+	MOVQ  1(DX)(SI*1), R10
+	MOVQ  (DX)(R8*1), R11
+	MOVQ  1(DX)(R8*1), R12
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x34, R9
+	SHLQ  $0x20, R10
+	IMULQ DI, R10
+	SHRQ  $0x36, R10
+	SHLQ  $0x10, R11
+	IMULQ BX, R11
+	SHRQ  $0x34, R11
 	SHLQ  $0x20, R12
-	IMULQ R8, R12
+	IMULQ DI, R12
 	SHRQ  $0x36, R12
-	MOVL  DI, 24(SP)(R10*4)
-	MOVL  R14, 24(SP)(R13*4)
-	MOVL  R14, 16408(SP)(R11*4)
-	MOVL  R15, 16408(SP)(R12*4)
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	LEAL  -2(CX), R9
-	LEAL  -1(CX), DI
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x34, R10
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x36, R11
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x34, R13
-	MOVL  R9, 24(SP)(R10*4)
-	MOVL  DI, 16408(SP)(R11*4)
-	MOVL  DI, 24(SP)(R13*4)
-	JMP   search_loop_encodeBetterBlockAsm10B
+	LEAQ  1(SI), DI
+	LEAQ  1(R8), R13
+	MOVL  SI, 24(SP)(R9*4)
+	MOVL  R8, 24(SP)(R11*4)
+	MOVL  DI, 16408(SP)(R10*4)
+	MOVL  R13, 16408(SP)(R12*4)
+	ADDQ  $0x01, SI
+	SUBQ  $0x01, R8
+
+index_loop_encodeBetterBlockAsm10B:
+	CMPQ  SI, R8
+	JAE   search_loop_encodeBetterBlockAsm10B
+	MOVQ  (DX)(SI*1), DI
+	MOVQ  (DX)(R8*1), R9
+	SHLQ  $0x10, DI
+	IMULQ BX, DI
+	SHRQ  $0x34, DI
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x34, R9
+	MOVL  SI, 24(SP)(DI*4)
+	MOVL  R8, 24(SP)(R9*4)
+	ADDQ  $0x02, SI
+	SUBQ  $0x02, R8
+	JMP   index_loop_encodeBetterBlockAsm10B
 
 emit_remainder_encodeBetterBlockAsm10B:
 	MOVQ src_len+32(FP), CX
@@ -9510,8 +9486,8 @@ zero_loop_encodeBetterBlockAsm8B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -6(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -9521,478 +9497,228 @@ zero_loop_encodeBetterBlockAsm8B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeBetterBlockAsm8B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x04, SI
-	LEAL  1(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x04, BX
+	LEAL  1(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeBetterBlockAsm8B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  $0x9e3779b1, SI
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x36, R10
-	SHLQ  $0x20, R11
-	IMULQ SI, R11
-	SHRQ  $0x38, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  4120(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	MOVL  CX, 4120(SP)(R11*4)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  $0x9e3779b1, BX
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x36, R9
+	SHLQ  $0x20, R10
+	IMULQ BX, R10
+	SHRQ  $0x38, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  4120(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	MOVL  CX, 4120(SP)(R10*4)
+	MOVQ  (DX)(BX*1), R9
+	MOVQ  (DX)(DI*1), R10
+	CMPQ  R9, SI
 	JEQ   candidate_match_encodeBetterBlockAsm8B
-	CMPL  (DX)(R8*1), DI
-	JEQ   candidateS_match_encodeBetterBlockAsm8B
-	MOVL  20(SP), CX
-	JMP   search_loop_encodeBetterBlockAsm8B
+	CMPQ  R10, SI
+	JNE   no_short_found_encodeBetterBlockAsm8B
+	MOVL  DI, BX
+	JMP   candidate_match_encodeBetterBlockAsm8B
+
+no_short_found_encodeBetterBlockAsm8B:
+	CMPL R9, SI
+	JEQ  candidate_match_encodeBetterBlockAsm8B
+	CMPL R10, SI
+	JEQ  candidateS_match_encodeBetterBlockAsm8B
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeBetterBlockAsm8B
 
 candidateS_match_encodeBetterBlockAsm8B:
-	SHRQ  $0x08, DI
-	MOVQ  DI, R10
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x36, R10
-	MOVL  24(SP)(R10*4), SI
+	SHRQ  $0x08, SI
+	MOVQ  SI, R9
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x36, R9
+	MOVL  24(SP)(R9*4), BX
 	INCL  CX
-	MOVL  CX, 24(SP)(R10*4)
-	CMPL  (DX)(SI*1), DI
+	MOVL  CX, 24(SP)(R9*4)
+	CMPL  (DX)(BX*1), SI
 	JEQ   candidate_match_encodeBetterBlockAsm8B
 	DECL  CX
-	MOVL  R8, SI
+	MOVL  DI, BX
 
 candidate_match_encodeBetterBlockAsm8B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeBetterBlockAsm8B
 
 match_extend_back_loop_encodeBetterBlockAsm8B:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeBetterBlockAsm8B
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeBetterBlockAsm8B
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeBetterBlockAsm8B
 	JMP  match_extend_back_loop_encodeBetterBlockAsm8B
 
 match_extend_back_end_encodeBetterBlockAsm8B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeBetterBlockAsm8B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeBetterBlockAsm8B:
-	MOVL CX, DI
+	MOVL CX, SI
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), R10
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), R9
 
 	// matchLen
-	XORL R12, R12
-	CMPL R8, $0x08
+	XORL R11, R11
+	CMPL DI, $0x08
 	JL   matchlen_match4_match_nolit_encodeBetterBlockAsm8B
 
 matchlen_loopback_match_nolit_encodeBetterBlockAsm8B:
-	MOVQ  (R9)(R12*1), R11
-	XORQ  (R10)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R8)(R11*1), R10
+	XORQ  (R9)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_match_nolit_encodeBetterBlockAsm8B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  match_nolit_end_encodeBetterBlockAsm8B
 
 matchlen_loop_match_nolit_encodeBetterBlockAsm8B:
-	LEAL -8(R8), R8
-	LEAL 8(R12), R12
-	CMPL R8, $0x08
+	LEAL -8(DI), DI
+	LEAL 8(R11), R11
+	CMPL DI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeBetterBlockAsm8B
 	JZ   match_nolit_end_encodeBetterBlockAsm8B
 
 matchlen_match4_match_nolit_encodeBetterBlockAsm8B:
-	CMPL R8, $0x04
+	CMPL DI, $0x04
 	JL   matchlen_match2_match_nolit_encodeBetterBlockAsm8B
-	MOVL (R9)(R12*1), R11
-	CMPL (R10)(R12*1), R11
+	MOVL (R8)(R11*1), R10
+	CMPL (R9)(R11*1), R10
 	JNE  matchlen_match2_match_nolit_encodeBetterBlockAsm8B
-	SUBL $0x04, R8
-	LEAL 4(R12), R12
+	SUBL $0x04, DI
+	LEAL 4(R11), R11
 
 matchlen_match2_match_nolit_encodeBetterBlockAsm8B:
-	CMPL R8, $0x02
+	CMPL DI, $0x02
 	JL   matchlen_match1_match_nolit_encodeBetterBlockAsm8B
-	MOVW (R9)(R12*1), R11
-	CMPW (R10)(R12*1), R11
+	MOVW (R8)(R11*1), R10
+	CMPW (R9)(R11*1), R10
 	JNE  matchlen_match1_match_nolit_encodeBetterBlockAsm8B
-	SUBL $0x02, R8
-	LEAL 2(R12), R12
+	SUBL $0x02, DI
+	LEAL 2(R11), R11
 
 matchlen_match1_match_nolit_encodeBetterBlockAsm8B:
-	CMPL R8, $0x01
+	CMPL DI, $0x01
 	JL   match_nolit_end_encodeBetterBlockAsm8B
-	MOVB (R9)(R12*1), R11
-	CMPB (R10)(R12*1), R11
+	MOVB (R8)(R11*1), R10
+	CMPB (R9)(R11*1), R10
 	JNE  match_nolit_end_encodeBetterBlockAsm8B
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 match_nolit_end_encodeBetterBlockAsm8B:
-	MOVL CX, R8
-	SUBL SI, R8
+	MOVL CX, DI
+	SUBL BX, DI
 
 	// Check if repeat
-	CMPL 16(SP), R8
+	CMPL 16(SP), DI
 	JEQ  match_is_repeat_encodeBetterBlockAsm8B
-	MOVL R8, 16(SP)
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL DI, 16(SP)
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_encodeBetterBlockAsm8B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_encodeBetterBlockAsm8B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_encodeBetterBlockAsm8B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm8B
 
 two_bytes_match_emit_encodeBetterBlockAsm8B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_encodeBetterBlockAsm8B
 	JMP  memmove_long_match_emit_encodeBetterBlockAsm8B
 
 one_byte_match_emit_encodeBetterBlockAsm8B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeBetterBlockAsm8B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x04
+	CMPQ R8, $0x04
 	JLE  emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_4
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JB   emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_4through7
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_4:
-	MOVL (R10), R11
-	MOVL R11, (AX)
+	MOVL (R9), R10
+	MOVL R10, (AX)
 	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm8B
 
 emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_4through7:
-	MOVL (R10), R11
-	MOVL -4(R10)(R9*1), R10
-	MOVL R11, (AX)
-	MOVL R10, -4(AX)(R9*1)
-	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm8B
-
-emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
-	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm8B
-
-emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
-	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
-	JMP   memmove_end_copy_match_emit_encodeBetterBlockAsm8B
-
-emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-
-memmove_end_copy_match_emit_encodeBetterBlockAsm8B:
-	MOVQ SI, AX
-	JMP  emit_literal_done_match_emit_encodeBetterBlockAsm8B
-
-memmove_long_match_emit_encodeBetterBlockAsm8B:
-	LEAQ (AX)(R9*1), SI
-
-	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
-	JA    emit_lit_memmove_long_match_emit_encodeBetterBlockAsm8Blarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
-
-emit_lit_memmove_long_match_emit_encodeBetterBlockAsm8Blarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
-	ADDQ  $0x20, R14
-	DECQ  R13
-	JNA   emit_lit_memmove_long_match_emit_encodeBetterBlockAsm8Blarge_big_loop_back
-
-emit_lit_memmove_long_match_emit_encodeBetterBlockAsm8Blarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
-	JAE   emit_lit_memmove_long_match_emit_encodeBetterBlockAsm8Blarge_forward_sse_loop_32
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
-
-emit_literal_done_match_emit_encodeBetterBlockAsm8B:
-	ADDL R12, CX
-	ADDL $0x04, R12
-	MOVL CX, 12(SP)
-
-	// emitCopy
-two_byte_offset_match_nolit_encodeBetterBlockAsm8B:
-	CMPL R12, $0x40
-	JLE  two_byte_offset_short_match_nolit_encodeBetterBlockAsm8B
-	CMPL R8, $0x00000800
-	JAE  long_offset_short_match_nolit_encodeBetterBlockAsm8B
-	MOVL $0x00000001, SI
-	LEAL 16(SI), SI
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, SI
-	MOVB SI, (AX)
-	ADDQ $0x02, AX
-	SUBL $0x08, R12
-
-	// emitRepeat
-	LEAL -4(R12), R12
-	JMP  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
-	JLE  repeat_two_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b
-	CMPL SI, $0x0c
-	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b
-
-cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b:
-	CMPL R12, $0x00000104
-	JLT  repeat_three_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b
-	LEAL -256(R12), R12
-	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
-	ADDQ $0x04, AX
-	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
-
-repeat_three_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b:
-	LEAL -4(R12), R12
-	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
-	ADDQ $0x03, AX
-	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
-
-repeat_two_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
-	ADDQ $0x02, AX
-	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
-	ADDQ $0x02, AX
-	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
-
-long_offset_short_match_nolit_encodeBetterBlockAsm8B:
-	MOVB $0xee, (AX)
-	MOVW R8, 1(AX)
-	LEAL -60(R12), R12
-	ADDQ $0x03, AX
-
-	// emitRepeat
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
-	JLE  repeat_two_match_nolit_encodeBetterBlockAsm8B_emit_copy_short
-	CMPL SI, $0x0c
-	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm8B_emit_copy_short
-
-cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm8B_emit_copy_short:
-	CMPL R12, $0x00000104
-	JLT  repeat_three_match_nolit_encodeBetterBlockAsm8B_emit_copy_short
-	LEAL -256(R12), R12
-	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
-	ADDQ $0x04, AX
-	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
-
-repeat_three_match_nolit_encodeBetterBlockAsm8B_emit_copy_short:
-	LEAL -4(R12), R12
-	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
-	ADDQ $0x03, AX
-	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
-
-repeat_two_match_nolit_encodeBetterBlockAsm8B_emit_copy_short:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
-	ADDQ $0x02, AX
-	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
-	ADDQ $0x02, AX
-	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
-	JMP two_byte_offset_match_nolit_encodeBetterBlockAsm8B
-
-two_byte_offset_short_match_nolit_encodeBetterBlockAsm8B:
-	CMPL R12, $0x0c
-	JGE  emit_copy_three_match_nolit_encodeBetterBlockAsm8B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R12*4), R12
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
-	ADDQ $0x02, AX
-	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
-
-emit_copy_three_match_nolit_encodeBetterBlockAsm8B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R12*4), R12
-	MOVB R12, (AX)
-	MOVW R8, 1(AX)
-	ADDQ $0x03, AX
-	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
-
-match_is_repeat_encodeBetterBlockAsm8B:
-	MOVL 12(SP), SI
-	CMPL SI, DI
-	JEQ  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm8B
-	MOVL DI, R8
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R9
-	SUBL SI, R8
-	LEAL -1(R8), SI
-	CMPL SI, $0x3c
-	JLT  one_byte_match_emit_repeat_encodeBetterBlockAsm8B
-	CMPL SI, $0x00000100
-	JLT  two_bytes_match_emit_repeat_encodeBetterBlockAsm8B
-	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
-	ADDQ $0x03, AX
-	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm8B
-
-two_bytes_match_emit_repeat_encodeBetterBlockAsm8B:
-	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
-	ADDQ $0x02, AX
-	CMPL SI, $0x40
-	JL   memmove_match_emit_repeat_encodeBetterBlockAsm8B
-	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm8B
-
-one_byte_match_emit_repeat_encodeBetterBlockAsm8B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
-	ADDQ $0x01, AX
-
-memmove_match_emit_repeat_encodeBetterBlockAsm8B:
-	LEAQ (AX)(R8*1), SI
-
-	// genMemMoveShort
-	CMPQ R8, $0x04
-	JLE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_4
-	CMPQ R8, $0x08
-	JB   emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_4through7
-	CMPQ R8, $0x10
-	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_8through16
-	CMPQ R8, $0x20
-	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_17through32
-	JMP  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_33through64
-
-emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_4:
-	MOVL (R9), R10
-	MOVL R10, (AX)
-	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm8B
-
-emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_4through7:
 	MOVL (R9), R10
 	MOVL -4(R9)(R8*1), R9
 	MOVL R10, (AX)
 	MOVL R9, -4(AX)(R8*1)
-	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm8B
+	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm8B
 
-emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_8through16:
+emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_8through16:
 	MOVQ (R9), R10
 	MOVQ -8(R9)(R8*1), R9
 	MOVQ R10, (AX)
 	MOVQ R9, -8(AX)(R8*1)
-	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm8B
+	JMP  memmove_end_copy_match_emit_encodeBetterBlockAsm8B
 
-emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_17through32:
+emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_17through32:
 	MOVOU (R9), X0
 	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
 	MOVOU X1, -16(AX)(R8*1)
-	JMP   memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm8B
+	JMP   memmove_end_copy_match_emit_encodeBetterBlockAsm8B
 
-emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_33through64:
+emit_lit_memmove_match_emit_encodeBetterBlockAsm8B_memmove_move_33through64:
 	MOVOU (R9), X0
 	MOVOU 16(R9), X1
 	MOVOU -32(R9)(R8*1), X2
@@ -10002,30 +9728,30 @@ emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_33through
 	MOVOU X2, -32(AX)(R8*1)
 	MOVOU X3, -16(AX)(R8*1)
 
-memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm8B:
-	MOVQ SI, AX
-	JMP  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm8B
+memmove_end_copy_match_emit_encodeBetterBlockAsm8B:
+	MOVQ BX, AX
+	JMP  emit_literal_done_match_emit_encodeBetterBlockAsm8B
 
-memmove_long_match_emit_repeat_encodeBetterBlockAsm8B:
-	LEAQ (AX)(R8*1), SI
+memmove_long_match_emit_encodeBetterBlockAsm8B:
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
 	MOVOU (R9), X0
 	MOVOU 16(R9), X1
 	MOVOU -32(R9)(R8*1), X2
 	MOVOU -16(R9)(R8*1), X3
-	MOVQ  R8, R11
-	SHRQ  $0x05, R11
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
 	MOVQ  AX, R10
 	ANDL  $0x0000001f, R10
 	MOVQ  $0x00000040, R13
 	SUBQ  R10, R13
-	DECQ  R11
-	JA    emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm8Blarge_forward_sse_loop_32
+	DECQ  R12
+	JA    emit_lit_memmove_long_match_emit_encodeBetterBlockAsm8Blarge_forward_sse_loop_32
 	LEAQ  -32(R9)(R13*1), R10
 	LEAQ  -32(AX)(R13*1), R14
 
-emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm8Blarge_big_loop_back:
+emit_lit_memmove_long_match_emit_encodeBetterBlockAsm8Blarge_big_loop_back:
 	MOVOU (R10), X4
 	MOVOU 16(R10), X5
 	MOVOA X4, (R14)
@@ -10033,65 +9759,323 @@ emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm8Blarge_big_loop_bac
 	ADDQ  $0x20, R14
 	ADDQ  $0x20, R10
 	ADDQ  $0x20, R13
-	DECQ  R11
-	JNA   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm8Blarge_big_loop_back
+	DECQ  R12
+	JNA   emit_lit_memmove_long_match_emit_encodeBetterBlockAsm8Blarge_big_loop_back
 
-emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm8Blarge_forward_sse_loop_32:
+emit_lit_memmove_long_match_emit_encodeBetterBlockAsm8Blarge_forward_sse_loop_32:
 	MOVOU -32(R9)(R13*1), X4
 	MOVOU -16(R9)(R13*1), X5
 	MOVOA X4, -32(AX)(R13*1)
 	MOVOA X5, -16(AX)(R13*1)
 	ADDQ  $0x20, R13
 	CMPQ  R8, R13
-	JAE   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm8Blarge_forward_sse_loop_32
+	JAE   emit_lit_memmove_long_match_emit_encodeBetterBlockAsm8Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
 	MOVOU X2, -32(AX)(R8*1)
 	MOVOU X3, -16(AX)(R8*1)
-	MOVQ  SI, AX
+	MOVQ  BX, AX
+
+emit_literal_done_match_emit_encodeBetterBlockAsm8B:
+	ADDL R11, CX
+	ADDL $0x04, R11
+	MOVL CX, 12(SP)
+
+	// emitCopy
+	CMPL R11, $0x40
+	JLE  two_byte_offset_short_match_nolit_encodeBetterBlockAsm8B
+	CMPL DI, $0x00000800
+	JAE  long_offset_short_match_nolit_encodeBetterBlockAsm8B
+	MOVL $0x00000001, BX
+	LEAL 16(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
+	ADDQ $0x02, AX
+	SUBL $0x08, R11
+
+	// emitRepeat
+	LEAL -4(R11), R11
+	JMP  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
+	JLE  repeat_two_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b
+	CMPL BX, $0x0c
+	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b
+
+cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b:
+	CMPL R11, $0x00000104
+	JLT  repeat_three_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b
+	LEAL -256(R11), R11
+	MOVW $0x0019, (AX)
+	MOVW R11, 2(AX)
+	ADDQ $0x04, AX
+	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
+
+repeat_three_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b:
+	LEAL -4(R11), R11
+	MOVW $0x0015, (AX)
+	MOVB R11, 2(AX)
+	ADDQ $0x03, AX
+	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
+
+repeat_two_match_nolit_encodeBetterBlockAsm8B_emit_copy_short_2b:
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
+	ADDQ $0x02, AX
+	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
+	ADDQ $0x02, AX
+	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
+
+long_offset_short_match_nolit_encodeBetterBlockAsm8B:
+	MOVB $0xee, (AX)
+	MOVW DI, 1(AX)
+	LEAL -60(R11), R11
+	ADDQ $0x03, AX
+
+	// emitRepeat
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
+	JLE  repeat_two_match_nolit_encodeBetterBlockAsm8B_emit_copy_short
+	CMPL BX, $0x0c
+	JGE  cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm8B_emit_copy_short
+
+cant_repeat_two_offset_match_nolit_encodeBetterBlockAsm8B_emit_copy_short:
+	CMPL R11, $0x00000104
+	JLT  repeat_three_match_nolit_encodeBetterBlockAsm8B_emit_copy_short
+	LEAL -256(R11), R11
+	MOVW $0x0019, (AX)
+	MOVW R11, 2(AX)
+	ADDQ $0x04, AX
+	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
+
+repeat_three_match_nolit_encodeBetterBlockAsm8B_emit_copy_short:
+	LEAL -4(R11), R11
+	MOVW $0x0015, (AX)
+	MOVB R11, 2(AX)
+	ADDQ $0x03, AX
+	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
+
+repeat_two_match_nolit_encodeBetterBlockAsm8B_emit_copy_short:
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
+	ADDQ $0x02, AX
+	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
+	ADDQ $0x02, AX
+	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
+
+two_byte_offset_short_match_nolit_encodeBetterBlockAsm8B:
+	MOVL R11, BX
+	SHLL $0x02, BX
+	CMPL R11, $0x0c
+	JGE  emit_copy_three_match_nolit_encodeBetterBlockAsm8B
+	LEAL -15(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
+	ADDQ $0x02, AX
+	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
+
+emit_copy_three_match_nolit_encodeBetterBlockAsm8B:
+	LEAL -2(BX), BX
+	MOVB BL, (AX)
+	MOVW DI, 1(AX)
+	ADDQ $0x03, AX
+	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
+
+match_is_repeat_encodeBetterBlockAsm8B:
+	MOVL 12(SP), BX
+	CMPL BX, SI
+	JEQ  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm8B
+	MOVL SI, DI
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R8
+	SUBL BX, DI
+	LEAL -1(DI), BX
+	CMPL BX, $0x3c
+	JLT  one_byte_match_emit_repeat_encodeBetterBlockAsm8B
+	CMPL BX, $0x00000100
+	JLT  two_bytes_match_emit_repeat_encodeBetterBlockAsm8B
+	MOVB $0xf4, (AX)
+	MOVW BX, 1(AX)
+	ADDQ $0x03, AX
+	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm8B
+
+two_bytes_match_emit_repeat_encodeBetterBlockAsm8B:
+	MOVB $0xf0, (AX)
+	MOVB BL, 1(AX)
+	ADDQ $0x02, AX
+	CMPL BX, $0x40
+	JL   memmove_match_emit_repeat_encodeBetterBlockAsm8B
+	JMP  memmove_long_match_emit_repeat_encodeBetterBlockAsm8B
+
+one_byte_match_emit_repeat_encodeBetterBlockAsm8B:
+	SHLB $0x02, BL
+	MOVB BL, (AX)
+	ADDQ $0x01, AX
+
+memmove_match_emit_repeat_encodeBetterBlockAsm8B:
+	LEAQ (AX)(DI*1), BX
+
+	// genMemMoveShort
+	CMPQ DI, $0x04
+	JLE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_4
+	CMPQ DI, $0x08
+	JB   emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_4through7
+	CMPQ DI, $0x10
+	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_8through16
+	CMPQ DI, $0x20
+	JBE  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_17through32
+	JMP  emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_33through64
+
+emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_4:
+	MOVL (R8), R9
+	MOVL R9, (AX)
+	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm8B
+
+emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_4through7:
+	MOVL (R8), R9
+	MOVL -4(R8)(DI*1), R8
+	MOVL R9, (AX)
+	MOVL R8, -4(AX)(DI*1)
+	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm8B
+
+emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_8through16:
+	MOVQ (R8), R9
+	MOVQ -8(R8)(DI*1), R8
+	MOVQ R9, (AX)
+	MOVQ R8, -8(AX)(DI*1)
+	JMP  memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm8B
+
+emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_17through32:
+	MOVOU (R8), X0
+	MOVOU -16(R8)(DI*1), X1
+	MOVOU X0, (AX)
+	MOVOU X1, -16(AX)(DI*1)
+	JMP   memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm8B
+
+emit_lit_memmove_match_emit_repeat_encodeBetterBlockAsm8B_memmove_move_33through64:
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
+
+memmove_end_copy_match_emit_repeat_encodeBetterBlockAsm8B:
+	MOVQ BX, AX
+	JMP  emit_literal_done_match_emit_repeat_encodeBetterBlockAsm8B
+
+memmove_long_match_emit_repeat_encodeBetterBlockAsm8B:
+	LEAQ (AX)(DI*1), BX
+
+	// genMemMoveLong
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
+	MOVQ  DI, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R12
+	SUBQ  R9, R12
+	DECQ  R10
+	JA    emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm8Blarge_forward_sse_loop_32
+	LEAQ  -32(R8)(R12*1), R9
+	LEAQ  -32(AX)(R12*1), R13
+
+emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm8Blarge_big_loop_back:
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R13)
+	MOVOA X5, 16(R13)
+	ADDQ  $0x20, R13
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R12
+	DECQ  R10
+	JNA   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm8Blarge_big_loop_back
+
+emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm8Blarge_forward_sse_loop_32:
+	MOVOU -32(R8)(R12*1), X4
+	MOVOU -16(R8)(R12*1), X5
+	MOVOA X4, -32(AX)(R12*1)
+	MOVOA X5, -16(AX)(R12*1)
+	ADDQ  $0x20, R12
+	CMPQ  DI, R12
+	JAE   emit_lit_memmove_long_match_emit_repeat_encodeBetterBlockAsm8Blarge_forward_sse_loop_32
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_repeat_encodeBetterBlockAsm8B:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitRepeat
-	MOVL R12, SI
-	LEAL -4(R12), R12
-	CMPL SI, $0x08
+	MOVL R11, BX
+	LEAL -4(R11), R11
+	CMPL BX, $0x08
 	JLE  repeat_two_match_nolit_repeat_encodeBetterBlockAsm8B
-	CMPL SI, $0x0c
+	CMPL BX, $0x0c
 	JGE  cant_repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm8B
 
 cant_repeat_two_offset_match_nolit_repeat_encodeBetterBlockAsm8B:
-	CMPL R12, $0x00000104
+	CMPL R11, $0x00000104
 	JLT  repeat_three_match_nolit_repeat_encodeBetterBlockAsm8B
-	LEAL -256(R12), R12
+	LEAL -256(R11), R11
 	MOVW $0x0019, (AX)
-	MOVW R12, 2(AX)
+	MOVW R11, 2(AX)
 	ADDQ $0x04, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
 
 repeat_three_match_nolit_repeat_encodeBetterBlockAsm8B:
-	LEAL -4(R12), R12
+	LEAL -4(R11), R11
 	MOVW $0x0015, (AX)
-	MOVB R12, 2(AX)
+	MOVB R11, 2(AX)
 	ADDQ $0x03, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
 
 repeat_two_match_nolit_repeat_encodeBetterBlockAsm8B:
-	SHLL $0x02, R12
-	ORL  $0x01, R12
-	MOVW R12, (AX)
+	SHLL $0x02, R11
+	ORL  $0x01, R11
+	MOVW R11, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeBetterBlockAsm8B
-	XORQ SI, SI
-	LEAL 1(SI)(R12*4), R12
-	MOVB R8, 1(AX)
-	SARL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	XORQ BX, BX
+	LEAL 1(BX)(R11*4), R11
+	MOVB DI, 1(AX)
+	SARL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, R11
+	MOVB R11, (AX)
 	ADDQ $0x02, AX
 
 match_nolit_emitcopy_end_encodeBetterBlockAsm8B:
@@ -10103,54 +10087,51 @@ match_nolit_emitcopy_end_encodeBetterBlockAsm8B:
 	RET
 
 match_nolit_dst_ok_encodeBetterBlockAsm8B:
-	MOVQ  $0x0000cf1bbcdcbf9b, SI
-	MOVQ  $0x9e3779b1, R8
-	INCL  DI
-	MOVQ  (DX)(DI*1), R9
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	MOVQ  R9, R12
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	SHRQ  $0x10, R12
-	LEAL  1(DI), R14
-	LEAL  2(DI), R15
-	MOVQ  -2(DX)(CX*1), R9
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x36, R10
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x36, R13
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x38, R11
+	MOVQ  $0x0000cf1bbcdcbf9b, BX
+	MOVQ  $0x9e3779b1, DI
+	LEAQ  1(SI), SI
+	LEAQ  -2(CX), R8
+	MOVQ  (DX)(SI*1), R9
+	MOVQ  1(DX)(SI*1), R10
+	MOVQ  (DX)(R8*1), R11
+	MOVQ  1(DX)(R8*1), R12
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x36, R9
+	SHLQ  $0x20, R10
+	IMULQ DI, R10
+	SHRQ  $0x38, R10
+	SHLQ  $0x10, R11
+	IMULQ BX, R11
+	SHRQ  $0x36, R11
 	SHLQ  $0x20, R12
-	IMULQ R8, R12
+	IMULQ DI, R12
 	SHRQ  $0x38, R12
-	MOVL  DI, 24(SP)(R10*4)
-	MOVL  R14, 24(SP)(R13*4)
-	MOVL  R14, 4120(SP)(R11*4)
-	MOVL  R15, 4120(SP)(R12*4)
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	LEAL  -2(CX), R9
-	LEAL  -1(CX), DI
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x36, R10
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x38, R11
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x36, R13
-	MOVL  R9, 24(SP)(R10*4)
-	MOVL  DI, 4120(SP)(R11*4)
-	MOVL  DI, 24(SP)(R13*4)
-	JMP   search_loop_encodeBetterBlockAsm8B
+	LEAQ  1(SI), DI
+	LEAQ  1(R8), R13
+	MOVL  SI, 24(SP)(R9*4)
+	MOVL  R8, 24(SP)(R11*4)
+	MOVL  DI, 4120(SP)(R10*4)
+	MOVL  R13, 4120(SP)(R12*4)
+	ADDQ  $0x01, SI
+	SUBQ  $0x01, R8
+
+index_loop_encodeBetterBlockAsm8B:
+	CMPQ  SI, R8
+	JAE   search_loop_encodeBetterBlockAsm8B
+	MOVQ  (DX)(SI*1), DI
+	MOVQ  (DX)(R8*1), R9
+	SHLQ  $0x10, DI
+	IMULQ BX, DI
+	SHRQ  $0x36, DI
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x36, R9
+	MOVL  SI, 24(SP)(DI*4)
+	MOVL  R8, 24(SP)(R9*4)
+	ADDQ  $0x02, SI
+	SUBQ  $0x02, R8
+	JMP   index_loop_encodeBetterBlockAsm8B
 
 emit_remainder_encodeBetterBlockAsm8B:
 	MOVQ src_len+32(FP), CX
@@ -10332,8 +10313,8 @@ zero_loop_encodeSnappyBlockAsm:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -10343,539 +10324,216 @@ zero_loop_encodeSnappyBlockAsm:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeSnappyBlockAsm:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x06, SI
-	LEAL  4(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x06, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeSnappyBlockAsm
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHRQ  $0x08, R11
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
 	SHLQ  $0x10, R10
-	IMULQ R9, R10
+	IMULQ R8, R10
 	SHRQ  $0x32, R10
-	SHLQ  $0x10, R11
-	IMULQ R9, R11
-	SHRQ  $0x32, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  24(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	LEAL  1(CX), R10
-	MOVL  R10, 24(SP)(R11*4)
-	MOVQ  DI, R10
-	SHRQ  $0x10, R10
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x32, R10
-	MOVL  CX, R9
-	SUBL  16(SP), R9
-	MOVL  1(DX)(R9*1), R11
-	MOVQ  DI, R9
-	SHRQ  $0x08, R9
-	CMPL  R9, R11
-	JNE   no_repeat_found_encodeSnappyBlockAsm
-	LEAL  1(CX), DI
-	MOVL  12(SP), SI
-	MOVL  DI, R8
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
+	MOVL  CX, R8
 	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
+	JNE   no_repeat_found_encodeSnappyBlockAsm
+	LEAL  1(CX), SI
+	MOVL  12(SP), BX
+	MOVL  SI, DI
+	SUBL  16(SP), DI
 	JZ    repeat_extend_back_end_encodeSnappyBlockAsm
 
 repeat_extend_back_loop_encodeSnappyBlockAsm:
-	CMPL DI, SI
+	CMPL SI, BX
 	JLE  repeat_extend_back_end_encodeSnappyBlockAsm
-	MOVB -1(DX)(R8*1), BL
-	MOVB -1(DX)(DI*1), R9
-	CMPB BL, R9
+	MOVB -1(DX)(DI*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
 	JNE  repeat_extend_back_end_encodeSnappyBlockAsm
-	LEAL -1(DI), DI
-	DECL R8
+	LEAL -1(SI), SI
+	DECL DI
 	JNZ  repeat_extend_back_loop_encodeSnappyBlockAsm
 
 repeat_extend_back_end_encodeSnappyBlockAsm:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_repeat_emit_encodeSnappyBlockAsm
-	MOVL DI, R8
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R9
-	SUBL SI, R8
-	LEAL -1(R8), SI
-	CMPL SI, $0x3c
+	MOVL SI, DI
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R8
+	SUBL BX, DI
+	LEAL -1(DI), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_repeat_emit_encodeSnappyBlockAsm
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_repeat_emit_encodeSnappyBlockAsm
-	CMPL SI, $0x00010000
+	CMPL BX, $0x00010000
 	JLT  three_bytes_repeat_emit_encodeSnappyBlockAsm
-	CMPL SI, $0x01000000
+	CMPL BX, $0x01000000
 	JLT  four_bytes_repeat_emit_encodeSnappyBlockAsm
 	MOVB $0xfc, (AX)
-	MOVL SI, 1(AX)
+	MOVL BX, 1(AX)
 	ADDQ $0x05, AX
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm
 
 four_bytes_repeat_emit_encodeSnappyBlockAsm:
-	MOVL SI, R10
-	SHRL $0x10, R10
+	MOVL BX, R9
+	SHRL $0x10, R9
 	MOVB $0xf8, (AX)
-	MOVW SI, 1(AX)
-	MOVB R10, 3(AX)
+	MOVW BX, 1(AX)
+	MOVB R9, 3(AX)
 	ADDQ $0x04, AX
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm
 
 three_bytes_repeat_emit_encodeSnappyBlockAsm:
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm
 
 two_bytes_repeat_emit_encodeSnappyBlockAsm:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_repeat_emit_encodeSnappyBlockAsm
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm
 
 one_byte_repeat_emit_encodeSnappyBlockAsm:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_repeat_emit_encodeSnappyBlockAsm:
-	LEAQ (AX)(R8*1), SI
+	LEAQ (AX)(DI*1), BX
 
 	// genMemMoveShort
-	CMPQ R8, $0x08
+	CMPQ DI, $0x08
 	JLE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm_memmove_move_8
-	CMPQ R8, $0x10
+	CMPQ DI, $0x10
 	JBE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm_memmove_move_8through16
-	CMPQ R8, $0x20
+	CMPQ DI, $0x20
 	JBE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm_memmove_move_17through32
 	JMP  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm_memmove_move_33through64
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm_memmove_move_8:
-	MOVQ (R9), R10
-	MOVQ R10, (AX)
+	MOVQ (R8), R9
+	MOVQ R9, (AX)
 	JMP  memmove_end_copy_repeat_emit_encodeSnappyBlockAsm
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm_memmove_move_8through16:
-	MOVQ (R9), R10
-	MOVQ -8(R9)(R8*1), R9
-	MOVQ R10, (AX)
-	MOVQ R9, -8(AX)(R8*1)
+	MOVQ (R8), R9
+	MOVQ -8(R8)(DI*1), R8
+	MOVQ R9, (AX)
+	MOVQ R8, -8(AX)(DI*1)
 	JMP  memmove_end_copy_repeat_emit_encodeSnappyBlockAsm
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm_memmove_move_17through32:
-	MOVOU (R9), X0
-	MOVOU -16(R9)(R8*1), X1
+	MOVOU (R8), X0
+	MOVOU -16(R8)(DI*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R8*1)
+	MOVOU X1, -16(AX)(DI*1)
 	JMP   memmove_end_copy_repeat_emit_encodeSnappyBlockAsm
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm_memmove_move_33through64:
-	MOVOU (R9), X0
-	MOVOU 16(R9), X1
-	MOVOU -32(R9)(R8*1), X2
-	MOVOU -16(R9)(R8*1), X3
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R8*1)
-	MOVOU X3, -16(AX)(R8*1)
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
 
 memmove_end_copy_repeat_emit_encodeSnappyBlockAsm:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_repeat_emit_encodeSnappyBlockAsm
 
 memmove_long_repeat_emit_encodeSnappyBlockAsm:
-	LEAQ (AX)(R8*1), SI
+	LEAQ (AX)(DI*1), BX
 
 	// genMemMoveLong
-	MOVOU (R9), X0
-	MOVOU 16(R9), X1
-	MOVOU -32(R9)(R8*1), X2
-	MOVOU -16(R9)(R8*1), X3
-	MOVQ  R8, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
+	MOVQ  DI, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
 	JA    emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsmlarge_forward_sse_loop_32
-	LEAQ  -32(R9)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
+	LEAQ  -32(R8)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
 
 emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsmlarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
 	ADDQ  $0x20, R12
-	DECQ  R11
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
 	JNA   emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsmlarge_big_loop_back
 
 emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsmlarge_forward_sse_loop_32:
-	MOVOU -32(R9)(R12*1), X4
-	MOVOU -16(R9)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R8, R12
+	MOVOU -32(R8)(R11*1), X4
+	MOVOU -16(R8)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  DI, R11
 	JAE   emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsmlarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R8*1)
-	MOVOU X3, -16(AX)(R8*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
+	MOVQ  BX, AX
 
 emit_literal_done_repeat_emit_encodeSnappyBlockAsm:
 	ADDL $0x05, CX
-	MOVL CX, SI
-	SUBL 16(SP), SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), SI
-
-	// matchLen
-	XORL R11, R11
-	CMPL R8, $0x08
-	JL   matchlen_match4_repeat_extend_encodeSnappyBlockAsm
-
-matchlen_loopback_repeat_extend_encodeSnappyBlockAsm:
-	MOVQ  (R9)(R11*1), R10
-	XORQ  (SI)(R11*1), R10
-	TESTQ R10, R10
-	JZ    matchlen_loop_repeat_extend_encodeSnappyBlockAsm
-
-#ifdef GOAMD64_v3
-	TZCNTQ R10, R10
-
-#else
-	BSFQ R10, R10
-
-#endif
-	SARQ $0x03, R10
-	LEAL (R11)(R10*1), R11
-	JMP  repeat_extend_forward_end_encodeSnappyBlockAsm
-
-matchlen_loop_repeat_extend_encodeSnappyBlockAsm:
-	LEAL -8(R8), R8
-	LEAL 8(R11), R11
-	CMPL R8, $0x08
-	JGE  matchlen_loopback_repeat_extend_encodeSnappyBlockAsm
-	JZ   repeat_extend_forward_end_encodeSnappyBlockAsm
-
-matchlen_match4_repeat_extend_encodeSnappyBlockAsm:
-	CMPL R8, $0x04
-	JL   matchlen_match2_repeat_extend_encodeSnappyBlockAsm
-	MOVL (R9)(R11*1), R10
-	CMPL (SI)(R11*1), R10
-	JNE  matchlen_match2_repeat_extend_encodeSnappyBlockAsm
-	SUBL $0x04, R8
-	LEAL 4(R11), R11
-
-matchlen_match2_repeat_extend_encodeSnappyBlockAsm:
-	CMPL R8, $0x02
-	JL   matchlen_match1_repeat_extend_encodeSnappyBlockAsm
-	MOVW (R9)(R11*1), R10
-	CMPW (SI)(R11*1), R10
-	JNE  matchlen_match1_repeat_extend_encodeSnappyBlockAsm
-	SUBL $0x02, R8
-	LEAL 2(R11), R11
-
-matchlen_match1_repeat_extend_encodeSnappyBlockAsm:
-	CMPL R8, $0x01
-	JL   repeat_extend_forward_end_encodeSnappyBlockAsm
-	MOVB (R9)(R11*1), R10
-	CMPB (SI)(R11*1), R10
-	JNE  repeat_extend_forward_end_encodeSnappyBlockAsm
-	LEAL 1(R11), R11
-
-repeat_extend_forward_end_encodeSnappyBlockAsm:
-	ADDL R11, CX
-	MOVL CX, SI
-	SUBL DI, SI
-	MOVL 16(SP), DI
-
-	// emitCopy
-	CMPL DI, $0x00010000
-	JL   two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm
-
-four_bytes_loop_back_repeat_as_copy_encodeSnappyBlockAsm:
-	CMPL SI, $0x40
-	JLE  four_bytes_remain_repeat_as_copy_encodeSnappyBlockAsm
-	MOVB $0xff, (AX)
-	MOVL DI, 1(AX)
-	LEAL -64(SI), SI
-	ADDQ $0x05, AX
-	CMPL SI, $0x04
-	JL   four_bytes_remain_repeat_as_copy_encodeSnappyBlockAsm
-	JMP  four_bytes_loop_back_repeat_as_copy_encodeSnappyBlockAsm
-
-four_bytes_remain_repeat_as_copy_encodeSnappyBlockAsm:
-	TESTL SI, SI
-	JZ    repeat_end_emit_encodeSnappyBlockAsm
-	MOVB  $0x03, BL
-	LEAL  -4(BX)(SI*4), SI
-	MOVB  SI, (AX)
-	MOVL  DI, 1(AX)
-	ADDQ  $0x05, AX
-	JMP   repeat_end_emit_encodeSnappyBlockAsm
-
-two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm:
-	CMPL SI, $0x40
-	JLE  two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm
-	MOVB $0xee, (AX)
-	MOVW DI, 1(AX)
-	LEAL -60(SI), SI
-	ADDQ $0x03, AX
-	JMP  two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm
-
-two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm:
-	CMPL SI, $0x0c
-	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm
-	CMPL DI, $0x00000800
-	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm
-	MOVB $0x01, BL
-	LEAL -16(BX)(SI*4), SI
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeSnappyBlockAsm
-
-emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm:
-	MOVB $0x02, BL
-	LEAL -4(BX)(SI*4), SI
-	MOVB SI, (AX)
-	MOVW DI, 1(AX)
-	ADDQ $0x03, AX
-
-repeat_end_emit_encodeSnappyBlockAsm:
-	MOVL CX, 12(SP)
-	JMP  search_loop_encodeSnappyBlockAsm
-
-no_repeat_found_encodeSnappyBlockAsm:
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate_match_encodeSnappyBlockAsm
-	SHRQ $0x08, DI
-	MOVL 24(SP)(R10*4), SI
-	LEAL 2(CX), R9
-	CMPL (DX)(R8*1), DI
-	JEQ  candidate2_match_encodeSnappyBlockAsm
-	MOVL R9, 24(SP)(R10*4)
-	SHRQ $0x08, DI
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate3_match_encodeSnappyBlockAsm
-	MOVL 20(SP), CX
-	JMP  search_loop_encodeSnappyBlockAsm
-
-candidate3_match_encodeSnappyBlockAsm:
-	ADDL $0x02, CX
-	JMP  candidate_match_encodeSnappyBlockAsm
-
-candidate2_match_encodeSnappyBlockAsm:
-	MOVL R9, 24(SP)(R10*4)
-	INCL CX
-	MOVL R8, SI
-
-candidate_match_encodeSnappyBlockAsm:
-	MOVL  12(SP), DI
-	TESTL SI, SI
-	JZ    match_extend_back_end_encodeSnappyBlockAsm
-
-match_extend_back_loop_encodeSnappyBlockAsm:
-	CMPL CX, DI
-	JLE  match_extend_back_end_encodeSnappyBlockAsm
-	MOVB -1(DX)(SI*1), BL
-	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
-	JNE  match_extend_back_end_encodeSnappyBlockAsm
-	LEAL -1(CX), CX
-	DECL SI
-	JZ   match_extend_back_end_encodeSnappyBlockAsm
-	JMP  match_extend_back_loop_encodeSnappyBlockAsm
-
-match_extend_back_end_encodeSnappyBlockAsm:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 5(AX)(DI*1), DI
-	CMPQ DI, (SP)
-	JL   match_dst_size_check_encodeSnappyBlockAsm
-	MOVQ $0x00000000, ret+48(FP)
-	RET
-
-match_dst_size_check_encodeSnappyBlockAsm:
-	MOVL CX, DI
-	MOVL 12(SP), R8
-	CMPL R8, DI
-	JEQ  emit_literal_done_match_emit_encodeSnappyBlockAsm
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(R8*1), DI
-	SUBL R8, R9
-	LEAL -1(R9), R8
-	CMPL R8, $0x3c
-	JLT  one_byte_match_emit_encodeSnappyBlockAsm
-	CMPL R8, $0x00000100
-	JLT  two_bytes_match_emit_encodeSnappyBlockAsm
-	CMPL R8, $0x00010000
-	JLT  three_bytes_match_emit_encodeSnappyBlockAsm
-	CMPL R8, $0x01000000
-	JLT  four_bytes_match_emit_encodeSnappyBlockAsm
-	MOVB $0xfc, (AX)
-	MOVL R8, 1(AX)
-	ADDQ $0x05, AX
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm
-
-four_bytes_match_emit_encodeSnappyBlockAsm:
-	MOVL R8, R10
-	SHRL $0x10, R10
-	MOVB $0xf8, (AX)
-	MOVW R8, 1(AX)
-	MOVB R10, 3(AX)
-	ADDQ $0x04, AX
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm
-
-three_bytes_match_emit_encodeSnappyBlockAsm:
-	MOVB $0xf4, (AX)
-	MOVW R8, 1(AX)
-	ADDQ $0x03, AX
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm
-
-two_bytes_match_emit_encodeSnappyBlockAsm:
-	MOVB $0xf0, (AX)
-	MOVB R8, 1(AX)
-	ADDQ $0x02, AX
-	CMPL R8, $0x40
-	JL   memmove_match_emit_encodeSnappyBlockAsm
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm
-
-one_byte_match_emit_encodeSnappyBlockAsm:
-	SHLB $0x02, R8
-	MOVB R8, (AX)
-	ADDQ $0x01, AX
-
-memmove_match_emit_encodeSnappyBlockAsm:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveShort
-	CMPQ R9, $0x08
-	JLE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_8
-	CMPQ R9, $0x10
-	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_8through16
-	CMPQ R9, $0x20
-	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_17through32
-	JMP  emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_33through64
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_8:
-	MOVQ (DI), R10
-	MOVQ R10, (AX)
-	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_8through16:
-	MOVQ (DI), R10
-	MOVQ -8(DI)(R9*1), DI
-	MOVQ R10, (AX)
-	MOVQ DI, -8(AX)(R9*1)
-	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_17through32:
-	MOVOU (DI), X0
-	MOVOU -16(DI)(R9*1), X1
-	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
-	JMP   memmove_end_copy_match_emit_encodeSnappyBlockAsm
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_33through64:
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-
-memmove_end_copy_match_emit_encodeSnappyBlockAsm:
-	MOVQ R8, AX
-	JMP  emit_literal_done_match_emit_encodeSnappyBlockAsm
-
-memmove_long_match_emit_encodeSnappyBlockAsm:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveLong
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVQ  R9, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
-	JA    emit_lit_memmove_long_match_emit_encodeSnappyBlockAsmlarge_forward_sse_loop_32
-	LEAQ  -32(DI)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
-
-emit_lit_memmove_long_match_emit_encodeSnappyBlockAsmlarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
-	ADDQ  $0x20, R12
-	DECQ  R11
-	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsmlarge_big_loop_back
-
-emit_lit_memmove_long_match_emit_encodeSnappyBlockAsmlarge_forward_sse_loop_32:
-	MOVOU -32(DI)(R12*1), X4
-	MOVOU -16(DI)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R9, R12
-	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsmlarge_forward_sse_loop_32
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  R8, AX
-
-emit_literal_done_match_emit_encodeSnappyBlockAsm:
-match_nolit_loop_encodeSnappyBlockAsm:
-	MOVL CX, DI
-	SUBL SI, DI
-	MOVL DI, 16(SP)
-	ADDL $0x04, CX
-	ADDL $0x04, SI
+	MOVL CX, BX
+	SUBL 16(SP), BX
 	MOVQ src_len+32(FP), DI
 	SUBL CX, DI
 	LEAQ (DX)(CX*1), R8
-	LEAQ (DX)(SI*1), SI
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
 	XORL R10, R10
 	CMPL DI, $0x08
-	JL   matchlen_match4_match_nolit_encodeSnappyBlockAsm
+	JL   matchlen_match4_repeat_extend_encodeSnappyBlockAsm
 
-matchlen_loopback_match_nolit_encodeSnappyBlockAsm:
+matchlen_loopback_repeat_extend_encodeSnappyBlockAsm:
 	MOVQ  (R8)(R10*1), R9
-	XORQ  (SI)(R10*1), R9
+	XORQ  (BX)(R10*1), R9
 	TESTQ R9, R9
-	JZ    matchlen_loop_match_nolit_encodeSnappyBlockAsm
+	JZ    matchlen_loop_repeat_extend_encodeSnappyBlockAsm
 
 #ifdef GOAMD64_v3
 	TZCNTQ R9, R9
@@ -10886,129 +10544,452 @@ matchlen_loopback_match_nolit_encodeSnappyBlockAsm:
 #endif
 	SARQ $0x03, R9
 	LEAL (R10)(R9*1), R10
-	JMP  match_nolit_end_encodeSnappyBlockAsm
+	JMP  repeat_extend_forward_end_encodeSnappyBlockAsm
 
-matchlen_loop_match_nolit_encodeSnappyBlockAsm:
+matchlen_loop_repeat_extend_encodeSnappyBlockAsm:
 	LEAL -8(DI), DI
 	LEAL 8(R10), R10
 	CMPL DI, $0x08
+	JGE  matchlen_loopback_repeat_extend_encodeSnappyBlockAsm
+	JZ   repeat_extend_forward_end_encodeSnappyBlockAsm
+
+matchlen_match4_repeat_extend_encodeSnappyBlockAsm:
+	CMPL DI, $0x04
+	JL   matchlen_match2_repeat_extend_encodeSnappyBlockAsm
+	MOVL (R8)(R10*1), R9
+	CMPL (BX)(R10*1), R9
+	JNE  matchlen_match2_repeat_extend_encodeSnappyBlockAsm
+	SUBL $0x04, DI
+	LEAL 4(R10), R10
+
+matchlen_match2_repeat_extend_encodeSnappyBlockAsm:
+	CMPL DI, $0x02
+	JL   matchlen_match1_repeat_extend_encodeSnappyBlockAsm
+	MOVW (R8)(R10*1), R9
+	CMPW (BX)(R10*1), R9
+	JNE  matchlen_match1_repeat_extend_encodeSnappyBlockAsm
+	SUBL $0x02, DI
+	LEAL 2(R10), R10
+
+matchlen_match1_repeat_extend_encodeSnappyBlockAsm:
+	CMPL DI, $0x01
+	JL   repeat_extend_forward_end_encodeSnappyBlockAsm
+	MOVB (R8)(R10*1), R9
+	CMPB (BX)(R10*1), R9
+	JNE  repeat_extend_forward_end_encodeSnappyBlockAsm
+	LEAL 1(R10), R10
+
+repeat_extend_forward_end_encodeSnappyBlockAsm:
+	ADDL R10, CX
+	MOVL CX, BX
+	SUBL SI, BX
+	MOVL 16(SP), SI
+
+	// emitCopy
+	CMPL SI, $0x00010000
+	JL   two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm
+
+four_bytes_loop_back_repeat_as_copy_encodeSnappyBlockAsm:
+	CMPL BX, $0x40
+	JLE  four_bytes_remain_repeat_as_copy_encodeSnappyBlockAsm
+	MOVB $0xff, (AX)
+	MOVL SI, 1(AX)
+	LEAL -64(BX), BX
+	ADDQ $0x05, AX
+	CMPL BX, $0x04
+	JL   four_bytes_remain_repeat_as_copy_encodeSnappyBlockAsm
+	JMP  four_bytes_loop_back_repeat_as_copy_encodeSnappyBlockAsm
+
+four_bytes_remain_repeat_as_copy_encodeSnappyBlockAsm:
+	TESTL BX, BX
+	JZ    repeat_end_emit_encodeSnappyBlockAsm
+	XORL  DI, DI
+	LEAL  -1(DI)(BX*4), BX
+	MOVB  BL, (AX)
+	MOVL  SI, 1(AX)
+	ADDQ  $0x05, AX
+	JMP   repeat_end_emit_encodeSnappyBlockAsm
+
+two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm:
+	CMPL BX, $0x40
+	JLE  two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm
+	MOVB $0xee, (AX)
+	MOVW SI, 1(AX)
+	LEAL -60(BX), BX
+	ADDQ $0x03, AX
+	JMP  two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm
+
+two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm:
+	MOVL BX, DI
+	SHLL $0x02, DI
+	CMPL BX, $0x0c
+	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm
+	CMPL SI, $0x00000800
+	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm
+	LEAL -15(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeSnappyBlockAsm
+
+emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm:
+	LEAL -2(DI), DI
+	MOVB DI, (AX)
+	MOVW SI, 1(AX)
+	ADDQ $0x03, AX
+
+repeat_end_emit_encodeSnappyBlockAsm:
+	MOVL CX, 12(SP)
+	JMP  search_loop_encodeSnappyBlockAsm
+
+no_repeat_found_encodeSnappyBlockAsm:
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate_match_encodeSnappyBlockAsm
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
+	JEQ  candidate2_match_encodeSnappyBlockAsm
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate3_match_encodeSnappyBlockAsm
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeSnappyBlockAsm
+
+candidate3_match_encodeSnappyBlockAsm:
+	ADDL $0x02, CX
+	JMP  candidate_match_encodeSnappyBlockAsm
+
+candidate2_match_encodeSnappyBlockAsm:
+	MOVL R8, 24(SP)(R9*4)
+	INCL CX
+	MOVL DI, BX
+
+candidate_match_encodeSnappyBlockAsm:
+	MOVL  12(SP), SI
+	TESTL BX, BX
+	JZ    match_extend_back_end_encodeSnappyBlockAsm
+
+match_extend_back_loop_encodeSnappyBlockAsm:
+	CMPL CX, SI
+	JLE  match_extend_back_end_encodeSnappyBlockAsm
+	MOVB -1(DX)(BX*1), DI
+	MOVB -1(DX)(CX*1), R8
+	CMPB DI, R8
+	JNE  match_extend_back_end_encodeSnappyBlockAsm
+	LEAL -1(CX), CX
+	DECL BX
+	JZ   match_extend_back_end_encodeSnappyBlockAsm
+	JMP  match_extend_back_loop_encodeSnappyBlockAsm
+
+match_extend_back_end_encodeSnappyBlockAsm:
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 5(AX)(SI*1), SI
+	CMPQ SI, (SP)
+	JL   match_dst_size_check_encodeSnappyBlockAsm
+	MOVQ $0x00000000, ret+48(FP)
+	RET
+
+match_dst_size_check_encodeSnappyBlockAsm:
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
+	JEQ  emit_literal_done_match_emit_encodeSnappyBlockAsm
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), DI
+	CMPL DI, $0x3c
+	JLT  one_byte_match_emit_encodeSnappyBlockAsm
+	CMPL DI, $0x00000100
+	JLT  two_bytes_match_emit_encodeSnappyBlockAsm
+	CMPL DI, $0x00010000
+	JLT  three_bytes_match_emit_encodeSnappyBlockAsm
+	CMPL DI, $0x01000000
+	JLT  four_bytes_match_emit_encodeSnappyBlockAsm
+	MOVB $0xfc, (AX)
+	MOVL DI, 1(AX)
+	ADDQ $0x05, AX
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm
+
+four_bytes_match_emit_encodeSnappyBlockAsm:
+	MOVL DI, R9
+	SHRL $0x10, R9
+	MOVB $0xf8, (AX)
+	MOVW DI, 1(AX)
+	MOVB R9, 3(AX)
+	ADDQ $0x04, AX
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm
+
+three_bytes_match_emit_encodeSnappyBlockAsm:
+	MOVB $0xf4, (AX)
+	MOVW DI, 1(AX)
+	ADDQ $0x03, AX
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm
+
+two_bytes_match_emit_encodeSnappyBlockAsm:
+	MOVB $0xf0, (AX)
+	MOVB DI, 1(AX)
+	ADDQ $0x02, AX
+	CMPL DI, $0x40
+	JL   memmove_match_emit_encodeSnappyBlockAsm
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm
+
+one_byte_match_emit_encodeSnappyBlockAsm:
+	SHLB $0x02, DI
+	MOVB DI, (AX)
+	ADDQ $0x01, AX
+
+memmove_match_emit_encodeSnappyBlockAsm:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveShort
+	CMPQ R8, $0x08
+	JLE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_8
+	CMPQ R8, $0x10
+	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_8through16
+	CMPQ R8, $0x20
+	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_17through32
+	JMP  emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_33through64
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_8:
+	MOVQ (SI), R9
+	MOVQ R9, (AX)
+	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_8through16:
+	MOVQ (SI), R9
+	MOVQ -8(SI)(R8*1), SI
+	MOVQ R9, (AX)
+	MOVQ SI, -8(AX)(R8*1)
+	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_17through32:
+	MOVOU (SI), X0
+	MOVOU -16(SI)(R8*1), X1
+	MOVOU X0, (AX)
+	MOVOU X1, -16(AX)(R8*1)
+	JMP   memmove_end_copy_match_emit_encodeSnappyBlockAsm
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm_memmove_move_33through64:
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+
+memmove_end_copy_match_emit_encodeSnappyBlockAsm:
+	MOVQ DI, AX
+	JMP  emit_literal_done_match_emit_encodeSnappyBlockAsm
+
+memmove_long_match_emit_encodeSnappyBlockAsm:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveLong
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVQ  R8, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
+	JA    emit_lit_memmove_long_match_emit_encodeSnappyBlockAsmlarge_forward_sse_loop_32
+	LEAQ  -32(SI)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
+
+emit_lit_memmove_long_match_emit_encodeSnappyBlockAsmlarge_big_loop_back:
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
+	ADDQ  $0x20, R12
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
+	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsmlarge_big_loop_back
+
+emit_lit_memmove_long_match_emit_encodeSnappyBlockAsmlarge_forward_sse_loop_32:
+	MOVOU -32(SI)(R11*1), X4
+	MOVOU -16(SI)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  R8, R11
+	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsmlarge_forward_sse_loop_32
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  DI, AX
+
+emit_literal_done_match_emit_encodeSnappyBlockAsm:
+match_nolit_loop_encodeSnappyBlockAsm:
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
+	ADDL $0x04, CX
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
+
+	// matchLen
+	XORL R9, R9
+	CMPL SI, $0x08
+	JL   matchlen_match4_match_nolit_encodeSnappyBlockAsm
+
+matchlen_loopback_match_nolit_encodeSnappyBlockAsm:
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
+	JZ    matchlen_loop_match_nolit_encodeSnappyBlockAsm
+
+#ifdef GOAMD64_v3
+	TZCNTQ R8, R8
+
+#else
+	BSFQ R8, R8
+
+#endif
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
+	JMP  match_nolit_end_encodeSnappyBlockAsm
+
+matchlen_loop_match_nolit_encodeSnappyBlockAsm:
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeSnappyBlockAsm
 	JZ   match_nolit_end_encodeSnappyBlockAsm
 
 matchlen_match4_match_nolit_encodeSnappyBlockAsm:
-	CMPL DI, $0x04
+	CMPL SI, $0x04
 	JL   matchlen_match2_match_nolit_encodeSnappyBlockAsm
-	MOVL (R8)(R10*1), R9
-	CMPL (SI)(R10*1), R9
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
 	JNE  matchlen_match2_match_nolit_encodeSnappyBlockAsm
-	SUBL $0x04, DI
-	LEAL 4(R10), R10
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
 
 matchlen_match2_match_nolit_encodeSnappyBlockAsm:
-	CMPL DI, $0x02
+	CMPL SI, $0x02
 	JL   matchlen_match1_match_nolit_encodeSnappyBlockAsm
-	MOVW (R8)(R10*1), R9
-	CMPW (SI)(R10*1), R9
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
 	JNE  matchlen_match1_match_nolit_encodeSnappyBlockAsm
-	SUBL $0x02, DI
-	LEAL 2(R10), R10
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
 
 matchlen_match1_match_nolit_encodeSnappyBlockAsm:
-	CMPL DI, $0x01
+	CMPL SI, $0x01
 	JL   match_nolit_end_encodeSnappyBlockAsm
-	MOVB (R8)(R10*1), R9
-	CMPB (SI)(R10*1), R9
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
 	JNE  match_nolit_end_encodeSnappyBlockAsm
-	LEAL 1(R10), R10
+	LEAL 1(R9), R9
 
 match_nolit_end_encodeSnappyBlockAsm:
-	ADDL R10, CX
-	MOVL 16(SP), SI
-	ADDL $0x04, R10
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
 	MOVL CX, 12(SP)
 
 	// emitCopy
-	CMPL SI, $0x00010000
+	CMPL BX, $0x00010000
 	JL   two_byte_offset_match_nolit_encodeSnappyBlockAsm
 
 four_bytes_loop_back_match_nolit_encodeSnappyBlockAsm:
-	CMPL R10, $0x40
+	CMPL R9, $0x40
 	JLE  four_bytes_remain_match_nolit_encodeSnappyBlockAsm
 	MOVB $0xff, (AX)
-	MOVL SI, 1(AX)
-	LEAL -64(R10), R10
+	MOVL BX, 1(AX)
+	LEAL -64(R9), R9
 	ADDQ $0x05, AX
-	CMPL R10, $0x04
+	CMPL R9, $0x04
 	JL   four_bytes_remain_match_nolit_encodeSnappyBlockAsm
 	JMP  four_bytes_loop_back_match_nolit_encodeSnappyBlockAsm
 
 four_bytes_remain_match_nolit_encodeSnappyBlockAsm:
-	TESTL R10, R10
+	TESTL R9, R9
 	JZ    match_nolit_emitcopy_end_encodeSnappyBlockAsm
-	MOVB  $0x03, BL
-	LEAL  -4(BX)(R10*4), R10
-	MOVB  R10, (AX)
-	MOVL  SI, 1(AX)
+	XORL  SI, SI
+	LEAL  -1(SI)(R9*4), R9
+	MOVB  R9, (AX)
+	MOVL  BX, 1(AX)
 	ADDQ  $0x05, AX
 	JMP   match_nolit_emitcopy_end_encodeSnappyBlockAsm
 
 two_byte_offset_match_nolit_encodeSnappyBlockAsm:
-	CMPL R10, $0x40
+	CMPL R9, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeSnappyBlockAsm
 	MOVB $0xee, (AX)
-	MOVW SI, 1(AX)
-	LEAL -60(R10), R10
+	MOVW BX, 1(AX)
+	LEAL -60(R9), R9
 	ADDQ $0x03, AX
 	JMP  two_byte_offset_match_nolit_encodeSnappyBlockAsm
 
 two_byte_offset_short_match_nolit_encodeSnappyBlockAsm:
-	CMPL R10, $0x0c
+	MOVL R9, SI
+	SHLL $0x02, SI
+	CMPL R9, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeSnappyBlockAsm
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeSnappyBlockAsm
-	MOVB $0x01, BL
-	LEAL -16(BX)(R10*4), R10
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	LEAL -15(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeSnappyBlockAsm
 
 emit_copy_three_match_nolit_encodeSnappyBlockAsm:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R10*4), R10
-	MOVB R10, (AX)
-	MOVW SI, 1(AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeSnappyBlockAsm:
 	CMPL CX, 8(SP)
 	JGE  emit_remainder_encodeSnappyBlockAsm
-	MOVQ -2(DX)(CX*1), DI
+	MOVQ -2(DX)(CX*1), SI
 	CMPQ AX, (SP)
 	JL   match_nolit_dst_ok_encodeSnappyBlockAsm
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_nolit_dst_ok_encodeSnappyBlockAsm:
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  DI, R8
-	SHRQ  $0x10, DI
-	MOVQ  DI, SI
-	SHLQ  $0x10, R8
-	IMULQ R9, R8
-	SHRQ  $0x32, R8
-	SHLQ  $0x10, SI
-	IMULQ R9, SI
-	SHRQ  $0x32, SI
-	LEAL  -2(CX), R9
-	LEAQ  24(SP)(SI*4), R10
-	MOVL  (R10), SI
-	MOVL  R9, 24(SP)(R8*4)
-	MOVL  CX, (R10)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x10, DI
+	IMULQ R8, DI
+	SHRQ  $0x32, DI
+	SHLQ  $0x10, BX
+	IMULQ R8, BX
+	SHRQ  $0x32, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
 	JEQ   match_nolit_loop_encodeSnappyBlockAsm
 	INCL  CX
 	JMP   search_loop_encodeSnappyBlockAsm
@@ -11212,8 +11193,8 @@ zero_loop_encodeSnappyBlockAsm64K:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -11223,477 +11204,197 @@ zero_loop_encodeSnappyBlockAsm64K:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeSnappyBlockAsm64K:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x06, SI
-	LEAL  4(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x06, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeSnappyBlockAsm64K
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHRQ  $0x08, R11
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
 	SHLQ  $0x10, R10
-	IMULQ R9, R10
+	IMULQ R8, R10
 	SHRQ  $0x32, R10
-	SHLQ  $0x10, R11
-	IMULQ R9, R11
-	SHRQ  $0x32, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  24(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	LEAL  1(CX), R10
-	MOVL  R10, 24(SP)(R11*4)
-	MOVQ  DI, R10
-	SHRQ  $0x10, R10
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x32, R10
-	MOVL  CX, R9
-	SUBL  16(SP), R9
-	MOVL  1(DX)(R9*1), R11
-	MOVQ  DI, R9
-	SHRQ  $0x08, R9
-	CMPL  R9, R11
-	JNE   no_repeat_found_encodeSnappyBlockAsm64K
-	LEAL  1(CX), DI
-	MOVL  12(SP), SI
-	MOVL  DI, R8
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
+	MOVL  CX, R8
 	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
+	JNE   no_repeat_found_encodeSnappyBlockAsm64K
+	LEAL  1(CX), SI
+	MOVL  12(SP), BX
+	MOVL  SI, DI
+	SUBL  16(SP), DI
 	JZ    repeat_extend_back_end_encodeSnappyBlockAsm64K
 
 repeat_extend_back_loop_encodeSnappyBlockAsm64K:
-	CMPL DI, SI
+	CMPL SI, BX
 	JLE  repeat_extend_back_end_encodeSnappyBlockAsm64K
-	MOVB -1(DX)(R8*1), BL
-	MOVB -1(DX)(DI*1), R9
-	CMPB BL, R9
+	MOVB -1(DX)(DI*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
 	JNE  repeat_extend_back_end_encodeSnappyBlockAsm64K
-	LEAL -1(DI), DI
-	DECL R8
+	LEAL -1(SI), SI
+	DECL DI
 	JNZ  repeat_extend_back_loop_encodeSnappyBlockAsm64K
 
 repeat_extend_back_end_encodeSnappyBlockAsm64K:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_repeat_emit_encodeSnappyBlockAsm64K
-	MOVL DI, R8
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R9
-	SUBL SI, R8
-	LEAL -1(R8), SI
-	CMPL SI, $0x3c
+	MOVL SI, DI
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R8
+	SUBL BX, DI
+	LEAL -1(DI), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_repeat_emit_encodeSnappyBlockAsm64K
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_repeat_emit_encodeSnappyBlockAsm64K
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm64K
 
 two_bytes_repeat_emit_encodeSnappyBlockAsm64K:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_repeat_emit_encodeSnappyBlockAsm64K
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm64K
 
 one_byte_repeat_emit_encodeSnappyBlockAsm64K:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_repeat_emit_encodeSnappyBlockAsm64K:
-	LEAQ (AX)(R8*1), SI
+	LEAQ (AX)(DI*1), BX
 
 	// genMemMoveShort
-	CMPQ R8, $0x08
+	CMPQ DI, $0x08
 	JLE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm64K_memmove_move_8
-	CMPQ R8, $0x10
+	CMPQ DI, $0x10
 	JBE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm64K_memmove_move_8through16
-	CMPQ R8, $0x20
+	CMPQ DI, $0x20
 	JBE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm64K_memmove_move_17through32
 	JMP  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm64K_memmove_move_33through64
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm64K_memmove_move_8:
-	MOVQ (R9), R10
-	MOVQ R10, (AX)
+	MOVQ (R8), R9
+	MOVQ R9, (AX)
 	JMP  memmove_end_copy_repeat_emit_encodeSnappyBlockAsm64K
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm64K_memmove_move_8through16:
-	MOVQ (R9), R10
-	MOVQ -8(R9)(R8*1), R9
-	MOVQ R10, (AX)
-	MOVQ R9, -8(AX)(R8*1)
+	MOVQ (R8), R9
+	MOVQ -8(R8)(DI*1), R8
+	MOVQ R9, (AX)
+	MOVQ R8, -8(AX)(DI*1)
 	JMP  memmove_end_copy_repeat_emit_encodeSnappyBlockAsm64K
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm64K_memmove_move_17through32:
-	MOVOU (R9), X0
-	MOVOU -16(R9)(R8*1), X1
+	MOVOU (R8), X0
+	MOVOU -16(R8)(DI*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R8*1)
+	MOVOU X1, -16(AX)(DI*1)
 	JMP   memmove_end_copy_repeat_emit_encodeSnappyBlockAsm64K
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm64K_memmove_move_33through64:
-	MOVOU (R9), X0
-	MOVOU 16(R9), X1
-	MOVOU -32(R9)(R8*1), X2
-	MOVOU -16(R9)(R8*1), X3
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R8*1)
-	MOVOU X3, -16(AX)(R8*1)
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
 
 memmove_end_copy_repeat_emit_encodeSnappyBlockAsm64K:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_repeat_emit_encodeSnappyBlockAsm64K
 
 memmove_long_repeat_emit_encodeSnappyBlockAsm64K:
-	LEAQ (AX)(R8*1), SI
+	LEAQ (AX)(DI*1), BX
 
 	// genMemMoveLong
-	MOVOU (R9), X0
-	MOVOU 16(R9), X1
-	MOVOU -32(R9)(R8*1), X2
-	MOVOU -16(R9)(R8*1), X3
-	MOVQ  R8, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
+	MOVQ  DI, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
 	JA    emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm64Klarge_forward_sse_loop_32
-	LEAQ  -32(R9)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
+	LEAQ  -32(R8)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
 
 emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm64Klarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
 	ADDQ  $0x20, R12
-	DECQ  R11
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
 	JNA   emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm64Klarge_big_loop_back
 
 emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm64Klarge_forward_sse_loop_32:
-	MOVOU -32(R9)(R12*1), X4
-	MOVOU -16(R9)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R8, R12
+	MOVOU -32(R8)(R11*1), X4
+	MOVOU -16(R8)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  DI, R11
 	JAE   emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm64Klarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R8*1)
-	MOVOU X3, -16(AX)(R8*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
+	MOVQ  BX, AX
 
 emit_literal_done_repeat_emit_encodeSnappyBlockAsm64K:
 	ADDL $0x05, CX
-	MOVL CX, SI
-	SUBL 16(SP), SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), SI
-
-	// matchLen
-	XORL R11, R11
-	CMPL R8, $0x08
-	JL   matchlen_match4_repeat_extend_encodeSnappyBlockAsm64K
-
-matchlen_loopback_repeat_extend_encodeSnappyBlockAsm64K:
-	MOVQ  (R9)(R11*1), R10
-	XORQ  (SI)(R11*1), R10
-	TESTQ R10, R10
-	JZ    matchlen_loop_repeat_extend_encodeSnappyBlockAsm64K
-
-#ifdef GOAMD64_v3
-	TZCNTQ R10, R10
-
-#else
-	BSFQ R10, R10
-
-#endif
-	SARQ $0x03, R10
-	LEAL (R11)(R10*1), R11
-	JMP  repeat_extend_forward_end_encodeSnappyBlockAsm64K
-
-matchlen_loop_repeat_extend_encodeSnappyBlockAsm64K:
-	LEAL -8(R8), R8
-	LEAL 8(R11), R11
-	CMPL R8, $0x08
-	JGE  matchlen_loopback_repeat_extend_encodeSnappyBlockAsm64K
-	JZ   repeat_extend_forward_end_encodeSnappyBlockAsm64K
-
-matchlen_match4_repeat_extend_encodeSnappyBlockAsm64K:
-	CMPL R8, $0x04
-	JL   matchlen_match2_repeat_extend_encodeSnappyBlockAsm64K
-	MOVL (R9)(R11*1), R10
-	CMPL (SI)(R11*1), R10
-	JNE  matchlen_match2_repeat_extend_encodeSnappyBlockAsm64K
-	SUBL $0x04, R8
-	LEAL 4(R11), R11
-
-matchlen_match2_repeat_extend_encodeSnappyBlockAsm64K:
-	CMPL R8, $0x02
-	JL   matchlen_match1_repeat_extend_encodeSnappyBlockAsm64K
-	MOVW (R9)(R11*1), R10
-	CMPW (SI)(R11*1), R10
-	JNE  matchlen_match1_repeat_extend_encodeSnappyBlockAsm64K
-	SUBL $0x02, R8
-	LEAL 2(R11), R11
-
-matchlen_match1_repeat_extend_encodeSnappyBlockAsm64K:
-	CMPL R8, $0x01
-	JL   repeat_extend_forward_end_encodeSnappyBlockAsm64K
-	MOVB (R9)(R11*1), R10
-	CMPB (SI)(R11*1), R10
-	JNE  repeat_extend_forward_end_encodeSnappyBlockAsm64K
-	LEAL 1(R11), R11
-
-repeat_extend_forward_end_encodeSnappyBlockAsm64K:
-	ADDL R11, CX
-	MOVL CX, SI
-	SUBL DI, SI
-	MOVL 16(SP), DI
-
-	// emitCopy
-two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm64K:
-	CMPL SI, $0x40
-	JLE  two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm64K
-	MOVB $0xee, (AX)
-	MOVW DI, 1(AX)
-	LEAL -60(SI), SI
-	ADDQ $0x03, AX
-	JMP  two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm64K
-
-two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm64K:
-	CMPL SI, $0x0c
-	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm64K
-	CMPL DI, $0x00000800
-	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm64K
-	MOVB $0x01, BL
-	LEAL -16(BX)(SI*4), SI
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeSnappyBlockAsm64K
-
-emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm64K:
-	MOVB $0x02, BL
-	LEAL -4(BX)(SI*4), SI
-	MOVB SI, (AX)
-	MOVW DI, 1(AX)
-	ADDQ $0x03, AX
-
-repeat_end_emit_encodeSnappyBlockAsm64K:
-	MOVL CX, 12(SP)
-	JMP  search_loop_encodeSnappyBlockAsm64K
-
-no_repeat_found_encodeSnappyBlockAsm64K:
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate_match_encodeSnappyBlockAsm64K
-	SHRQ $0x08, DI
-	MOVL 24(SP)(R10*4), SI
-	LEAL 2(CX), R9
-	CMPL (DX)(R8*1), DI
-	JEQ  candidate2_match_encodeSnappyBlockAsm64K
-	MOVL R9, 24(SP)(R10*4)
-	SHRQ $0x08, DI
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate3_match_encodeSnappyBlockAsm64K
-	MOVL 20(SP), CX
-	JMP  search_loop_encodeSnappyBlockAsm64K
-
-candidate3_match_encodeSnappyBlockAsm64K:
-	ADDL $0x02, CX
-	JMP  candidate_match_encodeSnappyBlockAsm64K
-
-candidate2_match_encodeSnappyBlockAsm64K:
-	MOVL R9, 24(SP)(R10*4)
-	INCL CX
-	MOVL R8, SI
-
-candidate_match_encodeSnappyBlockAsm64K:
-	MOVL  12(SP), DI
-	TESTL SI, SI
-	JZ    match_extend_back_end_encodeSnappyBlockAsm64K
-
-match_extend_back_loop_encodeSnappyBlockAsm64K:
-	CMPL CX, DI
-	JLE  match_extend_back_end_encodeSnappyBlockAsm64K
-	MOVB -1(DX)(SI*1), BL
-	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
-	JNE  match_extend_back_end_encodeSnappyBlockAsm64K
-	LEAL -1(CX), CX
-	DECL SI
-	JZ   match_extend_back_end_encodeSnappyBlockAsm64K
-	JMP  match_extend_back_loop_encodeSnappyBlockAsm64K
-
-match_extend_back_end_encodeSnappyBlockAsm64K:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
-	JL   match_dst_size_check_encodeSnappyBlockAsm64K
-	MOVQ $0x00000000, ret+48(FP)
-	RET
-
-match_dst_size_check_encodeSnappyBlockAsm64K:
-	MOVL CX, DI
-	MOVL 12(SP), R8
-	CMPL R8, DI
-	JEQ  emit_literal_done_match_emit_encodeSnappyBlockAsm64K
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(R8*1), DI
-	SUBL R8, R9
-	LEAL -1(R9), R8
-	CMPL R8, $0x3c
-	JLT  one_byte_match_emit_encodeSnappyBlockAsm64K
-	CMPL R8, $0x00000100
-	JLT  two_bytes_match_emit_encodeSnappyBlockAsm64K
-	MOVB $0xf4, (AX)
-	MOVW R8, 1(AX)
-	ADDQ $0x03, AX
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm64K
-
-two_bytes_match_emit_encodeSnappyBlockAsm64K:
-	MOVB $0xf0, (AX)
-	MOVB R8, 1(AX)
-	ADDQ $0x02, AX
-	CMPL R8, $0x40
-	JL   memmove_match_emit_encodeSnappyBlockAsm64K
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm64K
-
-one_byte_match_emit_encodeSnappyBlockAsm64K:
-	SHLB $0x02, R8
-	MOVB R8, (AX)
-	ADDQ $0x01, AX
-
-memmove_match_emit_encodeSnappyBlockAsm64K:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveShort
-	CMPQ R9, $0x08
-	JLE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_8
-	CMPQ R9, $0x10
-	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_8through16
-	CMPQ R9, $0x20
-	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_17through32
-	JMP  emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_33through64
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_8:
-	MOVQ (DI), R10
-	MOVQ R10, (AX)
-	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm64K
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_8through16:
-	MOVQ (DI), R10
-	MOVQ -8(DI)(R9*1), DI
-	MOVQ R10, (AX)
-	MOVQ DI, -8(AX)(R9*1)
-	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm64K
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_17through32:
-	MOVOU (DI), X0
-	MOVOU -16(DI)(R9*1), X1
-	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
-	JMP   memmove_end_copy_match_emit_encodeSnappyBlockAsm64K
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_33through64:
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-
-memmove_end_copy_match_emit_encodeSnappyBlockAsm64K:
-	MOVQ R8, AX
-	JMP  emit_literal_done_match_emit_encodeSnappyBlockAsm64K
-
-memmove_long_match_emit_encodeSnappyBlockAsm64K:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveLong
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVQ  R9, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
-	JA    emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm64Klarge_forward_sse_loop_32
-	LEAQ  -32(DI)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
-
-emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm64Klarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
-	ADDQ  $0x20, R12
-	DECQ  R11
-	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm64Klarge_big_loop_back
-
-emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm64Klarge_forward_sse_loop_32:
-	MOVOU -32(DI)(R12*1), X4
-	MOVOU -16(DI)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R9, R12
-	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm64Klarge_forward_sse_loop_32
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  R8, AX
-
-emit_literal_done_match_emit_encodeSnappyBlockAsm64K:
-match_nolit_loop_encodeSnappyBlockAsm64K:
-	MOVL CX, DI
-	SUBL SI, DI
-	MOVL DI, 16(SP)
-	ADDL $0x04, CX
-	ADDL $0x04, SI
+	MOVL CX, BX
+	SUBL 16(SP), BX
 	MOVQ src_len+32(FP), DI
 	SUBL CX, DI
 	LEAQ (DX)(CX*1), R8
-	LEAQ (DX)(SI*1), SI
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
 	XORL R10, R10
 	CMPL DI, $0x08
-	JL   matchlen_match4_match_nolit_encodeSnappyBlockAsm64K
+	JL   matchlen_match4_repeat_extend_encodeSnappyBlockAsm64K
 
-matchlen_loopback_match_nolit_encodeSnappyBlockAsm64K:
+matchlen_loopback_repeat_extend_encodeSnappyBlockAsm64K:
 	MOVQ  (R8)(R10*1), R9
-	XORQ  (SI)(R10*1), R9
+	XORQ  (BX)(R10*1), R9
 	TESTQ R9, R9
-	JZ    matchlen_loop_match_nolit_encodeSnappyBlockAsm64K
+	JZ    matchlen_loop_repeat_extend_encodeSnappyBlockAsm64K
 
 #ifdef GOAMD64_v3
 	TZCNTQ R9, R9
@@ -11704,105 +11405,385 @@ matchlen_loopback_match_nolit_encodeSnappyBlockAsm64K:
 #endif
 	SARQ $0x03, R9
 	LEAL (R10)(R9*1), R10
-	JMP  match_nolit_end_encodeSnappyBlockAsm64K
+	JMP  repeat_extend_forward_end_encodeSnappyBlockAsm64K
 
-matchlen_loop_match_nolit_encodeSnappyBlockAsm64K:
+matchlen_loop_repeat_extend_encodeSnappyBlockAsm64K:
 	LEAL -8(DI), DI
 	LEAL 8(R10), R10
 	CMPL DI, $0x08
+	JGE  matchlen_loopback_repeat_extend_encodeSnappyBlockAsm64K
+	JZ   repeat_extend_forward_end_encodeSnappyBlockAsm64K
+
+matchlen_match4_repeat_extend_encodeSnappyBlockAsm64K:
+	CMPL DI, $0x04
+	JL   matchlen_match2_repeat_extend_encodeSnappyBlockAsm64K
+	MOVL (R8)(R10*1), R9
+	CMPL (BX)(R10*1), R9
+	JNE  matchlen_match2_repeat_extend_encodeSnappyBlockAsm64K
+	SUBL $0x04, DI
+	LEAL 4(R10), R10
+
+matchlen_match2_repeat_extend_encodeSnappyBlockAsm64K:
+	CMPL DI, $0x02
+	JL   matchlen_match1_repeat_extend_encodeSnappyBlockAsm64K
+	MOVW (R8)(R10*1), R9
+	CMPW (BX)(R10*1), R9
+	JNE  matchlen_match1_repeat_extend_encodeSnappyBlockAsm64K
+	SUBL $0x02, DI
+	LEAL 2(R10), R10
+
+matchlen_match1_repeat_extend_encodeSnappyBlockAsm64K:
+	CMPL DI, $0x01
+	JL   repeat_extend_forward_end_encodeSnappyBlockAsm64K
+	MOVB (R8)(R10*1), R9
+	CMPB (BX)(R10*1), R9
+	JNE  repeat_extend_forward_end_encodeSnappyBlockAsm64K
+	LEAL 1(R10), R10
+
+repeat_extend_forward_end_encodeSnappyBlockAsm64K:
+	ADDL R10, CX
+	MOVL CX, BX
+	SUBL SI, BX
+	MOVL 16(SP), SI
+
+	// emitCopy
+two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm64K:
+	CMPL BX, $0x40
+	JLE  two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm64K
+	MOVB $0xee, (AX)
+	MOVW SI, 1(AX)
+	LEAL -60(BX), BX
+	ADDQ $0x03, AX
+	JMP  two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm64K
+
+two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm64K:
+	MOVL BX, DI
+	SHLL $0x02, DI
+	CMPL BX, $0x0c
+	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm64K
+	CMPL SI, $0x00000800
+	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm64K
+	LEAL -15(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeSnappyBlockAsm64K
+
+emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm64K:
+	LEAL -2(DI), DI
+	MOVB DI, (AX)
+	MOVW SI, 1(AX)
+	ADDQ $0x03, AX
+
+repeat_end_emit_encodeSnappyBlockAsm64K:
+	MOVL CX, 12(SP)
+	JMP  search_loop_encodeSnappyBlockAsm64K
+
+no_repeat_found_encodeSnappyBlockAsm64K:
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate_match_encodeSnappyBlockAsm64K
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
+	JEQ  candidate2_match_encodeSnappyBlockAsm64K
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate3_match_encodeSnappyBlockAsm64K
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeSnappyBlockAsm64K
+
+candidate3_match_encodeSnappyBlockAsm64K:
+	ADDL $0x02, CX
+	JMP  candidate_match_encodeSnappyBlockAsm64K
+
+candidate2_match_encodeSnappyBlockAsm64K:
+	MOVL R8, 24(SP)(R9*4)
+	INCL CX
+	MOVL DI, BX
+
+candidate_match_encodeSnappyBlockAsm64K:
+	MOVL  12(SP), SI
+	TESTL BX, BX
+	JZ    match_extend_back_end_encodeSnappyBlockAsm64K
+
+match_extend_back_loop_encodeSnappyBlockAsm64K:
+	CMPL CX, SI
+	JLE  match_extend_back_end_encodeSnappyBlockAsm64K
+	MOVB -1(DX)(BX*1), DI
+	MOVB -1(DX)(CX*1), R8
+	CMPB DI, R8
+	JNE  match_extend_back_end_encodeSnappyBlockAsm64K
+	LEAL -1(CX), CX
+	DECL BX
+	JZ   match_extend_back_end_encodeSnappyBlockAsm64K
+	JMP  match_extend_back_loop_encodeSnappyBlockAsm64K
+
+match_extend_back_end_encodeSnappyBlockAsm64K:
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
+	JL   match_dst_size_check_encodeSnappyBlockAsm64K
+	MOVQ $0x00000000, ret+48(FP)
+	RET
+
+match_dst_size_check_encodeSnappyBlockAsm64K:
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
+	JEQ  emit_literal_done_match_emit_encodeSnappyBlockAsm64K
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), DI
+	CMPL DI, $0x3c
+	JLT  one_byte_match_emit_encodeSnappyBlockAsm64K
+	CMPL DI, $0x00000100
+	JLT  two_bytes_match_emit_encodeSnappyBlockAsm64K
+	MOVB $0xf4, (AX)
+	MOVW DI, 1(AX)
+	ADDQ $0x03, AX
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm64K
+
+two_bytes_match_emit_encodeSnappyBlockAsm64K:
+	MOVB $0xf0, (AX)
+	MOVB DI, 1(AX)
+	ADDQ $0x02, AX
+	CMPL DI, $0x40
+	JL   memmove_match_emit_encodeSnappyBlockAsm64K
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm64K
+
+one_byte_match_emit_encodeSnappyBlockAsm64K:
+	SHLB $0x02, DI
+	MOVB DI, (AX)
+	ADDQ $0x01, AX
+
+memmove_match_emit_encodeSnappyBlockAsm64K:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveShort
+	CMPQ R8, $0x08
+	JLE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_8
+	CMPQ R8, $0x10
+	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_8through16
+	CMPQ R8, $0x20
+	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_17through32
+	JMP  emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_33through64
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_8:
+	MOVQ (SI), R9
+	MOVQ R9, (AX)
+	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm64K
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_8through16:
+	MOVQ (SI), R9
+	MOVQ -8(SI)(R8*1), SI
+	MOVQ R9, (AX)
+	MOVQ SI, -8(AX)(R8*1)
+	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm64K
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_17through32:
+	MOVOU (SI), X0
+	MOVOU -16(SI)(R8*1), X1
+	MOVOU X0, (AX)
+	MOVOU X1, -16(AX)(R8*1)
+	JMP   memmove_end_copy_match_emit_encodeSnappyBlockAsm64K
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm64K_memmove_move_33through64:
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+
+memmove_end_copy_match_emit_encodeSnappyBlockAsm64K:
+	MOVQ DI, AX
+	JMP  emit_literal_done_match_emit_encodeSnappyBlockAsm64K
+
+memmove_long_match_emit_encodeSnappyBlockAsm64K:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveLong
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVQ  R8, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
+	JA    emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm64Klarge_forward_sse_loop_32
+	LEAQ  -32(SI)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
+
+emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm64Klarge_big_loop_back:
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
+	ADDQ  $0x20, R12
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
+	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm64Klarge_big_loop_back
+
+emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm64Klarge_forward_sse_loop_32:
+	MOVOU -32(SI)(R11*1), X4
+	MOVOU -16(SI)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  R8, R11
+	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm64Klarge_forward_sse_loop_32
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  DI, AX
+
+emit_literal_done_match_emit_encodeSnappyBlockAsm64K:
+match_nolit_loop_encodeSnappyBlockAsm64K:
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
+	ADDL $0x04, CX
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
+
+	// matchLen
+	XORL R9, R9
+	CMPL SI, $0x08
+	JL   matchlen_match4_match_nolit_encodeSnappyBlockAsm64K
+
+matchlen_loopback_match_nolit_encodeSnappyBlockAsm64K:
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
+	JZ    matchlen_loop_match_nolit_encodeSnappyBlockAsm64K
+
+#ifdef GOAMD64_v3
+	TZCNTQ R8, R8
+
+#else
+	BSFQ R8, R8
+
+#endif
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
+	JMP  match_nolit_end_encodeSnappyBlockAsm64K
+
+matchlen_loop_match_nolit_encodeSnappyBlockAsm64K:
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeSnappyBlockAsm64K
 	JZ   match_nolit_end_encodeSnappyBlockAsm64K
 
 matchlen_match4_match_nolit_encodeSnappyBlockAsm64K:
-	CMPL DI, $0x04
+	CMPL SI, $0x04
 	JL   matchlen_match2_match_nolit_encodeSnappyBlockAsm64K
-	MOVL (R8)(R10*1), R9
-	CMPL (SI)(R10*1), R9
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
 	JNE  matchlen_match2_match_nolit_encodeSnappyBlockAsm64K
-	SUBL $0x04, DI
-	LEAL 4(R10), R10
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
 
 matchlen_match2_match_nolit_encodeSnappyBlockAsm64K:
-	CMPL DI, $0x02
+	CMPL SI, $0x02
 	JL   matchlen_match1_match_nolit_encodeSnappyBlockAsm64K
-	MOVW (R8)(R10*1), R9
-	CMPW (SI)(R10*1), R9
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
 	JNE  matchlen_match1_match_nolit_encodeSnappyBlockAsm64K
-	SUBL $0x02, DI
-	LEAL 2(R10), R10
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
 
 matchlen_match1_match_nolit_encodeSnappyBlockAsm64K:
-	CMPL DI, $0x01
+	CMPL SI, $0x01
 	JL   match_nolit_end_encodeSnappyBlockAsm64K
-	MOVB (R8)(R10*1), R9
-	CMPB (SI)(R10*1), R9
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
 	JNE  match_nolit_end_encodeSnappyBlockAsm64K
-	LEAL 1(R10), R10
+	LEAL 1(R9), R9
 
 match_nolit_end_encodeSnappyBlockAsm64K:
-	ADDL R10, CX
-	MOVL 16(SP), SI
-	ADDL $0x04, R10
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
 	MOVL CX, 12(SP)
 
 	// emitCopy
 two_byte_offset_match_nolit_encodeSnappyBlockAsm64K:
-	CMPL R10, $0x40
+	CMPL R9, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeSnappyBlockAsm64K
 	MOVB $0xee, (AX)
-	MOVW SI, 1(AX)
-	LEAL -60(R10), R10
+	MOVW BX, 1(AX)
+	LEAL -60(R9), R9
 	ADDQ $0x03, AX
 	JMP  two_byte_offset_match_nolit_encodeSnappyBlockAsm64K
 
 two_byte_offset_short_match_nolit_encodeSnappyBlockAsm64K:
-	CMPL R10, $0x0c
+	MOVL R9, SI
+	SHLL $0x02, SI
+	CMPL R9, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeSnappyBlockAsm64K
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeSnappyBlockAsm64K
-	MOVB $0x01, BL
-	LEAL -16(BX)(R10*4), R10
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	LEAL -15(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeSnappyBlockAsm64K
 
 emit_copy_three_match_nolit_encodeSnappyBlockAsm64K:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R10*4), R10
-	MOVB R10, (AX)
-	MOVW SI, 1(AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeSnappyBlockAsm64K:
 	CMPL CX, 8(SP)
 	JGE  emit_remainder_encodeSnappyBlockAsm64K
-	MOVQ -2(DX)(CX*1), DI
+	MOVQ -2(DX)(CX*1), SI
 	CMPQ AX, (SP)
 	JL   match_nolit_dst_ok_encodeSnappyBlockAsm64K
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_nolit_dst_ok_encodeSnappyBlockAsm64K:
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  DI, R8
-	SHRQ  $0x10, DI
-	MOVQ  DI, SI
-	SHLQ  $0x10, R8
-	IMULQ R9, R8
-	SHRQ  $0x32, R8
-	SHLQ  $0x10, SI
-	IMULQ R9, SI
-	SHRQ  $0x32, SI
-	LEAL  -2(CX), R9
-	LEAQ  24(SP)(SI*4), R10
-	MOVL  (R10), SI
-	MOVL  R9, 24(SP)(R8*4)
-	MOVL  CX, (R10)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x10, DI
+	IMULQ R8, DI
+	SHRQ  $0x32, DI
+	SHLQ  $0x10, BX
+	IMULQ R8, BX
+	SHRQ  $0x32, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
 	JEQ   match_nolit_loop_encodeSnappyBlockAsm64K
 	INCL  CX
 	JMP   search_loop_encodeSnappyBlockAsm64K
@@ -11987,8 +11968,8 @@ zero_loop_encodeSnappyBlockAsm12B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -11998,477 +11979,197 @@ zero_loop_encodeSnappyBlockAsm12B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeSnappyBlockAsm12B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x05, SI
-	LEAL  4(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x05, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeSnappyBlockAsm12B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x000000cf1bbcdcbb, R9
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHRQ  $0x08, R11
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x000000cf1bbcdcbb, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x18, R9
+	IMULQ R8, R9
+	SHRQ  $0x34, R9
 	SHLQ  $0x18, R10
-	IMULQ R9, R10
+	IMULQ R8, R10
 	SHRQ  $0x34, R10
-	SHLQ  $0x18, R11
-	IMULQ R9, R11
-	SHRQ  $0x34, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  24(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	LEAL  1(CX), R10
-	MOVL  R10, 24(SP)(R11*4)
-	MOVQ  DI, R10
-	SHRQ  $0x10, R10
-	SHLQ  $0x18, R10
-	IMULQ R9, R10
-	SHRQ  $0x34, R10
-	MOVL  CX, R9
-	SUBL  16(SP), R9
-	MOVL  1(DX)(R9*1), R11
-	MOVQ  DI, R9
-	SHRQ  $0x08, R9
-	CMPL  R9, R11
-	JNE   no_repeat_found_encodeSnappyBlockAsm12B
-	LEAL  1(CX), DI
-	MOVL  12(SP), SI
-	MOVL  DI, R8
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x18, R9
+	IMULQ R8, R9
+	SHRQ  $0x34, R9
+	MOVL  CX, R8
 	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
+	JNE   no_repeat_found_encodeSnappyBlockAsm12B
+	LEAL  1(CX), SI
+	MOVL  12(SP), BX
+	MOVL  SI, DI
+	SUBL  16(SP), DI
 	JZ    repeat_extend_back_end_encodeSnappyBlockAsm12B
 
 repeat_extend_back_loop_encodeSnappyBlockAsm12B:
-	CMPL DI, SI
+	CMPL SI, BX
 	JLE  repeat_extend_back_end_encodeSnappyBlockAsm12B
-	MOVB -1(DX)(R8*1), BL
-	MOVB -1(DX)(DI*1), R9
-	CMPB BL, R9
+	MOVB -1(DX)(DI*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
 	JNE  repeat_extend_back_end_encodeSnappyBlockAsm12B
-	LEAL -1(DI), DI
-	DECL R8
+	LEAL -1(SI), SI
+	DECL DI
 	JNZ  repeat_extend_back_loop_encodeSnappyBlockAsm12B
 
 repeat_extend_back_end_encodeSnappyBlockAsm12B:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_repeat_emit_encodeSnappyBlockAsm12B
-	MOVL DI, R8
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R9
-	SUBL SI, R8
-	LEAL -1(R8), SI
-	CMPL SI, $0x3c
+	MOVL SI, DI
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R8
+	SUBL BX, DI
+	LEAL -1(DI), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_repeat_emit_encodeSnappyBlockAsm12B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_repeat_emit_encodeSnappyBlockAsm12B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm12B
 
 two_bytes_repeat_emit_encodeSnappyBlockAsm12B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_repeat_emit_encodeSnappyBlockAsm12B
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm12B
 
 one_byte_repeat_emit_encodeSnappyBlockAsm12B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_repeat_emit_encodeSnappyBlockAsm12B:
-	LEAQ (AX)(R8*1), SI
+	LEAQ (AX)(DI*1), BX
 
 	// genMemMoveShort
-	CMPQ R8, $0x08
+	CMPQ DI, $0x08
 	JLE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm12B_memmove_move_8
-	CMPQ R8, $0x10
+	CMPQ DI, $0x10
 	JBE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm12B_memmove_move_8through16
-	CMPQ R8, $0x20
+	CMPQ DI, $0x20
 	JBE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm12B_memmove_move_17through32
 	JMP  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm12B_memmove_move_33through64
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm12B_memmove_move_8:
-	MOVQ (R9), R10
-	MOVQ R10, (AX)
+	MOVQ (R8), R9
+	MOVQ R9, (AX)
 	JMP  memmove_end_copy_repeat_emit_encodeSnappyBlockAsm12B
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm12B_memmove_move_8through16:
-	MOVQ (R9), R10
-	MOVQ -8(R9)(R8*1), R9
-	MOVQ R10, (AX)
-	MOVQ R9, -8(AX)(R8*1)
+	MOVQ (R8), R9
+	MOVQ -8(R8)(DI*1), R8
+	MOVQ R9, (AX)
+	MOVQ R8, -8(AX)(DI*1)
 	JMP  memmove_end_copy_repeat_emit_encodeSnappyBlockAsm12B
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm12B_memmove_move_17through32:
-	MOVOU (R9), X0
-	MOVOU -16(R9)(R8*1), X1
+	MOVOU (R8), X0
+	MOVOU -16(R8)(DI*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R8*1)
+	MOVOU X1, -16(AX)(DI*1)
 	JMP   memmove_end_copy_repeat_emit_encodeSnappyBlockAsm12B
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm12B_memmove_move_33through64:
-	MOVOU (R9), X0
-	MOVOU 16(R9), X1
-	MOVOU -32(R9)(R8*1), X2
-	MOVOU -16(R9)(R8*1), X3
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R8*1)
-	MOVOU X3, -16(AX)(R8*1)
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
 
 memmove_end_copy_repeat_emit_encodeSnappyBlockAsm12B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_repeat_emit_encodeSnappyBlockAsm12B
 
 memmove_long_repeat_emit_encodeSnappyBlockAsm12B:
-	LEAQ (AX)(R8*1), SI
+	LEAQ (AX)(DI*1), BX
 
 	// genMemMoveLong
-	MOVOU (R9), X0
-	MOVOU 16(R9), X1
-	MOVOU -32(R9)(R8*1), X2
-	MOVOU -16(R9)(R8*1), X3
-	MOVQ  R8, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
+	MOVQ  DI, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
 	JA    emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm12Blarge_forward_sse_loop_32
-	LEAQ  -32(R9)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
+	LEAQ  -32(R8)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
 
 emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm12Blarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
 	ADDQ  $0x20, R12
-	DECQ  R11
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
 	JNA   emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm12Blarge_big_loop_back
 
 emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm12Blarge_forward_sse_loop_32:
-	MOVOU -32(R9)(R12*1), X4
-	MOVOU -16(R9)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R8, R12
+	MOVOU -32(R8)(R11*1), X4
+	MOVOU -16(R8)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  DI, R11
 	JAE   emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm12Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R8*1)
-	MOVOU X3, -16(AX)(R8*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
+	MOVQ  BX, AX
 
 emit_literal_done_repeat_emit_encodeSnappyBlockAsm12B:
 	ADDL $0x05, CX
-	MOVL CX, SI
-	SUBL 16(SP), SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), SI
-
-	// matchLen
-	XORL R11, R11
-	CMPL R8, $0x08
-	JL   matchlen_match4_repeat_extend_encodeSnappyBlockAsm12B
-
-matchlen_loopback_repeat_extend_encodeSnappyBlockAsm12B:
-	MOVQ  (R9)(R11*1), R10
-	XORQ  (SI)(R11*1), R10
-	TESTQ R10, R10
-	JZ    matchlen_loop_repeat_extend_encodeSnappyBlockAsm12B
-
-#ifdef GOAMD64_v3
-	TZCNTQ R10, R10
-
-#else
-	BSFQ R10, R10
-
-#endif
-	SARQ $0x03, R10
-	LEAL (R11)(R10*1), R11
-	JMP  repeat_extend_forward_end_encodeSnappyBlockAsm12B
-
-matchlen_loop_repeat_extend_encodeSnappyBlockAsm12B:
-	LEAL -8(R8), R8
-	LEAL 8(R11), R11
-	CMPL R8, $0x08
-	JGE  matchlen_loopback_repeat_extend_encodeSnappyBlockAsm12B
-	JZ   repeat_extend_forward_end_encodeSnappyBlockAsm12B
-
-matchlen_match4_repeat_extend_encodeSnappyBlockAsm12B:
-	CMPL R8, $0x04
-	JL   matchlen_match2_repeat_extend_encodeSnappyBlockAsm12B
-	MOVL (R9)(R11*1), R10
-	CMPL (SI)(R11*1), R10
-	JNE  matchlen_match2_repeat_extend_encodeSnappyBlockAsm12B
-	SUBL $0x04, R8
-	LEAL 4(R11), R11
-
-matchlen_match2_repeat_extend_encodeSnappyBlockAsm12B:
-	CMPL R8, $0x02
-	JL   matchlen_match1_repeat_extend_encodeSnappyBlockAsm12B
-	MOVW (R9)(R11*1), R10
-	CMPW (SI)(R11*1), R10
-	JNE  matchlen_match1_repeat_extend_encodeSnappyBlockAsm12B
-	SUBL $0x02, R8
-	LEAL 2(R11), R11
-
-matchlen_match1_repeat_extend_encodeSnappyBlockAsm12B:
-	CMPL R8, $0x01
-	JL   repeat_extend_forward_end_encodeSnappyBlockAsm12B
-	MOVB (R9)(R11*1), R10
-	CMPB (SI)(R11*1), R10
-	JNE  repeat_extend_forward_end_encodeSnappyBlockAsm12B
-	LEAL 1(R11), R11
-
-repeat_extend_forward_end_encodeSnappyBlockAsm12B:
-	ADDL R11, CX
-	MOVL CX, SI
-	SUBL DI, SI
-	MOVL 16(SP), DI
-
-	// emitCopy
-two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm12B:
-	CMPL SI, $0x40
-	JLE  two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm12B
-	MOVB $0xee, (AX)
-	MOVW DI, 1(AX)
-	LEAL -60(SI), SI
-	ADDQ $0x03, AX
-	JMP  two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm12B
-
-two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm12B:
-	CMPL SI, $0x0c
-	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm12B
-	CMPL DI, $0x00000800
-	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm12B
-	MOVB $0x01, BL
-	LEAL -16(BX)(SI*4), SI
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeSnappyBlockAsm12B
-
-emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm12B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(SI*4), SI
-	MOVB SI, (AX)
-	MOVW DI, 1(AX)
-	ADDQ $0x03, AX
-
-repeat_end_emit_encodeSnappyBlockAsm12B:
-	MOVL CX, 12(SP)
-	JMP  search_loop_encodeSnappyBlockAsm12B
-
-no_repeat_found_encodeSnappyBlockAsm12B:
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate_match_encodeSnappyBlockAsm12B
-	SHRQ $0x08, DI
-	MOVL 24(SP)(R10*4), SI
-	LEAL 2(CX), R9
-	CMPL (DX)(R8*1), DI
-	JEQ  candidate2_match_encodeSnappyBlockAsm12B
-	MOVL R9, 24(SP)(R10*4)
-	SHRQ $0x08, DI
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate3_match_encodeSnappyBlockAsm12B
-	MOVL 20(SP), CX
-	JMP  search_loop_encodeSnappyBlockAsm12B
-
-candidate3_match_encodeSnappyBlockAsm12B:
-	ADDL $0x02, CX
-	JMP  candidate_match_encodeSnappyBlockAsm12B
-
-candidate2_match_encodeSnappyBlockAsm12B:
-	MOVL R9, 24(SP)(R10*4)
-	INCL CX
-	MOVL R8, SI
-
-candidate_match_encodeSnappyBlockAsm12B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
-	JZ    match_extend_back_end_encodeSnappyBlockAsm12B
-
-match_extend_back_loop_encodeSnappyBlockAsm12B:
-	CMPL CX, DI
-	JLE  match_extend_back_end_encodeSnappyBlockAsm12B
-	MOVB -1(DX)(SI*1), BL
-	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
-	JNE  match_extend_back_end_encodeSnappyBlockAsm12B
-	LEAL -1(CX), CX
-	DECL SI
-	JZ   match_extend_back_end_encodeSnappyBlockAsm12B
-	JMP  match_extend_back_loop_encodeSnappyBlockAsm12B
-
-match_extend_back_end_encodeSnappyBlockAsm12B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
-	JL   match_dst_size_check_encodeSnappyBlockAsm12B
-	MOVQ $0x00000000, ret+48(FP)
-	RET
-
-match_dst_size_check_encodeSnappyBlockAsm12B:
-	MOVL CX, DI
-	MOVL 12(SP), R8
-	CMPL R8, DI
-	JEQ  emit_literal_done_match_emit_encodeSnappyBlockAsm12B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(R8*1), DI
-	SUBL R8, R9
-	LEAL -1(R9), R8
-	CMPL R8, $0x3c
-	JLT  one_byte_match_emit_encodeSnappyBlockAsm12B
-	CMPL R8, $0x00000100
-	JLT  two_bytes_match_emit_encodeSnappyBlockAsm12B
-	MOVB $0xf4, (AX)
-	MOVW R8, 1(AX)
-	ADDQ $0x03, AX
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm12B
-
-two_bytes_match_emit_encodeSnappyBlockAsm12B:
-	MOVB $0xf0, (AX)
-	MOVB R8, 1(AX)
-	ADDQ $0x02, AX
-	CMPL R8, $0x40
-	JL   memmove_match_emit_encodeSnappyBlockAsm12B
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm12B
-
-one_byte_match_emit_encodeSnappyBlockAsm12B:
-	SHLB $0x02, R8
-	MOVB R8, (AX)
-	ADDQ $0x01, AX
-
-memmove_match_emit_encodeSnappyBlockAsm12B:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveShort
-	CMPQ R9, $0x08
-	JLE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_8
-	CMPQ R9, $0x10
-	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_8through16
-	CMPQ R9, $0x20
-	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_17through32
-	JMP  emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_33through64
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_8:
-	MOVQ (DI), R10
-	MOVQ R10, (AX)
-	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm12B
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_8through16:
-	MOVQ (DI), R10
-	MOVQ -8(DI)(R9*1), DI
-	MOVQ R10, (AX)
-	MOVQ DI, -8(AX)(R9*1)
-	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm12B
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_17through32:
-	MOVOU (DI), X0
-	MOVOU -16(DI)(R9*1), X1
-	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
-	JMP   memmove_end_copy_match_emit_encodeSnappyBlockAsm12B
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_33through64:
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-
-memmove_end_copy_match_emit_encodeSnappyBlockAsm12B:
-	MOVQ R8, AX
-	JMP  emit_literal_done_match_emit_encodeSnappyBlockAsm12B
-
-memmove_long_match_emit_encodeSnappyBlockAsm12B:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveLong
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVQ  R9, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
-	JA    emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm12Blarge_forward_sse_loop_32
-	LEAQ  -32(DI)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
-
-emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm12Blarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
-	ADDQ  $0x20, R12
-	DECQ  R11
-	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm12Blarge_big_loop_back
-
-emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm12Blarge_forward_sse_loop_32:
-	MOVOU -32(DI)(R12*1), X4
-	MOVOU -16(DI)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R9, R12
-	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm12Blarge_forward_sse_loop_32
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  R8, AX
-
-emit_literal_done_match_emit_encodeSnappyBlockAsm12B:
-match_nolit_loop_encodeSnappyBlockAsm12B:
-	MOVL CX, DI
-	SUBL SI, DI
-	MOVL DI, 16(SP)
-	ADDL $0x04, CX
-	ADDL $0x04, SI
+	MOVL CX, BX
+	SUBL 16(SP), BX
 	MOVQ src_len+32(FP), DI
 	SUBL CX, DI
 	LEAQ (DX)(CX*1), R8
-	LEAQ (DX)(SI*1), SI
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
 	XORL R10, R10
 	CMPL DI, $0x08
-	JL   matchlen_match4_match_nolit_encodeSnappyBlockAsm12B
+	JL   matchlen_match4_repeat_extend_encodeSnappyBlockAsm12B
 
-matchlen_loopback_match_nolit_encodeSnappyBlockAsm12B:
+matchlen_loopback_repeat_extend_encodeSnappyBlockAsm12B:
 	MOVQ  (R8)(R10*1), R9
-	XORQ  (SI)(R10*1), R9
+	XORQ  (BX)(R10*1), R9
 	TESTQ R9, R9
-	JZ    matchlen_loop_match_nolit_encodeSnappyBlockAsm12B
+	JZ    matchlen_loop_repeat_extend_encodeSnappyBlockAsm12B
 
 #ifdef GOAMD64_v3
 	TZCNTQ R9, R9
@@ -12479,105 +12180,385 @@ matchlen_loopback_match_nolit_encodeSnappyBlockAsm12B:
 #endif
 	SARQ $0x03, R9
 	LEAL (R10)(R9*1), R10
-	JMP  match_nolit_end_encodeSnappyBlockAsm12B
+	JMP  repeat_extend_forward_end_encodeSnappyBlockAsm12B
 
-matchlen_loop_match_nolit_encodeSnappyBlockAsm12B:
+matchlen_loop_repeat_extend_encodeSnappyBlockAsm12B:
 	LEAL -8(DI), DI
 	LEAL 8(R10), R10
 	CMPL DI, $0x08
+	JGE  matchlen_loopback_repeat_extend_encodeSnappyBlockAsm12B
+	JZ   repeat_extend_forward_end_encodeSnappyBlockAsm12B
+
+matchlen_match4_repeat_extend_encodeSnappyBlockAsm12B:
+	CMPL DI, $0x04
+	JL   matchlen_match2_repeat_extend_encodeSnappyBlockAsm12B
+	MOVL (R8)(R10*1), R9
+	CMPL (BX)(R10*1), R9
+	JNE  matchlen_match2_repeat_extend_encodeSnappyBlockAsm12B
+	SUBL $0x04, DI
+	LEAL 4(R10), R10
+
+matchlen_match2_repeat_extend_encodeSnappyBlockAsm12B:
+	CMPL DI, $0x02
+	JL   matchlen_match1_repeat_extend_encodeSnappyBlockAsm12B
+	MOVW (R8)(R10*1), R9
+	CMPW (BX)(R10*1), R9
+	JNE  matchlen_match1_repeat_extend_encodeSnappyBlockAsm12B
+	SUBL $0x02, DI
+	LEAL 2(R10), R10
+
+matchlen_match1_repeat_extend_encodeSnappyBlockAsm12B:
+	CMPL DI, $0x01
+	JL   repeat_extend_forward_end_encodeSnappyBlockAsm12B
+	MOVB (R8)(R10*1), R9
+	CMPB (BX)(R10*1), R9
+	JNE  repeat_extend_forward_end_encodeSnappyBlockAsm12B
+	LEAL 1(R10), R10
+
+repeat_extend_forward_end_encodeSnappyBlockAsm12B:
+	ADDL R10, CX
+	MOVL CX, BX
+	SUBL SI, BX
+	MOVL 16(SP), SI
+
+	// emitCopy
+two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm12B:
+	CMPL BX, $0x40
+	JLE  two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm12B
+	MOVB $0xee, (AX)
+	MOVW SI, 1(AX)
+	LEAL -60(BX), BX
+	ADDQ $0x03, AX
+	JMP  two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm12B
+
+two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm12B:
+	MOVL BX, DI
+	SHLL $0x02, DI
+	CMPL BX, $0x0c
+	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm12B
+	CMPL SI, $0x00000800
+	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm12B
+	LEAL -15(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeSnappyBlockAsm12B
+
+emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm12B:
+	LEAL -2(DI), DI
+	MOVB DI, (AX)
+	MOVW SI, 1(AX)
+	ADDQ $0x03, AX
+
+repeat_end_emit_encodeSnappyBlockAsm12B:
+	MOVL CX, 12(SP)
+	JMP  search_loop_encodeSnappyBlockAsm12B
+
+no_repeat_found_encodeSnappyBlockAsm12B:
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate_match_encodeSnappyBlockAsm12B
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
+	JEQ  candidate2_match_encodeSnappyBlockAsm12B
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate3_match_encodeSnappyBlockAsm12B
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeSnappyBlockAsm12B
+
+candidate3_match_encodeSnappyBlockAsm12B:
+	ADDL $0x02, CX
+	JMP  candidate_match_encodeSnappyBlockAsm12B
+
+candidate2_match_encodeSnappyBlockAsm12B:
+	MOVL R8, 24(SP)(R9*4)
+	INCL CX
+	MOVL DI, BX
+
+candidate_match_encodeSnappyBlockAsm12B:
+	MOVL  12(SP), SI
+	TESTL BX, BX
+	JZ    match_extend_back_end_encodeSnappyBlockAsm12B
+
+match_extend_back_loop_encodeSnappyBlockAsm12B:
+	CMPL CX, SI
+	JLE  match_extend_back_end_encodeSnappyBlockAsm12B
+	MOVB -1(DX)(BX*1), DI
+	MOVB -1(DX)(CX*1), R8
+	CMPB DI, R8
+	JNE  match_extend_back_end_encodeSnappyBlockAsm12B
+	LEAL -1(CX), CX
+	DECL BX
+	JZ   match_extend_back_end_encodeSnappyBlockAsm12B
+	JMP  match_extend_back_loop_encodeSnappyBlockAsm12B
+
+match_extend_back_end_encodeSnappyBlockAsm12B:
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
+	JL   match_dst_size_check_encodeSnappyBlockAsm12B
+	MOVQ $0x00000000, ret+48(FP)
+	RET
+
+match_dst_size_check_encodeSnappyBlockAsm12B:
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
+	JEQ  emit_literal_done_match_emit_encodeSnappyBlockAsm12B
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), DI
+	CMPL DI, $0x3c
+	JLT  one_byte_match_emit_encodeSnappyBlockAsm12B
+	CMPL DI, $0x00000100
+	JLT  two_bytes_match_emit_encodeSnappyBlockAsm12B
+	MOVB $0xf4, (AX)
+	MOVW DI, 1(AX)
+	ADDQ $0x03, AX
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm12B
+
+two_bytes_match_emit_encodeSnappyBlockAsm12B:
+	MOVB $0xf0, (AX)
+	MOVB DI, 1(AX)
+	ADDQ $0x02, AX
+	CMPL DI, $0x40
+	JL   memmove_match_emit_encodeSnappyBlockAsm12B
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm12B
+
+one_byte_match_emit_encodeSnappyBlockAsm12B:
+	SHLB $0x02, DI
+	MOVB DI, (AX)
+	ADDQ $0x01, AX
+
+memmove_match_emit_encodeSnappyBlockAsm12B:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveShort
+	CMPQ R8, $0x08
+	JLE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_8
+	CMPQ R8, $0x10
+	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_8through16
+	CMPQ R8, $0x20
+	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_17through32
+	JMP  emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_33through64
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_8:
+	MOVQ (SI), R9
+	MOVQ R9, (AX)
+	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm12B
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_8through16:
+	MOVQ (SI), R9
+	MOVQ -8(SI)(R8*1), SI
+	MOVQ R9, (AX)
+	MOVQ SI, -8(AX)(R8*1)
+	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm12B
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_17through32:
+	MOVOU (SI), X0
+	MOVOU -16(SI)(R8*1), X1
+	MOVOU X0, (AX)
+	MOVOU X1, -16(AX)(R8*1)
+	JMP   memmove_end_copy_match_emit_encodeSnappyBlockAsm12B
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm12B_memmove_move_33through64:
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+
+memmove_end_copy_match_emit_encodeSnappyBlockAsm12B:
+	MOVQ DI, AX
+	JMP  emit_literal_done_match_emit_encodeSnappyBlockAsm12B
+
+memmove_long_match_emit_encodeSnappyBlockAsm12B:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveLong
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVQ  R8, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
+	JA    emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm12Blarge_forward_sse_loop_32
+	LEAQ  -32(SI)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
+
+emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm12Blarge_big_loop_back:
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
+	ADDQ  $0x20, R12
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
+	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm12Blarge_big_loop_back
+
+emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm12Blarge_forward_sse_loop_32:
+	MOVOU -32(SI)(R11*1), X4
+	MOVOU -16(SI)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  R8, R11
+	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm12Blarge_forward_sse_loop_32
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  DI, AX
+
+emit_literal_done_match_emit_encodeSnappyBlockAsm12B:
+match_nolit_loop_encodeSnappyBlockAsm12B:
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
+	ADDL $0x04, CX
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
+
+	// matchLen
+	XORL R9, R9
+	CMPL SI, $0x08
+	JL   matchlen_match4_match_nolit_encodeSnappyBlockAsm12B
+
+matchlen_loopback_match_nolit_encodeSnappyBlockAsm12B:
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
+	JZ    matchlen_loop_match_nolit_encodeSnappyBlockAsm12B
+
+#ifdef GOAMD64_v3
+	TZCNTQ R8, R8
+
+#else
+	BSFQ R8, R8
+
+#endif
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
+	JMP  match_nolit_end_encodeSnappyBlockAsm12B
+
+matchlen_loop_match_nolit_encodeSnappyBlockAsm12B:
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeSnappyBlockAsm12B
 	JZ   match_nolit_end_encodeSnappyBlockAsm12B
 
 matchlen_match4_match_nolit_encodeSnappyBlockAsm12B:
-	CMPL DI, $0x04
+	CMPL SI, $0x04
 	JL   matchlen_match2_match_nolit_encodeSnappyBlockAsm12B
-	MOVL (R8)(R10*1), R9
-	CMPL (SI)(R10*1), R9
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
 	JNE  matchlen_match2_match_nolit_encodeSnappyBlockAsm12B
-	SUBL $0x04, DI
-	LEAL 4(R10), R10
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
 
 matchlen_match2_match_nolit_encodeSnappyBlockAsm12B:
-	CMPL DI, $0x02
+	CMPL SI, $0x02
 	JL   matchlen_match1_match_nolit_encodeSnappyBlockAsm12B
-	MOVW (R8)(R10*1), R9
-	CMPW (SI)(R10*1), R9
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
 	JNE  matchlen_match1_match_nolit_encodeSnappyBlockAsm12B
-	SUBL $0x02, DI
-	LEAL 2(R10), R10
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
 
 matchlen_match1_match_nolit_encodeSnappyBlockAsm12B:
-	CMPL DI, $0x01
+	CMPL SI, $0x01
 	JL   match_nolit_end_encodeSnappyBlockAsm12B
-	MOVB (R8)(R10*1), R9
-	CMPB (SI)(R10*1), R9
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
 	JNE  match_nolit_end_encodeSnappyBlockAsm12B
-	LEAL 1(R10), R10
+	LEAL 1(R9), R9
 
 match_nolit_end_encodeSnappyBlockAsm12B:
-	ADDL R10, CX
-	MOVL 16(SP), SI
-	ADDL $0x04, R10
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
 	MOVL CX, 12(SP)
 
 	// emitCopy
 two_byte_offset_match_nolit_encodeSnappyBlockAsm12B:
-	CMPL R10, $0x40
+	CMPL R9, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeSnappyBlockAsm12B
 	MOVB $0xee, (AX)
-	MOVW SI, 1(AX)
-	LEAL -60(R10), R10
+	MOVW BX, 1(AX)
+	LEAL -60(R9), R9
 	ADDQ $0x03, AX
 	JMP  two_byte_offset_match_nolit_encodeSnappyBlockAsm12B
 
 two_byte_offset_short_match_nolit_encodeSnappyBlockAsm12B:
-	CMPL R10, $0x0c
+	MOVL R9, SI
+	SHLL $0x02, SI
+	CMPL R9, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeSnappyBlockAsm12B
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeSnappyBlockAsm12B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R10*4), R10
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	LEAL -15(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeSnappyBlockAsm12B
 
 emit_copy_three_match_nolit_encodeSnappyBlockAsm12B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R10*4), R10
-	MOVB R10, (AX)
-	MOVW SI, 1(AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeSnappyBlockAsm12B:
 	CMPL CX, 8(SP)
 	JGE  emit_remainder_encodeSnappyBlockAsm12B
-	MOVQ -2(DX)(CX*1), DI
+	MOVQ -2(DX)(CX*1), SI
 	CMPQ AX, (SP)
 	JL   match_nolit_dst_ok_encodeSnappyBlockAsm12B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_nolit_dst_ok_encodeSnappyBlockAsm12B:
-	MOVQ  $0x000000cf1bbcdcbb, R9
-	MOVQ  DI, R8
-	SHRQ  $0x10, DI
-	MOVQ  DI, SI
-	SHLQ  $0x18, R8
-	IMULQ R9, R8
-	SHRQ  $0x34, R8
-	SHLQ  $0x18, SI
-	IMULQ R9, SI
-	SHRQ  $0x34, SI
-	LEAL  -2(CX), R9
-	LEAQ  24(SP)(SI*4), R10
-	MOVL  (R10), SI
-	MOVL  R9, 24(SP)(R8*4)
-	MOVL  CX, (R10)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  $0x000000cf1bbcdcbb, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x18, DI
+	IMULQ R8, DI
+	SHRQ  $0x34, DI
+	SHLQ  $0x18, BX
+	IMULQ R8, BX
+	SHRQ  $0x34, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
 	JEQ   match_nolit_loop_encodeSnappyBlockAsm12B
 	INCL  CX
 	JMP   search_loop_encodeSnappyBlockAsm12B
@@ -12762,8 +12743,8 @@ zero_loop_encodeSnappyBlockAsm10B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -12773,477 +12754,197 @@ zero_loop_encodeSnappyBlockAsm10B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeSnappyBlockAsm10B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x05, SI
-	LEAL  4(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x05, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeSnappyBlockAsm10B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x9e3779b1, R9
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHRQ  $0x08, R11
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x9e3779b1, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x20, R9
+	IMULQ R8, R9
+	SHRQ  $0x36, R9
 	SHLQ  $0x20, R10
-	IMULQ R9, R10
+	IMULQ R8, R10
 	SHRQ  $0x36, R10
-	SHLQ  $0x20, R11
-	IMULQ R9, R11
-	SHRQ  $0x36, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  24(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	LEAL  1(CX), R10
-	MOVL  R10, 24(SP)(R11*4)
-	MOVQ  DI, R10
-	SHRQ  $0x10, R10
-	SHLQ  $0x20, R10
-	IMULQ R9, R10
-	SHRQ  $0x36, R10
-	MOVL  CX, R9
-	SUBL  16(SP), R9
-	MOVL  1(DX)(R9*1), R11
-	MOVQ  DI, R9
-	SHRQ  $0x08, R9
-	CMPL  R9, R11
-	JNE   no_repeat_found_encodeSnappyBlockAsm10B
-	LEAL  1(CX), DI
-	MOVL  12(SP), SI
-	MOVL  DI, R8
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x20, R9
+	IMULQ R8, R9
+	SHRQ  $0x36, R9
+	MOVL  CX, R8
 	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
+	JNE   no_repeat_found_encodeSnappyBlockAsm10B
+	LEAL  1(CX), SI
+	MOVL  12(SP), BX
+	MOVL  SI, DI
+	SUBL  16(SP), DI
 	JZ    repeat_extend_back_end_encodeSnappyBlockAsm10B
 
 repeat_extend_back_loop_encodeSnappyBlockAsm10B:
-	CMPL DI, SI
+	CMPL SI, BX
 	JLE  repeat_extend_back_end_encodeSnappyBlockAsm10B
-	MOVB -1(DX)(R8*1), BL
-	MOVB -1(DX)(DI*1), R9
-	CMPB BL, R9
+	MOVB -1(DX)(DI*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
 	JNE  repeat_extend_back_end_encodeSnappyBlockAsm10B
-	LEAL -1(DI), DI
-	DECL R8
+	LEAL -1(SI), SI
+	DECL DI
 	JNZ  repeat_extend_back_loop_encodeSnappyBlockAsm10B
 
 repeat_extend_back_end_encodeSnappyBlockAsm10B:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_repeat_emit_encodeSnappyBlockAsm10B
-	MOVL DI, R8
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R9
-	SUBL SI, R8
-	LEAL -1(R8), SI
-	CMPL SI, $0x3c
+	MOVL SI, DI
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R8
+	SUBL BX, DI
+	LEAL -1(DI), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_repeat_emit_encodeSnappyBlockAsm10B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_repeat_emit_encodeSnappyBlockAsm10B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm10B
 
 two_bytes_repeat_emit_encodeSnappyBlockAsm10B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_repeat_emit_encodeSnappyBlockAsm10B
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm10B
 
 one_byte_repeat_emit_encodeSnappyBlockAsm10B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_repeat_emit_encodeSnappyBlockAsm10B:
-	LEAQ (AX)(R8*1), SI
+	LEAQ (AX)(DI*1), BX
 
 	// genMemMoveShort
-	CMPQ R8, $0x08
+	CMPQ DI, $0x08
 	JLE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm10B_memmove_move_8
-	CMPQ R8, $0x10
+	CMPQ DI, $0x10
 	JBE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm10B_memmove_move_8through16
-	CMPQ R8, $0x20
+	CMPQ DI, $0x20
 	JBE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm10B_memmove_move_17through32
 	JMP  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm10B_memmove_move_33through64
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm10B_memmove_move_8:
-	MOVQ (R9), R10
-	MOVQ R10, (AX)
+	MOVQ (R8), R9
+	MOVQ R9, (AX)
 	JMP  memmove_end_copy_repeat_emit_encodeSnappyBlockAsm10B
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm10B_memmove_move_8through16:
-	MOVQ (R9), R10
-	MOVQ -8(R9)(R8*1), R9
-	MOVQ R10, (AX)
-	MOVQ R9, -8(AX)(R8*1)
+	MOVQ (R8), R9
+	MOVQ -8(R8)(DI*1), R8
+	MOVQ R9, (AX)
+	MOVQ R8, -8(AX)(DI*1)
 	JMP  memmove_end_copy_repeat_emit_encodeSnappyBlockAsm10B
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm10B_memmove_move_17through32:
-	MOVOU (R9), X0
-	MOVOU -16(R9)(R8*1), X1
+	MOVOU (R8), X0
+	MOVOU -16(R8)(DI*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R8*1)
+	MOVOU X1, -16(AX)(DI*1)
 	JMP   memmove_end_copy_repeat_emit_encodeSnappyBlockAsm10B
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm10B_memmove_move_33through64:
-	MOVOU (R9), X0
-	MOVOU 16(R9), X1
-	MOVOU -32(R9)(R8*1), X2
-	MOVOU -16(R9)(R8*1), X3
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R8*1)
-	MOVOU X3, -16(AX)(R8*1)
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
 
 memmove_end_copy_repeat_emit_encodeSnappyBlockAsm10B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_repeat_emit_encodeSnappyBlockAsm10B
 
 memmove_long_repeat_emit_encodeSnappyBlockAsm10B:
-	LEAQ (AX)(R8*1), SI
+	LEAQ (AX)(DI*1), BX
 
 	// genMemMoveLong
-	MOVOU (R9), X0
-	MOVOU 16(R9), X1
-	MOVOU -32(R9)(R8*1), X2
-	MOVOU -16(R9)(R8*1), X3
-	MOVQ  R8, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
+	MOVQ  DI, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
 	JA    emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm10Blarge_forward_sse_loop_32
-	LEAQ  -32(R9)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
+	LEAQ  -32(R8)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
 
 emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm10Blarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
 	ADDQ  $0x20, R12
-	DECQ  R11
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
 	JNA   emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm10Blarge_big_loop_back
 
 emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm10Blarge_forward_sse_loop_32:
-	MOVOU -32(R9)(R12*1), X4
-	MOVOU -16(R9)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R8, R12
+	MOVOU -32(R8)(R11*1), X4
+	MOVOU -16(R8)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  DI, R11
 	JAE   emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm10Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R8*1)
-	MOVOU X3, -16(AX)(R8*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
+	MOVQ  BX, AX
 
 emit_literal_done_repeat_emit_encodeSnappyBlockAsm10B:
 	ADDL $0x05, CX
-	MOVL CX, SI
-	SUBL 16(SP), SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), SI
-
-	// matchLen
-	XORL R11, R11
-	CMPL R8, $0x08
-	JL   matchlen_match4_repeat_extend_encodeSnappyBlockAsm10B
-
-matchlen_loopback_repeat_extend_encodeSnappyBlockAsm10B:
-	MOVQ  (R9)(R11*1), R10
-	XORQ  (SI)(R11*1), R10
-	TESTQ R10, R10
-	JZ    matchlen_loop_repeat_extend_encodeSnappyBlockAsm10B
-
-#ifdef GOAMD64_v3
-	TZCNTQ R10, R10
-
-#else
-	BSFQ R10, R10
-
-#endif
-	SARQ $0x03, R10
-	LEAL (R11)(R10*1), R11
-	JMP  repeat_extend_forward_end_encodeSnappyBlockAsm10B
-
-matchlen_loop_repeat_extend_encodeSnappyBlockAsm10B:
-	LEAL -8(R8), R8
-	LEAL 8(R11), R11
-	CMPL R8, $0x08
-	JGE  matchlen_loopback_repeat_extend_encodeSnappyBlockAsm10B
-	JZ   repeat_extend_forward_end_encodeSnappyBlockAsm10B
-
-matchlen_match4_repeat_extend_encodeSnappyBlockAsm10B:
-	CMPL R8, $0x04
-	JL   matchlen_match2_repeat_extend_encodeSnappyBlockAsm10B
-	MOVL (R9)(R11*1), R10
-	CMPL (SI)(R11*1), R10
-	JNE  matchlen_match2_repeat_extend_encodeSnappyBlockAsm10B
-	SUBL $0x04, R8
-	LEAL 4(R11), R11
-
-matchlen_match2_repeat_extend_encodeSnappyBlockAsm10B:
-	CMPL R8, $0x02
-	JL   matchlen_match1_repeat_extend_encodeSnappyBlockAsm10B
-	MOVW (R9)(R11*1), R10
-	CMPW (SI)(R11*1), R10
-	JNE  matchlen_match1_repeat_extend_encodeSnappyBlockAsm10B
-	SUBL $0x02, R8
-	LEAL 2(R11), R11
-
-matchlen_match1_repeat_extend_encodeSnappyBlockAsm10B:
-	CMPL R8, $0x01
-	JL   repeat_extend_forward_end_encodeSnappyBlockAsm10B
-	MOVB (R9)(R11*1), R10
-	CMPB (SI)(R11*1), R10
-	JNE  repeat_extend_forward_end_encodeSnappyBlockAsm10B
-	LEAL 1(R11), R11
-
-repeat_extend_forward_end_encodeSnappyBlockAsm10B:
-	ADDL R11, CX
-	MOVL CX, SI
-	SUBL DI, SI
-	MOVL 16(SP), DI
-
-	// emitCopy
-two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm10B:
-	CMPL SI, $0x40
-	JLE  two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm10B
-	MOVB $0xee, (AX)
-	MOVW DI, 1(AX)
-	LEAL -60(SI), SI
-	ADDQ $0x03, AX
-	JMP  two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm10B
-
-two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm10B:
-	CMPL SI, $0x0c
-	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm10B
-	CMPL DI, $0x00000800
-	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm10B
-	MOVB $0x01, BL
-	LEAL -16(BX)(SI*4), SI
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeSnappyBlockAsm10B
-
-emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm10B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(SI*4), SI
-	MOVB SI, (AX)
-	MOVW DI, 1(AX)
-	ADDQ $0x03, AX
-
-repeat_end_emit_encodeSnappyBlockAsm10B:
-	MOVL CX, 12(SP)
-	JMP  search_loop_encodeSnappyBlockAsm10B
-
-no_repeat_found_encodeSnappyBlockAsm10B:
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate_match_encodeSnappyBlockAsm10B
-	SHRQ $0x08, DI
-	MOVL 24(SP)(R10*4), SI
-	LEAL 2(CX), R9
-	CMPL (DX)(R8*1), DI
-	JEQ  candidate2_match_encodeSnappyBlockAsm10B
-	MOVL R9, 24(SP)(R10*4)
-	SHRQ $0x08, DI
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate3_match_encodeSnappyBlockAsm10B
-	MOVL 20(SP), CX
-	JMP  search_loop_encodeSnappyBlockAsm10B
-
-candidate3_match_encodeSnappyBlockAsm10B:
-	ADDL $0x02, CX
-	JMP  candidate_match_encodeSnappyBlockAsm10B
-
-candidate2_match_encodeSnappyBlockAsm10B:
-	MOVL R9, 24(SP)(R10*4)
-	INCL CX
-	MOVL R8, SI
-
-candidate_match_encodeSnappyBlockAsm10B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
-	JZ    match_extend_back_end_encodeSnappyBlockAsm10B
-
-match_extend_back_loop_encodeSnappyBlockAsm10B:
-	CMPL CX, DI
-	JLE  match_extend_back_end_encodeSnappyBlockAsm10B
-	MOVB -1(DX)(SI*1), BL
-	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
-	JNE  match_extend_back_end_encodeSnappyBlockAsm10B
-	LEAL -1(CX), CX
-	DECL SI
-	JZ   match_extend_back_end_encodeSnappyBlockAsm10B
-	JMP  match_extend_back_loop_encodeSnappyBlockAsm10B
-
-match_extend_back_end_encodeSnappyBlockAsm10B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
-	JL   match_dst_size_check_encodeSnappyBlockAsm10B
-	MOVQ $0x00000000, ret+48(FP)
-	RET
-
-match_dst_size_check_encodeSnappyBlockAsm10B:
-	MOVL CX, DI
-	MOVL 12(SP), R8
-	CMPL R8, DI
-	JEQ  emit_literal_done_match_emit_encodeSnappyBlockAsm10B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(R8*1), DI
-	SUBL R8, R9
-	LEAL -1(R9), R8
-	CMPL R8, $0x3c
-	JLT  one_byte_match_emit_encodeSnappyBlockAsm10B
-	CMPL R8, $0x00000100
-	JLT  two_bytes_match_emit_encodeSnappyBlockAsm10B
-	MOVB $0xf4, (AX)
-	MOVW R8, 1(AX)
-	ADDQ $0x03, AX
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm10B
-
-two_bytes_match_emit_encodeSnappyBlockAsm10B:
-	MOVB $0xf0, (AX)
-	MOVB R8, 1(AX)
-	ADDQ $0x02, AX
-	CMPL R8, $0x40
-	JL   memmove_match_emit_encodeSnappyBlockAsm10B
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm10B
-
-one_byte_match_emit_encodeSnappyBlockAsm10B:
-	SHLB $0x02, R8
-	MOVB R8, (AX)
-	ADDQ $0x01, AX
-
-memmove_match_emit_encodeSnappyBlockAsm10B:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveShort
-	CMPQ R9, $0x08
-	JLE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_8
-	CMPQ R9, $0x10
-	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_8through16
-	CMPQ R9, $0x20
-	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_17through32
-	JMP  emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_33through64
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_8:
-	MOVQ (DI), R10
-	MOVQ R10, (AX)
-	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm10B
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_8through16:
-	MOVQ (DI), R10
-	MOVQ -8(DI)(R9*1), DI
-	MOVQ R10, (AX)
-	MOVQ DI, -8(AX)(R9*1)
-	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm10B
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_17through32:
-	MOVOU (DI), X0
-	MOVOU -16(DI)(R9*1), X1
-	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
-	JMP   memmove_end_copy_match_emit_encodeSnappyBlockAsm10B
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_33through64:
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-
-memmove_end_copy_match_emit_encodeSnappyBlockAsm10B:
-	MOVQ R8, AX
-	JMP  emit_literal_done_match_emit_encodeSnappyBlockAsm10B
-
-memmove_long_match_emit_encodeSnappyBlockAsm10B:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveLong
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVQ  R9, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
-	JA    emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm10Blarge_forward_sse_loop_32
-	LEAQ  -32(DI)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
-
-emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm10Blarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
-	ADDQ  $0x20, R12
-	DECQ  R11
-	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm10Blarge_big_loop_back
-
-emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm10Blarge_forward_sse_loop_32:
-	MOVOU -32(DI)(R12*1), X4
-	MOVOU -16(DI)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R9, R12
-	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm10Blarge_forward_sse_loop_32
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  R8, AX
-
-emit_literal_done_match_emit_encodeSnappyBlockAsm10B:
-match_nolit_loop_encodeSnappyBlockAsm10B:
-	MOVL CX, DI
-	SUBL SI, DI
-	MOVL DI, 16(SP)
-	ADDL $0x04, CX
-	ADDL $0x04, SI
+	MOVL CX, BX
+	SUBL 16(SP), BX
 	MOVQ src_len+32(FP), DI
 	SUBL CX, DI
 	LEAQ (DX)(CX*1), R8
-	LEAQ (DX)(SI*1), SI
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
 	XORL R10, R10
 	CMPL DI, $0x08
-	JL   matchlen_match4_match_nolit_encodeSnappyBlockAsm10B
+	JL   matchlen_match4_repeat_extend_encodeSnappyBlockAsm10B
 
-matchlen_loopback_match_nolit_encodeSnappyBlockAsm10B:
+matchlen_loopback_repeat_extend_encodeSnappyBlockAsm10B:
 	MOVQ  (R8)(R10*1), R9
-	XORQ  (SI)(R10*1), R9
+	XORQ  (BX)(R10*1), R9
 	TESTQ R9, R9
-	JZ    matchlen_loop_match_nolit_encodeSnappyBlockAsm10B
+	JZ    matchlen_loop_repeat_extend_encodeSnappyBlockAsm10B
 
 #ifdef GOAMD64_v3
 	TZCNTQ R9, R9
@@ -13254,105 +12955,385 @@ matchlen_loopback_match_nolit_encodeSnappyBlockAsm10B:
 #endif
 	SARQ $0x03, R9
 	LEAL (R10)(R9*1), R10
-	JMP  match_nolit_end_encodeSnappyBlockAsm10B
+	JMP  repeat_extend_forward_end_encodeSnappyBlockAsm10B
 
-matchlen_loop_match_nolit_encodeSnappyBlockAsm10B:
+matchlen_loop_repeat_extend_encodeSnappyBlockAsm10B:
 	LEAL -8(DI), DI
 	LEAL 8(R10), R10
 	CMPL DI, $0x08
+	JGE  matchlen_loopback_repeat_extend_encodeSnappyBlockAsm10B
+	JZ   repeat_extend_forward_end_encodeSnappyBlockAsm10B
+
+matchlen_match4_repeat_extend_encodeSnappyBlockAsm10B:
+	CMPL DI, $0x04
+	JL   matchlen_match2_repeat_extend_encodeSnappyBlockAsm10B
+	MOVL (R8)(R10*1), R9
+	CMPL (BX)(R10*1), R9
+	JNE  matchlen_match2_repeat_extend_encodeSnappyBlockAsm10B
+	SUBL $0x04, DI
+	LEAL 4(R10), R10
+
+matchlen_match2_repeat_extend_encodeSnappyBlockAsm10B:
+	CMPL DI, $0x02
+	JL   matchlen_match1_repeat_extend_encodeSnappyBlockAsm10B
+	MOVW (R8)(R10*1), R9
+	CMPW (BX)(R10*1), R9
+	JNE  matchlen_match1_repeat_extend_encodeSnappyBlockAsm10B
+	SUBL $0x02, DI
+	LEAL 2(R10), R10
+
+matchlen_match1_repeat_extend_encodeSnappyBlockAsm10B:
+	CMPL DI, $0x01
+	JL   repeat_extend_forward_end_encodeSnappyBlockAsm10B
+	MOVB (R8)(R10*1), R9
+	CMPB (BX)(R10*1), R9
+	JNE  repeat_extend_forward_end_encodeSnappyBlockAsm10B
+	LEAL 1(R10), R10
+
+repeat_extend_forward_end_encodeSnappyBlockAsm10B:
+	ADDL R10, CX
+	MOVL CX, BX
+	SUBL SI, BX
+	MOVL 16(SP), SI
+
+	// emitCopy
+two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm10B:
+	CMPL BX, $0x40
+	JLE  two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm10B
+	MOVB $0xee, (AX)
+	MOVW SI, 1(AX)
+	LEAL -60(BX), BX
+	ADDQ $0x03, AX
+	JMP  two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm10B
+
+two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm10B:
+	MOVL BX, DI
+	SHLL $0x02, DI
+	CMPL BX, $0x0c
+	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm10B
+	CMPL SI, $0x00000800
+	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm10B
+	LEAL -15(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeSnappyBlockAsm10B
+
+emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm10B:
+	LEAL -2(DI), DI
+	MOVB DI, (AX)
+	MOVW SI, 1(AX)
+	ADDQ $0x03, AX
+
+repeat_end_emit_encodeSnappyBlockAsm10B:
+	MOVL CX, 12(SP)
+	JMP  search_loop_encodeSnappyBlockAsm10B
+
+no_repeat_found_encodeSnappyBlockAsm10B:
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate_match_encodeSnappyBlockAsm10B
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
+	JEQ  candidate2_match_encodeSnappyBlockAsm10B
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate3_match_encodeSnappyBlockAsm10B
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeSnappyBlockAsm10B
+
+candidate3_match_encodeSnappyBlockAsm10B:
+	ADDL $0x02, CX
+	JMP  candidate_match_encodeSnappyBlockAsm10B
+
+candidate2_match_encodeSnappyBlockAsm10B:
+	MOVL R8, 24(SP)(R9*4)
+	INCL CX
+	MOVL DI, BX
+
+candidate_match_encodeSnappyBlockAsm10B:
+	MOVL  12(SP), SI
+	TESTL BX, BX
+	JZ    match_extend_back_end_encodeSnappyBlockAsm10B
+
+match_extend_back_loop_encodeSnappyBlockAsm10B:
+	CMPL CX, SI
+	JLE  match_extend_back_end_encodeSnappyBlockAsm10B
+	MOVB -1(DX)(BX*1), DI
+	MOVB -1(DX)(CX*1), R8
+	CMPB DI, R8
+	JNE  match_extend_back_end_encodeSnappyBlockAsm10B
+	LEAL -1(CX), CX
+	DECL BX
+	JZ   match_extend_back_end_encodeSnappyBlockAsm10B
+	JMP  match_extend_back_loop_encodeSnappyBlockAsm10B
+
+match_extend_back_end_encodeSnappyBlockAsm10B:
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
+	JL   match_dst_size_check_encodeSnappyBlockAsm10B
+	MOVQ $0x00000000, ret+48(FP)
+	RET
+
+match_dst_size_check_encodeSnappyBlockAsm10B:
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
+	JEQ  emit_literal_done_match_emit_encodeSnappyBlockAsm10B
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), DI
+	CMPL DI, $0x3c
+	JLT  one_byte_match_emit_encodeSnappyBlockAsm10B
+	CMPL DI, $0x00000100
+	JLT  two_bytes_match_emit_encodeSnappyBlockAsm10B
+	MOVB $0xf4, (AX)
+	MOVW DI, 1(AX)
+	ADDQ $0x03, AX
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm10B
+
+two_bytes_match_emit_encodeSnappyBlockAsm10B:
+	MOVB $0xf0, (AX)
+	MOVB DI, 1(AX)
+	ADDQ $0x02, AX
+	CMPL DI, $0x40
+	JL   memmove_match_emit_encodeSnappyBlockAsm10B
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm10B
+
+one_byte_match_emit_encodeSnappyBlockAsm10B:
+	SHLB $0x02, DI
+	MOVB DI, (AX)
+	ADDQ $0x01, AX
+
+memmove_match_emit_encodeSnappyBlockAsm10B:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveShort
+	CMPQ R8, $0x08
+	JLE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_8
+	CMPQ R8, $0x10
+	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_8through16
+	CMPQ R8, $0x20
+	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_17through32
+	JMP  emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_33through64
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_8:
+	MOVQ (SI), R9
+	MOVQ R9, (AX)
+	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm10B
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_8through16:
+	MOVQ (SI), R9
+	MOVQ -8(SI)(R8*1), SI
+	MOVQ R9, (AX)
+	MOVQ SI, -8(AX)(R8*1)
+	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm10B
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_17through32:
+	MOVOU (SI), X0
+	MOVOU -16(SI)(R8*1), X1
+	MOVOU X0, (AX)
+	MOVOU X1, -16(AX)(R8*1)
+	JMP   memmove_end_copy_match_emit_encodeSnappyBlockAsm10B
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm10B_memmove_move_33through64:
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+
+memmove_end_copy_match_emit_encodeSnappyBlockAsm10B:
+	MOVQ DI, AX
+	JMP  emit_literal_done_match_emit_encodeSnappyBlockAsm10B
+
+memmove_long_match_emit_encodeSnappyBlockAsm10B:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveLong
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVQ  R8, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
+	JA    emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm10Blarge_forward_sse_loop_32
+	LEAQ  -32(SI)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
+
+emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm10Blarge_big_loop_back:
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
+	ADDQ  $0x20, R12
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
+	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm10Blarge_big_loop_back
+
+emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm10Blarge_forward_sse_loop_32:
+	MOVOU -32(SI)(R11*1), X4
+	MOVOU -16(SI)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  R8, R11
+	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm10Blarge_forward_sse_loop_32
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  DI, AX
+
+emit_literal_done_match_emit_encodeSnappyBlockAsm10B:
+match_nolit_loop_encodeSnappyBlockAsm10B:
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
+	ADDL $0x04, CX
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
+
+	// matchLen
+	XORL R9, R9
+	CMPL SI, $0x08
+	JL   matchlen_match4_match_nolit_encodeSnappyBlockAsm10B
+
+matchlen_loopback_match_nolit_encodeSnappyBlockAsm10B:
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
+	JZ    matchlen_loop_match_nolit_encodeSnappyBlockAsm10B
+
+#ifdef GOAMD64_v3
+	TZCNTQ R8, R8
+
+#else
+	BSFQ R8, R8
+
+#endif
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
+	JMP  match_nolit_end_encodeSnappyBlockAsm10B
+
+matchlen_loop_match_nolit_encodeSnappyBlockAsm10B:
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeSnappyBlockAsm10B
 	JZ   match_nolit_end_encodeSnappyBlockAsm10B
 
 matchlen_match4_match_nolit_encodeSnappyBlockAsm10B:
-	CMPL DI, $0x04
+	CMPL SI, $0x04
 	JL   matchlen_match2_match_nolit_encodeSnappyBlockAsm10B
-	MOVL (R8)(R10*1), R9
-	CMPL (SI)(R10*1), R9
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
 	JNE  matchlen_match2_match_nolit_encodeSnappyBlockAsm10B
-	SUBL $0x04, DI
-	LEAL 4(R10), R10
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
 
 matchlen_match2_match_nolit_encodeSnappyBlockAsm10B:
-	CMPL DI, $0x02
+	CMPL SI, $0x02
 	JL   matchlen_match1_match_nolit_encodeSnappyBlockAsm10B
-	MOVW (R8)(R10*1), R9
-	CMPW (SI)(R10*1), R9
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
 	JNE  matchlen_match1_match_nolit_encodeSnappyBlockAsm10B
-	SUBL $0x02, DI
-	LEAL 2(R10), R10
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
 
 matchlen_match1_match_nolit_encodeSnappyBlockAsm10B:
-	CMPL DI, $0x01
+	CMPL SI, $0x01
 	JL   match_nolit_end_encodeSnappyBlockAsm10B
-	MOVB (R8)(R10*1), R9
-	CMPB (SI)(R10*1), R9
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
 	JNE  match_nolit_end_encodeSnappyBlockAsm10B
-	LEAL 1(R10), R10
+	LEAL 1(R9), R9
 
 match_nolit_end_encodeSnappyBlockAsm10B:
-	ADDL R10, CX
-	MOVL 16(SP), SI
-	ADDL $0x04, R10
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
 	MOVL CX, 12(SP)
 
 	// emitCopy
 two_byte_offset_match_nolit_encodeSnappyBlockAsm10B:
-	CMPL R10, $0x40
+	CMPL R9, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeSnappyBlockAsm10B
 	MOVB $0xee, (AX)
-	MOVW SI, 1(AX)
-	LEAL -60(R10), R10
+	MOVW BX, 1(AX)
+	LEAL -60(R9), R9
 	ADDQ $0x03, AX
 	JMP  two_byte_offset_match_nolit_encodeSnappyBlockAsm10B
 
 two_byte_offset_short_match_nolit_encodeSnappyBlockAsm10B:
-	CMPL R10, $0x0c
+	MOVL R9, SI
+	SHLL $0x02, SI
+	CMPL R9, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeSnappyBlockAsm10B
-	CMPL SI, $0x00000800
+	CMPL BX, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeSnappyBlockAsm10B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R10*4), R10
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	LEAL -15(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeSnappyBlockAsm10B
 
 emit_copy_three_match_nolit_encodeSnappyBlockAsm10B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R10*4), R10
-	MOVB R10, (AX)
-	MOVW SI, 1(AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeSnappyBlockAsm10B:
 	CMPL CX, 8(SP)
 	JGE  emit_remainder_encodeSnappyBlockAsm10B
-	MOVQ -2(DX)(CX*1), DI
+	MOVQ -2(DX)(CX*1), SI
 	CMPQ AX, (SP)
 	JL   match_nolit_dst_ok_encodeSnappyBlockAsm10B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_nolit_dst_ok_encodeSnappyBlockAsm10B:
-	MOVQ  $0x9e3779b1, R9
-	MOVQ  DI, R8
-	SHRQ  $0x10, DI
-	MOVQ  DI, SI
-	SHLQ  $0x20, R8
-	IMULQ R9, R8
-	SHRQ  $0x36, R8
-	SHLQ  $0x20, SI
-	IMULQ R9, SI
-	SHRQ  $0x36, SI
-	LEAL  -2(CX), R9
-	LEAQ  24(SP)(SI*4), R10
-	MOVL  (R10), SI
-	MOVL  R9, 24(SP)(R8*4)
-	MOVL  CX, (R10)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  $0x9e3779b1, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x20, DI
+	IMULQ R8, DI
+	SHRQ  $0x36, DI
+	SHLQ  $0x20, BX
+	IMULQ R8, BX
+	SHRQ  $0x36, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
 	JEQ   match_nolit_loop_encodeSnappyBlockAsm10B
 	INCL  CX
 	JMP   search_loop_encodeSnappyBlockAsm10B
@@ -13537,8 +13518,8 @@ zero_loop_encodeSnappyBlockAsm8B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -13548,475 +13529,197 @@ zero_loop_encodeSnappyBlockAsm8B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeSnappyBlockAsm8B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x04, SI
-	LEAL  4(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x04, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeSnappyBlockAsm8B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x9e3779b1, R9
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHRQ  $0x08, R11
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x9e3779b1, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x20, R9
+	IMULQ R8, R9
+	SHRQ  $0x38, R9
 	SHLQ  $0x20, R10
-	IMULQ R9, R10
+	IMULQ R8, R10
 	SHRQ  $0x38, R10
-	SHLQ  $0x20, R11
-	IMULQ R9, R11
-	SHRQ  $0x38, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  24(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	LEAL  1(CX), R10
-	MOVL  R10, 24(SP)(R11*4)
-	MOVQ  DI, R10
-	SHRQ  $0x10, R10
-	SHLQ  $0x20, R10
-	IMULQ R9, R10
-	SHRQ  $0x38, R10
-	MOVL  CX, R9
-	SUBL  16(SP), R9
-	MOVL  1(DX)(R9*1), R11
-	MOVQ  DI, R9
-	SHRQ  $0x08, R9
-	CMPL  R9, R11
-	JNE   no_repeat_found_encodeSnappyBlockAsm8B
-	LEAL  1(CX), DI
-	MOVL  12(SP), SI
-	MOVL  DI, R8
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x20, R9
+	IMULQ R8, R9
+	SHRQ  $0x38, R9
+	MOVL  CX, R8
 	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
+	JNE   no_repeat_found_encodeSnappyBlockAsm8B
+	LEAL  1(CX), SI
+	MOVL  12(SP), BX
+	MOVL  SI, DI
+	SUBL  16(SP), DI
 	JZ    repeat_extend_back_end_encodeSnappyBlockAsm8B
 
 repeat_extend_back_loop_encodeSnappyBlockAsm8B:
-	CMPL DI, SI
+	CMPL SI, BX
 	JLE  repeat_extend_back_end_encodeSnappyBlockAsm8B
-	MOVB -1(DX)(R8*1), BL
-	MOVB -1(DX)(DI*1), R9
-	CMPB BL, R9
+	MOVB -1(DX)(DI*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
 	JNE  repeat_extend_back_end_encodeSnappyBlockAsm8B
-	LEAL -1(DI), DI
-	DECL R8
+	LEAL -1(SI), SI
+	DECL DI
 	JNZ  repeat_extend_back_loop_encodeSnappyBlockAsm8B
 
 repeat_extend_back_end_encodeSnappyBlockAsm8B:
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_repeat_emit_encodeSnappyBlockAsm8B
-	MOVL DI, R8
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R9
-	SUBL SI, R8
-	LEAL -1(R8), SI
-	CMPL SI, $0x3c
+	MOVL SI, DI
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R8
+	SUBL BX, DI
+	LEAL -1(DI), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_repeat_emit_encodeSnappyBlockAsm8B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_repeat_emit_encodeSnappyBlockAsm8B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm8B
 
 two_bytes_repeat_emit_encodeSnappyBlockAsm8B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_repeat_emit_encodeSnappyBlockAsm8B
 	JMP  memmove_long_repeat_emit_encodeSnappyBlockAsm8B
 
 one_byte_repeat_emit_encodeSnappyBlockAsm8B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_repeat_emit_encodeSnappyBlockAsm8B:
-	LEAQ (AX)(R8*1), SI
+	LEAQ (AX)(DI*1), BX
 
 	// genMemMoveShort
-	CMPQ R8, $0x08
+	CMPQ DI, $0x08
 	JLE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm8B_memmove_move_8
-	CMPQ R8, $0x10
+	CMPQ DI, $0x10
 	JBE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm8B_memmove_move_8through16
-	CMPQ R8, $0x20
+	CMPQ DI, $0x20
 	JBE  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm8B_memmove_move_17through32
 	JMP  emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm8B_memmove_move_33through64
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm8B_memmove_move_8:
-	MOVQ (R9), R10
-	MOVQ R10, (AX)
+	MOVQ (R8), R9
+	MOVQ R9, (AX)
 	JMP  memmove_end_copy_repeat_emit_encodeSnappyBlockAsm8B
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm8B_memmove_move_8through16:
-	MOVQ (R9), R10
-	MOVQ -8(R9)(R8*1), R9
-	MOVQ R10, (AX)
-	MOVQ R9, -8(AX)(R8*1)
+	MOVQ (R8), R9
+	MOVQ -8(R8)(DI*1), R8
+	MOVQ R9, (AX)
+	MOVQ R8, -8(AX)(DI*1)
 	JMP  memmove_end_copy_repeat_emit_encodeSnappyBlockAsm8B
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm8B_memmove_move_17through32:
-	MOVOU (R9), X0
-	MOVOU -16(R9)(R8*1), X1
+	MOVOU (R8), X0
+	MOVOU -16(R8)(DI*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R8*1)
+	MOVOU X1, -16(AX)(DI*1)
 	JMP   memmove_end_copy_repeat_emit_encodeSnappyBlockAsm8B
 
 emit_lit_memmove_repeat_emit_encodeSnappyBlockAsm8B_memmove_move_33through64:
-	MOVOU (R9), X0
-	MOVOU 16(R9), X1
-	MOVOU -32(R9)(R8*1), X2
-	MOVOU -16(R9)(R8*1), X3
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R8*1)
-	MOVOU X3, -16(AX)(R8*1)
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
 
 memmove_end_copy_repeat_emit_encodeSnappyBlockAsm8B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_repeat_emit_encodeSnappyBlockAsm8B
 
 memmove_long_repeat_emit_encodeSnappyBlockAsm8B:
-	LEAQ (AX)(R8*1), SI
+	LEAQ (AX)(DI*1), BX
 
 	// genMemMoveLong
-	MOVOU (R9), X0
-	MOVOU 16(R9), X1
-	MOVOU -32(R9)(R8*1), X2
-	MOVOU -16(R9)(R8*1), X3
-	MOVQ  R8, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
+	MOVOU (R8), X0
+	MOVOU 16(R8), X1
+	MOVOU -32(R8)(DI*1), X2
+	MOVOU -16(R8)(DI*1), X3
+	MOVQ  DI, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
 	JA    emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm8Blarge_forward_sse_loop_32
-	LEAQ  -32(R9)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
+	LEAQ  -32(R8)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
 
 emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm8Blarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
 	ADDQ  $0x20, R12
-	DECQ  R11
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
 	JNA   emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm8Blarge_big_loop_back
 
 emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm8Blarge_forward_sse_loop_32:
-	MOVOU -32(R9)(R12*1), X4
-	MOVOU -16(R9)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R8, R12
+	MOVOU -32(R8)(R11*1), X4
+	MOVOU -16(R8)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  DI, R11
 	JAE   emit_lit_memmove_long_repeat_emit_encodeSnappyBlockAsm8Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R8*1)
-	MOVOU X3, -16(AX)(R8*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(DI*1)
+	MOVOU X3, -16(AX)(DI*1)
+	MOVQ  BX, AX
 
 emit_literal_done_repeat_emit_encodeSnappyBlockAsm8B:
 	ADDL $0x05, CX
-	MOVL CX, SI
-	SUBL 16(SP), SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), SI
-
-	// matchLen
-	XORL R11, R11
-	CMPL R8, $0x08
-	JL   matchlen_match4_repeat_extend_encodeSnappyBlockAsm8B
-
-matchlen_loopback_repeat_extend_encodeSnappyBlockAsm8B:
-	MOVQ  (R9)(R11*1), R10
-	XORQ  (SI)(R11*1), R10
-	TESTQ R10, R10
-	JZ    matchlen_loop_repeat_extend_encodeSnappyBlockAsm8B
-
-#ifdef GOAMD64_v3
-	TZCNTQ R10, R10
-
-#else
-	BSFQ R10, R10
-
-#endif
-	SARQ $0x03, R10
-	LEAL (R11)(R10*1), R11
-	JMP  repeat_extend_forward_end_encodeSnappyBlockAsm8B
-
-matchlen_loop_repeat_extend_encodeSnappyBlockAsm8B:
-	LEAL -8(R8), R8
-	LEAL 8(R11), R11
-	CMPL R8, $0x08
-	JGE  matchlen_loopback_repeat_extend_encodeSnappyBlockAsm8B
-	JZ   repeat_extend_forward_end_encodeSnappyBlockAsm8B
-
-matchlen_match4_repeat_extend_encodeSnappyBlockAsm8B:
-	CMPL R8, $0x04
-	JL   matchlen_match2_repeat_extend_encodeSnappyBlockAsm8B
-	MOVL (R9)(R11*1), R10
-	CMPL (SI)(R11*1), R10
-	JNE  matchlen_match2_repeat_extend_encodeSnappyBlockAsm8B
-	SUBL $0x04, R8
-	LEAL 4(R11), R11
-
-matchlen_match2_repeat_extend_encodeSnappyBlockAsm8B:
-	CMPL R8, $0x02
-	JL   matchlen_match1_repeat_extend_encodeSnappyBlockAsm8B
-	MOVW (R9)(R11*1), R10
-	CMPW (SI)(R11*1), R10
-	JNE  matchlen_match1_repeat_extend_encodeSnappyBlockAsm8B
-	SUBL $0x02, R8
-	LEAL 2(R11), R11
-
-matchlen_match1_repeat_extend_encodeSnappyBlockAsm8B:
-	CMPL R8, $0x01
-	JL   repeat_extend_forward_end_encodeSnappyBlockAsm8B
-	MOVB (R9)(R11*1), R10
-	CMPB (SI)(R11*1), R10
-	JNE  repeat_extend_forward_end_encodeSnappyBlockAsm8B
-	LEAL 1(R11), R11
-
-repeat_extend_forward_end_encodeSnappyBlockAsm8B:
-	ADDL R11, CX
-	MOVL CX, SI
-	SUBL DI, SI
-	MOVL 16(SP), DI
-
-	// emitCopy
-two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm8B:
-	CMPL SI, $0x40
-	JLE  two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm8B
-	MOVB $0xee, (AX)
-	MOVW DI, 1(AX)
-	LEAL -60(SI), SI
-	ADDQ $0x03, AX
-	JMP  two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm8B
-
-two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm8B:
-	CMPL SI, $0x0c
-	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm8B
-	MOVB $0x01, BL
-	LEAL -16(BX)(SI*4), SI
-	MOVB DI, 1(AX)
-	SHRL $0x08, DI
-	SHLL $0x05, DI
-	ORL  DI, SI
-	MOVB SI, (AX)
-	ADDQ $0x02, AX
-	JMP  repeat_end_emit_encodeSnappyBlockAsm8B
-
-emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm8B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(SI*4), SI
-	MOVB SI, (AX)
-	MOVW DI, 1(AX)
-	ADDQ $0x03, AX
-
-repeat_end_emit_encodeSnappyBlockAsm8B:
-	MOVL CX, 12(SP)
-	JMP  search_loop_encodeSnappyBlockAsm8B
-
-no_repeat_found_encodeSnappyBlockAsm8B:
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate_match_encodeSnappyBlockAsm8B
-	SHRQ $0x08, DI
-	MOVL 24(SP)(R10*4), SI
-	LEAL 2(CX), R9
-	CMPL (DX)(R8*1), DI
-	JEQ  candidate2_match_encodeSnappyBlockAsm8B
-	MOVL R9, 24(SP)(R10*4)
-	SHRQ $0x08, DI
-	CMPL (DX)(SI*1), DI
-	JEQ  candidate3_match_encodeSnappyBlockAsm8B
-	MOVL 20(SP), CX
-	JMP  search_loop_encodeSnappyBlockAsm8B
-
-candidate3_match_encodeSnappyBlockAsm8B:
-	ADDL $0x02, CX
-	JMP  candidate_match_encodeSnappyBlockAsm8B
-
-candidate2_match_encodeSnappyBlockAsm8B:
-	MOVL R9, 24(SP)(R10*4)
-	INCL CX
-	MOVL R8, SI
-
-candidate_match_encodeSnappyBlockAsm8B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
-	JZ    match_extend_back_end_encodeSnappyBlockAsm8B
-
-match_extend_back_loop_encodeSnappyBlockAsm8B:
-	CMPL CX, DI
-	JLE  match_extend_back_end_encodeSnappyBlockAsm8B
-	MOVB -1(DX)(SI*1), BL
-	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
-	JNE  match_extend_back_end_encodeSnappyBlockAsm8B
-	LEAL -1(CX), CX
-	DECL SI
-	JZ   match_extend_back_end_encodeSnappyBlockAsm8B
-	JMP  match_extend_back_loop_encodeSnappyBlockAsm8B
-
-match_extend_back_end_encodeSnappyBlockAsm8B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
-	JL   match_dst_size_check_encodeSnappyBlockAsm8B
-	MOVQ $0x00000000, ret+48(FP)
-	RET
-
-match_dst_size_check_encodeSnappyBlockAsm8B:
-	MOVL CX, DI
-	MOVL 12(SP), R8
-	CMPL R8, DI
-	JEQ  emit_literal_done_match_emit_encodeSnappyBlockAsm8B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(R8*1), DI
-	SUBL R8, R9
-	LEAL -1(R9), R8
-	CMPL R8, $0x3c
-	JLT  one_byte_match_emit_encodeSnappyBlockAsm8B
-	CMPL R8, $0x00000100
-	JLT  two_bytes_match_emit_encodeSnappyBlockAsm8B
-	MOVB $0xf4, (AX)
-	MOVW R8, 1(AX)
-	ADDQ $0x03, AX
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm8B
-
-two_bytes_match_emit_encodeSnappyBlockAsm8B:
-	MOVB $0xf0, (AX)
-	MOVB R8, 1(AX)
-	ADDQ $0x02, AX
-	CMPL R8, $0x40
-	JL   memmove_match_emit_encodeSnappyBlockAsm8B
-	JMP  memmove_long_match_emit_encodeSnappyBlockAsm8B
-
-one_byte_match_emit_encodeSnappyBlockAsm8B:
-	SHLB $0x02, R8
-	MOVB R8, (AX)
-	ADDQ $0x01, AX
-
-memmove_match_emit_encodeSnappyBlockAsm8B:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveShort
-	CMPQ R9, $0x08
-	JLE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_8
-	CMPQ R9, $0x10
-	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_8through16
-	CMPQ R9, $0x20
-	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_17through32
-	JMP  emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_33through64
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_8:
-	MOVQ (DI), R10
-	MOVQ R10, (AX)
-	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm8B
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_8through16:
-	MOVQ (DI), R10
-	MOVQ -8(DI)(R9*1), DI
-	MOVQ R10, (AX)
-	MOVQ DI, -8(AX)(R9*1)
-	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm8B
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_17through32:
-	MOVOU (DI), X0
-	MOVOU -16(DI)(R9*1), X1
-	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
-	JMP   memmove_end_copy_match_emit_encodeSnappyBlockAsm8B
-
-emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_33through64:
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-
-memmove_end_copy_match_emit_encodeSnappyBlockAsm8B:
-	MOVQ R8, AX
-	JMP  emit_literal_done_match_emit_encodeSnappyBlockAsm8B
-
-memmove_long_match_emit_encodeSnappyBlockAsm8B:
-	LEAQ (AX)(R9*1), R8
-
-	// genMemMoveLong
-	MOVOU (DI), X0
-	MOVOU 16(DI), X1
-	MOVOU -32(DI)(R9*1), X2
-	MOVOU -16(DI)(R9*1), X3
-	MOVQ  R9, R11
-	SHRQ  $0x05, R11
-	MOVQ  AX, R10
-	ANDL  $0x0000001f, R10
-	MOVQ  $0x00000040, R12
-	SUBQ  R10, R12
-	DECQ  R11
-	JA    emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm8Blarge_forward_sse_loop_32
-	LEAQ  -32(DI)(R12*1), R10
-	LEAQ  -32(AX)(R12*1), R13
-
-emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm8Blarge_big_loop_back:
-	MOVOU (R10), X4
-	MOVOU 16(R10), X5
-	MOVOA X4, (R13)
-	MOVOA X5, 16(R13)
-	ADDQ  $0x20, R13
-	ADDQ  $0x20, R10
-	ADDQ  $0x20, R12
-	DECQ  R11
-	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm8Blarge_big_loop_back
-
-emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm8Blarge_forward_sse_loop_32:
-	MOVOU -32(DI)(R12*1), X4
-	MOVOU -16(DI)(R12*1), X5
-	MOVOA X4, -32(AX)(R12*1)
-	MOVOA X5, -16(AX)(R12*1)
-	ADDQ  $0x20, R12
-	CMPQ  R9, R12
-	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm8Blarge_forward_sse_loop_32
-	MOVOU X0, (AX)
-	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  R8, AX
-
-emit_literal_done_match_emit_encodeSnappyBlockAsm8B:
-match_nolit_loop_encodeSnappyBlockAsm8B:
-	MOVL CX, DI
-	SUBL SI, DI
-	MOVL DI, 16(SP)
-	ADDL $0x04, CX
-	ADDL $0x04, SI
+	MOVL CX, BX
+	SUBL 16(SP), BX
 	MOVQ src_len+32(FP), DI
 	SUBL CX, DI
 	LEAQ (DX)(CX*1), R8
-	LEAQ (DX)(SI*1), SI
+	LEAQ (DX)(BX*1), BX
 
 	// matchLen
 	XORL R10, R10
 	CMPL DI, $0x08
-	JL   matchlen_match4_match_nolit_encodeSnappyBlockAsm8B
+	JL   matchlen_match4_repeat_extend_encodeSnappyBlockAsm8B
 
-matchlen_loopback_match_nolit_encodeSnappyBlockAsm8B:
+matchlen_loopback_repeat_extend_encodeSnappyBlockAsm8B:
 	MOVQ  (R8)(R10*1), R9
-	XORQ  (SI)(R10*1), R9
+	XORQ  (BX)(R10*1), R9
 	TESTQ R9, R9
-	JZ    matchlen_loop_match_nolit_encodeSnappyBlockAsm8B
+	JZ    matchlen_loop_repeat_extend_encodeSnappyBlockAsm8B
 
 #ifdef GOAMD64_v3
 	TZCNTQ R9, R9
@@ -14027,103 +13730,381 @@ matchlen_loopback_match_nolit_encodeSnappyBlockAsm8B:
 #endif
 	SARQ $0x03, R9
 	LEAL (R10)(R9*1), R10
-	JMP  match_nolit_end_encodeSnappyBlockAsm8B
+	JMP  repeat_extend_forward_end_encodeSnappyBlockAsm8B
 
-matchlen_loop_match_nolit_encodeSnappyBlockAsm8B:
+matchlen_loop_repeat_extend_encodeSnappyBlockAsm8B:
 	LEAL -8(DI), DI
 	LEAL 8(R10), R10
 	CMPL DI, $0x08
+	JGE  matchlen_loopback_repeat_extend_encodeSnappyBlockAsm8B
+	JZ   repeat_extend_forward_end_encodeSnappyBlockAsm8B
+
+matchlen_match4_repeat_extend_encodeSnappyBlockAsm8B:
+	CMPL DI, $0x04
+	JL   matchlen_match2_repeat_extend_encodeSnappyBlockAsm8B
+	MOVL (R8)(R10*1), R9
+	CMPL (BX)(R10*1), R9
+	JNE  matchlen_match2_repeat_extend_encodeSnappyBlockAsm8B
+	SUBL $0x04, DI
+	LEAL 4(R10), R10
+
+matchlen_match2_repeat_extend_encodeSnappyBlockAsm8B:
+	CMPL DI, $0x02
+	JL   matchlen_match1_repeat_extend_encodeSnappyBlockAsm8B
+	MOVW (R8)(R10*1), R9
+	CMPW (BX)(R10*1), R9
+	JNE  matchlen_match1_repeat_extend_encodeSnappyBlockAsm8B
+	SUBL $0x02, DI
+	LEAL 2(R10), R10
+
+matchlen_match1_repeat_extend_encodeSnappyBlockAsm8B:
+	CMPL DI, $0x01
+	JL   repeat_extend_forward_end_encodeSnappyBlockAsm8B
+	MOVB (R8)(R10*1), R9
+	CMPB (BX)(R10*1), R9
+	JNE  repeat_extend_forward_end_encodeSnappyBlockAsm8B
+	LEAL 1(R10), R10
+
+repeat_extend_forward_end_encodeSnappyBlockAsm8B:
+	ADDL R10, CX
+	MOVL CX, BX
+	SUBL SI, BX
+	MOVL 16(SP), SI
+
+	// emitCopy
+two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm8B:
+	CMPL BX, $0x40
+	JLE  two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm8B
+	MOVB $0xee, (AX)
+	MOVW SI, 1(AX)
+	LEAL -60(BX), BX
+	ADDQ $0x03, AX
+	JMP  two_byte_offset_repeat_as_copy_encodeSnappyBlockAsm8B
+
+two_byte_offset_short_repeat_as_copy_encodeSnappyBlockAsm8B:
+	MOVL BX, DI
+	SHLL $0x02, DI
+	CMPL BX, $0x0c
+	JGE  emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm8B
+	LEAL -15(DI), DI
+	MOVB SI, 1(AX)
+	SHRL $0x08, SI
+	SHLL $0x05, SI
+	ORL  SI, DI
+	MOVB DI, (AX)
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_encodeSnappyBlockAsm8B
+
+emit_copy_three_repeat_as_copy_encodeSnappyBlockAsm8B:
+	LEAL -2(DI), DI
+	MOVB DI, (AX)
+	MOVW SI, 1(AX)
+	ADDQ $0x03, AX
+
+repeat_end_emit_encodeSnappyBlockAsm8B:
+	MOVL CX, 12(SP)
+	JMP  search_loop_encodeSnappyBlockAsm8B
+
+no_repeat_found_encodeSnappyBlockAsm8B:
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate_match_encodeSnappyBlockAsm8B
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
+	JEQ  candidate2_match_encodeSnappyBlockAsm8B
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate3_match_encodeSnappyBlockAsm8B
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeSnappyBlockAsm8B
+
+candidate3_match_encodeSnappyBlockAsm8B:
+	ADDL $0x02, CX
+	JMP  candidate_match_encodeSnappyBlockAsm8B
+
+candidate2_match_encodeSnappyBlockAsm8B:
+	MOVL R8, 24(SP)(R9*4)
+	INCL CX
+	MOVL DI, BX
+
+candidate_match_encodeSnappyBlockAsm8B:
+	MOVL  12(SP), SI
+	TESTL BX, BX
+	JZ    match_extend_back_end_encodeSnappyBlockAsm8B
+
+match_extend_back_loop_encodeSnappyBlockAsm8B:
+	CMPL CX, SI
+	JLE  match_extend_back_end_encodeSnappyBlockAsm8B
+	MOVB -1(DX)(BX*1), DI
+	MOVB -1(DX)(CX*1), R8
+	CMPB DI, R8
+	JNE  match_extend_back_end_encodeSnappyBlockAsm8B
+	LEAL -1(CX), CX
+	DECL BX
+	JZ   match_extend_back_end_encodeSnappyBlockAsm8B
+	JMP  match_extend_back_loop_encodeSnappyBlockAsm8B
+
+match_extend_back_end_encodeSnappyBlockAsm8B:
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
+	JL   match_dst_size_check_encodeSnappyBlockAsm8B
+	MOVQ $0x00000000, ret+48(FP)
+	RET
+
+match_dst_size_check_encodeSnappyBlockAsm8B:
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
+	JEQ  emit_literal_done_match_emit_encodeSnappyBlockAsm8B
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), DI
+	CMPL DI, $0x3c
+	JLT  one_byte_match_emit_encodeSnappyBlockAsm8B
+	CMPL DI, $0x00000100
+	JLT  two_bytes_match_emit_encodeSnappyBlockAsm8B
+	MOVB $0xf4, (AX)
+	MOVW DI, 1(AX)
+	ADDQ $0x03, AX
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm8B
+
+two_bytes_match_emit_encodeSnappyBlockAsm8B:
+	MOVB $0xf0, (AX)
+	MOVB DI, 1(AX)
+	ADDQ $0x02, AX
+	CMPL DI, $0x40
+	JL   memmove_match_emit_encodeSnappyBlockAsm8B
+	JMP  memmove_long_match_emit_encodeSnappyBlockAsm8B
+
+one_byte_match_emit_encodeSnappyBlockAsm8B:
+	SHLB $0x02, DI
+	MOVB DI, (AX)
+	ADDQ $0x01, AX
+
+memmove_match_emit_encodeSnappyBlockAsm8B:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveShort
+	CMPQ R8, $0x08
+	JLE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_8
+	CMPQ R8, $0x10
+	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_8through16
+	CMPQ R8, $0x20
+	JBE  emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_17through32
+	JMP  emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_33through64
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_8:
+	MOVQ (SI), R9
+	MOVQ R9, (AX)
+	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm8B
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_8through16:
+	MOVQ (SI), R9
+	MOVQ -8(SI)(R8*1), SI
+	MOVQ R9, (AX)
+	MOVQ SI, -8(AX)(R8*1)
+	JMP  memmove_end_copy_match_emit_encodeSnappyBlockAsm8B
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_17through32:
+	MOVOU (SI), X0
+	MOVOU -16(SI)(R8*1), X1
+	MOVOU X0, (AX)
+	MOVOU X1, -16(AX)(R8*1)
+	JMP   memmove_end_copy_match_emit_encodeSnappyBlockAsm8B
+
+emit_lit_memmove_match_emit_encodeSnappyBlockAsm8B_memmove_move_33through64:
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+
+memmove_end_copy_match_emit_encodeSnappyBlockAsm8B:
+	MOVQ DI, AX
+	JMP  emit_literal_done_match_emit_encodeSnappyBlockAsm8B
+
+memmove_long_match_emit_encodeSnappyBlockAsm8B:
+	LEAQ (AX)(R8*1), DI
+
+	// genMemMoveLong
+	MOVOU (SI), X0
+	MOVOU 16(SI), X1
+	MOVOU -32(SI)(R8*1), X2
+	MOVOU -16(SI)(R8*1), X3
+	MOVQ  R8, R10
+	SHRQ  $0x05, R10
+	MOVQ  AX, R9
+	ANDL  $0x0000001f, R9
+	MOVQ  $0x00000040, R11
+	SUBQ  R9, R11
+	DECQ  R10
+	JA    emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm8Blarge_forward_sse_loop_32
+	LEAQ  -32(SI)(R11*1), R9
+	LEAQ  -32(AX)(R11*1), R12
+
+emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm8Blarge_big_loop_back:
+	MOVOU (R9), X4
+	MOVOU 16(R9), X5
+	MOVOA X4, (R12)
+	MOVOA X5, 16(R12)
+	ADDQ  $0x20, R12
+	ADDQ  $0x20, R9
+	ADDQ  $0x20, R11
+	DECQ  R10
+	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm8Blarge_big_loop_back
+
+emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm8Blarge_forward_sse_loop_32:
+	MOVOU -32(SI)(R11*1), X4
+	MOVOU -16(SI)(R11*1), X5
+	MOVOA X4, -32(AX)(R11*1)
+	MOVOA X5, -16(AX)(R11*1)
+	ADDQ  $0x20, R11
+	CMPQ  R8, R11
+	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBlockAsm8Blarge_forward_sse_loop_32
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  DI, AX
+
+emit_literal_done_match_emit_encodeSnappyBlockAsm8B:
+match_nolit_loop_encodeSnappyBlockAsm8B:
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
+	ADDL $0x04, CX
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
+
+	// matchLen
+	XORL R9, R9
+	CMPL SI, $0x08
+	JL   matchlen_match4_match_nolit_encodeSnappyBlockAsm8B
+
+matchlen_loopback_match_nolit_encodeSnappyBlockAsm8B:
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
+	JZ    matchlen_loop_match_nolit_encodeSnappyBlockAsm8B
+
+#ifdef GOAMD64_v3
+	TZCNTQ R8, R8
+
+#else
+	BSFQ R8, R8
+
+#endif
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
+	JMP  match_nolit_end_encodeSnappyBlockAsm8B
+
+matchlen_loop_match_nolit_encodeSnappyBlockAsm8B:
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeSnappyBlockAsm8B
 	JZ   match_nolit_end_encodeSnappyBlockAsm8B
 
 matchlen_match4_match_nolit_encodeSnappyBlockAsm8B:
-	CMPL DI, $0x04
+	CMPL SI, $0x04
 	JL   matchlen_match2_match_nolit_encodeSnappyBlockAsm8B
-	MOVL (R8)(R10*1), R9
-	CMPL (SI)(R10*1), R9
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
 	JNE  matchlen_match2_match_nolit_encodeSnappyBlockAsm8B
-	SUBL $0x04, DI
-	LEAL 4(R10), R10
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
 
 matchlen_match2_match_nolit_encodeSnappyBlockAsm8B:
-	CMPL DI, $0x02
+	CMPL SI, $0x02
 	JL   matchlen_match1_match_nolit_encodeSnappyBlockAsm8B
-	MOVW (R8)(R10*1), R9
-	CMPW (SI)(R10*1), R9
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
 	JNE  matchlen_match1_match_nolit_encodeSnappyBlockAsm8B
-	SUBL $0x02, DI
-	LEAL 2(R10), R10
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
 
 matchlen_match1_match_nolit_encodeSnappyBlockAsm8B:
-	CMPL DI, $0x01
+	CMPL SI, $0x01
 	JL   match_nolit_end_encodeSnappyBlockAsm8B
-	MOVB (R8)(R10*1), R9
-	CMPB (SI)(R10*1), R9
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
 	JNE  match_nolit_end_encodeSnappyBlockAsm8B
-	LEAL 1(R10), R10
+	LEAL 1(R9), R9
 
 match_nolit_end_encodeSnappyBlockAsm8B:
-	ADDL R10, CX
-	MOVL 16(SP), SI
-	ADDL $0x04, R10
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
 	MOVL CX, 12(SP)
 
 	// emitCopy
 two_byte_offset_match_nolit_encodeSnappyBlockAsm8B:
-	CMPL R10, $0x40
+	CMPL R9, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeSnappyBlockAsm8B
 	MOVB $0xee, (AX)
-	MOVW SI, 1(AX)
-	LEAL -60(R10), R10
+	MOVW BX, 1(AX)
+	LEAL -60(R9), R9
 	ADDQ $0x03, AX
 	JMP  two_byte_offset_match_nolit_encodeSnappyBlockAsm8B
 
 two_byte_offset_short_match_nolit_encodeSnappyBlockAsm8B:
-	CMPL R10, $0x0c
+	MOVL R9, SI
+	SHLL $0x02, SI
+	CMPL R9, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeSnappyBlockAsm8B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R10*4), R10
-	MOVB SI, 1(AX)
-	SHRL $0x08, SI
-	SHLL $0x05, SI
-	ORL  SI, R10
-	MOVB R10, (AX)
+	LEAL -15(SI), SI
+	MOVB BL, 1(AX)
+	SHRL $0x08, BX
+	SHLL $0x05, BX
+	ORL  BX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeSnappyBlockAsm8B
 
 emit_copy_three_match_nolit_encodeSnappyBlockAsm8B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R10*4), R10
-	MOVB R10, (AX)
-	MOVW SI, 1(AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeSnappyBlockAsm8B:
 	CMPL CX, 8(SP)
 	JGE  emit_remainder_encodeSnappyBlockAsm8B
-	MOVQ -2(DX)(CX*1), DI
+	MOVQ -2(DX)(CX*1), SI
 	CMPQ AX, (SP)
 	JL   match_nolit_dst_ok_encodeSnappyBlockAsm8B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_nolit_dst_ok_encodeSnappyBlockAsm8B:
-	MOVQ  $0x9e3779b1, R9
-	MOVQ  DI, R8
-	SHRQ  $0x10, DI
-	MOVQ  DI, SI
-	SHLQ  $0x20, R8
-	IMULQ R9, R8
-	SHRQ  $0x38, R8
-	SHLQ  $0x20, SI
-	IMULQ R9, SI
-	SHRQ  $0x38, SI
-	LEAL  -2(CX), R9
-	LEAQ  24(SP)(SI*4), R10
-	MOVL  (R10), SI
-	MOVL  R9, 24(SP)(R8*4)
-	MOVL  CX, (R10)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  $0x9e3779b1, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x20, DI
+	IMULQ R8, DI
+	SHRQ  $0x38, DI
+	SHLQ  $0x20, BX
+	IMULQ R8, BX
+	SHRQ  $0x38, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
 	JEQ   match_nolit_loop_encodeSnappyBlockAsm8B
 	INCL  CX
 	JMP   search_loop_encodeSnappyBlockAsm8B
@@ -14287,9 +14268,9 @@ emit_literal_done_emit_remainder_encodeSnappyBlockAsm8B:
 
 // func encodeSnappyBetterBlockAsm(dst []byte, src []byte) int
 // Requires: BMI, SSE2
-TEXT ·encodeSnappyBetterBlockAsm(SB), $327704-56
+TEXT ·encodeSnappyBetterBlockAsm(SB), $589848-56
 	MOVQ dst_base+0(FP), AX
-	MOVQ $0x00000a00, CX
+	MOVQ $0x00001200, CX
 	LEAQ 24(SP), DX
 	PXOR X0, X0
 
@@ -14308,8 +14289,8 @@ zero_loop_encodeSnappyBetterBlockAsm:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -14319,359 +14300,369 @@ zero_loop_encodeSnappyBetterBlockAsm:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeSnappyBetterBlockAsm:
-	MOVL CX, SI
-	SUBL 12(SP), SI
-	SHRL $0x07, SI
-	CMPL SI, $0x63
+	MOVL CX, BX
+	SUBL 12(SP), BX
+	SHRL $0x07, BX
+	CMPL BX, $0x63
 	JLE  check_maxskip_ok_encodeSnappyBetterBlockAsm
-	LEAL 100(CX), SI
+	LEAL 100(CX), BX
 	JMP  check_maxskip_cont_encodeSnappyBetterBlockAsm
 
 check_maxskip_ok_encodeSnappyBetterBlockAsm:
-	LEAL 1(CX)(SI*1), SI
+	LEAL 1(CX)(BX*1), BX
 
 check_maxskip_cont_encodeSnappyBetterBlockAsm:
-	CMPL  SI, 8(SP)
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeSnappyBetterBlockAsm
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x00cf1bbcdcbfa563, R9
-	MOVQ  $0x9e3779b1, SI
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHLQ  $0x08, R10
-	IMULQ R9, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x20, R11
-	IMULQ SI, R11
-	SHRQ  $0x32, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  262168(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	MOVL  CX, 262168(SP)(R11*4)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x00cf1bbcdcbfa563, R8
+	MOVQ  $0x9e3779b1, BX
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHLQ  $0x08, R9
+	IMULQ R8, R9
+	SHRQ  $0x2f, R9
+	SHLQ  $0x20, R10
+	IMULQ BX, R10
+	SHRQ  $0x32, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  524312(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	MOVL  CX, 524312(SP)(R10*4)
+	MOVQ  (DX)(BX*1), R9
+	MOVQ  (DX)(DI*1), R10
+	CMPQ  R9, SI
 	JEQ   candidate_match_encodeSnappyBetterBlockAsm
-	CMPL  (DX)(R8*1), DI
-	JEQ   candidateS_match_encodeSnappyBetterBlockAsm
-	MOVL  20(SP), CX
-	JMP   search_loop_encodeSnappyBetterBlockAsm
+	CMPQ  R10, SI
+	JNE   no_short_found_encodeSnappyBetterBlockAsm
+	MOVL  DI, BX
+	JMP   candidate_match_encodeSnappyBetterBlockAsm
+
+no_short_found_encodeSnappyBetterBlockAsm:
+	CMPL R9, SI
+	JEQ  candidate_match_encodeSnappyBetterBlockAsm
+	CMPL R10, SI
+	JEQ  candidateS_match_encodeSnappyBetterBlockAsm
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeSnappyBetterBlockAsm
 
 candidateS_match_encodeSnappyBetterBlockAsm:
-	SHRQ  $0x08, DI
-	MOVQ  DI, R10
-	SHLQ  $0x08, R10
-	IMULQ R9, R10
-	SHRQ  $0x30, R10
-	MOVL  24(SP)(R10*4), SI
+	SHRQ  $0x08, SI
+	MOVQ  SI, R9
+	SHLQ  $0x08, R9
+	IMULQ R8, R9
+	SHRQ  $0x2f, R9
+	MOVL  24(SP)(R9*4), BX
 	INCL  CX
-	MOVL  CX, 24(SP)(R10*4)
-	CMPL  (DX)(SI*1), DI
+	MOVL  CX, 24(SP)(R9*4)
+	CMPL  (DX)(BX*1), SI
 	JEQ   candidate_match_encodeSnappyBetterBlockAsm
 	DECL  CX
-	MOVL  R8, SI
+	MOVL  DI, BX
 
 candidate_match_encodeSnappyBetterBlockAsm:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeSnappyBetterBlockAsm
 
 match_extend_back_loop_encodeSnappyBetterBlockAsm:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeSnappyBetterBlockAsm
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeSnappyBetterBlockAsm
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeSnappyBetterBlockAsm
 	JMP  match_extend_back_loop_encodeSnappyBetterBlockAsm
 
 match_extend_back_end_encodeSnappyBetterBlockAsm:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 5(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 5(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeSnappyBetterBlockAsm
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeSnappyBetterBlockAsm:
-	MOVL CX, DI
+	MOVL CX, SI
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), R10
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), R9
 
 	// matchLen
-	XORL R12, R12
-	CMPL R8, $0x08
+	XORL R11, R11
+	CMPL DI, $0x08
 	JL   matchlen_match4_match_nolit_encodeSnappyBetterBlockAsm
 
 matchlen_loopback_match_nolit_encodeSnappyBetterBlockAsm:
-	MOVQ  (R9)(R12*1), R11
-	XORQ  (R10)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R8)(R11*1), R10
+	XORQ  (R9)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_match_nolit_encodeSnappyBetterBlockAsm
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  match_nolit_end_encodeSnappyBetterBlockAsm
 
 matchlen_loop_match_nolit_encodeSnappyBetterBlockAsm:
-	LEAL -8(R8), R8
-	LEAL 8(R12), R12
-	CMPL R8, $0x08
+	LEAL -8(DI), DI
+	LEAL 8(R11), R11
+	CMPL DI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeSnappyBetterBlockAsm
 	JZ   match_nolit_end_encodeSnappyBetterBlockAsm
 
 matchlen_match4_match_nolit_encodeSnappyBetterBlockAsm:
-	CMPL R8, $0x04
+	CMPL DI, $0x04
 	JL   matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm
-	MOVL (R9)(R12*1), R11
-	CMPL (R10)(R12*1), R11
+	MOVL (R8)(R11*1), R10
+	CMPL (R9)(R11*1), R10
 	JNE  matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm
-	SUBL $0x04, R8
-	LEAL 4(R12), R12
+	SUBL $0x04, DI
+	LEAL 4(R11), R11
 
 matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm:
-	CMPL R8, $0x02
+	CMPL DI, $0x02
 	JL   matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm
-	MOVW (R9)(R12*1), R11
-	CMPW (R10)(R12*1), R11
+	MOVW (R8)(R11*1), R10
+	CMPW (R9)(R11*1), R10
 	JNE  matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm
-	SUBL $0x02, R8
-	LEAL 2(R12), R12
+	SUBL $0x02, DI
+	LEAL 2(R11), R11
 
 matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm:
-	CMPL R8, $0x01
+	CMPL DI, $0x01
 	JL   match_nolit_end_encodeSnappyBetterBlockAsm
-	MOVB (R9)(R12*1), R11
-	CMPB (R10)(R12*1), R11
+	MOVB (R8)(R11*1), R10
+	CMPB (R9)(R11*1), R10
 	JNE  match_nolit_end_encodeSnappyBetterBlockAsm
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 match_nolit_end_encodeSnappyBetterBlockAsm:
-	MOVL CX, R8
-	SUBL SI, R8
+	MOVL CX, DI
+	SUBL BX, DI
 
 	// Check if repeat
-	CMPL R12, $0x01
+	CMPL R11, $0x01
 	JG   match_length_ok_encodeSnappyBetterBlockAsm
-	CMPL R8, $0x0000ffff
+	CMPL DI, $0x0000ffff
 	JLE  match_length_ok_encodeSnappyBetterBlockAsm
 	MOVL 20(SP), CX
 	INCL CX
 	JMP  search_loop_encodeSnappyBetterBlockAsm
 
 match_length_ok_encodeSnappyBetterBlockAsm:
-	MOVL R8, 16(SP)
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL DI, 16(SP)
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_encodeSnappyBetterBlockAsm
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_encodeSnappyBetterBlockAsm
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_encodeSnappyBetterBlockAsm
-	CMPL SI, $0x00010000
+	CMPL BX, $0x00010000
 	JLT  three_bytes_match_emit_encodeSnappyBetterBlockAsm
-	CMPL SI, $0x01000000
+	CMPL BX, $0x01000000
 	JLT  four_bytes_match_emit_encodeSnappyBetterBlockAsm
 	MOVB $0xfc, (AX)
-	MOVL SI, 1(AX)
+	MOVL BX, 1(AX)
 	ADDQ $0x05, AX
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm
 
 four_bytes_match_emit_encodeSnappyBetterBlockAsm:
-	MOVL SI, R11
-	SHRL $0x10, R11
+	MOVL BX, R10
+	SHRL $0x10, R10
 	MOVB $0xf8, (AX)
-	MOVW SI, 1(AX)
-	MOVB R11, 3(AX)
+	MOVW BX, 1(AX)
+	MOVB R10, 3(AX)
 	ADDQ $0x04, AX
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm
 
 three_bytes_match_emit_encodeSnappyBetterBlockAsm:
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm
 
 two_bytes_match_emit_encodeSnappyBetterBlockAsm:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_encodeSnappyBetterBlockAsm
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm
 
 one_byte_match_emit_encodeSnappyBetterBlockAsm:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeSnappyBetterBlockAsm:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm_memmove_move_8:
-	MOVQ (R10), R11
-	MOVQ R11, (AX)
+	MOVQ (R9), R10
+	MOVQ R10, (AX)
 	JMP  memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_encodeSnappyBetterBlockAsm
 
 memmove_long_match_emit_encodeSnappyBetterBlockAsm:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsmlarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsmlarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsmlarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsmlarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsmlarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_encodeSnappyBetterBlockAsm:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitCopy
-	CMPL R8, $0x00010000
+	CMPL DI, $0x00010000
 	JL   two_byte_offset_match_nolit_encodeSnappyBetterBlockAsm
 
 four_bytes_loop_back_match_nolit_encodeSnappyBetterBlockAsm:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  four_bytes_remain_match_nolit_encodeSnappyBetterBlockAsm
 	MOVB $0xff, (AX)
-	MOVL R8, 1(AX)
-	LEAL -64(R12), R12
+	MOVL DI, 1(AX)
+	LEAL -64(R11), R11
 	ADDQ $0x05, AX
-	CMPL R12, $0x04
+	CMPL R11, $0x04
 	JL   four_bytes_remain_match_nolit_encodeSnappyBetterBlockAsm
 	JMP  four_bytes_loop_back_match_nolit_encodeSnappyBetterBlockAsm
 
 four_bytes_remain_match_nolit_encodeSnappyBetterBlockAsm:
-	TESTL R12, R12
+	TESTL R11, R11
 	JZ    match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm
-	MOVB  $0x03, BL
-	LEAL  -4(BX)(R12*4), R12
-	MOVB  R12, (AX)
-	MOVL  R8, 1(AX)
+	XORL  BX, BX
+	LEAL  -1(BX)(R11*4), R11
+	MOVB  R11, (AX)
+	MOVL  DI, 1(AX)
 	ADDQ  $0x05, AX
 	JMP   match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm
 
 two_byte_offset_match_nolit_encodeSnappyBetterBlockAsm:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeSnappyBetterBlockAsm
 	MOVB $0xee, (AX)
-	MOVW R8, 1(AX)
-	LEAL -60(R12), R12
+	MOVW DI, 1(AX)
+	LEAL -60(R11), R11
 	ADDQ $0x03, AX
 	JMP  two_byte_offset_match_nolit_encodeSnappyBetterBlockAsm
 
 two_byte_offset_short_match_nolit_encodeSnappyBetterBlockAsm:
-	CMPL R12, $0x0c
+	MOVL R11, BX
+	SHLL $0x02, BX
+	CMPL R11, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm
-	MOVB $0x01, BL
-	LEAL -16(BX)(R12*4), R12
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	LEAL -15(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm
 
 emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R12*4), R12
-	MOVB R12, (AX)
-	MOVW R8, 1(AX)
+	LEAL -2(BX), BX
+	MOVB BL, (AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm:
@@ -14683,54 +14674,51 @@ match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm:
 	RET
 
 match_nolit_dst_ok_encodeSnappyBetterBlockAsm:
-	MOVQ  $0x00cf1bbcdcbfa563, SI
-	MOVQ  $0x9e3779b1, R8
-	INCL  DI
-	MOVQ  (DX)(DI*1), R9
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	MOVQ  R9, R12
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	SHRQ  $0x10, R12
-	LEAL  1(DI), R14
-	LEAL  2(DI), R15
-	MOVQ  -2(DX)(CX*1), R9
-	SHLQ  $0x08, R10
-	IMULQ SI, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x08, R13
-	IMULQ SI, R13
-	SHRQ  $0x30, R13
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x32, R11
+	MOVQ  $0x00cf1bbcdcbfa563, BX
+	MOVQ  $0x9e3779b1, DI
+	LEAQ  1(SI), SI
+	LEAQ  -2(CX), R8
+	MOVQ  (DX)(SI*1), R9
+	MOVQ  1(DX)(SI*1), R10
+	MOVQ  (DX)(R8*1), R11
+	MOVQ  1(DX)(R8*1), R12
+	SHLQ  $0x08, R9
+	IMULQ BX, R9
+	SHRQ  $0x2f, R9
+	SHLQ  $0x20, R10
+	IMULQ DI, R10
+	SHRQ  $0x32, R10
+	SHLQ  $0x08, R11
+	IMULQ BX, R11
+	SHRQ  $0x2f, R11
 	SHLQ  $0x20, R12
-	IMULQ R8, R12
+	IMULQ DI, R12
 	SHRQ  $0x32, R12
-	MOVL  DI, 24(SP)(R10*4)
-	MOVL  R14, 24(SP)(R13*4)
-	MOVL  R14, 262168(SP)(R11*4)
-	MOVL  R15, 262168(SP)(R12*4)
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	LEAL  -2(CX), R9
-	LEAL  -1(CX), DI
-	SHLQ  $0x08, R10
-	IMULQ SI, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x32, R11
-	SHLQ  $0x08, R13
-	IMULQ SI, R13
-	SHRQ  $0x30, R13
-	MOVL  R9, 24(SP)(R10*4)
-	MOVL  DI, 262168(SP)(R11*4)
-	MOVL  DI, 24(SP)(R13*4)
-	JMP   search_loop_encodeSnappyBetterBlockAsm
+	LEAQ  1(SI), DI
+	LEAQ  1(R8), R13
+	MOVL  SI, 24(SP)(R9*4)
+	MOVL  R8, 24(SP)(R11*4)
+	MOVL  DI, 524312(SP)(R10*4)
+	MOVL  R13, 524312(SP)(R12*4)
+	ADDQ  $0x01, SI
+	SUBQ  $0x01, R8
+
+index_loop_encodeSnappyBetterBlockAsm:
+	CMPQ  SI, R8
+	JAE   search_loop_encodeSnappyBetterBlockAsm
+	MOVQ  (DX)(SI*1), DI
+	MOVQ  (DX)(R8*1), R9
+	SHLQ  $0x08, DI
+	IMULQ BX, DI
+	SHRQ  $0x2f, DI
+	SHLQ  $0x08, R9
+	IMULQ BX, R9
+	SHRQ  $0x2f, R9
+	MOVL  SI, 24(SP)(DI*4)
+	MOVL  R8, 24(SP)(R9*4)
+	ADDQ  $0x02, SI
+	SUBQ  $0x02, R8
+	JMP   index_loop_encodeSnappyBetterBlockAsm
 
 emit_remainder_encodeSnappyBetterBlockAsm:
 	MOVQ src_len+32(FP), CX
@@ -14931,8 +14919,8 @@ zero_loop_encodeSnappyBetterBlockAsm64K:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -14942,299 +14930,309 @@ zero_loop_encodeSnappyBetterBlockAsm64K:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeSnappyBetterBlockAsm64K:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x07, SI
-	LEAL  1(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x07, BX
+	LEAL  1(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeSnappyBetterBlockAsm64K
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x00cf1bbcdcbfa563, R9
-	MOVQ  $0x9e3779b1, SI
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHLQ  $0x08, R10
-	IMULQ R9, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x20, R11
-	IMULQ SI, R11
-	SHRQ  $0x32, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  262168(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	MOVL  CX, 262168(SP)(R11*4)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x00cf1bbcdcbfa563, R8
+	MOVQ  $0x9e3779b1, BX
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHLQ  $0x08, R9
+	IMULQ R8, R9
+	SHRQ  $0x30, R9
+	SHLQ  $0x20, R10
+	IMULQ BX, R10
+	SHRQ  $0x32, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  262168(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	MOVL  CX, 262168(SP)(R10*4)
+	MOVQ  (DX)(BX*1), R9
+	MOVQ  (DX)(DI*1), R10
+	CMPQ  R9, SI
 	JEQ   candidate_match_encodeSnappyBetterBlockAsm64K
-	CMPL  (DX)(R8*1), DI
-	JEQ   candidateS_match_encodeSnappyBetterBlockAsm64K
-	MOVL  20(SP), CX
-	JMP   search_loop_encodeSnappyBetterBlockAsm64K
+	CMPQ  R10, SI
+	JNE   no_short_found_encodeSnappyBetterBlockAsm64K
+	MOVL  DI, BX
+	JMP   candidate_match_encodeSnappyBetterBlockAsm64K
+
+no_short_found_encodeSnappyBetterBlockAsm64K:
+	CMPL R9, SI
+	JEQ  candidate_match_encodeSnappyBetterBlockAsm64K
+	CMPL R10, SI
+	JEQ  candidateS_match_encodeSnappyBetterBlockAsm64K
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeSnappyBetterBlockAsm64K
 
 candidateS_match_encodeSnappyBetterBlockAsm64K:
-	SHRQ  $0x08, DI
-	MOVQ  DI, R10
-	SHLQ  $0x08, R10
-	IMULQ R9, R10
-	SHRQ  $0x30, R10
-	MOVL  24(SP)(R10*4), SI
+	SHRQ  $0x08, SI
+	MOVQ  SI, R9
+	SHLQ  $0x08, R9
+	IMULQ R8, R9
+	SHRQ  $0x30, R9
+	MOVL  24(SP)(R9*4), BX
 	INCL  CX
-	MOVL  CX, 24(SP)(R10*4)
-	CMPL  (DX)(SI*1), DI
+	MOVL  CX, 24(SP)(R9*4)
+	CMPL  (DX)(BX*1), SI
 	JEQ   candidate_match_encodeSnappyBetterBlockAsm64K
 	DECL  CX
-	MOVL  R8, SI
+	MOVL  DI, BX
 
 candidate_match_encodeSnappyBetterBlockAsm64K:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeSnappyBetterBlockAsm64K
 
 match_extend_back_loop_encodeSnappyBetterBlockAsm64K:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeSnappyBetterBlockAsm64K
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeSnappyBetterBlockAsm64K
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeSnappyBetterBlockAsm64K
 	JMP  match_extend_back_loop_encodeSnappyBetterBlockAsm64K
 
 match_extend_back_end_encodeSnappyBetterBlockAsm64K:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeSnappyBetterBlockAsm64K
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeSnappyBetterBlockAsm64K:
-	MOVL CX, DI
+	MOVL CX, SI
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), R10
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), R9
 
 	// matchLen
-	XORL R12, R12
-	CMPL R8, $0x08
+	XORL R11, R11
+	CMPL DI, $0x08
 	JL   matchlen_match4_match_nolit_encodeSnappyBetterBlockAsm64K
 
 matchlen_loopback_match_nolit_encodeSnappyBetterBlockAsm64K:
-	MOVQ  (R9)(R12*1), R11
-	XORQ  (R10)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R8)(R11*1), R10
+	XORQ  (R9)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_match_nolit_encodeSnappyBetterBlockAsm64K
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  match_nolit_end_encodeSnappyBetterBlockAsm64K
 
 matchlen_loop_match_nolit_encodeSnappyBetterBlockAsm64K:
-	LEAL -8(R8), R8
-	LEAL 8(R12), R12
-	CMPL R8, $0x08
+	LEAL -8(DI), DI
+	LEAL 8(R11), R11
+	CMPL DI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeSnappyBetterBlockAsm64K
 	JZ   match_nolit_end_encodeSnappyBetterBlockAsm64K
 
 matchlen_match4_match_nolit_encodeSnappyBetterBlockAsm64K:
-	CMPL R8, $0x04
+	CMPL DI, $0x04
 	JL   matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm64K
-	MOVL (R9)(R12*1), R11
-	CMPL (R10)(R12*1), R11
+	MOVL (R8)(R11*1), R10
+	CMPL (R9)(R11*1), R10
 	JNE  matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm64K
-	SUBL $0x04, R8
-	LEAL 4(R12), R12
+	SUBL $0x04, DI
+	LEAL 4(R11), R11
 
 matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm64K:
-	CMPL R8, $0x02
+	CMPL DI, $0x02
 	JL   matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm64K
-	MOVW (R9)(R12*1), R11
-	CMPW (R10)(R12*1), R11
+	MOVW (R8)(R11*1), R10
+	CMPW (R9)(R11*1), R10
 	JNE  matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm64K
-	SUBL $0x02, R8
-	LEAL 2(R12), R12
+	SUBL $0x02, DI
+	LEAL 2(R11), R11
 
 matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm64K:
-	CMPL R8, $0x01
+	CMPL DI, $0x01
 	JL   match_nolit_end_encodeSnappyBetterBlockAsm64K
-	MOVB (R9)(R12*1), R11
-	CMPB (R10)(R12*1), R11
+	MOVB (R8)(R11*1), R10
+	CMPB (R9)(R11*1), R10
 	JNE  match_nolit_end_encodeSnappyBetterBlockAsm64K
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 match_nolit_end_encodeSnappyBetterBlockAsm64K:
-	MOVL CX, R8
-	SUBL SI, R8
+	MOVL CX, DI
+	SUBL BX, DI
 
 	// Check if repeat
-	MOVL R8, 16(SP)
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL DI, 16(SP)
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_encodeSnappyBetterBlockAsm64K
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_encodeSnappyBetterBlockAsm64K
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_encodeSnappyBetterBlockAsm64K
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm64K
 
 two_bytes_match_emit_encodeSnappyBetterBlockAsm64K:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_encodeSnappyBetterBlockAsm64K
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm64K
 
 one_byte_match_emit_encodeSnappyBetterBlockAsm64K:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeSnappyBetterBlockAsm64K:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm64K_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm64K_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm64K_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm64K_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm64K_memmove_move_8:
-	MOVQ (R10), R11
-	MOVQ R11, (AX)
+	MOVQ (R9), R10
+	MOVQ R10, (AX)
 	JMP  memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm64K
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm64K_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm64K
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm64K_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm64K
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm64K_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm64K:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_encodeSnappyBetterBlockAsm64K
 
 memmove_long_match_emit_encodeSnappyBetterBlockAsm64K:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm64Klarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm64Klarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm64Klarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm64Klarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm64Klarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_encodeSnappyBetterBlockAsm64K:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitCopy
 two_byte_offset_match_nolit_encodeSnappyBetterBlockAsm64K:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeSnappyBetterBlockAsm64K
 	MOVB $0xee, (AX)
-	MOVW R8, 1(AX)
-	LEAL -60(R12), R12
+	MOVW DI, 1(AX)
+	LEAL -60(R11), R11
 	ADDQ $0x03, AX
 	JMP  two_byte_offset_match_nolit_encodeSnappyBetterBlockAsm64K
 
 two_byte_offset_short_match_nolit_encodeSnappyBetterBlockAsm64K:
-	CMPL R12, $0x0c
+	MOVL R11, BX
+	SHLL $0x02, BX
+	CMPL R11, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm64K
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm64K
-	MOVB $0x01, BL
-	LEAL -16(BX)(R12*4), R12
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	LEAL -15(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm64K
 
 emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm64K:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R12*4), R12
-	MOVB R12, (AX)
-	MOVW R8, 1(AX)
+	LEAL -2(BX), BX
+	MOVB BL, (AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm64K:
@@ -15246,54 +15244,51 @@ match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm64K:
 	RET
 
 match_nolit_dst_ok_encodeSnappyBetterBlockAsm64K:
-	MOVQ  $0x00cf1bbcdcbfa563, SI
-	MOVQ  $0x9e3779b1, R8
-	INCL  DI
-	MOVQ  (DX)(DI*1), R9
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	MOVQ  R9, R12
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	SHRQ  $0x10, R12
-	LEAL  1(DI), R14
-	LEAL  2(DI), R15
-	MOVQ  -2(DX)(CX*1), R9
-	SHLQ  $0x08, R10
-	IMULQ SI, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x08, R13
-	IMULQ SI, R13
-	SHRQ  $0x30, R13
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x32, R11
+	MOVQ  $0x00cf1bbcdcbfa563, BX
+	MOVQ  $0x9e3779b1, DI
+	LEAQ  1(SI), SI
+	LEAQ  -2(CX), R8
+	MOVQ  (DX)(SI*1), R9
+	MOVQ  1(DX)(SI*1), R10
+	MOVQ  (DX)(R8*1), R11
+	MOVQ  1(DX)(R8*1), R12
+	SHLQ  $0x08, R9
+	IMULQ BX, R9
+	SHRQ  $0x30, R9
+	SHLQ  $0x20, R10
+	IMULQ DI, R10
+	SHRQ  $0x32, R10
+	SHLQ  $0x08, R11
+	IMULQ BX, R11
+	SHRQ  $0x30, R11
 	SHLQ  $0x20, R12
-	IMULQ R8, R12
+	IMULQ DI, R12
 	SHRQ  $0x32, R12
-	MOVL  DI, 24(SP)(R10*4)
-	MOVL  R14, 24(SP)(R13*4)
-	MOVL  R14, 262168(SP)(R11*4)
-	MOVL  R15, 262168(SP)(R12*4)
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	LEAL  -2(CX), R9
-	LEAL  -1(CX), DI
-	SHLQ  $0x08, R10
-	IMULQ SI, R10
-	SHRQ  $0x30, R10
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x32, R11
-	SHLQ  $0x08, R13
-	IMULQ SI, R13
-	SHRQ  $0x30, R13
-	MOVL  R9, 24(SP)(R10*4)
-	MOVL  DI, 262168(SP)(R11*4)
-	MOVL  DI, 24(SP)(R13*4)
-	JMP   search_loop_encodeSnappyBetterBlockAsm64K
+	LEAQ  1(SI), DI
+	LEAQ  1(R8), R13
+	MOVL  SI, 24(SP)(R9*4)
+	MOVL  R8, 24(SP)(R11*4)
+	MOVL  DI, 262168(SP)(R10*4)
+	MOVL  R13, 262168(SP)(R12*4)
+	ADDQ  $0x01, SI
+	SUBQ  $0x01, R8
+
+index_loop_encodeSnappyBetterBlockAsm64K:
+	CMPQ  SI, R8
+	JAE   search_loop_encodeSnappyBetterBlockAsm64K
+	MOVQ  (DX)(SI*1), DI
+	MOVQ  (DX)(R8*1), R9
+	SHLQ  $0x08, DI
+	IMULQ BX, DI
+	SHRQ  $0x30, DI
+	SHLQ  $0x08, R9
+	IMULQ BX, R9
+	SHRQ  $0x30, R9
+	MOVL  SI, 24(SP)(DI*4)
+	MOVL  R8, 24(SP)(R9*4)
+	ADDQ  $0x02, SI
+	SUBQ  $0x02, R8
+	JMP   index_loop_encodeSnappyBetterBlockAsm64K
 
 emit_remainder_encodeSnappyBetterBlockAsm64K:
 	MOVQ src_len+32(FP), CX
@@ -15475,8 +15470,8 @@ zero_loop_encodeSnappyBetterBlockAsm12B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -15486,299 +15481,309 @@ zero_loop_encodeSnappyBetterBlockAsm12B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeSnappyBetterBlockAsm12B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x06, SI
-	LEAL  1(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x06, BX
+	LEAL  1(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeSnappyBetterBlockAsm12B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  $0x9e3779b1, SI
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x32, R10
-	SHLQ  $0x20, R11
-	IMULQ SI, R11
-	SHRQ  $0x34, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  65560(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	MOVL  CX, 65560(SP)(R11*4)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  $0x9e3779b1, BX
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
+	SHLQ  $0x20, R10
+	IMULQ BX, R10
+	SHRQ  $0x34, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  65560(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	MOVL  CX, 65560(SP)(R10*4)
+	MOVQ  (DX)(BX*1), R9
+	MOVQ  (DX)(DI*1), R10
+	CMPQ  R9, SI
 	JEQ   candidate_match_encodeSnappyBetterBlockAsm12B
-	CMPL  (DX)(R8*1), DI
-	JEQ   candidateS_match_encodeSnappyBetterBlockAsm12B
-	MOVL  20(SP), CX
-	JMP   search_loop_encodeSnappyBetterBlockAsm12B
+	CMPQ  R10, SI
+	JNE   no_short_found_encodeSnappyBetterBlockAsm12B
+	MOVL  DI, BX
+	JMP   candidate_match_encodeSnappyBetterBlockAsm12B
+
+no_short_found_encodeSnappyBetterBlockAsm12B:
+	CMPL R9, SI
+	JEQ  candidate_match_encodeSnappyBetterBlockAsm12B
+	CMPL R10, SI
+	JEQ  candidateS_match_encodeSnappyBetterBlockAsm12B
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeSnappyBetterBlockAsm12B
 
 candidateS_match_encodeSnappyBetterBlockAsm12B:
-	SHRQ  $0x08, DI
-	MOVQ  DI, R10
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x32, R10
-	MOVL  24(SP)(R10*4), SI
+	SHRQ  $0x08, SI
+	MOVQ  SI, R9
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x32, R9
+	MOVL  24(SP)(R9*4), BX
 	INCL  CX
-	MOVL  CX, 24(SP)(R10*4)
-	CMPL  (DX)(SI*1), DI
+	MOVL  CX, 24(SP)(R9*4)
+	CMPL  (DX)(BX*1), SI
 	JEQ   candidate_match_encodeSnappyBetterBlockAsm12B
 	DECL  CX
-	MOVL  R8, SI
+	MOVL  DI, BX
 
 candidate_match_encodeSnappyBetterBlockAsm12B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeSnappyBetterBlockAsm12B
 
 match_extend_back_loop_encodeSnappyBetterBlockAsm12B:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeSnappyBetterBlockAsm12B
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeSnappyBetterBlockAsm12B
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeSnappyBetterBlockAsm12B
 	JMP  match_extend_back_loop_encodeSnappyBetterBlockAsm12B
 
 match_extend_back_end_encodeSnappyBetterBlockAsm12B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeSnappyBetterBlockAsm12B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeSnappyBetterBlockAsm12B:
-	MOVL CX, DI
+	MOVL CX, SI
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), R10
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), R9
 
 	// matchLen
-	XORL R12, R12
-	CMPL R8, $0x08
+	XORL R11, R11
+	CMPL DI, $0x08
 	JL   matchlen_match4_match_nolit_encodeSnappyBetterBlockAsm12B
 
 matchlen_loopback_match_nolit_encodeSnappyBetterBlockAsm12B:
-	MOVQ  (R9)(R12*1), R11
-	XORQ  (R10)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R8)(R11*1), R10
+	XORQ  (R9)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_match_nolit_encodeSnappyBetterBlockAsm12B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  match_nolit_end_encodeSnappyBetterBlockAsm12B
 
 matchlen_loop_match_nolit_encodeSnappyBetterBlockAsm12B:
-	LEAL -8(R8), R8
-	LEAL 8(R12), R12
-	CMPL R8, $0x08
+	LEAL -8(DI), DI
+	LEAL 8(R11), R11
+	CMPL DI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeSnappyBetterBlockAsm12B
 	JZ   match_nolit_end_encodeSnappyBetterBlockAsm12B
 
 matchlen_match4_match_nolit_encodeSnappyBetterBlockAsm12B:
-	CMPL R8, $0x04
+	CMPL DI, $0x04
 	JL   matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm12B
-	MOVL (R9)(R12*1), R11
-	CMPL (R10)(R12*1), R11
+	MOVL (R8)(R11*1), R10
+	CMPL (R9)(R11*1), R10
 	JNE  matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm12B
-	SUBL $0x04, R8
-	LEAL 4(R12), R12
+	SUBL $0x04, DI
+	LEAL 4(R11), R11
 
 matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm12B:
-	CMPL R8, $0x02
+	CMPL DI, $0x02
 	JL   matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm12B
-	MOVW (R9)(R12*1), R11
-	CMPW (R10)(R12*1), R11
+	MOVW (R8)(R11*1), R10
+	CMPW (R9)(R11*1), R10
 	JNE  matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm12B
-	SUBL $0x02, R8
-	LEAL 2(R12), R12
+	SUBL $0x02, DI
+	LEAL 2(R11), R11
 
 matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm12B:
-	CMPL R8, $0x01
+	CMPL DI, $0x01
 	JL   match_nolit_end_encodeSnappyBetterBlockAsm12B
-	MOVB (R9)(R12*1), R11
-	CMPB (R10)(R12*1), R11
+	MOVB (R8)(R11*1), R10
+	CMPB (R9)(R11*1), R10
 	JNE  match_nolit_end_encodeSnappyBetterBlockAsm12B
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 match_nolit_end_encodeSnappyBetterBlockAsm12B:
-	MOVL CX, R8
-	SUBL SI, R8
+	MOVL CX, DI
+	SUBL BX, DI
 
 	// Check if repeat
-	MOVL R8, 16(SP)
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL DI, 16(SP)
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_encodeSnappyBetterBlockAsm12B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_encodeSnappyBetterBlockAsm12B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_encodeSnappyBetterBlockAsm12B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm12B
 
 two_bytes_match_emit_encodeSnappyBetterBlockAsm12B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_encodeSnappyBetterBlockAsm12B
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm12B
 
 one_byte_match_emit_encodeSnappyBetterBlockAsm12B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeSnappyBetterBlockAsm12B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm12B_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm12B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm12B_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm12B_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm12B_memmove_move_8:
-	MOVQ (R10), R11
-	MOVQ R11, (AX)
+	MOVQ (R9), R10
+	MOVQ R10, (AX)
 	JMP  memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm12B
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm12B_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm12B
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm12B_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm12B
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm12B_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm12B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_encodeSnappyBetterBlockAsm12B
 
 memmove_long_match_emit_encodeSnappyBetterBlockAsm12B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm12Blarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm12Blarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm12Blarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm12Blarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm12Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_encodeSnappyBetterBlockAsm12B:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitCopy
 two_byte_offset_match_nolit_encodeSnappyBetterBlockAsm12B:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeSnappyBetterBlockAsm12B
 	MOVB $0xee, (AX)
-	MOVW R8, 1(AX)
-	LEAL -60(R12), R12
+	MOVW DI, 1(AX)
+	LEAL -60(R11), R11
 	ADDQ $0x03, AX
 	JMP  two_byte_offset_match_nolit_encodeSnappyBetterBlockAsm12B
 
 two_byte_offset_short_match_nolit_encodeSnappyBetterBlockAsm12B:
-	CMPL R12, $0x0c
+	MOVL R11, BX
+	SHLL $0x02, BX
+	CMPL R11, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm12B
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm12B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R12*4), R12
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	LEAL -15(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm12B
 
 emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm12B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R12*4), R12
-	MOVB R12, (AX)
-	MOVW R8, 1(AX)
+	LEAL -2(BX), BX
+	MOVB BL, (AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm12B:
@@ -15790,54 +15795,51 @@ match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm12B:
 	RET
 
 match_nolit_dst_ok_encodeSnappyBetterBlockAsm12B:
-	MOVQ  $0x0000cf1bbcdcbf9b, SI
-	MOVQ  $0x9e3779b1, R8
-	INCL  DI
-	MOVQ  (DX)(DI*1), R9
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	MOVQ  R9, R12
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	SHRQ  $0x10, R12
-	LEAL  1(DI), R14
-	LEAL  2(DI), R15
-	MOVQ  -2(DX)(CX*1), R9
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x32, R10
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x32, R13
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x34, R11
+	MOVQ  $0x0000cf1bbcdcbf9b, BX
+	MOVQ  $0x9e3779b1, DI
+	LEAQ  1(SI), SI
+	LEAQ  -2(CX), R8
+	MOVQ  (DX)(SI*1), R9
+	MOVQ  1(DX)(SI*1), R10
+	MOVQ  (DX)(R8*1), R11
+	MOVQ  1(DX)(R8*1), R12
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x32, R9
+	SHLQ  $0x20, R10
+	IMULQ DI, R10
+	SHRQ  $0x34, R10
+	SHLQ  $0x10, R11
+	IMULQ BX, R11
+	SHRQ  $0x32, R11
 	SHLQ  $0x20, R12
-	IMULQ R8, R12
+	IMULQ DI, R12
 	SHRQ  $0x34, R12
-	MOVL  DI, 24(SP)(R10*4)
-	MOVL  R14, 24(SP)(R13*4)
-	MOVL  R14, 65560(SP)(R11*4)
-	MOVL  R15, 65560(SP)(R12*4)
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	LEAL  -2(CX), R9
-	LEAL  -1(CX), DI
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x32, R10
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x34, R11
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x32, R13
-	MOVL  R9, 24(SP)(R10*4)
-	MOVL  DI, 65560(SP)(R11*4)
-	MOVL  DI, 24(SP)(R13*4)
-	JMP   search_loop_encodeSnappyBetterBlockAsm12B
+	LEAQ  1(SI), DI
+	LEAQ  1(R8), R13
+	MOVL  SI, 24(SP)(R9*4)
+	MOVL  R8, 24(SP)(R11*4)
+	MOVL  DI, 65560(SP)(R10*4)
+	MOVL  R13, 65560(SP)(R12*4)
+	ADDQ  $0x01, SI
+	SUBQ  $0x01, R8
+
+index_loop_encodeSnappyBetterBlockAsm12B:
+	CMPQ  SI, R8
+	JAE   search_loop_encodeSnappyBetterBlockAsm12B
+	MOVQ  (DX)(SI*1), DI
+	MOVQ  (DX)(R8*1), R9
+	SHLQ  $0x10, DI
+	IMULQ BX, DI
+	SHRQ  $0x32, DI
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x32, R9
+	MOVL  SI, 24(SP)(DI*4)
+	MOVL  R8, 24(SP)(R9*4)
+	ADDQ  $0x02, SI
+	SUBQ  $0x02, R8
+	JMP   index_loop_encodeSnappyBetterBlockAsm12B
 
 emit_remainder_encodeSnappyBetterBlockAsm12B:
 	MOVQ src_len+32(FP), CX
@@ -16019,8 +16021,8 @@ zero_loop_encodeSnappyBetterBlockAsm10B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -16030,299 +16032,309 @@ zero_loop_encodeSnappyBetterBlockAsm10B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeSnappyBetterBlockAsm10B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x05, SI
-	LEAL  1(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x05, BX
+	LEAL  1(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeSnappyBetterBlockAsm10B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  $0x9e3779b1, SI
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x34, R10
-	SHLQ  $0x20, R11
-	IMULQ SI, R11
-	SHRQ  $0x36, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  16408(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	MOVL  CX, 16408(SP)(R11*4)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  $0x9e3779b1, BX
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x34, R9
+	SHLQ  $0x20, R10
+	IMULQ BX, R10
+	SHRQ  $0x36, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  16408(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	MOVL  CX, 16408(SP)(R10*4)
+	MOVQ  (DX)(BX*1), R9
+	MOVQ  (DX)(DI*1), R10
+	CMPQ  R9, SI
 	JEQ   candidate_match_encodeSnappyBetterBlockAsm10B
-	CMPL  (DX)(R8*1), DI
-	JEQ   candidateS_match_encodeSnappyBetterBlockAsm10B
-	MOVL  20(SP), CX
-	JMP   search_loop_encodeSnappyBetterBlockAsm10B
+	CMPQ  R10, SI
+	JNE   no_short_found_encodeSnappyBetterBlockAsm10B
+	MOVL  DI, BX
+	JMP   candidate_match_encodeSnappyBetterBlockAsm10B
+
+no_short_found_encodeSnappyBetterBlockAsm10B:
+	CMPL R9, SI
+	JEQ  candidate_match_encodeSnappyBetterBlockAsm10B
+	CMPL R10, SI
+	JEQ  candidateS_match_encodeSnappyBetterBlockAsm10B
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeSnappyBetterBlockAsm10B
 
 candidateS_match_encodeSnappyBetterBlockAsm10B:
-	SHRQ  $0x08, DI
-	MOVQ  DI, R10
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x34, R10
-	MOVL  24(SP)(R10*4), SI
+	SHRQ  $0x08, SI
+	MOVQ  SI, R9
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x34, R9
+	MOVL  24(SP)(R9*4), BX
 	INCL  CX
-	MOVL  CX, 24(SP)(R10*4)
-	CMPL  (DX)(SI*1), DI
+	MOVL  CX, 24(SP)(R9*4)
+	CMPL  (DX)(BX*1), SI
 	JEQ   candidate_match_encodeSnappyBetterBlockAsm10B
 	DECL  CX
-	MOVL  R8, SI
+	MOVL  DI, BX
 
 candidate_match_encodeSnappyBetterBlockAsm10B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeSnappyBetterBlockAsm10B
 
 match_extend_back_loop_encodeSnappyBetterBlockAsm10B:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeSnappyBetterBlockAsm10B
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeSnappyBetterBlockAsm10B
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeSnappyBetterBlockAsm10B
 	JMP  match_extend_back_loop_encodeSnappyBetterBlockAsm10B
 
 match_extend_back_end_encodeSnappyBetterBlockAsm10B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeSnappyBetterBlockAsm10B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeSnappyBetterBlockAsm10B:
-	MOVL CX, DI
+	MOVL CX, SI
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), R10
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), R9
 
 	// matchLen
-	XORL R12, R12
-	CMPL R8, $0x08
+	XORL R11, R11
+	CMPL DI, $0x08
 	JL   matchlen_match4_match_nolit_encodeSnappyBetterBlockAsm10B
 
 matchlen_loopback_match_nolit_encodeSnappyBetterBlockAsm10B:
-	MOVQ  (R9)(R12*1), R11
-	XORQ  (R10)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R8)(R11*1), R10
+	XORQ  (R9)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_match_nolit_encodeSnappyBetterBlockAsm10B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  match_nolit_end_encodeSnappyBetterBlockAsm10B
 
 matchlen_loop_match_nolit_encodeSnappyBetterBlockAsm10B:
-	LEAL -8(R8), R8
-	LEAL 8(R12), R12
-	CMPL R8, $0x08
+	LEAL -8(DI), DI
+	LEAL 8(R11), R11
+	CMPL DI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeSnappyBetterBlockAsm10B
 	JZ   match_nolit_end_encodeSnappyBetterBlockAsm10B
 
 matchlen_match4_match_nolit_encodeSnappyBetterBlockAsm10B:
-	CMPL R8, $0x04
+	CMPL DI, $0x04
 	JL   matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm10B
-	MOVL (R9)(R12*1), R11
-	CMPL (R10)(R12*1), R11
+	MOVL (R8)(R11*1), R10
+	CMPL (R9)(R11*1), R10
 	JNE  matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm10B
-	SUBL $0x04, R8
-	LEAL 4(R12), R12
+	SUBL $0x04, DI
+	LEAL 4(R11), R11
 
 matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm10B:
-	CMPL R8, $0x02
+	CMPL DI, $0x02
 	JL   matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm10B
-	MOVW (R9)(R12*1), R11
-	CMPW (R10)(R12*1), R11
+	MOVW (R8)(R11*1), R10
+	CMPW (R9)(R11*1), R10
 	JNE  matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm10B
-	SUBL $0x02, R8
-	LEAL 2(R12), R12
+	SUBL $0x02, DI
+	LEAL 2(R11), R11
 
 matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm10B:
-	CMPL R8, $0x01
+	CMPL DI, $0x01
 	JL   match_nolit_end_encodeSnappyBetterBlockAsm10B
-	MOVB (R9)(R12*1), R11
-	CMPB (R10)(R12*1), R11
+	MOVB (R8)(R11*1), R10
+	CMPB (R9)(R11*1), R10
 	JNE  match_nolit_end_encodeSnappyBetterBlockAsm10B
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 match_nolit_end_encodeSnappyBetterBlockAsm10B:
-	MOVL CX, R8
-	SUBL SI, R8
+	MOVL CX, DI
+	SUBL BX, DI
 
 	// Check if repeat
-	MOVL R8, 16(SP)
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL DI, 16(SP)
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_encodeSnappyBetterBlockAsm10B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_encodeSnappyBetterBlockAsm10B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_encodeSnappyBetterBlockAsm10B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm10B
 
 two_bytes_match_emit_encodeSnappyBetterBlockAsm10B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_encodeSnappyBetterBlockAsm10B
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm10B
 
 one_byte_match_emit_encodeSnappyBetterBlockAsm10B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeSnappyBetterBlockAsm10B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm10B_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm10B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm10B_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm10B_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm10B_memmove_move_8:
-	MOVQ (R10), R11
-	MOVQ R11, (AX)
+	MOVQ (R9), R10
+	MOVQ R10, (AX)
 	JMP  memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm10B
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm10B_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm10B
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm10B_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm10B
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm10B_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm10B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_encodeSnappyBetterBlockAsm10B
 
 memmove_long_match_emit_encodeSnappyBetterBlockAsm10B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm10Blarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm10Blarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm10Blarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm10Blarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm10Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_encodeSnappyBetterBlockAsm10B:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitCopy
 two_byte_offset_match_nolit_encodeSnappyBetterBlockAsm10B:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeSnappyBetterBlockAsm10B
 	MOVB $0xee, (AX)
-	MOVW R8, 1(AX)
-	LEAL -60(R12), R12
+	MOVW DI, 1(AX)
+	LEAL -60(R11), R11
 	ADDQ $0x03, AX
 	JMP  two_byte_offset_match_nolit_encodeSnappyBetterBlockAsm10B
 
 two_byte_offset_short_match_nolit_encodeSnappyBetterBlockAsm10B:
-	CMPL R12, $0x0c
+	MOVL R11, BX
+	SHLL $0x02, BX
+	CMPL R11, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm10B
-	CMPL R8, $0x00000800
+	CMPL DI, $0x00000800
 	JGE  emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm10B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R12*4), R12
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	LEAL -15(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm10B
 
 emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm10B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R12*4), R12
-	MOVB R12, (AX)
-	MOVW R8, 1(AX)
+	LEAL -2(BX), BX
+	MOVB BL, (AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm10B:
@@ -16334,54 +16346,51 @@ match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm10B:
 	RET
 
 match_nolit_dst_ok_encodeSnappyBetterBlockAsm10B:
-	MOVQ  $0x0000cf1bbcdcbf9b, SI
-	MOVQ  $0x9e3779b1, R8
-	INCL  DI
-	MOVQ  (DX)(DI*1), R9
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	MOVQ  R9, R12
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	SHRQ  $0x10, R12
-	LEAL  1(DI), R14
-	LEAL  2(DI), R15
-	MOVQ  -2(DX)(CX*1), R9
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x34, R10
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x34, R13
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x36, R11
+	MOVQ  $0x0000cf1bbcdcbf9b, BX
+	MOVQ  $0x9e3779b1, DI
+	LEAQ  1(SI), SI
+	LEAQ  -2(CX), R8
+	MOVQ  (DX)(SI*1), R9
+	MOVQ  1(DX)(SI*1), R10
+	MOVQ  (DX)(R8*1), R11
+	MOVQ  1(DX)(R8*1), R12
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x34, R9
+	SHLQ  $0x20, R10
+	IMULQ DI, R10
+	SHRQ  $0x36, R10
+	SHLQ  $0x10, R11
+	IMULQ BX, R11
+	SHRQ  $0x34, R11
 	SHLQ  $0x20, R12
-	IMULQ R8, R12
+	IMULQ DI, R12
 	SHRQ  $0x36, R12
-	MOVL  DI, 24(SP)(R10*4)
-	MOVL  R14, 24(SP)(R13*4)
-	MOVL  R14, 16408(SP)(R11*4)
-	MOVL  R15, 16408(SP)(R12*4)
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	LEAL  -2(CX), R9
-	LEAL  -1(CX), DI
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x34, R10
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x36, R11
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x34, R13
-	MOVL  R9, 24(SP)(R10*4)
-	MOVL  DI, 16408(SP)(R11*4)
-	MOVL  DI, 24(SP)(R13*4)
-	JMP   search_loop_encodeSnappyBetterBlockAsm10B
+	LEAQ  1(SI), DI
+	LEAQ  1(R8), R13
+	MOVL  SI, 24(SP)(R9*4)
+	MOVL  R8, 24(SP)(R11*4)
+	MOVL  DI, 16408(SP)(R10*4)
+	MOVL  R13, 16408(SP)(R12*4)
+	ADDQ  $0x01, SI
+	SUBQ  $0x01, R8
+
+index_loop_encodeSnappyBetterBlockAsm10B:
+	CMPQ  SI, R8
+	JAE   search_loop_encodeSnappyBetterBlockAsm10B
+	MOVQ  (DX)(SI*1), DI
+	MOVQ  (DX)(R8*1), R9
+	SHLQ  $0x10, DI
+	IMULQ BX, DI
+	SHRQ  $0x34, DI
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x34, R9
+	MOVL  SI, 24(SP)(DI*4)
+	MOVL  R8, 24(SP)(R9*4)
+	ADDQ  $0x02, SI
+	SUBQ  $0x02, R8
+	JMP   index_loop_encodeSnappyBetterBlockAsm10B
 
 emit_remainder_encodeSnappyBetterBlockAsm10B:
 	MOVQ src_len+32(FP), CX
@@ -16563,8 +16572,8 @@ zero_loop_encodeSnappyBetterBlockAsm8B:
 	MOVL  $0x00000000, 12(SP)
 	MOVQ  src_len+32(FP), CX
 	LEAQ  -9(CX), DX
-	LEAQ  -8(CX), SI
-	MOVL  SI, 8(SP)
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
 	SHRQ  $0x05, CX
 	SUBL  CX, DX
 	LEAQ  (AX)(DX*1), DX
@@ -16574,297 +16583,307 @@ zero_loop_encodeSnappyBetterBlockAsm8B:
 	MOVQ  src_base+24(FP), DX
 
 search_loop_encodeSnappyBetterBlockAsm8B:
-	MOVL  CX, SI
-	SUBL  12(SP), SI
-	SHRL  $0x04, SI
-	LEAL  1(CX)(SI*1), SI
-	CMPL  SI, 8(SP)
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x04, BX
+	LEAL  1(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
 	JGE   emit_remainder_encodeSnappyBetterBlockAsm8B
-	MOVQ  (DX)(CX*1), DI
-	MOVL  SI, 20(SP)
-	MOVQ  $0x0000cf1bbcdcbf9b, R9
-	MOVQ  $0x9e3779b1, SI
-	MOVQ  DI, R10
-	MOVQ  DI, R11
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x36, R10
-	SHLQ  $0x20, R11
-	IMULQ SI, R11
-	SHRQ  $0x38, R11
-	MOVL  24(SP)(R10*4), SI
-	MOVL  4120(SP)(R11*4), R8
-	MOVL  CX, 24(SP)(R10*4)
-	MOVL  CX, 4120(SP)(R11*4)
-	CMPL  (DX)(SI*1), DI
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  $0x9e3779b1, BX
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x36, R9
+	SHLQ  $0x20, R10
+	IMULQ BX, R10
+	SHRQ  $0x38, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  4120(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	MOVL  CX, 4120(SP)(R10*4)
+	MOVQ  (DX)(BX*1), R9
+	MOVQ  (DX)(DI*1), R10
+	CMPQ  R9, SI
 	JEQ   candidate_match_encodeSnappyBetterBlockAsm8B
-	CMPL  (DX)(R8*1), DI
-	JEQ   candidateS_match_encodeSnappyBetterBlockAsm8B
-	MOVL  20(SP), CX
-	JMP   search_loop_encodeSnappyBetterBlockAsm8B
+	CMPQ  R10, SI
+	JNE   no_short_found_encodeSnappyBetterBlockAsm8B
+	MOVL  DI, BX
+	JMP   candidate_match_encodeSnappyBetterBlockAsm8B
+
+no_short_found_encodeSnappyBetterBlockAsm8B:
+	CMPL R9, SI
+	JEQ  candidate_match_encodeSnappyBetterBlockAsm8B
+	CMPL R10, SI
+	JEQ  candidateS_match_encodeSnappyBetterBlockAsm8B
+	MOVL 20(SP), CX
+	JMP  search_loop_encodeSnappyBetterBlockAsm8B
 
 candidateS_match_encodeSnappyBetterBlockAsm8B:
-	SHRQ  $0x08, DI
-	MOVQ  DI, R10
-	SHLQ  $0x10, R10
-	IMULQ R9, R10
-	SHRQ  $0x36, R10
-	MOVL  24(SP)(R10*4), SI
+	SHRQ  $0x08, SI
+	MOVQ  SI, R9
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x36, R9
+	MOVL  24(SP)(R9*4), BX
 	INCL  CX
-	MOVL  CX, 24(SP)(R10*4)
-	CMPL  (DX)(SI*1), DI
+	MOVL  CX, 24(SP)(R9*4)
+	CMPL  (DX)(BX*1), SI
 	JEQ   candidate_match_encodeSnappyBetterBlockAsm8B
 	DECL  CX
-	MOVL  R8, SI
+	MOVL  DI, BX
 
 candidate_match_encodeSnappyBetterBlockAsm8B:
-	MOVL  12(SP), DI
-	TESTL SI, SI
+	MOVL  12(SP), SI
+	TESTL BX, BX
 	JZ    match_extend_back_end_encodeSnappyBetterBlockAsm8B
 
 match_extend_back_loop_encodeSnappyBetterBlockAsm8B:
-	CMPL CX, DI
+	CMPL CX, SI
 	JLE  match_extend_back_end_encodeSnappyBetterBlockAsm8B
-	MOVB -1(DX)(SI*1), BL
+	MOVB -1(DX)(BX*1), DI
 	MOVB -1(DX)(CX*1), R8
-	CMPB BL, R8
+	CMPB DI, R8
 	JNE  match_extend_back_end_encodeSnappyBetterBlockAsm8B
 	LEAL -1(CX), CX
-	DECL SI
+	DECL BX
 	JZ   match_extend_back_end_encodeSnappyBetterBlockAsm8B
 	JMP  match_extend_back_loop_encodeSnappyBetterBlockAsm8B
 
 match_extend_back_end_encodeSnappyBetterBlockAsm8B:
-	MOVL CX, DI
-	SUBL 12(SP), DI
-	LEAQ 3(AX)(DI*1), DI
-	CMPQ DI, (SP)
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
 	JL   match_dst_size_check_encodeSnappyBetterBlockAsm8B
 	MOVQ $0x00000000, ret+48(FP)
 	RET
 
 match_dst_size_check_encodeSnappyBetterBlockAsm8B:
-	MOVL CX, DI
+	MOVL CX, SI
 	ADDL $0x04, CX
-	ADDL $0x04, SI
-	MOVQ src_len+32(FP), R8
-	SUBL CX, R8
-	LEAQ (DX)(CX*1), R9
-	LEAQ (DX)(SI*1), R10
+	ADDL $0x04, BX
+	MOVQ src_len+32(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), R9
 
 	// matchLen
-	XORL R12, R12
-	CMPL R8, $0x08
+	XORL R11, R11
+	CMPL DI, $0x08
 	JL   matchlen_match4_match_nolit_encodeSnappyBetterBlockAsm8B
 
 matchlen_loopback_match_nolit_encodeSnappyBetterBlockAsm8B:
-	MOVQ  (R9)(R12*1), R11
-	XORQ  (R10)(R12*1), R11
-	TESTQ R11, R11
+	MOVQ  (R8)(R11*1), R10
+	XORQ  (R9)(R11*1), R10
+	TESTQ R10, R10
 	JZ    matchlen_loop_match_nolit_encodeSnappyBetterBlockAsm8B
 
 #ifdef GOAMD64_v3
-	TZCNTQ R11, R11
+	TZCNTQ R10, R10
 
 #else
-	BSFQ R11, R11
+	BSFQ R10, R10
 
 #endif
-	SARQ $0x03, R11
-	LEAL (R12)(R11*1), R12
+	SARQ $0x03, R10
+	LEAL (R11)(R10*1), R11
 	JMP  match_nolit_end_encodeSnappyBetterBlockAsm8B
 
 matchlen_loop_match_nolit_encodeSnappyBetterBlockAsm8B:
-	LEAL -8(R8), R8
-	LEAL 8(R12), R12
-	CMPL R8, $0x08
+	LEAL -8(DI), DI
+	LEAL 8(R11), R11
+	CMPL DI, $0x08
 	JGE  matchlen_loopback_match_nolit_encodeSnappyBetterBlockAsm8B
 	JZ   match_nolit_end_encodeSnappyBetterBlockAsm8B
 
 matchlen_match4_match_nolit_encodeSnappyBetterBlockAsm8B:
-	CMPL R8, $0x04
+	CMPL DI, $0x04
 	JL   matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm8B
-	MOVL (R9)(R12*1), R11
-	CMPL (R10)(R12*1), R11
+	MOVL (R8)(R11*1), R10
+	CMPL (R9)(R11*1), R10
 	JNE  matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm8B
-	SUBL $0x04, R8
-	LEAL 4(R12), R12
+	SUBL $0x04, DI
+	LEAL 4(R11), R11
 
 matchlen_match2_match_nolit_encodeSnappyBetterBlockAsm8B:
-	CMPL R8, $0x02
+	CMPL DI, $0x02
 	JL   matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm8B
-	MOVW (R9)(R12*1), R11
-	CMPW (R10)(R12*1), R11
+	MOVW (R8)(R11*1), R10
+	CMPW (R9)(R11*1), R10
 	JNE  matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm8B
-	SUBL $0x02, R8
-	LEAL 2(R12), R12
+	SUBL $0x02, DI
+	LEAL 2(R11), R11
 
 matchlen_match1_match_nolit_encodeSnappyBetterBlockAsm8B:
-	CMPL R8, $0x01
+	CMPL DI, $0x01
 	JL   match_nolit_end_encodeSnappyBetterBlockAsm8B
-	MOVB (R9)(R12*1), R11
-	CMPB (R10)(R12*1), R11
+	MOVB (R8)(R11*1), R10
+	CMPB (R9)(R11*1), R10
 	JNE  match_nolit_end_encodeSnappyBetterBlockAsm8B
-	LEAL 1(R12), R12
+	LEAL 1(R11), R11
 
 match_nolit_end_encodeSnappyBetterBlockAsm8B:
-	MOVL CX, R8
-	SUBL SI, R8
+	MOVL CX, DI
+	SUBL BX, DI
 
 	// Check if repeat
-	MOVL R8, 16(SP)
-	MOVL 12(SP), SI
-	CMPL SI, DI
+	MOVL DI, 16(SP)
+	MOVL 12(SP), BX
+	CMPL BX, SI
 	JEQ  emit_literal_done_match_emit_encodeSnappyBetterBlockAsm8B
-	MOVL DI, R9
-	MOVL DI, 12(SP)
-	LEAQ (DX)(SI*1), R10
-	SUBL SI, R9
-	LEAL -1(R9), SI
-	CMPL SI, $0x3c
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R9
+	SUBL BX, R8
+	LEAL -1(R8), BX
+	CMPL BX, $0x3c
 	JLT  one_byte_match_emit_encodeSnappyBetterBlockAsm8B
-	CMPL SI, $0x00000100
+	CMPL BX, $0x00000100
 	JLT  two_bytes_match_emit_encodeSnappyBetterBlockAsm8B
 	MOVB $0xf4, (AX)
-	MOVW SI, 1(AX)
+	MOVW BX, 1(AX)
 	ADDQ $0x03, AX
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm8B
 
 two_bytes_match_emit_encodeSnappyBetterBlockAsm8B:
 	MOVB $0xf0, (AX)
-	MOVB SI, 1(AX)
+	MOVB BL, 1(AX)
 	ADDQ $0x02, AX
-	CMPL SI, $0x40
+	CMPL BX, $0x40
 	JL   memmove_match_emit_encodeSnappyBetterBlockAsm8B
 	JMP  memmove_long_match_emit_encodeSnappyBetterBlockAsm8B
 
 one_byte_match_emit_encodeSnappyBetterBlockAsm8B:
-	SHLB $0x02, SI
-	MOVB SI, (AX)
+	SHLB $0x02, BL
+	MOVB BL, (AX)
 	ADDQ $0x01, AX
 
 memmove_match_emit_encodeSnappyBetterBlockAsm8B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveShort
-	CMPQ R9, $0x08
+	CMPQ R8, $0x08
 	JLE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm8B_memmove_move_8
-	CMPQ R9, $0x10
+	CMPQ R8, $0x10
 	JBE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm8B_memmove_move_8through16
-	CMPQ R9, $0x20
+	CMPQ R8, $0x20
 	JBE  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm8B_memmove_move_17through32
 	JMP  emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm8B_memmove_move_33through64
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm8B_memmove_move_8:
-	MOVQ (R10), R11
-	MOVQ R11, (AX)
+	MOVQ (R9), R10
+	MOVQ R10, (AX)
 	JMP  memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm8B
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm8B_memmove_move_8through16:
-	MOVQ (R10), R11
-	MOVQ -8(R10)(R9*1), R10
-	MOVQ R11, (AX)
-	MOVQ R10, -8(AX)(R9*1)
+	MOVQ (R9), R10
+	MOVQ -8(R9)(R8*1), R9
+	MOVQ R10, (AX)
+	MOVQ R9, -8(AX)(R8*1)
 	JMP  memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm8B
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm8B_memmove_move_17through32:
-	MOVOU (R10), X0
-	MOVOU -16(R10)(R9*1), X1
+	MOVOU (R9), X0
+	MOVOU -16(R9)(R8*1), X1
 	MOVOU X0, (AX)
-	MOVOU X1, -16(AX)(R9*1)
+	MOVOU X1, -16(AX)(R8*1)
 	JMP   memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm8B
 
 emit_lit_memmove_match_emit_encodeSnappyBetterBlockAsm8B_memmove_move_33through64:
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
 
 memmove_end_copy_match_emit_encodeSnappyBetterBlockAsm8B:
-	MOVQ SI, AX
+	MOVQ BX, AX
 	JMP  emit_literal_done_match_emit_encodeSnappyBetterBlockAsm8B
 
 memmove_long_match_emit_encodeSnappyBetterBlockAsm8B:
-	LEAQ (AX)(R9*1), SI
+	LEAQ (AX)(R8*1), BX
 
 	// genMemMoveLong
-	MOVOU (R10), X0
-	MOVOU 16(R10), X1
-	MOVOU -32(R10)(R9*1), X2
-	MOVOU -16(R10)(R9*1), X3
-	MOVQ  R9, R13
-	SHRQ  $0x05, R13
-	MOVQ  AX, R11
-	ANDL  $0x0000001f, R11
-	MOVQ  $0x00000040, R14
-	SUBQ  R11, R14
-	DECQ  R13
+	MOVOU (R9), X0
+	MOVOU 16(R9), X1
+	MOVOU -32(R9)(R8*1), X2
+	MOVOU -16(R9)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R10
+	ANDL  $0x0000001f, R10
+	MOVQ  $0x00000040, R13
+	SUBQ  R10, R13
+	DECQ  R12
 	JA    emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm8Blarge_forward_sse_loop_32
-	LEAQ  -32(R10)(R14*1), R11
-	LEAQ  -32(AX)(R14*1), R15
+	LEAQ  -32(R9)(R13*1), R10
+	LEAQ  -32(AX)(R13*1), R14
 
 emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm8Blarge_big_loop_back:
-	MOVOU (R11), X4
-	MOVOU 16(R11), X5
-	MOVOA X4, (R15)
-	MOVOA X5, 16(R15)
-	ADDQ  $0x20, R15
-	ADDQ  $0x20, R11
+	MOVOU (R10), X4
+	MOVOU 16(R10), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
 	ADDQ  $0x20, R14
-	DECQ  R13
+	ADDQ  $0x20, R10
+	ADDQ  $0x20, R13
+	DECQ  R12
 	JNA   emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm8Blarge_big_loop_back
 
 emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm8Blarge_forward_sse_loop_32:
-	MOVOU -32(R10)(R14*1), X4
-	MOVOU -16(R10)(R14*1), X5
-	MOVOA X4, -32(AX)(R14*1)
-	MOVOA X5, -16(AX)(R14*1)
-	ADDQ  $0x20, R14
-	CMPQ  R9, R14
+	MOVOU -32(R9)(R13*1), X4
+	MOVOU -16(R9)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
 	JAE   emit_lit_memmove_long_match_emit_encodeSnappyBetterBlockAsm8Blarge_forward_sse_loop_32
 	MOVOU X0, (AX)
 	MOVOU X1, 16(AX)
-	MOVOU X2, -32(AX)(R9*1)
-	MOVOU X3, -16(AX)(R9*1)
-	MOVQ  SI, AX
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  BX, AX
 
 emit_literal_done_match_emit_encodeSnappyBetterBlockAsm8B:
-	ADDL R12, CX
-	ADDL $0x04, R12
+	ADDL R11, CX
+	ADDL $0x04, R11
 	MOVL CX, 12(SP)
 
 	// emitCopy
 two_byte_offset_match_nolit_encodeSnappyBetterBlockAsm8B:
-	CMPL R12, $0x40
+	CMPL R11, $0x40
 	JLE  two_byte_offset_short_match_nolit_encodeSnappyBetterBlockAsm8B
 	MOVB $0xee, (AX)
-	MOVW R8, 1(AX)
-	LEAL -60(R12), R12
+	MOVW DI, 1(AX)
+	LEAL -60(R11), R11
 	ADDQ $0x03, AX
 	JMP  two_byte_offset_match_nolit_encodeSnappyBetterBlockAsm8B
 
 two_byte_offset_short_match_nolit_encodeSnappyBetterBlockAsm8B:
-	CMPL R12, $0x0c
+	MOVL R11, BX
+	SHLL $0x02, BX
+	CMPL R11, $0x0c
 	JGE  emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm8B
-	MOVB $0x01, BL
-	LEAL -16(BX)(R12*4), R12
-	MOVB R8, 1(AX)
-	SHRL $0x08, R8
-	SHLL $0x05, R8
-	ORL  R8, R12
-	MOVB R12, (AX)
+	LEAL -15(BX), BX
+	MOVB DI, 1(AX)
+	SHRL $0x08, DI
+	SHLL $0x05, DI
+	ORL  DI, BX
+	MOVB BL, (AX)
 	ADDQ $0x02, AX
 	JMP  match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm8B
 
 emit_copy_three_match_nolit_encodeSnappyBetterBlockAsm8B:
-	MOVB $0x02, BL
-	LEAL -4(BX)(R12*4), R12
-	MOVB R12, (AX)
-	MOVW R8, 1(AX)
+	LEAL -2(BX), BX
+	MOVB BL, (AX)
+	MOVW DI, 1(AX)
 	ADDQ $0x03, AX
 
 match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm8B:
@@ -16876,54 +16895,51 @@ match_nolit_emitcopy_end_encodeSnappyBetterBlockAsm8B:
 	RET
 
 match_nolit_dst_ok_encodeSnappyBetterBlockAsm8B:
-	MOVQ  $0x0000cf1bbcdcbf9b, SI
-	MOVQ  $0x9e3779b1, R8
-	INCL  DI
-	MOVQ  (DX)(DI*1), R9
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	MOVQ  R9, R12
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	SHRQ  $0x10, R12
-	LEAL  1(DI), R14
-	LEAL  2(DI), R15
-	MOVQ  -2(DX)(CX*1), R9
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x36, R10
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x36, R13
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x38, R11
+	MOVQ  $0x0000cf1bbcdcbf9b, BX
+	MOVQ  $0x9e3779b1, DI
+	LEAQ  1(SI), SI
+	LEAQ  -2(CX), R8
+	MOVQ  (DX)(SI*1), R9
+	MOVQ  1(DX)(SI*1), R10
+	MOVQ  (DX)(R8*1), R11
+	MOVQ  1(DX)(R8*1), R12
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x36, R9
+	SHLQ  $0x20, R10
+	IMULQ DI, R10
+	SHRQ  $0x38, R10
+	SHLQ  $0x10, R11
+	IMULQ BX, R11
+	SHRQ  $0x36, R11
 	SHLQ  $0x20, R12
-	IMULQ R8, R12
+	IMULQ DI, R12
 	SHRQ  $0x38, R12
-	MOVL  DI, 24(SP)(R10*4)
-	MOVL  R14, 24(SP)(R13*4)
-	MOVL  R14, 4120(SP)(R11*4)
-	MOVL  R15, 4120(SP)(R12*4)
-	MOVQ  R9, R10
-	MOVQ  R9, R11
-	SHRQ  $0x08, R11
-	MOVQ  R11, R13
-	LEAL  -2(CX), R9
-	LEAL  -1(CX), DI
-	SHLQ  $0x10, R10
-	IMULQ SI, R10
-	SHRQ  $0x36, R10
-	SHLQ  $0x20, R11
-	IMULQ R8, R11
-	SHRQ  $0x38, R11
-	SHLQ  $0x10, R13
-	IMULQ SI, R13
-	SHRQ  $0x36, R13
-	MOVL  R9, 24(SP)(R10*4)
-	MOVL  DI, 4120(SP)(R11*4)
-	MOVL  DI, 24(SP)(R13*4)
-	JMP   search_loop_encodeSnappyBetterBlockAsm8B
+	LEAQ  1(SI), DI
+	LEAQ  1(R8), R13
+	MOVL  SI, 24(SP)(R9*4)
+	MOVL  R8, 24(SP)(R11*4)
+	MOVL  DI, 4120(SP)(R10*4)
+	MOVL  R13, 4120(SP)(R12*4)
+	ADDQ  $0x01, SI
+	SUBQ  $0x01, R8
+
+index_loop_encodeSnappyBetterBlockAsm8B:
+	CMPQ  SI, R8
+	JAE   search_loop_encodeSnappyBetterBlockAsm8B
+	MOVQ  (DX)(SI*1), DI
+	MOVQ  (DX)(R8*1), R9
+	SHLQ  $0x10, DI
+	IMULQ BX, DI
+	SHRQ  $0x36, DI
+	SHLQ  $0x10, R9
+	IMULQ BX, R9
+	SHRQ  $0x36, R9
+	MOVL  SI, 24(SP)(DI*4)
+	MOVL  R8, 24(SP)(R9*4)
+	ADDQ  $0x02, SI
+	SUBQ  $0x02, R8
+	JMP   index_loop_encodeSnappyBetterBlockAsm8B
 
 emit_remainder_encodeSnappyBetterBlockAsm8B:
 	MOVQ src_len+32(FP), CX
@@ -17082,6 +17098,1008 @@ emit_literal_done_emit_remainder_encodeSnappyBetterBlockAsm8B:
 	MOVQ AX, ret+48(FP)
 	RET
 
+// func calcBlockSize(src []byte) int
+// Requires: BMI, SSE2
+TEXT ·calcBlockSize(SB), $32792-32
+	XORQ AX, AX
+	MOVQ $0x00000100, CX
+	LEAQ 24(SP), DX
+	PXOR X0, X0
+
+zero_loop_calcBlockSize:
+	MOVOU X0, (DX)
+	MOVOU X0, 16(DX)
+	MOVOU X0, 32(DX)
+	MOVOU X0, 48(DX)
+	MOVOU X0, 64(DX)
+	MOVOU X0, 80(DX)
+	MOVOU X0, 96(DX)
+	MOVOU X0, 112(DX)
+	ADDQ  $0x80, DX
+	DECQ  CX
+	JNZ   zero_loop_calcBlockSize
+	MOVL  $0x00000000, 12(SP)
+	MOVQ  src_len+8(FP), CX
+	LEAQ  -9(CX), DX
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
+	SHRQ  $0x05, CX
+	SUBL  CX, DX
+	LEAQ  (AX)(DX*1), DX
+	MOVQ  DX, (SP)
+	MOVL  $0x00000001, CX
+	MOVL  CX, 16(SP)
+	MOVQ  src_base+0(FP), DX
+
+search_loop_calcBlockSize:
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x05, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
+	JGE   emit_remainder_calcBlockSize
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x33, R9
+	SHLQ  $0x10, R10
+	IMULQ R8, R10
+	SHRQ  $0x33, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x10, R9
+	IMULQ R8, R9
+	SHRQ  $0x33, R9
+	MOVL  CX, R8
+	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
+	JNE   no_repeat_found_calcBlockSize
+	LEAL  1(CX), SI
+	MOVL  12(SP), BX
+	MOVL  SI, DI
+	SUBL  16(SP), DI
+	JZ    repeat_extend_back_end_calcBlockSize
+
+repeat_extend_back_loop_calcBlockSize:
+	CMPL SI, BX
+	JLE  repeat_extend_back_end_calcBlockSize
+	MOVB -1(DX)(DI*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
+	JNE  repeat_extend_back_end_calcBlockSize
+	LEAL -1(SI), SI
+	DECL DI
+	JNZ  repeat_extend_back_loop_calcBlockSize
+
+repeat_extend_back_end_calcBlockSize:
+	MOVL 12(SP), BX
+	CMPL BX, SI
+	JEQ  emit_literal_done_repeat_emit_calcBlockSize
+	MOVL SI, DI
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R8
+	SUBL BX, DI
+	LEAL -1(DI), BX
+	CMPL BX, $0x3c
+	JLT  one_byte_repeat_emit_calcBlockSize
+	CMPL BX, $0x00000100
+	JLT  two_bytes_repeat_emit_calcBlockSize
+	CMPL BX, $0x00010000
+	JLT  three_bytes_repeat_emit_calcBlockSize
+	CMPL BX, $0x01000000
+	JLT  four_bytes_repeat_emit_calcBlockSize
+	ADDQ $0x05, AX
+	JMP  memmove_long_repeat_emit_calcBlockSize
+
+four_bytes_repeat_emit_calcBlockSize:
+	ADDQ $0x04, AX
+	JMP  memmove_long_repeat_emit_calcBlockSize
+
+three_bytes_repeat_emit_calcBlockSize:
+	ADDQ $0x03, AX
+	JMP  memmove_long_repeat_emit_calcBlockSize
+
+two_bytes_repeat_emit_calcBlockSize:
+	ADDQ $0x02, AX
+	CMPL BX, $0x40
+	JL   memmove_repeat_emit_calcBlockSize
+	JMP  memmove_long_repeat_emit_calcBlockSize
+
+one_byte_repeat_emit_calcBlockSize:
+	ADDQ $0x01, AX
+
+memmove_repeat_emit_calcBlockSize:
+	LEAQ (AX)(DI*1), AX
+	JMP  emit_literal_done_repeat_emit_calcBlockSize
+
+memmove_long_repeat_emit_calcBlockSize:
+	LEAQ (AX)(DI*1), AX
+
+emit_literal_done_repeat_emit_calcBlockSize:
+	ADDL $0x05, CX
+	MOVL CX, BX
+	SUBL 16(SP), BX
+	MOVQ src_len+8(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), BX
+
+	// matchLen
+	XORL R10, R10
+	CMPL DI, $0x08
+	JL   matchlen_match4_repeat_extend_calcBlockSize
+
+matchlen_loopback_repeat_extend_calcBlockSize:
+	MOVQ  (R8)(R10*1), R9
+	XORQ  (BX)(R10*1), R9
+	TESTQ R9, R9
+	JZ    matchlen_loop_repeat_extend_calcBlockSize
+
+#ifdef GOAMD64_v3
+	TZCNTQ R9, R9
+
+#else
+	BSFQ R9, R9
+
+#endif
+	SARQ $0x03, R9
+	LEAL (R10)(R9*1), R10
+	JMP  repeat_extend_forward_end_calcBlockSize
+
+matchlen_loop_repeat_extend_calcBlockSize:
+	LEAL -8(DI), DI
+	LEAL 8(R10), R10
+	CMPL DI, $0x08
+	JGE  matchlen_loopback_repeat_extend_calcBlockSize
+	JZ   repeat_extend_forward_end_calcBlockSize
+
+matchlen_match4_repeat_extend_calcBlockSize:
+	CMPL DI, $0x04
+	JL   matchlen_match2_repeat_extend_calcBlockSize
+	MOVL (R8)(R10*1), R9
+	CMPL (BX)(R10*1), R9
+	JNE  matchlen_match2_repeat_extend_calcBlockSize
+	SUBL $0x04, DI
+	LEAL 4(R10), R10
+
+matchlen_match2_repeat_extend_calcBlockSize:
+	CMPL DI, $0x02
+	JL   matchlen_match1_repeat_extend_calcBlockSize
+	MOVW (R8)(R10*1), R9
+	CMPW (BX)(R10*1), R9
+	JNE  matchlen_match1_repeat_extend_calcBlockSize
+	SUBL $0x02, DI
+	LEAL 2(R10), R10
+
+matchlen_match1_repeat_extend_calcBlockSize:
+	CMPL DI, $0x01
+	JL   repeat_extend_forward_end_calcBlockSize
+	MOVB (R8)(R10*1), R9
+	CMPB (BX)(R10*1), R9
+	JNE  repeat_extend_forward_end_calcBlockSize
+	LEAL 1(R10), R10
+
+repeat_extend_forward_end_calcBlockSize:
+	ADDL R10, CX
+	MOVL CX, BX
+	SUBL SI, BX
+	MOVL 16(SP), SI
+
+	// emitCopy
+	CMPL SI, $0x00010000
+	JL   two_byte_offset_repeat_as_copy_calcBlockSize
+
+four_bytes_loop_back_repeat_as_copy_calcBlockSize:
+	CMPL BX, $0x40
+	JLE  four_bytes_remain_repeat_as_copy_calcBlockSize
+	LEAL -64(BX), BX
+	ADDQ $0x05, AX
+	CMPL BX, $0x04
+	JL   four_bytes_remain_repeat_as_copy_calcBlockSize
+	JMP  four_bytes_loop_back_repeat_as_copy_calcBlockSize
+
+four_bytes_remain_repeat_as_copy_calcBlockSize:
+	TESTL BX, BX
+	JZ    repeat_end_emit_calcBlockSize
+	XORL  BX, BX
+	ADDQ  $0x05, AX
+	JMP   repeat_end_emit_calcBlockSize
+
+two_byte_offset_repeat_as_copy_calcBlockSize:
+	CMPL BX, $0x40
+	JLE  two_byte_offset_short_repeat_as_copy_calcBlockSize
+	LEAL -60(BX), BX
+	ADDQ $0x03, AX
+	JMP  two_byte_offset_repeat_as_copy_calcBlockSize
+
+two_byte_offset_short_repeat_as_copy_calcBlockSize:
+	MOVL BX, DI
+	SHLL $0x02, DI
+	CMPL BX, $0x0c
+	JGE  emit_copy_three_repeat_as_copy_calcBlockSize
+	CMPL SI, $0x00000800
+	JGE  emit_copy_three_repeat_as_copy_calcBlockSize
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_calcBlockSize
+
+emit_copy_three_repeat_as_copy_calcBlockSize:
+	ADDQ $0x03, AX
+
+repeat_end_emit_calcBlockSize:
+	MOVL CX, 12(SP)
+	JMP  search_loop_calcBlockSize
+
+no_repeat_found_calcBlockSize:
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate_match_calcBlockSize
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
+	JEQ  candidate2_match_calcBlockSize
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate3_match_calcBlockSize
+	MOVL 20(SP), CX
+	JMP  search_loop_calcBlockSize
+
+candidate3_match_calcBlockSize:
+	ADDL $0x02, CX
+	JMP  candidate_match_calcBlockSize
+
+candidate2_match_calcBlockSize:
+	MOVL R8, 24(SP)(R9*4)
+	INCL CX
+	MOVL DI, BX
+
+candidate_match_calcBlockSize:
+	MOVL  12(SP), SI
+	TESTL BX, BX
+	JZ    match_extend_back_end_calcBlockSize
+
+match_extend_back_loop_calcBlockSize:
+	CMPL CX, SI
+	JLE  match_extend_back_end_calcBlockSize
+	MOVB -1(DX)(BX*1), DI
+	MOVB -1(DX)(CX*1), R8
+	CMPB DI, R8
+	JNE  match_extend_back_end_calcBlockSize
+	LEAL -1(CX), CX
+	DECL BX
+	JZ   match_extend_back_end_calcBlockSize
+	JMP  match_extend_back_loop_calcBlockSize
+
+match_extend_back_end_calcBlockSize:
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 5(AX)(SI*1), SI
+	CMPQ SI, (SP)
+	JL   match_dst_size_check_calcBlockSize
+	MOVQ $0x00000000, ret+24(FP)
+	RET
+
+match_dst_size_check_calcBlockSize:
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
+	JEQ  emit_literal_done_match_emit_calcBlockSize
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), SI
+	CMPL SI, $0x3c
+	JLT  one_byte_match_emit_calcBlockSize
+	CMPL SI, $0x00000100
+	JLT  two_bytes_match_emit_calcBlockSize
+	CMPL SI, $0x00010000
+	JLT  three_bytes_match_emit_calcBlockSize
+	CMPL SI, $0x01000000
+	JLT  four_bytes_match_emit_calcBlockSize
+	ADDQ $0x05, AX
+	JMP  memmove_long_match_emit_calcBlockSize
+
+four_bytes_match_emit_calcBlockSize:
+	ADDQ $0x04, AX
+	JMP  memmove_long_match_emit_calcBlockSize
+
+three_bytes_match_emit_calcBlockSize:
+	ADDQ $0x03, AX
+	JMP  memmove_long_match_emit_calcBlockSize
+
+two_bytes_match_emit_calcBlockSize:
+	ADDQ $0x02, AX
+	CMPL SI, $0x40
+	JL   memmove_match_emit_calcBlockSize
+	JMP  memmove_long_match_emit_calcBlockSize
+
+one_byte_match_emit_calcBlockSize:
+	ADDQ $0x01, AX
+
+memmove_match_emit_calcBlockSize:
+	LEAQ (AX)(R8*1), AX
+	JMP  emit_literal_done_match_emit_calcBlockSize
+
+memmove_long_match_emit_calcBlockSize:
+	LEAQ (AX)(R8*1), AX
+
+emit_literal_done_match_emit_calcBlockSize:
+match_nolit_loop_calcBlockSize:
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
+	ADDL $0x04, CX
+	ADDL $0x04, BX
+	MOVQ src_len+8(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
+
+	// matchLen
+	XORL R9, R9
+	CMPL SI, $0x08
+	JL   matchlen_match4_match_nolit_calcBlockSize
+
+matchlen_loopback_match_nolit_calcBlockSize:
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
+	JZ    matchlen_loop_match_nolit_calcBlockSize
+
+#ifdef GOAMD64_v3
+	TZCNTQ R8, R8
+
+#else
+	BSFQ R8, R8
+
+#endif
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
+	JMP  match_nolit_end_calcBlockSize
+
+matchlen_loop_match_nolit_calcBlockSize:
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
+	JGE  matchlen_loopback_match_nolit_calcBlockSize
+	JZ   match_nolit_end_calcBlockSize
+
+matchlen_match4_match_nolit_calcBlockSize:
+	CMPL SI, $0x04
+	JL   matchlen_match2_match_nolit_calcBlockSize
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
+	JNE  matchlen_match2_match_nolit_calcBlockSize
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
+
+matchlen_match2_match_nolit_calcBlockSize:
+	CMPL SI, $0x02
+	JL   matchlen_match1_match_nolit_calcBlockSize
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
+	JNE  matchlen_match1_match_nolit_calcBlockSize
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
+
+matchlen_match1_match_nolit_calcBlockSize:
+	CMPL SI, $0x01
+	JL   match_nolit_end_calcBlockSize
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
+	JNE  match_nolit_end_calcBlockSize
+	LEAL 1(R9), R9
+
+match_nolit_end_calcBlockSize:
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
+	MOVL CX, 12(SP)
+
+	// emitCopy
+	CMPL BX, $0x00010000
+	JL   two_byte_offset_match_nolit_calcBlockSize
+
+four_bytes_loop_back_match_nolit_calcBlockSize:
+	CMPL R9, $0x40
+	JLE  four_bytes_remain_match_nolit_calcBlockSize
+	LEAL -64(R9), R9
+	ADDQ $0x05, AX
+	CMPL R9, $0x04
+	JL   four_bytes_remain_match_nolit_calcBlockSize
+	JMP  four_bytes_loop_back_match_nolit_calcBlockSize
+
+four_bytes_remain_match_nolit_calcBlockSize:
+	TESTL R9, R9
+	JZ    match_nolit_emitcopy_end_calcBlockSize
+	XORL  BX, BX
+	ADDQ  $0x05, AX
+	JMP   match_nolit_emitcopy_end_calcBlockSize
+
+two_byte_offset_match_nolit_calcBlockSize:
+	CMPL R9, $0x40
+	JLE  two_byte_offset_short_match_nolit_calcBlockSize
+	LEAL -60(R9), R9
+	ADDQ $0x03, AX
+	JMP  two_byte_offset_match_nolit_calcBlockSize
+
+two_byte_offset_short_match_nolit_calcBlockSize:
+	MOVL R9, SI
+	SHLL $0x02, SI
+	CMPL R9, $0x0c
+	JGE  emit_copy_three_match_nolit_calcBlockSize
+	CMPL BX, $0x00000800
+	JGE  emit_copy_three_match_nolit_calcBlockSize
+	ADDQ $0x02, AX
+	JMP  match_nolit_emitcopy_end_calcBlockSize
+
+emit_copy_three_match_nolit_calcBlockSize:
+	ADDQ $0x03, AX
+
+match_nolit_emitcopy_end_calcBlockSize:
+	CMPL CX, 8(SP)
+	JGE  emit_remainder_calcBlockSize
+	MOVQ -2(DX)(CX*1), SI
+	CMPQ AX, (SP)
+	JL   match_nolit_dst_ok_calcBlockSize
+	MOVQ $0x00000000, ret+24(FP)
+	RET
+
+match_nolit_dst_ok_calcBlockSize:
+	MOVQ  $0x0000cf1bbcdcbf9b, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x10, DI
+	IMULQ R8, DI
+	SHRQ  $0x33, DI
+	SHLQ  $0x10, BX
+	IMULQ R8, BX
+	SHRQ  $0x33, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
+	JEQ   match_nolit_loop_calcBlockSize
+	INCL  CX
+	JMP   search_loop_calcBlockSize
+
+emit_remainder_calcBlockSize:
+	MOVQ src_len+8(FP), CX
+	SUBL 12(SP), CX
+	LEAQ 5(AX)(CX*1), CX
+	CMPQ CX, (SP)
+	JL   emit_remainder_ok_calcBlockSize
+	MOVQ $0x00000000, ret+24(FP)
+	RET
+
+emit_remainder_ok_calcBlockSize:
+	MOVQ src_len+8(FP), CX
+	MOVL 12(SP), BX
+	CMPL BX, CX
+	JEQ  emit_literal_done_emit_remainder_calcBlockSize
+	MOVL CX, SI
+	MOVL CX, 12(SP)
+	LEAQ (DX)(BX*1), CX
+	SUBL BX, SI
+	LEAL -1(SI), CX
+	CMPL CX, $0x3c
+	JLT  one_byte_emit_remainder_calcBlockSize
+	CMPL CX, $0x00000100
+	JLT  two_bytes_emit_remainder_calcBlockSize
+	CMPL CX, $0x00010000
+	JLT  three_bytes_emit_remainder_calcBlockSize
+	CMPL CX, $0x01000000
+	JLT  four_bytes_emit_remainder_calcBlockSize
+	ADDQ $0x05, AX
+	JMP  memmove_long_emit_remainder_calcBlockSize
+
+four_bytes_emit_remainder_calcBlockSize:
+	ADDQ $0x04, AX
+	JMP  memmove_long_emit_remainder_calcBlockSize
+
+three_bytes_emit_remainder_calcBlockSize:
+	ADDQ $0x03, AX
+	JMP  memmove_long_emit_remainder_calcBlockSize
+
+two_bytes_emit_remainder_calcBlockSize:
+	ADDQ $0x02, AX
+	CMPL CX, $0x40
+	JL   memmove_emit_remainder_calcBlockSize
+	JMP  memmove_long_emit_remainder_calcBlockSize
+
+one_byte_emit_remainder_calcBlockSize:
+	ADDQ $0x01, AX
+
+memmove_emit_remainder_calcBlockSize:
+	LEAQ (AX)(SI*1), AX
+	JMP  emit_literal_done_emit_remainder_calcBlockSize
+
+memmove_long_emit_remainder_calcBlockSize:
+	LEAQ (AX)(SI*1), AX
+
+emit_literal_done_emit_remainder_calcBlockSize:
+	MOVQ AX, ret+24(FP)
+	RET
+
+// func calcBlockSizeSmall(src []byte) int
+// Requires: BMI, SSE2
+TEXT ·calcBlockSizeSmall(SB), $2072-32
+	XORQ AX, AX
+	MOVQ $0x00000010, CX
+	LEAQ 24(SP), DX
+	PXOR X0, X0
+
+zero_loop_calcBlockSizeSmall:
+	MOVOU X0, (DX)
+	MOVOU X0, 16(DX)
+	MOVOU X0, 32(DX)
+	MOVOU X0, 48(DX)
+	MOVOU X0, 64(DX)
+	MOVOU X0, 80(DX)
+	MOVOU X0, 96(DX)
+	MOVOU X0, 112(DX)
+	ADDQ  $0x80, DX
+	DECQ  CX
+	JNZ   zero_loop_calcBlockSizeSmall
+	MOVL  $0x00000000, 12(SP)
+	MOVQ  src_len+8(FP), CX
+	LEAQ  -9(CX), DX
+	LEAQ  -8(CX), BX
+	MOVL  BX, 8(SP)
+	SHRQ  $0x05, CX
+	SUBL  CX, DX
+	LEAQ  (AX)(DX*1), DX
+	MOVQ  DX, (SP)
+	MOVL  $0x00000001, CX
+	MOVL  CX, 16(SP)
+	MOVQ  src_base+0(FP), DX
+
+search_loop_calcBlockSizeSmall:
+	MOVL  CX, BX
+	SUBL  12(SP), BX
+	SHRL  $0x04, BX
+	LEAL  4(CX)(BX*1), BX
+	CMPL  BX, 8(SP)
+	JGE   emit_remainder_calcBlockSizeSmall
+	MOVQ  (DX)(CX*1), SI
+	MOVL  BX, 20(SP)
+	MOVQ  $0x9e3779b1, R8
+	MOVQ  SI, R9
+	MOVQ  SI, R10
+	SHRQ  $0x08, R10
+	SHLQ  $0x20, R9
+	IMULQ R8, R9
+	SHRQ  $0x37, R9
+	SHLQ  $0x20, R10
+	IMULQ R8, R10
+	SHRQ  $0x37, R10
+	MOVL  24(SP)(R9*4), BX
+	MOVL  24(SP)(R10*4), DI
+	MOVL  CX, 24(SP)(R9*4)
+	LEAL  1(CX), R9
+	MOVL  R9, 24(SP)(R10*4)
+	MOVQ  SI, R9
+	SHRQ  $0x10, R9
+	SHLQ  $0x20, R9
+	IMULQ R8, R9
+	SHRQ  $0x37, R9
+	MOVL  CX, R8
+	SUBL  16(SP), R8
+	MOVL  1(DX)(R8*1), R10
+	MOVQ  SI, R8
+	SHRQ  $0x08, R8
+	CMPL  R8, R10
+	JNE   no_repeat_found_calcBlockSizeSmall
+	LEAL  1(CX), SI
+	MOVL  12(SP), BX
+	MOVL  SI, DI
+	SUBL  16(SP), DI
+	JZ    repeat_extend_back_end_calcBlockSizeSmall
+
+repeat_extend_back_loop_calcBlockSizeSmall:
+	CMPL SI, BX
+	JLE  repeat_extend_back_end_calcBlockSizeSmall
+	MOVB -1(DX)(DI*1), R8
+	MOVB -1(DX)(SI*1), R9
+	CMPB R8, R9
+	JNE  repeat_extend_back_end_calcBlockSizeSmall
+	LEAL -1(SI), SI
+	DECL DI
+	JNZ  repeat_extend_back_loop_calcBlockSizeSmall
+
+repeat_extend_back_end_calcBlockSizeSmall:
+	MOVL 12(SP), BX
+	CMPL BX, SI
+	JEQ  emit_literal_done_repeat_emit_calcBlockSizeSmall
+	MOVL SI, DI
+	MOVL SI, 12(SP)
+	LEAQ (DX)(BX*1), R8
+	SUBL BX, DI
+	LEAL -1(DI), BX
+	CMPL BX, $0x3c
+	JLT  one_byte_repeat_emit_calcBlockSizeSmall
+	CMPL BX, $0x00000100
+	JLT  two_bytes_repeat_emit_calcBlockSizeSmall
+	ADDQ $0x03, AX
+	JMP  memmove_long_repeat_emit_calcBlockSizeSmall
+
+two_bytes_repeat_emit_calcBlockSizeSmall:
+	ADDQ $0x02, AX
+	CMPL BX, $0x40
+	JL   memmove_repeat_emit_calcBlockSizeSmall
+	JMP  memmove_long_repeat_emit_calcBlockSizeSmall
+
+one_byte_repeat_emit_calcBlockSizeSmall:
+	ADDQ $0x01, AX
+
+memmove_repeat_emit_calcBlockSizeSmall:
+	LEAQ (AX)(DI*1), AX
+	JMP  emit_literal_done_repeat_emit_calcBlockSizeSmall
+
+memmove_long_repeat_emit_calcBlockSizeSmall:
+	LEAQ (AX)(DI*1), AX
+
+emit_literal_done_repeat_emit_calcBlockSizeSmall:
+	ADDL $0x05, CX
+	MOVL CX, BX
+	SUBL 16(SP), BX
+	MOVQ src_len+8(FP), DI
+	SUBL CX, DI
+	LEAQ (DX)(CX*1), R8
+	LEAQ (DX)(BX*1), BX
+
+	// matchLen
+	XORL R10, R10
+	CMPL DI, $0x08
+	JL   matchlen_match4_repeat_extend_calcBlockSizeSmall
+
+matchlen_loopback_repeat_extend_calcBlockSizeSmall:
+	MOVQ  (R8)(R10*1), R9
+	XORQ  (BX)(R10*1), R9
+	TESTQ R9, R9
+	JZ    matchlen_loop_repeat_extend_calcBlockSizeSmall
+
+#ifdef GOAMD64_v3
+	TZCNTQ R9, R9
+
+#else
+	BSFQ R9, R9
+
+#endif
+	SARQ $0x03, R9
+	LEAL (R10)(R9*1), R10
+	JMP  repeat_extend_forward_end_calcBlockSizeSmall
+
+matchlen_loop_repeat_extend_calcBlockSizeSmall:
+	LEAL -8(DI), DI
+	LEAL 8(R10), R10
+	CMPL DI, $0x08
+	JGE  matchlen_loopback_repeat_extend_calcBlockSizeSmall
+	JZ   repeat_extend_forward_end_calcBlockSizeSmall
+
+matchlen_match4_repeat_extend_calcBlockSizeSmall:
+	CMPL DI, $0x04
+	JL   matchlen_match2_repeat_extend_calcBlockSizeSmall
+	MOVL (R8)(R10*1), R9
+	CMPL (BX)(R10*1), R9
+	JNE  matchlen_match2_repeat_extend_calcBlockSizeSmall
+	SUBL $0x04, DI
+	LEAL 4(R10), R10
+
+matchlen_match2_repeat_extend_calcBlockSizeSmall:
+	CMPL DI, $0x02
+	JL   matchlen_match1_repeat_extend_calcBlockSizeSmall
+	MOVW (R8)(R10*1), R9
+	CMPW (BX)(R10*1), R9
+	JNE  matchlen_match1_repeat_extend_calcBlockSizeSmall
+	SUBL $0x02, DI
+	LEAL 2(R10), R10
+
+matchlen_match1_repeat_extend_calcBlockSizeSmall:
+	CMPL DI, $0x01
+	JL   repeat_extend_forward_end_calcBlockSizeSmall
+	MOVB (R8)(R10*1), R9
+	CMPB (BX)(R10*1), R9
+	JNE  repeat_extend_forward_end_calcBlockSizeSmall
+	LEAL 1(R10), R10
+
+repeat_extend_forward_end_calcBlockSizeSmall:
+	ADDL R10, CX
+	MOVL CX, BX
+	SUBL SI, BX
+	MOVL 16(SP), SI
+
+	// emitCopy
+two_byte_offset_repeat_as_copy_calcBlockSizeSmall:
+	CMPL BX, $0x40
+	JLE  two_byte_offset_short_repeat_as_copy_calcBlockSizeSmall
+	LEAL -60(BX), BX
+	ADDQ $0x03, AX
+	JMP  two_byte_offset_repeat_as_copy_calcBlockSizeSmall
+
+two_byte_offset_short_repeat_as_copy_calcBlockSizeSmall:
+	MOVL BX, SI
+	SHLL $0x02, SI
+	CMPL BX, $0x0c
+	JGE  emit_copy_three_repeat_as_copy_calcBlockSizeSmall
+	ADDQ $0x02, AX
+	JMP  repeat_end_emit_calcBlockSizeSmall
+
+emit_copy_three_repeat_as_copy_calcBlockSizeSmall:
+	ADDQ $0x03, AX
+
+repeat_end_emit_calcBlockSizeSmall:
+	MOVL CX, 12(SP)
+	JMP  search_loop_calcBlockSizeSmall
+
+no_repeat_found_calcBlockSizeSmall:
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate_match_calcBlockSizeSmall
+	SHRQ $0x08, SI
+	MOVL 24(SP)(R9*4), BX
+	LEAL 2(CX), R8
+	CMPL (DX)(DI*1), SI
+	JEQ  candidate2_match_calcBlockSizeSmall
+	MOVL R8, 24(SP)(R9*4)
+	SHRQ $0x08, SI
+	CMPL (DX)(BX*1), SI
+	JEQ  candidate3_match_calcBlockSizeSmall
+	MOVL 20(SP), CX
+	JMP  search_loop_calcBlockSizeSmall
+
+candidate3_match_calcBlockSizeSmall:
+	ADDL $0x02, CX
+	JMP  candidate_match_calcBlockSizeSmall
+
+candidate2_match_calcBlockSizeSmall:
+	MOVL R8, 24(SP)(R9*4)
+	INCL CX
+	MOVL DI, BX
+
+candidate_match_calcBlockSizeSmall:
+	MOVL  12(SP), SI
+	TESTL BX, BX
+	JZ    match_extend_back_end_calcBlockSizeSmall
+
+match_extend_back_loop_calcBlockSizeSmall:
+	CMPL CX, SI
+	JLE  match_extend_back_end_calcBlockSizeSmall
+	MOVB -1(DX)(BX*1), DI
+	MOVB -1(DX)(CX*1), R8
+	CMPB DI, R8
+	JNE  match_extend_back_end_calcBlockSizeSmall
+	LEAL -1(CX), CX
+	DECL BX
+	JZ   match_extend_back_end_calcBlockSizeSmall
+	JMP  match_extend_back_loop_calcBlockSizeSmall
+
+match_extend_back_end_calcBlockSizeSmall:
+	MOVL CX, SI
+	SUBL 12(SP), SI
+	LEAQ 3(AX)(SI*1), SI
+	CMPQ SI, (SP)
+	JL   match_dst_size_check_calcBlockSizeSmall
+	MOVQ $0x00000000, ret+24(FP)
+	RET
+
+match_dst_size_check_calcBlockSizeSmall:
+	MOVL CX, SI
+	MOVL 12(SP), DI
+	CMPL DI, SI
+	JEQ  emit_literal_done_match_emit_calcBlockSizeSmall
+	MOVL SI, R8
+	MOVL SI, 12(SP)
+	LEAQ (DX)(DI*1), SI
+	SUBL DI, R8
+	LEAL -1(R8), SI
+	CMPL SI, $0x3c
+	JLT  one_byte_match_emit_calcBlockSizeSmall
+	CMPL SI, $0x00000100
+	JLT  two_bytes_match_emit_calcBlockSizeSmall
+	ADDQ $0x03, AX
+	JMP  memmove_long_match_emit_calcBlockSizeSmall
+
+two_bytes_match_emit_calcBlockSizeSmall:
+	ADDQ $0x02, AX
+	CMPL SI, $0x40
+	JL   memmove_match_emit_calcBlockSizeSmall
+	JMP  memmove_long_match_emit_calcBlockSizeSmall
+
+one_byte_match_emit_calcBlockSizeSmall:
+	ADDQ $0x01, AX
+
+memmove_match_emit_calcBlockSizeSmall:
+	LEAQ (AX)(R8*1), AX
+	JMP  emit_literal_done_match_emit_calcBlockSizeSmall
+
+memmove_long_match_emit_calcBlockSizeSmall:
+	LEAQ (AX)(R8*1), AX
+
+emit_literal_done_match_emit_calcBlockSizeSmall:
+match_nolit_loop_calcBlockSizeSmall:
+	MOVL CX, SI
+	SUBL BX, SI
+	MOVL SI, 16(SP)
+	ADDL $0x04, CX
+	ADDL $0x04, BX
+	MOVQ src_len+8(FP), SI
+	SUBL CX, SI
+	LEAQ (DX)(CX*1), DI
+	LEAQ (DX)(BX*1), BX
+
+	// matchLen
+	XORL R9, R9
+	CMPL SI, $0x08
+	JL   matchlen_match4_match_nolit_calcBlockSizeSmall
+
+matchlen_loopback_match_nolit_calcBlockSizeSmall:
+	MOVQ  (DI)(R9*1), R8
+	XORQ  (BX)(R9*1), R8
+	TESTQ R8, R8
+	JZ    matchlen_loop_match_nolit_calcBlockSizeSmall
+
+#ifdef GOAMD64_v3
+	TZCNTQ R8, R8
+
+#else
+	BSFQ R8, R8
+
+#endif
+	SARQ $0x03, R8
+	LEAL (R9)(R8*1), R9
+	JMP  match_nolit_end_calcBlockSizeSmall
+
+matchlen_loop_match_nolit_calcBlockSizeSmall:
+	LEAL -8(SI), SI
+	LEAL 8(R9), R9
+	CMPL SI, $0x08
+	JGE  matchlen_loopback_match_nolit_calcBlockSizeSmall
+	JZ   match_nolit_end_calcBlockSizeSmall
+
+matchlen_match4_match_nolit_calcBlockSizeSmall:
+	CMPL SI, $0x04
+	JL   matchlen_match2_match_nolit_calcBlockSizeSmall
+	MOVL (DI)(R9*1), R8
+	CMPL (BX)(R9*1), R8
+	JNE  matchlen_match2_match_nolit_calcBlockSizeSmall
+	SUBL $0x04, SI
+	LEAL 4(R9), R9
+
+matchlen_match2_match_nolit_calcBlockSizeSmall:
+	CMPL SI, $0x02
+	JL   matchlen_match1_match_nolit_calcBlockSizeSmall
+	MOVW (DI)(R9*1), R8
+	CMPW (BX)(R9*1), R8
+	JNE  matchlen_match1_match_nolit_calcBlockSizeSmall
+	SUBL $0x02, SI
+	LEAL 2(R9), R9
+
+matchlen_match1_match_nolit_calcBlockSizeSmall:
+	CMPL SI, $0x01
+	JL   match_nolit_end_calcBlockSizeSmall
+	MOVB (DI)(R9*1), R8
+	CMPB (BX)(R9*1), R8
+	JNE  match_nolit_end_calcBlockSizeSmall
+	LEAL 1(R9), R9
+
+match_nolit_end_calcBlockSizeSmall:
+	ADDL R9, CX
+	MOVL 16(SP), BX
+	ADDL $0x04, R9
+	MOVL CX, 12(SP)
+
+	// emitCopy
+two_byte_offset_match_nolit_calcBlockSizeSmall:
+	CMPL R9, $0x40
+	JLE  two_byte_offset_short_match_nolit_calcBlockSizeSmall
+	LEAL -60(R9), R9
+	ADDQ $0x03, AX
+	JMP  two_byte_offset_match_nolit_calcBlockSizeSmall
+
+two_byte_offset_short_match_nolit_calcBlockSizeSmall:
+	MOVL R9, BX
+	SHLL $0x02, BX
+	CMPL R9, $0x0c
+	JGE  emit_copy_three_match_nolit_calcBlockSizeSmall
+	ADDQ $0x02, AX
+	JMP  match_nolit_emitcopy_end_calcBlockSizeSmall
+
+emit_copy_three_match_nolit_calcBlockSizeSmall:
+	ADDQ $0x03, AX
+
+match_nolit_emitcopy_end_calcBlockSizeSmall:
+	CMPL CX, 8(SP)
+	JGE  emit_remainder_calcBlockSizeSmall
+	MOVQ -2(DX)(CX*1), SI
+	CMPQ AX, (SP)
+	JL   match_nolit_dst_ok_calcBlockSizeSmall
+	MOVQ $0x00000000, ret+24(FP)
+	RET
+
+match_nolit_dst_ok_calcBlockSizeSmall:
+	MOVQ  $0x9e3779b1, R8
+	MOVQ  SI, DI
+	SHRQ  $0x10, SI
+	MOVQ  SI, BX
+	SHLQ  $0x20, DI
+	IMULQ R8, DI
+	SHRQ  $0x37, DI
+	SHLQ  $0x20, BX
+	IMULQ R8, BX
+	SHRQ  $0x37, BX
+	LEAL  -2(CX), R8
+	LEAQ  24(SP)(BX*4), R9
+	MOVL  (R9), BX
+	MOVL  R8, 24(SP)(DI*4)
+	MOVL  CX, (R9)
+	CMPL  (DX)(BX*1), SI
+	JEQ   match_nolit_loop_calcBlockSizeSmall
+	INCL  CX
+	JMP   search_loop_calcBlockSizeSmall
+
+emit_remainder_calcBlockSizeSmall:
+	MOVQ src_len+8(FP), CX
+	SUBL 12(SP), CX
+	LEAQ 3(AX)(CX*1), CX
+	CMPQ CX, (SP)
+	JL   emit_remainder_ok_calcBlockSizeSmall
+	MOVQ $0x00000000, ret+24(FP)
+	RET
+
+emit_remainder_ok_calcBlockSizeSmall:
+	MOVQ src_len+8(FP), CX
+	MOVL 12(SP), BX
+	CMPL BX, CX
+	JEQ  emit_literal_done_emit_remainder_calcBlockSizeSmall
+	MOVL CX, SI
+	MOVL CX, 12(SP)
+	LEAQ (DX)(BX*1), CX
+	SUBL BX, SI
+	LEAL -1(SI), CX
+	CMPL CX, $0x3c
+	JLT  one_byte_emit_remainder_calcBlockSizeSmall
+	CMPL CX, $0x00000100
+	JLT  two_bytes_emit_remainder_calcBlockSizeSmall
+	ADDQ $0x03, AX
+	JMP  memmove_long_emit_remainder_calcBlockSizeSmall
+
+two_bytes_emit_remainder_calcBlockSizeSmall:
+	ADDQ $0x02, AX
+	CMPL CX, $0x40
+	JL   memmove_emit_remainder_calcBlockSizeSmall
+	JMP  memmove_long_emit_remainder_calcBlockSizeSmall
+
+one_byte_emit_remainder_calcBlockSizeSmall:
+	ADDQ $0x01, AX
+
+memmove_emit_remainder_calcBlockSizeSmall:
+	LEAQ (AX)(SI*1), AX
+	JMP  emit_literal_done_emit_remainder_calcBlockSizeSmall
+
+memmove_long_emit_remainder_calcBlockSizeSmall:
+	LEAQ (AX)(SI*1), AX
+
+emit_literal_done_emit_remainder_calcBlockSizeSmall:
+	MOVQ AX, ret+24(FP)
+	RET
+
 // func emitLiteral(dst []byte, lit []byte) int
 // Requires: SSE2
 TEXT ·emitLiteral(SB), NOSPLIT, $0-56
@@ -17274,8 +18292,7 @@ cant_repeat_two_offset_standalone:
 	CMPL DX, $0x0100ffff
 	JLT  repeat_five_standalone
 	LEAL -16842747(DX), DX
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
+	MOVL $0xfffb001d, (AX)
 	MOVB $0xff, 4(AX)
 	ADDQ $0x05, AX
 	ADDQ $0x05, BX
@@ -17341,8 +18358,6 @@ TEXT ·emitCopy(SB), NOSPLIT, $0-48
 	// emitCopy
 	CMPL CX, $0x00010000
 	JL   two_byte_offset_standalone
-
-four_bytes_loop_back_standalone:
 	CMPL DX, $0x40
 	JLE  four_bytes_remain_standalone
 	MOVB $0xff, (AX)
@@ -17372,8 +18387,7 @@ cant_repeat_two_offset_standalone_emit_copy:
 	CMPL DX, $0x0100ffff
 	JLT  repeat_five_standalone_emit_copy
 	LEAL -16842747(DX), DX
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
+	MOVL $0xfffb001d, (AX)
 	MOVB $0xff, 4(AX)
 	ADDQ $0x05, AX
 	ADDQ $0x05, BX
@@ -17425,13 +18439,12 @@ repeat_two_offset_standalone_emit_copy:
 	ADDQ $0x02, BX
 	ADDQ $0x02, AX
 	JMP  gen_emit_copy_end
-	JMP four_bytes_loop_back_standalone
 
 four_bytes_remain_standalone:
 	TESTL DX, DX
 	JZ    gen_emit_copy_end
-	MOVB  $0x03, SI
-	LEAL  -4(SI)(DX*4), DX
+	XORL  SI, SI
+	LEAL  -1(SI)(DX*4), DX
 	MOVB  DL, (AX)
 	MOVL  CX, 1(AX)
 	ADDQ  $0x05, BX
@@ -17477,8 +18490,7 @@ cant_repeat_two_offset_standalone_emit_copy_short_2b:
 	CMPL DX, $0x0100ffff
 	JLT  repeat_five_standalone_emit_copy_short_2b
 	LEAL -16842747(DX), DX
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
+	MOVL $0xfffb001d, (AX)
 	MOVB $0xff, 4(AX)
 	ADDQ $0x05, AX
 	ADDQ $0x05, BX
@@ -17557,8 +18569,7 @@ cant_repeat_two_offset_standalone_emit_copy_short:
 	CMPL DX, $0x0100ffff
 	JLT  repeat_five_standalone_emit_copy_short
 	LEAL -16842747(DX), DX
-	MOVW $0x001d, (AX)
-	MOVW $0xfffb, 2(AX)
+	MOVL $0xfffb001d, (AX)
 	MOVB $0xff, 4(AX)
 	ADDQ $0x05, AX
 	ADDQ $0x05, BX
@@ -17610,28 +18621,27 @@ repeat_two_offset_standalone_emit_copy_short:
 	ADDQ $0x02, BX
 	ADDQ $0x02, AX
 	JMP  gen_emit_copy_end
-	JMP two_byte_offset_standalone
 
 two_byte_offset_short_standalone:
+	MOVL DX, SI
+	SHLL $0x02, SI
 	CMPL DX, $0x0c
 	JGE  emit_copy_three_standalone
 	CMPL CX, $0x00000800
 	JGE  emit_copy_three_standalone
-	MOVB $0x01, SI
-	LEAL -16(SI)(DX*4), DX
+	LEAL -15(SI), SI
 	MOVB CL, 1(AX)
 	SHRL $0x08, CX
 	SHLL $0x05, CX
-	ORL  CX, DX
-	MOVB DL, (AX)
+	ORL  CX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, BX
 	ADDQ $0x02, AX
 	JMP  gen_emit_copy_end
 
 emit_copy_three_standalone:
-	MOVB $0x02, SI
-	LEAL -4(SI)(DX*4), DX
-	MOVB DL, (AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
 	MOVW CX, 1(AX)
 	ADDQ $0x03, BX
 	ADDQ $0x03, AX
@@ -17666,8 +18676,8 @@ four_bytes_loop_back_standalone_snappy:
 four_bytes_remain_standalone_snappy:
 	TESTL DX, DX
 	JZ    gen_emit_copy_end_snappy
-	MOVB  $0x03, SI
-	LEAL  -4(SI)(DX*4), DX
+	XORL  SI, SI
+	LEAL  -1(SI)(DX*4), DX
 	MOVB  DL, (AX)
 	MOVL  CX, 1(AX)
 	ADDQ  $0x05, BX
@@ -17685,25 +18695,25 @@ two_byte_offset_standalone_snappy:
 	JMP  two_byte_offset_standalone_snappy
 
 two_byte_offset_short_standalone_snappy:
+	MOVL DX, SI
+	SHLL $0x02, SI
 	CMPL DX, $0x0c
 	JGE  emit_copy_three_standalone_snappy
 	CMPL CX, $0x00000800
 	JGE  emit_copy_three_standalone_snappy
-	MOVB $0x01, SI
-	LEAL -16(SI)(DX*4), DX
+	LEAL -15(SI), SI
 	MOVB CL, 1(AX)
 	SHRL $0x08, CX
 	SHLL $0x05, CX
-	ORL  CX, DX
-	MOVB DL, (AX)
+	ORL  CX, SI
+	MOVB SI, (AX)
 	ADDQ $0x02, BX
 	ADDQ $0x02, AX
 	JMP  gen_emit_copy_end_snappy
 
 emit_copy_three_standalone_snappy:
-	MOVB $0x02, SI
-	LEAL -4(SI)(DX*4), DX
-	MOVB DL, (AX)
+	LEAL -2(SI), SI
+	MOVB SI, (AX)
 	MOVW CX, 1(AX)
 	ADDQ $0x03, BX
 	ADDQ $0x03, AX
@@ -17777,3 +18787,752 @@ matchlen_match1_standalone:
 gen_match_len_end:
 	MOVQ SI, ret+48(FP)
 	RET
+
+// func cvtLZ4BlockAsm(dst []byte, src []byte) (uncompressed int, dstUsed int)
+// Requires: SSE2
+TEXT ·cvtLZ4BlockAsm(SB), NOSPLIT, $0-64
+	XORQ SI, SI
+	MOVQ dst_base+0(FP), AX
+	MOVQ dst_len+8(FP), CX
+	MOVQ src_base+24(FP), DX
+	MOVQ src_len+32(FP), BX
+	LEAQ (DX)(BX*1), BX
+	LEAQ -10(AX)(CX*1), CX
+	XORQ DI, DI
+
+lz4_s2_loop:
+	CMPQ    DX, BX
+	JAE     lz4_s2_corrupt
+	CMPQ    AX, CX
+	JAE     lz4_s2_dstfull
+	MOVBQZX (DX), R8
+	MOVQ    R8, R9
+	MOVQ    R8, R10
+	SHRQ    $0x04, R9
+	ANDQ    $0x0f, R10
+	CMPQ    R8, $0xf0
+	JB      lz4_s2_ll_end
+
+lz4_s2_ll_loop:
+	INCQ    DX
+	CMPQ    DX, BX
+	JAE     lz4_s2_corrupt
+	MOVBQZX (DX), R8
+	ADDQ    R8, R9
+	CMPQ    R8, $0xff
+	JEQ     lz4_s2_ll_loop
+
+lz4_s2_ll_end:
+	LEAQ  (DX)(R9*1), R8
+	ADDQ  $0x04, R10
+	CMPQ  R8, BX
+	JAE   lz4_s2_corrupt
+	INCQ  DX
+	INCQ  R8
+	TESTQ R9, R9
+	JZ    lz4_s2_lits_done
+	LEAQ  (AX)(R9*1), R11
+	CMPQ  R11, CX
+	JAE   lz4_s2_dstfull
+	ADDQ  R9, SI
+	LEAL  -1(R9), R11
+	CMPL  R11, $0x3c
+	JLT   one_byte_lz4_s2
+	CMPL  R11, $0x00000100
+	JLT   two_bytes_lz4_s2
+	CMPL  R11, $0x00010000
+	JLT   three_bytes_lz4_s2
+	CMPL  R11, $0x01000000
+	JLT   four_bytes_lz4_s2
+	MOVB  $0xfc, (AX)
+	MOVL  R11, 1(AX)
+	ADDQ  $0x05, AX
+	JMP   memmove_long_lz4_s2
+
+four_bytes_lz4_s2:
+	MOVL R11, R12
+	SHRL $0x10, R12
+	MOVB $0xf8, (AX)
+	MOVW R11, 1(AX)
+	MOVB R12, 3(AX)
+	ADDQ $0x04, AX
+	JMP  memmove_long_lz4_s2
+
+three_bytes_lz4_s2:
+	MOVB $0xf4, (AX)
+	MOVW R11, 1(AX)
+	ADDQ $0x03, AX
+	JMP  memmove_long_lz4_s2
+
+two_bytes_lz4_s2:
+	MOVB $0xf0, (AX)
+	MOVB R11, 1(AX)
+	ADDQ $0x02, AX
+	CMPL R11, $0x40
+	JL   memmove_lz4_s2
+	JMP  memmove_long_lz4_s2
+
+one_byte_lz4_s2:
+	SHLB $0x02, R11
+	MOVB R11, (AX)
+	ADDQ $0x01, AX
+
+memmove_lz4_s2:
+	LEAQ (AX)(R9*1), R11
+
+	// genMemMoveShort
+	CMPQ R9, $0x08
+	JLE  emit_lit_memmove_lz4_s2_memmove_move_8
+	CMPQ R9, $0x10
+	JBE  emit_lit_memmove_lz4_s2_memmove_move_8through16
+	CMPQ R9, $0x20
+	JBE  emit_lit_memmove_lz4_s2_memmove_move_17through32
+	JMP  emit_lit_memmove_lz4_s2_memmove_move_33through64
+
+emit_lit_memmove_lz4_s2_memmove_move_8:
+	MOVQ (DX), R12
+	MOVQ R12, (AX)
+	JMP  memmove_end_copy_lz4_s2
+
+emit_lit_memmove_lz4_s2_memmove_move_8through16:
+	MOVQ (DX), R12
+	MOVQ -8(DX)(R9*1), DX
+	MOVQ R12, (AX)
+	MOVQ DX, -8(AX)(R9*1)
+	JMP  memmove_end_copy_lz4_s2
+
+emit_lit_memmove_lz4_s2_memmove_move_17through32:
+	MOVOU (DX), X0
+	MOVOU -16(DX)(R9*1), X1
+	MOVOU X0, (AX)
+	MOVOU X1, -16(AX)(R9*1)
+	JMP   memmove_end_copy_lz4_s2
+
+emit_lit_memmove_lz4_s2_memmove_move_33through64:
+	MOVOU (DX), X0
+	MOVOU 16(DX), X1
+	MOVOU -32(DX)(R9*1), X2
+	MOVOU -16(DX)(R9*1), X3
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R9*1)
+	MOVOU X3, -16(AX)(R9*1)
+
+memmove_end_copy_lz4_s2:
+	MOVQ R11, AX
+	JMP  lz4_s2_lits_emit_done
+
+memmove_long_lz4_s2:
+	LEAQ (AX)(R9*1), R11
+
+	// genMemMoveLong
+	MOVOU (DX), X0
+	MOVOU 16(DX), X1
+	MOVOU -32(DX)(R9*1), X2
+	MOVOU -16(DX)(R9*1), X3
+	MOVQ  R9, R13
+	SHRQ  $0x05, R13
+	MOVQ  AX, R12
+	ANDL  $0x0000001f, R12
+	MOVQ  $0x00000040, R14
+	SUBQ  R12, R14
+	DECQ  R13
+	JA    emit_lit_memmove_long_lz4_s2large_forward_sse_loop_32
+	LEAQ  -32(DX)(R14*1), R12
+	LEAQ  -32(AX)(R14*1), R15
+
+emit_lit_memmove_long_lz4_s2large_big_loop_back:
+	MOVOU (R12), X4
+	MOVOU 16(R12), X5
+	MOVOA X4, (R15)
+	MOVOA X5, 16(R15)
+	ADDQ  $0x20, R15
+	ADDQ  $0x20, R12
+	ADDQ  $0x20, R14
+	DECQ  R13
+	JNA   emit_lit_memmove_long_lz4_s2large_big_loop_back
+
+emit_lit_memmove_long_lz4_s2large_forward_sse_loop_32:
+	MOVOU -32(DX)(R14*1), X4
+	MOVOU -16(DX)(R14*1), X5
+	MOVOA X4, -32(AX)(R14*1)
+	MOVOA X5, -16(AX)(R14*1)
+	ADDQ  $0x20, R14
+	CMPQ  R9, R14
+	JAE   emit_lit_memmove_long_lz4_s2large_forward_sse_loop_32
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R9*1)
+	MOVOU X3, -16(AX)(R9*1)
+	MOVQ  R11, AX
+
+lz4_s2_lits_emit_done:
+	MOVQ R8, DX
+
+lz4_s2_lits_done:
+	CMPQ DX, BX
+	JNE  lz4_s2_match
+	CMPQ R10, $0x04
+	JEQ  lz4_s2_done
+	JMP  lz4_s2_corrupt
+
+lz4_s2_match:
+	LEAQ    2(DX), R8
+	CMPQ    R8, BX
+	JAE     lz4_s2_corrupt
+	MOVWQZX (DX), R9
+	MOVQ    R8, DX
+	TESTQ   R9, R9
+	JZ      lz4_s2_corrupt
+	CMPQ    R9, SI
+	JA      lz4_s2_corrupt
+	CMPQ    R10, $0x13
+	JNE     lz4_s2_ml_done
+
+lz4_s2_ml_loop:
+	MOVBQZX (DX), R8
+	INCQ    DX
+	ADDQ    R8, R10
+	CMPQ    DX, BX
+	JAE     lz4_s2_corrupt
+	CMPQ    R8, $0xff
+	JEQ     lz4_s2_ml_loop
+
+lz4_s2_ml_done:
+	ADDQ R10, SI
+	CMPQ R9, DI
+	JNE  lz4_s2_docopy
+
+	// emitRepeat
+emit_repeat_again_lz4_s2:
+	MOVL R10, R8
+	LEAL -4(R10), R10
+	CMPL R8, $0x08
+	JLE  repeat_two_lz4_s2
+	CMPL R8, $0x0c
+	JGE  cant_repeat_two_offset_lz4_s2
+	CMPL R9, $0x00000800
+	JLT  repeat_two_offset_lz4_s2
+
+cant_repeat_two_offset_lz4_s2:
+	CMPL R10, $0x00000104
+	JLT  repeat_three_lz4_s2
+	CMPL R10, $0x00010100
+	JLT  repeat_four_lz4_s2
+	CMPL R10, $0x0100ffff
+	JLT  repeat_five_lz4_s2
+	LEAL -16842747(R10), R10
+	MOVL $0xfffb001d, (AX)
+	MOVB $0xff, 4(AX)
+	ADDQ $0x05, AX
+	JMP  emit_repeat_again_lz4_s2
+
+repeat_five_lz4_s2:
+	LEAL -65536(R10), R10
+	MOVL R10, R9
+	MOVW $0x001d, (AX)
+	MOVW R10, 2(AX)
+	SARL $0x10, R9
+	MOVB R9, 4(AX)
+	ADDQ $0x05, AX
+	JMP  lz4_s2_loop
+
+repeat_four_lz4_s2:
+	LEAL -256(R10), R10
+	MOVW $0x0019, (AX)
+	MOVW R10, 2(AX)
+	ADDQ $0x04, AX
+	JMP  lz4_s2_loop
+
+repeat_three_lz4_s2:
+	LEAL -4(R10), R10
+	MOVW $0x0015, (AX)
+	MOVB R10, 2(AX)
+	ADDQ $0x03, AX
+	JMP  lz4_s2_loop
+
+repeat_two_lz4_s2:
+	SHLL $0x02, R10
+	ORL  $0x01, R10
+	MOVW R10, (AX)
+	ADDQ $0x02, AX
+	JMP  lz4_s2_loop
+
+repeat_two_offset_lz4_s2:
+	XORQ R8, R8
+	LEAL 1(R8)(R10*4), R10
+	MOVB R9, 1(AX)
+	SARL $0x08, R9
+	SHLL $0x05, R9
+	ORL  R9, R10
+	MOVB R10, (AX)
+	ADDQ $0x02, AX
+	JMP  lz4_s2_loop
+
+lz4_s2_docopy:
+	MOVQ R9, DI
+
+	// emitCopy
+	CMPL R10, $0x40
+	JLE  two_byte_offset_short_lz4_s2
+	CMPL R9, $0x00000800
+	JAE  long_offset_short_lz4_s2
+	MOVL $0x00000001, R8
+	LEAL 16(R8), R8
+	MOVB R9, 1(AX)
+	MOVL R9, R11
+	SHRL $0x08, R11
+	SHLL $0x05, R11
+	ORL  R11, R8
+	MOVB R8, (AX)
+	ADDQ $0x02, AX
+	SUBL $0x08, R10
+
+	// emitRepeat
+	LEAL -4(R10), R10
+	JMP  cant_repeat_two_offset_lz4_s2_emit_copy_short_2b
+
+emit_repeat_again_lz4_s2_emit_copy_short_2b:
+	MOVL R10, R8
+	LEAL -4(R10), R10
+	CMPL R8, $0x08
+	JLE  repeat_two_lz4_s2_emit_copy_short_2b
+	CMPL R8, $0x0c
+	JGE  cant_repeat_two_offset_lz4_s2_emit_copy_short_2b
+	CMPL R9, $0x00000800
+	JLT  repeat_two_offset_lz4_s2_emit_copy_short_2b
+
+cant_repeat_two_offset_lz4_s2_emit_copy_short_2b:
+	CMPL R10, $0x00000104
+	JLT  repeat_three_lz4_s2_emit_copy_short_2b
+	CMPL R10, $0x00010100
+	JLT  repeat_four_lz4_s2_emit_copy_short_2b
+	CMPL R10, $0x0100ffff
+	JLT  repeat_five_lz4_s2_emit_copy_short_2b
+	LEAL -16842747(R10), R10
+	MOVL $0xfffb001d, (AX)
+	MOVB $0xff, 4(AX)
+	ADDQ $0x05, AX
+	JMP  emit_repeat_again_lz4_s2_emit_copy_short_2b
+
+repeat_five_lz4_s2_emit_copy_short_2b:
+	LEAL -65536(R10), R10
+	MOVL R10, R9
+	MOVW $0x001d, (AX)
+	MOVW R10, 2(AX)
+	SARL $0x10, R9
+	MOVB R9, 4(AX)
+	ADDQ $0x05, AX
+	JMP  lz4_s2_loop
+
+repeat_four_lz4_s2_emit_copy_short_2b:
+	LEAL -256(R10), R10
+	MOVW $0x0019, (AX)
+	MOVW R10, 2(AX)
+	ADDQ $0x04, AX
+	JMP  lz4_s2_loop
+
+repeat_three_lz4_s2_emit_copy_short_2b:
+	LEAL -4(R10), R10
+	MOVW $0x0015, (AX)
+	MOVB R10, 2(AX)
+	ADDQ $0x03, AX
+	JMP  lz4_s2_loop
+
+repeat_two_lz4_s2_emit_copy_short_2b:
+	SHLL $0x02, R10
+	ORL  $0x01, R10
+	MOVW R10, (AX)
+	ADDQ $0x02, AX
+	JMP  lz4_s2_loop
+
+repeat_two_offset_lz4_s2_emit_copy_short_2b:
+	XORQ R8, R8
+	LEAL 1(R8)(R10*4), R10
+	MOVB R9, 1(AX)
+	SARL $0x08, R9
+	SHLL $0x05, R9
+	ORL  R9, R10
+	MOVB R10, (AX)
+	ADDQ $0x02, AX
+	JMP  lz4_s2_loop
+
+long_offset_short_lz4_s2:
+	MOVB $0xee, (AX)
+	MOVW R9, 1(AX)
+	LEAL -60(R10), R10
+	ADDQ $0x03, AX
+
+	// emitRepeat
+emit_repeat_again_lz4_s2_emit_copy_short:
+	MOVL R10, R8
+	LEAL -4(R10), R10
+	CMPL R8, $0x08
+	JLE  repeat_two_lz4_s2_emit_copy_short
+	CMPL R8, $0x0c
+	JGE  cant_repeat_two_offset_lz4_s2_emit_copy_short
+	CMPL R9, $0x00000800
+	JLT  repeat_two_offset_lz4_s2_emit_copy_short
+
+cant_repeat_two_offset_lz4_s2_emit_copy_short:
+	CMPL R10, $0x00000104
+	JLT  repeat_three_lz4_s2_emit_copy_short
+	CMPL R10, $0x00010100
+	JLT  repeat_four_lz4_s2_emit_copy_short
+	CMPL R10, $0x0100ffff
+	JLT  repeat_five_lz4_s2_emit_copy_short
+	LEAL -16842747(R10), R10
+	MOVL $0xfffb001d, (AX)
+	MOVB $0xff, 4(AX)
+	ADDQ $0x05, AX
+	JMP  emit_repeat_again_lz4_s2_emit_copy_short
+
+repeat_five_lz4_s2_emit_copy_short:
+	LEAL -65536(R10), R10
+	MOVL R10, R9
+	MOVW $0x001d, (AX)
+	MOVW R10, 2(AX)
+	SARL $0x10, R9
+	MOVB R9, 4(AX)
+	ADDQ $0x05, AX
+	JMP  lz4_s2_loop
+
+repeat_four_lz4_s2_emit_copy_short:
+	LEAL -256(R10), R10
+	MOVW $0x0019, (AX)
+	MOVW R10, 2(AX)
+	ADDQ $0x04, AX
+	JMP  lz4_s2_loop
+
+repeat_three_lz4_s2_emit_copy_short:
+	LEAL -4(R10), R10
+	MOVW $0x0015, (AX)
+	MOVB R10, 2(AX)
+	ADDQ $0x03, AX
+	JMP  lz4_s2_loop
+
+repeat_two_lz4_s2_emit_copy_short:
+	SHLL $0x02, R10
+	ORL  $0x01, R10
+	MOVW R10, (AX)
+	ADDQ $0x02, AX
+	JMP  lz4_s2_loop
+
+repeat_two_offset_lz4_s2_emit_copy_short:
+	XORQ R8, R8
+	LEAL 1(R8)(R10*4), R10
+	MOVB R9, 1(AX)
+	SARL $0x08, R9
+	SHLL $0x05, R9
+	ORL  R9, R10
+	MOVB R10, (AX)
+	ADDQ $0x02, AX
+	JMP  lz4_s2_loop
+
+two_byte_offset_short_lz4_s2:
+	MOVL R10, R8
+	SHLL $0x02, R8
+	CMPL R10, $0x0c
+	JGE  emit_copy_three_lz4_s2
+	CMPL R9, $0x00000800
+	JGE  emit_copy_three_lz4_s2
+	LEAL -15(R8), R8
+	MOVB R9, 1(AX)
+	SHRL $0x08, R9
+	SHLL $0x05, R9
+	ORL  R9, R8
+	MOVB R8, (AX)
+	ADDQ $0x02, AX
+	JMP  lz4_s2_loop
+
+emit_copy_three_lz4_s2:
+	LEAL -2(R8), R8
+	MOVB R8, (AX)
+	MOVW R9, 1(AX)
+	ADDQ $0x03, AX
+	JMP  lz4_s2_loop
+
+lz4_s2_done:
+	MOVQ dst_base+0(FP), CX
+	SUBQ CX, AX
+	MOVQ SI, uncompressed+48(FP)
+	MOVQ AX, dstUsed+56(FP)
+	RET
+
+lz4_s2_corrupt:
+	XORQ AX, AX
+	LEAQ -1(AX), SI
+	MOVQ SI, uncompressed+48(FP)
+	RET
+
+lz4_s2_dstfull:
+	XORQ AX, AX
+	LEAQ -2(AX), SI
+	MOVQ SI, uncompressed+48(FP)
+	RET
+
+// func cvtLZ4BlockSnappyAsm(dst []byte, src []byte) (uncompressed int, dstUsed int)
+// Requires: SSE2
+TEXT ·cvtLZ4BlockSnappyAsm(SB), NOSPLIT, $0-64
+	XORQ SI, SI
+	MOVQ dst_base+0(FP), AX
+	MOVQ dst_len+8(FP), CX
+	MOVQ src_base+24(FP), DX
+	MOVQ src_len+32(FP), BX
+	LEAQ (DX)(BX*1), BX
+	LEAQ -10(AX)(CX*1), CX
+
+lz4_snappy_loop:
+	CMPQ    DX, BX
+	JAE     lz4_snappy_corrupt
+	CMPQ    AX, CX
+	JAE     lz4_snappy_dstfull
+	MOVBQZX (DX), DI
+	MOVQ    DI, R8
+	MOVQ    DI, R9
+	SHRQ    $0x04, R8
+	ANDQ    $0x0f, R9
+	CMPQ    DI, $0xf0
+	JB      lz4_snappy_ll_end
+
+lz4_snappy_ll_loop:
+	INCQ    DX
+	CMPQ    DX, BX
+	JAE     lz4_snappy_corrupt
+	MOVBQZX (DX), DI
+	ADDQ    DI, R8
+	CMPQ    DI, $0xff
+	JEQ     lz4_snappy_ll_loop
+
+lz4_snappy_ll_end:
+	LEAQ  (DX)(R8*1), DI
+	ADDQ  $0x04, R9
+	CMPQ  DI, BX
+	JAE   lz4_snappy_corrupt
+	INCQ  DX
+	INCQ  DI
+	TESTQ R8, R8
+	JZ    lz4_snappy_lits_done
+	LEAQ  (AX)(R8*1), R10
+	CMPQ  R10, CX
+	JAE   lz4_snappy_dstfull
+	ADDQ  R8, SI
+	LEAL  -1(R8), R10
+	CMPL  R10, $0x3c
+	JLT   one_byte_lz4_snappy
+	CMPL  R10, $0x00000100
+	JLT   two_bytes_lz4_snappy
+	CMPL  R10, $0x00010000
+	JLT   three_bytes_lz4_snappy
+	CMPL  R10, $0x01000000
+	JLT   four_bytes_lz4_snappy
+	MOVB  $0xfc, (AX)
+	MOVL  R10, 1(AX)
+	ADDQ  $0x05, AX
+	JMP   memmove_long_lz4_snappy
+
+four_bytes_lz4_snappy:
+	MOVL R10, R11
+	SHRL $0x10, R11
+	MOVB $0xf8, (AX)
+	MOVW R10, 1(AX)
+	MOVB R11, 3(AX)
+	ADDQ $0x04, AX
+	JMP  memmove_long_lz4_snappy
+
+three_bytes_lz4_snappy:
+	MOVB $0xf4, (AX)
+	MOVW R10, 1(AX)
+	ADDQ $0x03, AX
+	JMP  memmove_long_lz4_snappy
+
+two_bytes_lz4_snappy:
+	MOVB $0xf0, (AX)
+	MOVB R10, 1(AX)
+	ADDQ $0x02, AX
+	CMPL R10, $0x40
+	JL   memmove_lz4_snappy
+	JMP  memmove_long_lz4_snappy
+
+one_byte_lz4_snappy:
+	SHLB $0x02, R10
+	MOVB R10, (AX)
+	ADDQ $0x01, AX
+
+memmove_lz4_snappy:
+	LEAQ (AX)(R8*1), R10
+
+	// genMemMoveShort
+	CMPQ R8, $0x08
+	JLE  emit_lit_memmove_lz4_snappy_memmove_move_8
+	CMPQ R8, $0x10
+	JBE  emit_lit_memmove_lz4_snappy_memmove_move_8through16
+	CMPQ R8, $0x20
+	JBE  emit_lit_memmove_lz4_snappy_memmove_move_17through32
+	JMP  emit_lit_memmove_lz4_snappy_memmove_move_33through64
+
+emit_lit_memmove_lz4_snappy_memmove_move_8:
+	MOVQ (DX), R11
+	MOVQ R11, (AX)
+	JMP  memmove_end_copy_lz4_snappy
+
+emit_lit_memmove_lz4_snappy_memmove_move_8through16:
+	MOVQ (DX), R11
+	MOVQ -8(DX)(R8*1), DX
+	MOVQ R11, (AX)
+	MOVQ DX, -8(AX)(R8*1)
+	JMP  memmove_end_copy_lz4_snappy
+
+emit_lit_memmove_lz4_snappy_memmove_move_17through32:
+	MOVOU (DX), X0
+	MOVOU -16(DX)(R8*1), X1
+	MOVOU X0, (AX)
+	MOVOU X1, -16(AX)(R8*1)
+	JMP   memmove_end_copy_lz4_snappy
+
+emit_lit_memmove_lz4_snappy_memmove_move_33through64:
+	MOVOU (DX), X0
+	MOVOU 16(DX), X1
+	MOVOU -32(DX)(R8*1), X2
+	MOVOU -16(DX)(R8*1), X3
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+
+memmove_end_copy_lz4_snappy:
+	MOVQ R10, AX
+	JMP  lz4_snappy_lits_emit_done
+
+memmove_long_lz4_snappy:
+	LEAQ (AX)(R8*1), R10
+
+	// genMemMoveLong
+	MOVOU (DX), X0
+	MOVOU 16(DX), X1
+	MOVOU -32(DX)(R8*1), X2
+	MOVOU -16(DX)(R8*1), X3
+	MOVQ  R8, R12
+	SHRQ  $0x05, R12
+	MOVQ  AX, R11
+	ANDL  $0x0000001f, R11
+	MOVQ  $0x00000040, R13
+	SUBQ  R11, R13
+	DECQ  R12
+	JA    emit_lit_memmove_long_lz4_snappylarge_forward_sse_loop_32
+	LEAQ  -32(DX)(R13*1), R11
+	LEAQ  -32(AX)(R13*1), R14
+
+emit_lit_memmove_long_lz4_snappylarge_big_loop_back:
+	MOVOU (R11), X4
+	MOVOU 16(R11), X5
+	MOVOA X4, (R14)
+	MOVOA X5, 16(R14)
+	ADDQ  $0x20, R14
+	ADDQ  $0x20, R11
+	ADDQ  $0x20, R13
+	DECQ  R12
+	JNA   emit_lit_memmove_long_lz4_snappylarge_big_loop_back
+
+emit_lit_memmove_long_lz4_snappylarge_forward_sse_loop_32:
+	MOVOU -32(DX)(R13*1), X4
+	MOVOU -16(DX)(R13*1), X5
+	MOVOA X4, -32(AX)(R13*1)
+	MOVOA X5, -16(AX)(R13*1)
+	ADDQ  $0x20, R13
+	CMPQ  R8, R13
+	JAE   emit_lit_memmove_long_lz4_snappylarge_forward_sse_loop_32
+	MOVOU X0, (AX)
+	MOVOU X1, 16(AX)
+	MOVOU X2, -32(AX)(R8*1)
+	MOVOU X3, -16(AX)(R8*1)
+	MOVQ  R10, AX
+
+lz4_snappy_lits_emit_done:
+	MOVQ DI, DX
+
+lz4_snappy_lits_done:
+	CMPQ DX, BX
+	JNE  lz4_snappy_match
+	CMPQ R9, $0x04
+	JEQ  lz4_snappy_done
+	JMP  lz4_snappy_corrupt
+
+lz4_snappy_match:
+	LEAQ    2(DX), DI
+	CMPQ    DI, BX
+	JAE     lz4_snappy_corrupt
+	MOVWQZX (DX), R8
+	MOVQ    DI, DX
+	TESTQ   R8, R8
+	JZ      lz4_snappy_corrupt
+	CMPQ    R8, SI
+	JA      lz4_snappy_corrupt
+	CMPQ    R9, $0x13
+	JNE     lz4_snappy_ml_done
+
+lz4_snappy_ml_loop:
+	MOVBQZX (DX), DI
+	INCQ    DX
+	ADDQ    DI, R9
+	CMPQ    DX, BX
+	JAE     lz4_snappy_corrupt
+	CMPQ    DI, $0xff
+	JEQ     lz4_snappy_ml_loop
+
+lz4_snappy_ml_done:
+	ADDQ R9, SI
+
+	// emitCopy
+two_byte_offset_lz4_s2:
+	CMPL R9, $0x40
+	JLE  two_byte_offset_short_lz4_s2
+	MOVB $0xee, (AX)
+	MOVW R8, 1(AX)
+	LEAL -60(R9), R9
+	ADDQ $0x03, AX
+	CMPQ AX, CX
+	JAE  lz4_snappy_loop
+	JMP  two_byte_offset_lz4_s2
+
+two_byte_offset_short_lz4_s2:
+	MOVL R9, DI
+	SHLL $0x02, DI
+	CMPL R9, $0x0c
+	JGE  emit_copy_three_lz4_s2
+	CMPL R8, $0x00000800
+	JGE  emit_copy_three_lz4_s2
+	LEAL -15(DI), DI
+	MOVB R8, 1(AX)
+	SHRL $0x08, R8
+	SHLL $0x05, R8
+	ORL  R8, DI
+	MOVB DI, (AX)
+	ADDQ $0x02, AX
+	JMP  lz4_snappy_loop
+
+emit_copy_three_lz4_s2:
+	LEAL -2(DI), DI
+	MOVB DI, (AX)
+	MOVW R8, 1(AX)
+	ADDQ $0x03, AX
+	JMP  lz4_snappy_loop
+
+lz4_snappy_done:
+	MOVQ dst_base+0(FP), CX
+	SUBQ CX, AX
+	MOVQ SI, uncompressed+48(FP)
+	MOVQ AX, dstUsed+56(FP)
+	RET
+
+lz4_snappy_corrupt:
+	XORQ AX, AX
+	LEAQ -1(AX), SI
+	MOVQ SI, uncompressed+48(FP)
+	RET
+
+lz4_snappy_dstfull:
+	XORQ AX, AX
+	LEAQ -2(AX), SI
+	MOVQ SI, uncompressed+48(FP)
+	RET
diff --git a/vendor/github.com/klauspost/compress/s2/lz4convert.go b/vendor/github.com/klauspost/compress/s2/lz4convert.go
new file mode 100644
index 00000000..46ed908e
--- /dev/null
+++ b/vendor/github.com/klauspost/compress/s2/lz4convert.go
@@ -0,0 +1,585 @@
+// Copyright (c) 2022 Klaus Post. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package s2
+
+import (
+	"encoding/binary"
+	"errors"
+	"fmt"
+)
+
+// LZ4Converter provides conversion from LZ4 blocks as defined here:
+// https://github.com/lz4/lz4/blob/dev/doc/lz4_Block_format.md
+type LZ4Converter struct {
+}
+
+// ErrDstTooSmall is returned when provided destination is too small.
+var ErrDstTooSmall = errors.New("s2: destination too small")
+
+// ConvertBlock will convert an LZ4 block and append it as an S2
+// block without block length to dst.
+// The uncompressed size is returned as well.
+// dst must have capacity to contain the entire compressed block.
+func (l *LZ4Converter) ConvertBlock(dst, src []byte) ([]byte, int, error) {
+	if len(src) == 0 {
+		return dst, 0, nil
+	}
+	const debug = false
+	const inline = true
+	const lz4MinMatch = 4
+
+	s, d := 0, len(dst)
+	dst = dst[:cap(dst)]
+	if !debug && hasAmd64Asm {
+		res, sz := cvtLZ4BlockAsm(dst[d:], src)
+		if res < 0 {
+			const (
+				errCorrupt     = -1
+				errDstTooSmall = -2
+			)
+			switch res {
+			case errCorrupt:
+				return nil, 0, ErrCorrupt
+			case errDstTooSmall:
+				return nil, 0, ErrDstTooSmall
+			default:
+				return nil, 0, fmt.Errorf("unexpected result: %d", res)
+			}
+		}
+		if d+sz > len(dst) {
+			return nil, 0, ErrDstTooSmall
+		}
+		return dst[:d+sz], res, nil
+	}
+
+	dLimit := len(dst) - 10
+	var lastOffset uint16
+	var uncompressed int
+	if debug {
+		fmt.Printf("convert block start: len(src): %d, len(dst):%d \n", len(src), len(dst))
+	}
+
+	for {
+		if s >= len(src) {
+			return dst[:d], 0, ErrCorrupt
+		}
+		// Read literal info
+		token := src[s]
+		ll := int(token >> 4)
+		ml := int(lz4MinMatch + (token & 0xf))
+
+		// If upper nibble is 15, literal length is extended
+		if token >= 0xf0 {
+			for {
+				s++
+				if s >= len(src) {
+					if debug {
+						fmt.Printf("error reading ll: s (%d) >= len(src) (%d)\n", s, len(src))
+					}
+					return dst[:d], 0, ErrCorrupt
+				}
+				val := src[s]
+				ll += int(val)
+				if val != 255 {
+					break
+				}
+			}
+		}
+		// Skip past token
+		if s+ll >= len(src) {
+			if debug {
+				fmt.Printf("error literals: s+ll (%d+%d) >= len(src) (%d)\n", s, ll, len(src))
+			}
+			return nil, 0, ErrCorrupt
+		}
+		s++
+		if ll > 0 {
+			if d+ll > dLimit {
+				return nil, 0, ErrDstTooSmall
+			}
+			if debug {
+				fmt.Printf("emit %d literals\n", ll)
+			}
+			d += emitLiteralGo(dst[d:], src[s:s+ll])
+			s += ll
+			uncompressed += ll
+		}
+
+		// Check if we are done...
+		if s == len(src) && ml == lz4MinMatch {
+			break
+		}
+		// 2 byte offset
+		if s >= len(src)-2 {
+			if debug {
+				fmt.Printf("s (%d) >= len(src)-2 (%d)", s, len(src)-2)
+			}
+			return nil, 0, ErrCorrupt
+		}
+		offset := binary.LittleEndian.Uint16(src[s:])
+		s += 2
+		if offset == 0 {
+			if debug {
+				fmt.Printf("error: offset 0, ml: %d, len(src)-s: %d\n", ml, len(src)-s)
+			}
+			return nil, 0, ErrCorrupt
+		}
+		if int(offset) > uncompressed {
+			if debug {
+				fmt.Printf("error: offset (%d)> uncompressed (%d)\n", offset, uncompressed)
+			}
+			return nil, 0, ErrCorrupt
+		}
+
+		if ml == lz4MinMatch+15 {
+			for {
+				if s >= len(src) {
+					if debug {
+						fmt.Printf("error reading ml: s (%d) >= len(src) (%d)\n", s, len(src))
+					}
+					return nil, 0, ErrCorrupt
+				}
+				val := src[s]
+				s++
+				ml += int(val)
+				if val != 255 {
+					if s >= len(src) {
+						if debug {
+							fmt.Printf("error reading ml: s (%d) >= len(src) (%d)\n", s, len(src))
+						}
+						return nil, 0, ErrCorrupt
+					}
+					break
+				}
+			}
+		}
+		if offset == lastOffset {
+			if debug {
+				fmt.Printf("emit repeat, length: %d, offset: %d\n", ml, offset)
+			}
+			if !inline {
+				d += emitRepeat16(dst[d:], offset, ml)
+			} else {
+				length := ml
+				dst := dst[d:]
+				for len(dst) > 5 {
+					// Repeat offset, make length cheaper
+					length -= 4
+					if length <= 4 {
+						dst[0] = uint8(length)<<2 | tagCopy1
+						dst[1] = 0
+						d += 2
+						break
+					}
+					if length < 8 && offset < 2048 {
+						// Encode WITH offset
+						dst[1] = uint8(offset)
+						dst[0] = uint8(offset>>8)<<5 | uint8(length)<<2 | tagCopy1
+						d += 2
+						break
+					}
+					if length < (1<<8)+4 {
+						length -= 4
+						dst[2] = uint8(length)
+						dst[1] = 0
+						dst[0] = 5<<2 | tagCopy1
+						d += 3
+						break
+					}
+					if length < (1<<16)+(1<<8) {
+						length -= 1 << 8
+						dst[3] = uint8(length >> 8)
+						dst[2] = uint8(length >> 0)
+						dst[1] = 0
+						dst[0] = 6<<2 | tagCopy1
+						d += 4
+						break
+					}
+					const maxRepeat = (1 << 24) - 1
+					length -= 1 << 16
+					left := 0
+					if length > maxRepeat {
+						left = length - maxRepeat + 4
+						length = maxRepeat - 4
+					}
+					dst[4] = uint8(length >> 16)
+					dst[3] = uint8(length >> 8)
+					dst[2] = uint8(length >> 0)
+					dst[1] = 0
+					dst[0] = 7<<2 | tagCopy1
+					if left > 0 {
+						d += 5 + emitRepeat16(dst[5:], offset, left)
+						break
+					}
+					d += 5
+					break
+				}
+			}
+		} else {
+			if debug {
+				fmt.Printf("emit copy, length: %d, offset: %d\n", ml, offset)
+			}
+			if !inline {
+				d += emitCopy16(dst[d:], offset, ml)
+			} else {
+				length := ml
+				dst := dst[d:]
+				for len(dst) > 5 {
+					// Offset no more than 2 bytes.
+					if length > 64 {
+						off := 3
+						if offset < 2048 {
+							// emit 8 bytes as tagCopy1, rest as repeats.
+							dst[1] = uint8(offset)
+							dst[0] = uint8(offset>>8)<<5 | uint8(8-4)<<2 | tagCopy1
+							length -= 8
+							off = 2
+						} else {
+							// Emit a length 60 copy, encoded as 3 bytes.
+							// Emit remaining as repeat value (minimum 4 bytes).
+							dst[2] = uint8(offset >> 8)
+							dst[1] = uint8(offset)
+							dst[0] = 59<<2 | tagCopy2
+							length -= 60
+						}
+						// Emit remaining as repeats, at least 4 bytes remain.
+						d += off + emitRepeat16(dst[off:], offset, length)
+						break
+					}
+					if length >= 12 || offset >= 2048 {
+						// Emit the remaining copy, encoded as 3 bytes.
+						dst[2] = uint8(offset >> 8)
+						dst[1] = uint8(offset)
+						dst[0] = uint8(length-1)<<2 | tagCopy2
+						d += 3
+						break
+					}
+					// Emit the remaining copy, encoded as 2 bytes.
+					dst[1] = uint8(offset)
+					dst[0] = uint8(offset>>8)<<5 | uint8(length-4)<<2 | tagCopy1
+					d += 2
+					break
+				}
+			}
+			lastOffset = offset
+		}
+		uncompressed += ml
+		if d > dLimit {
+			return nil, 0, ErrDstTooSmall
+		}
+	}
+
+	return dst[:d], uncompressed, nil
+}
+
+// ConvertBlockSnappy will convert an LZ4 block and append it
+// as a Snappy block without block length to dst.
+// The uncompressed size is returned as well.
+// dst must have capacity to contain the entire compressed block.
+func (l *LZ4Converter) ConvertBlockSnappy(dst, src []byte) ([]byte, int, error) {
+	if len(src) == 0 {
+		return dst, 0, nil
+	}
+	const debug = false
+	const lz4MinMatch = 4
+
+	s, d := 0, len(dst)
+	dst = dst[:cap(dst)]
+	// Use assembly when possible
+	if !debug && hasAmd64Asm {
+		res, sz := cvtLZ4BlockSnappyAsm(dst[d:], src)
+		if res < 0 {
+			const (
+				errCorrupt     = -1
+				errDstTooSmall = -2
+			)
+			switch res {
+			case errCorrupt:
+				return nil, 0, ErrCorrupt
+			case errDstTooSmall:
+				return nil, 0, ErrDstTooSmall
+			default:
+				return nil, 0, fmt.Errorf("unexpected result: %d", res)
+			}
+		}
+		if d+sz > len(dst) {
+			return nil, 0, ErrDstTooSmall
+		}
+		return dst[:d+sz], res, nil
+	}
+
+	dLimit := len(dst) - 10
+	var uncompressed int
+	if debug {
+		fmt.Printf("convert block start: len(src): %d, len(dst):%d \n", len(src), len(dst))
+	}
+
+	for {
+		if s >= len(src) {
+			return nil, 0, ErrCorrupt
+		}
+		// Read literal info
+		token := src[s]
+		ll := int(token >> 4)
+		ml := int(lz4MinMatch + (token & 0xf))
+
+		// If upper nibble is 15, literal length is extended
+		if token >= 0xf0 {
+			for {
+				s++
+				if s >= len(src) {
+					if debug {
+						fmt.Printf("error reading ll: s (%d) >= len(src) (%d)\n", s, len(src))
+					}
+					return nil, 0, ErrCorrupt
+				}
+				val := src[s]
+				ll += int(val)
+				if val != 255 {
+					break
+				}
+			}
+		}
+		// Skip past token
+		if s+ll >= len(src) {
+			if debug {
+				fmt.Printf("error literals: s+ll (%d+%d) >= len(src) (%d)\n", s, ll, len(src))
+			}
+			return nil, 0, ErrCorrupt
+		}
+		s++
+		if ll > 0 {
+			if d+ll > dLimit {
+				return nil, 0, ErrDstTooSmall
+			}
+			if debug {
+				fmt.Printf("emit %d literals\n", ll)
+			}
+			d += emitLiteralGo(dst[d:], src[s:s+ll])
+			s += ll
+			uncompressed += ll
+		}
+
+		// Check if we are done...
+		if s == len(src) && ml == lz4MinMatch {
+			break
+		}
+		// 2 byte offset
+		if s >= len(src)-2 {
+			if debug {
+				fmt.Printf("s (%d) >= len(src)-2 (%d)", s, len(src)-2)
+			}
+			return nil, 0, ErrCorrupt
+		}
+		offset := binary.LittleEndian.Uint16(src[s:])
+		s += 2
+		if offset == 0 {
+			if debug {
+				fmt.Printf("error: offset 0, ml: %d, len(src)-s: %d\n", ml, len(src)-s)
+			}
+			return nil, 0, ErrCorrupt
+		}
+		if int(offset) > uncompressed {
+			if debug {
+				fmt.Printf("error: offset (%d)> uncompressed (%d)\n", offset, uncompressed)
+			}
+			return nil, 0, ErrCorrupt
+		}
+
+		if ml == lz4MinMatch+15 {
+			for {
+				if s >= len(src) {
+					if debug {
+						fmt.Printf("error reading ml: s (%d) >= len(src) (%d)\n", s, len(src))
+					}
+					return nil, 0, ErrCorrupt
+				}
+				val := src[s]
+				s++
+				ml += int(val)
+				if val != 255 {
+					if s >= len(src) {
+						if debug {
+							fmt.Printf("error reading ml: s (%d) >= len(src) (%d)\n", s, len(src))
+						}
+						return nil, 0, ErrCorrupt
+					}
+					break
+				}
+			}
+		}
+		if debug {
+			fmt.Printf("emit copy, length: %d, offset: %d\n", ml, offset)
+		}
+		length := ml
+		// d += emitCopyNoRepeat(dst[d:], int(offset), ml)
+		for length > 0 {
+			if d >= dLimit {
+				return nil, 0, ErrDstTooSmall
+			}
+
+			// Offset no more than 2 bytes.
+			if length > 64 {
+				// Emit a length 64 copy, encoded as 3 bytes.
+				dst[d+2] = uint8(offset >> 8)
+				dst[d+1] = uint8(offset)
+				dst[d+0] = 63<<2 | tagCopy2
+				length -= 64
+				d += 3
+				continue
+			}
+			if length >= 12 || offset >= 2048 || length < 4 {
+				// Emit the remaining copy, encoded as 3 bytes.
+				dst[d+2] = uint8(offset >> 8)
+				dst[d+1] = uint8(offset)
+				dst[d+0] = uint8(length-1)<<2 | tagCopy2
+				d += 3
+				break
+			}
+			// Emit the remaining copy, encoded as 2 bytes.
+			dst[d+1] = uint8(offset)
+			dst[d+0] = uint8(offset>>8)<<5 | uint8(length-4)<<2 | tagCopy1
+			d += 2
+			break
+		}
+		uncompressed += ml
+		if d > dLimit {
+			return nil, 0, ErrDstTooSmall
+		}
+	}
+
+	return dst[:d], uncompressed, nil
+}
+
+// emitRepeat writes a repeat chunk and returns the number of bytes written.
+// Length must be at least 4 and < 1<<24
+func emitRepeat16(dst []byte, offset uint16, length int) int {
+	// Repeat offset, make length cheaper
+	length -= 4
+	if length <= 4 {
+		dst[0] = uint8(length)<<2 | tagCopy1
+		dst[1] = 0
+		return 2
+	}
+	if length < 8 && offset < 2048 {
+		// Encode WITH offset
+		dst[1] = uint8(offset)
+		dst[0] = uint8(offset>>8)<<5 | uint8(length)<<2 | tagCopy1
+		return 2
+	}
+	if length < (1<<8)+4 {
+		length -= 4
+		dst[2] = uint8(length)
+		dst[1] = 0
+		dst[0] = 5<<2 | tagCopy1
+		return 3
+	}
+	if length < (1<<16)+(1<<8) {
+		length -= 1 << 8
+		dst[3] = uint8(length >> 8)
+		dst[2] = uint8(length >> 0)
+		dst[1] = 0
+		dst[0] = 6<<2 | tagCopy1
+		return 4
+	}
+	const maxRepeat = (1 << 24) - 1
+	length -= 1 << 16
+	left := 0
+	if length > maxRepeat {
+		left = length - maxRepeat + 4
+		length = maxRepeat - 4
+	}
+	dst[4] = uint8(length >> 16)
+	dst[3] = uint8(length >> 8)
+	dst[2] = uint8(length >> 0)
+	dst[1] = 0
+	dst[0] = 7<<2 | tagCopy1
+	if left > 0 {
+		return 5 + emitRepeat16(dst[5:], offset, left)
+	}
+	return 5
+}
+
+// emitCopy writes a copy chunk and returns the number of bytes written.
+//
+// It assumes that:
+//
+//	dst is long enough to hold the encoded bytes
+//	1 <= offset && offset <= math.MaxUint16
+//	4 <= length && length <= math.MaxUint32
+func emitCopy16(dst []byte, offset uint16, length int) int {
+	// Offset no more than 2 bytes.
+	if length > 64 {
+		off := 3
+		if offset < 2048 {
+			// emit 8 bytes as tagCopy1, rest as repeats.
+			dst[1] = uint8(offset)
+			dst[0] = uint8(offset>>8)<<5 | uint8(8-4)<<2 | tagCopy1
+			length -= 8
+			off = 2
+		} else {
+			// Emit a length 60 copy, encoded as 3 bytes.
+			// Emit remaining as repeat value (minimum 4 bytes).
+			dst[2] = uint8(offset >> 8)
+			dst[1] = uint8(offset)
+			dst[0] = 59<<2 | tagCopy2
+			length -= 60
+		}
+		// Emit remaining as repeats, at least 4 bytes remain.
+		return off + emitRepeat16(dst[off:], offset, length)
+	}
+	if length >= 12 || offset >= 2048 {
+		// Emit the remaining copy, encoded as 3 bytes.
+		dst[2] = uint8(offset >> 8)
+		dst[1] = uint8(offset)
+		dst[0] = uint8(length-1)<<2 | tagCopy2
+		return 3
+	}
+	// Emit the remaining copy, encoded as 2 bytes.
+	dst[1] = uint8(offset)
+	dst[0] = uint8(offset>>8)<<5 | uint8(length-4)<<2 | tagCopy1
+	return 2
+}
+
+// emitLiteral writes a literal chunk and returns the number of bytes written.
+//
+// It assumes that:
+//
+//	dst is long enough to hold the encoded bytes
+//	0 <= len(lit) && len(lit) <= math.MaxUint32
+func emitLiteralGo(dst, lit []byte) int {
+	if len(lit) == 0 {
+		return 0
+	}
+	i, n := 0, uint(len(lit)-1)
+	switch {
+	case n < 60:
+		dst[0] = uint8(n)<<2 | tagLiteral
+		i = 1
+	case n < 1<<8:
+		dst[1] = uint8(n)
+		dst[0] = 60<<2 | tagLiteral
+		i = 2
+	case n < 1<<16:
+		dst[2] = uint8(n >> 8)
+		dst[1] = uint8(n)
+		dst[0] = 61<<2 | tagLiteral
+		i = 3
+	case n < 1<<24:
+		dst[3] = uint8(n >> 16)
+		dst[2] = uint8(n >> 8)
+		dst[1] = uint8(n)
+		dst[0] = 62<<2 | tagLiteral
+		i = 4
+	default:
+		dst[4] = uint8(n >> 24)
+		dst[3] = uint8(n >> 16)
+		dst[2] = uint8(n >> 8)
+		dst[1] = uint8(n)
+		dst[0] = 63<<2 | tagLiteral
+		i = 5
+	}
+	return i + copy(dst[i:], lit)
+}
diff --git a/vendor/github.com/klauspost/compress/zstd/README.md b/vendor/github.com/klauspost/compress/zstd/README.md
index beb7fa87..65b38abe 100644
--- a/vendor/github.com/klauspost/compress/zstd/README.md
+++ b/vendor/github.com/klauspost/compress/zstd/README.md
@@ -12,6 +12,8 @@ The `zstd` package is provided as open source software using a Go standard licen
 
 Currently the package is heavily optimized for 64 bit processors and will be significantly slower on 32 bit processors.
 
+For seekable zstd streams, see [this excellent package](https://github.com/SaveTheRbtz/zstd-seekable-format-go).
+
 ## Installation
 
 Install using `go get -u github.com/klauspost/compress`. The package is located in `github.com/klauspost/compress/zstd`.
diff --git a/vendor/github.com/klauspost/compress/zstd/blockdec.go b/vendor/github.com/klauspost/compress/zstd/blockdec.go
index 7eed729b..2445bb4f 100644
--- a/vendor/github.com/klauspost/compress/zstd/blockdec.go
+++ b/vendor/github.com/klauspost/compress/zstd/blockdec.go
@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sync"
@@ -83,8 +82,9 @@ type blockDec struct {
 
 	err error
 
-	// Check against this crc
-	checkCRC []byte
+	// Check against this crc, if hasCRC is true.
+	checkCRC uint32
+	hasCRC   bool
 
 	// Frame to use for singlethreaded decoding.
 	// Should not be used by the decoder itself since parent may be another frame.
@@ -192,16 +192,14 @@ func (b *blockDec) reset(br byteBuffer, windowSize uint64) error {
 	}
 
 	// Read block data.
-	if cap(b.dataStorage) < cSize {
+	if _, ok := br.(*byteBuf); !ok && cap(b.dataStorage) < cSize {
+		// byteBuf doesn't need a destination buffer.
 		if b.lowMem || cSize > maxCompressedBlockSize {
 			b.dataStorage = make([]byte, 0, cSize+compressedBlockOverAlloc)
 		} else {
 			b.dataStorage = make([]byte, 0, maxCompressedBlockSizeAlloc)
 		}
 	}
-	if cap(b.dst) <= maxSize {
-		b.dst = make([]byte, 0, maxSize+1)
-	}
 	b.data, err = br.readBig(cSize, b.dataStorage)
 	if err != nil {
 		if debugDecoder {
@@ -210,6 +208,9 @@ func (b *blockDec) reset(br byteBuffer, windowSize uint64) error {
 		}
 		return err
 	}
+	if cap(b.dst) <= maxSize {
+		b.dst = make([]byte, 0, maxSize+1)
+	}
 	return nil
 }
 
@@ -233,7 +234,7 @@ func (b *blockDec) decodeBuf(hist *history) error {
 			if b.lowMem {
 				b.dst = make([]byte, b.RLESize)
 			} else {
-				b.dst = make([]byte, maxBlockSize)
+				b.dst = make([]byte, maxCompressedBlockSize)
 			}
 		}
 		b.dst = b.dst[:b.RLESize]
@@ -651,7 +652,7 @@ func (b *blockDec) prepareSequences(in []byte, hist *history) (err error) {
 		fatalErr(binary.Write(&buf, binary.LittleEndian, hist.decoders.matchLengths.fse))
 		fatalErr(binary.Write(&buf, binary.LittleEndian, hist.decoders.offsets.fse))
 		buf.Write(in)
-		ioutil.WriteFile(filepath.Join("testdata", "seqs", fn), buf.Bytes(), os.ModePerm)
+		os.WriteFile(filepath.Join("testdata", "seqs", fn), buf.Bytes(), os.ModePerm)
 	}
 
 	return nil
diff --git a/vendor/github.com/klauspost/compress/zstd/bytebuf.go b/vendor/github.com/klauspost/compress/zstd/bytebuf.go
index 4493baa7..176788f2 100644
--- a/vendor/github.com/klauspost/compress/zstd/bytebuf.go
+++ b/vendor/github.com/klauspost/compress/zstd/bytebuf.go
@@ -7,7 +7,6 @@ package zstd
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 )
 
 type byteBuffer interface {
@@ -23,7 +22,7 @@ type byteBuffer interface {
 	readByte() (byte, error)
 
 	// Skip n bytes.
-	skipN(n int) error
+	skipN(n int64) error
 }
 
 // in-memory buffer
@@ -62,9 +61,12 @@ func (b *byteBuf) readByte() (byte, error) {
 	return r, nil
 }
 
-func (b *byteBuf) skipN(n int) error {
+func (b *byteBuf) skipN(n int64) error {
 	bb := *b
-	if len(bb) < n {
+	if n < 0 {
+		return fmt.Errorf("negative skip (%d) requested", n)
+	}
+	if int64(len(bb)) < n {
 		return io.ErrUnexpectedEOF
 	}
 	*b = bb[n:]
@@ -120,9 +122,9 @@ func (r *readerWrapper) readByte() (byte, error) {
 	return r.tmp[0], nil
 }
 
-func (r *readerWrapper) skipN(n int) error {
-	n2, err := io.CopyN(ioutil.Discard, r.r, int64(n))
-	if n2 != int64(n) {
+func (r *readerWrapper) skipN(n int64) error {
+	n2, err := io.CopyN(io.Discard, r.r, n)
+	if n2 != n {
 		err = io.ErrUnexpectedEOF
 	}
 	return err
diff --git a/vendor/github.com/klauspost/compress/zstd/decodeheader.go b/vendor/github.com/klauspost/compress/zstd/decodeheader.go
index 5022e71c..f6a24097 100644
--- a/vendor/github.com/klauspost/compress/zstd/decodeheader.go
+++ b/vendor/github.com/klauspost/compress/zstd/decodeheader.go
@@ -4,7 +4,6 @@
 package zstd
 
 import (
-	"bytes"
 	"encoding/binary"
 	"errors"
 	"io"
@@ -102,8 +101,8 @@ func (h *Header) Decode(in []byte) error {
 	}
 	h.HeaderSize += 4
 	b, in := in[:4], in[4:]
-	if !bytes.Equal(b, frameMagic) {
-		if !bytes.Equal(b[1:4], skippableFrameMagic) || b[0]&0xf0 != 0x50 {
+	if string(b) != frameMagic {
+		if string(b[1:4]) != skippableFrameMagic || b[0]&0xf0 != 0x50 {
 			return ErrMagicMismatch
 		}
 		if len(in) < 4 {
@@ -153,7 +152,7 @@ func (h *Header) Decode(in []byte) error {
 		}
 		b, in = in[:size], in[size:]
 		h.HeaderSize += int(size)
-		switch size {
+		switch len(b) {
 		case 1:
 			h.DictionaryID = uint32(b[0])
 		case 2:
@@ -183,7 +182,7 @@ func (h *Header) Decode(in []byte) error {
 		}
 		b, in = in[:fcsSize], in[fcsSize:]
 		h.HeaderSize += int(fcsSize)
-		switch fcsSize {
+		switch len(b) {
 		case 1:
 			h.FrameContentSize = uint64(b[0])
 		case 2:
diff --git a/vendor/github.com/klauspost/compress/zstd/decoder.go b/vendor/github.com/klauspost/compress/zstd/decoder.go
index 286c8f9d..7113e69e 100644
--- a/vendor/github.com/klauspost/compress/zstd/decoder.go
+++ b/vendor/github.com/klauspost/compress/zstd/decoder.go
@@ -5,7 +5,6 @@
 package zstd
 
 import (
-	"bytes"
 	"context"
 	"encoding/binary"
 	"io"
@@ -35,13 +34,13 @@ type Decoder struct {
 		br           readerWrapper
 		enabled      bool
 		inFrame      bool
+		dstBuf       []byte
 	}
 
 	frame *frameDec
 
 	// Custom dictionaries.
-	// Always uses copies.
-	dicts map[uint32]dict
+	dicts map[uint32]*dict
 
 	// streamWg is the waitgroup for all streams
 	streamWg sync.WaitGroup
@@ -103,7 +102,7 @@ func NewReader(r io.Reader, opts ...DOption) (*Decoder, error) {
 	}
 
 	// Transfer option dicts.
-	d.dicts = make(map[uint32]dict, len(d.o.dicts))
+	d.dicts = make(map[uint32]*dict, len(d.o.dicts))
 	for _, dc := range d.o.dicts {
 		d.dicts[dc.id] = dc
 	}
@@ -187,21 +186,23 @@ func (d *Decoder) Reset(r io.Reader) error {
 	}
 
 	// If bytes buffer and < 5MB, do sync decoding anyway.
-	if bb, ok := r.(byter); ok && bb.Len() < 5<<20 {
+	if bb, ok := r.(byter); ok && bb.Len() < d.o.decodeBufsBelow && !d.o.limitToCap {
 		bb2 := bb
 		if debugDecoder {
 			println("*bytes.Buffer detected, doing sync decode, len:", bb.Len())
 		}
 		b := bb2.Bytes()
 		var dst []byte
-		if cap(d.current.b) > 0 {
-			dst = d.current.b
+		if cap(d.syncStream.dstBuf) > 0 {
+			dst = d.syncStream.dstBuf[:0]
 		}
 
-		dst, err := d.DecodeAll(b, dst[:0])
+		dst, err := d.DecodeAll(b, dst)
 		if err == nil {
 			err = io.EOF
 		}
+		// Save output buffer
+		d.syncStream.dstBuf = dst
 		d.current.b = dst
 		d.current.err = err
 		d.current.flushed = true
@@ -216,6 +217,7 @@ func (d *Decoder) Reset(r io.Reader) error {
 	d.current.err = nil
 	d.current.flushed = false
 	d.current.d = nil
+	d.syncStream.dstBuf = nil
 
 	// Ensure no-one else is still running...
 	d.streamWg.Wait()
@@ -312,6 +314,7 @@ func (d *Decoder) DecodeAll(input, dst []byte) ([]byte, error) {
 	// Grab a block decoder and frame decoder.
 	block := <-d.decoders
 	frame := block.localFrame
+	initialSize := len(dst)
 	defer func() {
 		if debugDecoder {
 			printf("re-adding decoder: %p", block)
@@ -337,21 +340,26 @@ func (d *Decoder) DecodeAll(input, dst []byte) ([]byte, error) {
 			}
 			return dst, err
 		}
-		if frame.DictionaryID != nil {
-			dict, ok := d.dicts[*frame.DictionaryID]
-			if !ok {
-				return nil, ErrUnknownDictionary
-			}
-			if debugDecoder {
-				println("setting dict", frame.DictionaryID)
-			}
-			frame.history.setDict(&dict)
+		if err = d.setDict(frame); err != nil {
+			return nil, err
 		}
 		if frame.WindowSize > d.o.maxWindowSize {
+			if debugDecoder {
+				println("window size exceeded:", frame.WindowSize, ">", d.o.maxWindowSize)
+			}
 			return dst, ErrWindowSizeExceeded
 		}
 		if frame.FrameContentSize != fcsUnknown {
-			if frame.FrameContentSize > d.o.maxDecodedSize-uint64(len(dst)) {
+			if frame.FrameContentSize > d.o.maxDecodedSize-uint64(len(dst)-initialSize) {
+				if debugDecoder {
+					println("decoder size exceeded; fcs:", frame.FrameContentSize, "> mcs:", d.o.maxDecodedSize-uint64(len(dst)-initialSize), "len:", len(dst))
+				}
+				return dst, ErrDecoderSizeExceeded
+			}
+			if d.o.limitToCap && frame.FrameContentSize > uint64(cap(dst)-len(dst)) {
+				if debugDecoder {
+					println("decoder size exceeded; fcs:", frame.FrameContentSize, "> (cap-len)", cap(dst)-len(dst))
+				}
 				return dst, ErrDecoderSizeExceeded
 			}
 			if cap(dst)-len(dst) < int(frame.FrameContentSize) {
@@ -361,7 +369,7 @@ func (d *Decoder) DecodeAll(input, dst []byte) ([]byte, error) {
 			}
 		}
 
-		if cap(dst) == 0 {
+		if cap(dst) == 0 && !d.o.limitToCap {
 			// Allocate len(input) * 2 by default if nothing is provided
 			// and we didn't get frame content size.
 			size := len(input) * 2
@@ -379,6 +387,9 @@ func (d *Decoder) DecodeAll(input, dst []byte) ([]byte, error) {
 		if err != nil {
 			return dst, err
 		}
+		if uint64(len(dst)-initialSize) > d.o.maxDecodedSize {
+			return dst, ErrDecoderSizeExceeded
+		}
 		if len(frame.bBuf) == 0 {
 			if debugDecoder {
 				println("frame dbuf empty")
@@ -439,7 +450,11 @@ func (d *Decoder) nextBlock(blocking bool) (ok bool) {
 		println("got", len(d.current.b), "bytes, error:", d.current.err, "data crc:", tmp)
 	}
 
-	if !d.o.ignoreChecksum && len(next.b) > 0 {
+	if d.o.ignoreChecksum {
+		return true
+	}
+
+	if len(next.b) > 0 {
 		n, err := d.current.crc.Write(next.b)
 		if err == nil {
 			if n != len(next.b) {
@@ -447,18 +462,16 @@ func (d *Decoder) nextBlock(blocking bool) (ok bool) {
 			}
 		}
 	}
-	if next.err == nil && next.d != nil && len(next.d.checkCRC) != 0 {
-		got := d.current.crc.Sum64()
-		var tmp [4]byte
-		binary.LittleEndian.PutUint32(tmp[:], uint32(got))
-		if !d.o.ignoreChecksum && !bytes.Equal(tmp[:], next.d.checkCRC) {
+	if next.err == nil && next.d != nil && next.d.hasCRC {
+		got := uint32(d.current.crc.Sum64())
+		if got != next.d.checkCRC {
 			if debugDecoder {
-				println("CRC Check Failed:", tmp[:], " (got) !=", next.d.checkCRC, "(on stream)")
+				printf("CRC Check Failed: %08x (got) != %08x (on stream)\n", got, next.d.checkCRC)
 			}
 			d.current.err = ErrCRCMismatch
 		} else {
 			if debugDecoder {
-				println("CRC ok", tmp[:])
+				printf("CRC ok %08x\n", got)
 			}
 		}
 	}
@@ -474,18 +487,12 @@ func (d *Decoder) nextBlockSync() (ok bool) {
 		if !d.syncStream.inFrame {
 			d.frame.history.reset()
 			d.current.err = d.frame.reset(&d.syncStream.br)
+			if d.current.err == nil {
+				d.current.err = d.setDict(d.frame)
+			}
 			if d.current.err != nil {
 				return false
 			}
-			if d.frame.DictionaryID != nil {
-				dict, ok := d.dicts[*d.frame.DictionaryID]
-				if !ok {
-					d.current.err = ErrUnknownDictionary
-					return false
-				} else {
-					d.frame.history.setDict(&dict)
-				}
-			}
 			if d.frame.WindowSize > d.o.maxDecodedSize || d.frame.WindowSize > d.o.maxWindowSize {
 				d.current.err = ErrDecoderSizeExceeded
 				return false
@@ -664,6 +671,7 @@ func (d *Decoder) startStreamDecoder(ctx context.Context, r io.Reader, output ch
 				if debugDecoder {
 					println("Async 1: new history, recent:", block.async.newHist.recentOffsets)
 				}
+				hist.reset()
 				hist.decoders = block.async.newHist.decoders
 				hist.recentOffsets = block.async.newHist.recentOffsets
 				hist.windowSize = block.async.newHist.windowSize
@@ -695,6 +703,7 @@ func (d *Decoder) startStreamDecoder(ctx context.Context, r io.Reader, output ch
 			seqExecute <- block
 		}
 		close(seqExecute)
+		hist.reset()
 	}()
 
 	var wg sync.WaitGroup
@@ -718,6 +727,7 @@ func (d *Decoder) startStreamDecoder(ctx context.Context, r io.Reader, output ch
 				if debugDecoder {
 					println("Async 2: new history")
 				}
+				hist.reset()
 				hist.windowSize = block.async.newHist.windowSize
 				hist.allocFrameBuffer = block.async.newHist.allocFrameBuffer
 				if block.async.newHist.dict != nil {
@@ -747,7 +757,7 @@ func (d *Decoder) startStreamDecoder(ctx context.Context, r io.Reader, output ch
 					if block.lowMem {
 						block.dst = make([]byte, block.RLESize)
 					} else {
-						block.dst = make([]byte, maxBlockSize)
+						block.dst = make([]byte, maxCompressedBlockSize)
 					}
 				}
 				block.dst = block.dst[:block.RLESize]
@@ -799,13 +809,14 @@ func (d *Decoder) startStreamDecoder(ctx context.Context, r io.Reader, output ch
 		if debugDecoder {
 			println("decoder goroutines finished")
 		}
+		hist.reset()
 	}()
 
+	var hist history
 decodeStream:
 	for {
-		var hist history
 		var hasErr bool
-
+		hist.reset()
 		decodeBlock := func(block *blockDec) {
 			if hasErr {
 				if block != nil {
@@ -840,15 +851,14 @@ decodeStream:
 		if debugDecoder && err != nil {
 			println("Frame decoder returned", err)
 		}
-		if err == nil && frame.DictionaryID != nil {
-			dict, ok := d.dicts[*frame.DictionaryID]
-			if !ok {
-				err = ErrUnknownDictionary
-			} else {
-				frame.history.setDict(&dict)
-			}
+		if err == nil {
+			err = d.setDict(frame)
 		}
 		if err == nil && d.frame.WindowSize > d.o.maxWindowSize {
+			if debugDecoder {
+				println("decoder size exceeded, fws:", d.frame.WindowSize, "> mws:", d.o.maxWindowSize)
+			}
+
 			err = ErrDecoderSizeExceeded
 		}
 		if err != nil {
@@ -890,18 +900,22 @@ decodeStream:
 				println("next block returned error:", err)
 			}
 			dec.err = err
-			dec.checkCRC = nil
+			dec.hasCRC = false
 			if dec.Last && frame.HasCheckSum && err == nil {
 				crc, err := frame.rawInput.readSmall(4)
-				if err != nil {
+				if len(crc) < 4 {
+					if err == nil {
+						err = io.ErrUnexpectedEOF
+
+					}
 					println("CRC missing?", err)
 					dec.err = err
-				}
-				var tmp [4]byte
-				copy(tmp[:], crc)
-				dec.checkCRC = tmp[:]
-				if debugDecoder {
-					println("found crc to check:", dec.checkCRC)
+				} else {
+					dec.checkCRC = binary.LittleEndian.Uint32(crc)
+					dec.hasCRC = true
+					if debugDecoder {
+						printf("found crc to check: %08x\n", dec.checkCRC)
+					}
 				}
 			}
 			err = dec.err
@@ -917,5 +931,23 @@ decodeStream:
 	}
 	close(seqDecode)
 	wg.Wait()
+	hist.reset()
 	d.frame.history.b = frameHistCache
 }
+
+func (d *Decoder) setDict(frame *frameDec) (err error) {
+	dict, ok := d.dicts[frame.DictionaryID]
+	if ok {
+		if debugDecoder {
+			println("setting dict", frame.DictionaryID)
+		}
+		frame.history.setDict(dict)
+	} else if frame.DictionaryID != 0 {
+		// A zero or missing dictionary id is ambiguous:
+		// either dictionary zero, or no dictionary. In particular,
+		// zstd --patch-from uses this id for the source file,
+		// so only return an error if the dictionary id is not zero.
+		err = ErrUnknownDictionary
+	}
+	return err
+}
diff --git a/vendor/github.com/klauspost/compress/zstd/decoder_options.go b/vendor/github.com/klauspost/compress/zstd/decoder_options.go
index c70e6fa0..07a90dd7 100644
--- a/vendor/github.com/klauspost/compress/zstd/decoder_options.go
+++ b/vendor/github.com/klauspost/compress/zstd/decoder_options.go
@@ -6,6 +6,8 @@ package zstd
 
 import (
 	"errors"
+	"fmt"
+	"math/bits"
 	"runtime"
 )
 
@@ -14,20 +16,23 @@ type DOption func(*decoderOptions) error
 
 // options retains accumulated state of multiple options.
 type decoderOptions struct {
-	lowMem         bool
-	concurrent     int
-	maxDecodedSize uint64
-	maxWindowSize  uint64
-	dicts          []dict
-	ignoreChecksum bool
+	lowMem          bool
+	concurrent      int
+	maxDecodedSize  uint64
+	maxWindowSize   uint64
+	dicts           []*dict
+	ignoreChecksum  bool
+	limitToCap      bool
+	decodeBufsBelow int
 }
 
 func (o *decoderOptions) setDefault() {
 	*o = decoderOptions{
 		// use less ram: true for now, but may change.
-		lowMem:        true,
-		concurrent:    runtime.GOMAXPROCS(0),
-		maxWindowSize: MaxWindowSize,
+		lowMem:          true,
+		concurrent:      runtime.GOMAXPROCS(0),
+		maxWindowSize:   MaxWindowSize,
+		decodeBufsBelow: 128 << 10,
 	}
 	if o.concurrent > 4 {
 		o.concurrent = 4
@@ -82,7 +87,13 @@ func WithDecoderMaxMemory(n uint64) DOption {
 }
 
 // WithDecoderDicts allows to register one or more dictionaries for the decoder.
-// If several dictionaries with the same ID is provided the last one will be used.
+//
+// Each slice in dict must be in the [dictionary format] produced by
+// "zstd --train" from the Zstandard reference implementation.
+//
+// If several dictionaries with the same ID are provided, the last one will be used.
+//
+// [dictionary format]: https://github.com/facebook/zstd/blob/dev/doc/zstd_compression_format.md#dictionary-format
 func WithDecoderDicts(dicts ...[]byte) DOption {
 	return func(o *decoderOptions) error {
 		for _, b := range dicts {
@@ -90,12 +101,24 @@ func WithDecoderDicts(dicts ...[]byte) DOption {
 			if err != nil {
 				return err
 			}
-			o.dicts = append(o.dicts, *d)
+			o.dicts = append(o.dicts, d)
 		}
 		return nil
 	}
 }
 
+// WithEncoderDictRaw registers a dictionary that may be used by the decoder.
+// The slice content can be arbitrary data.
+func WithDecoderDictRaw(id uint32, content []byte) DOption {
+	return func(o *decoderOptions) error {
+		if bits.UintSize > 32 && uint(len(content)) > dictMaxLength {
+			return fmt.Errorf("dictionary of size %d > 2GiB too large", len(content))
+		}
+		o.dicts = append(o.dicts, &dict{id: id, content: content, offsets: [3]int{1, 4, 8}})
+		return nil
+	}
+}
+
 // WithDecoderMaxWindow allows to set a maximum window size for decodes.
 // This allows rejecting packets that will cause big memory usage.
 // The Decoder will likely allocate more memory based on the WithDecoderLowmem setting.
@@ -114,6 +137,29 @@ func WithDecoderMaxWindow(size uint64) DOption {
 	}
 }
 
+// WithDecodeAllCapLimit will limit DecodeAll to decoding cap(dst)-len(dst) bytes,
+// or any size set in WithDecoderMaxMemory.
+// This can be used to limit decoding to a specific maximum output size.
+// Disabled by default.
+func WithDecodeAllCapLimit(b bool) DOption {
+	return func(o *decoderOptions) error {
+		o.limitToCap = b
+		return nil
+	}
+}
+
+// WithDecodeBuffersBelow will fully decode readers that have a
+// `Bytes() []byte` and `Len() int` interface similar to bytes.Buffer.
+// This typically uses less allocations but will have the full decompressed object in memory.
+// Note that DecodeAllCapLimit will disable this, as well as giving a size of 0 or less.
+// Default is 128KiB.
+func WithDecodeBuffersBelow(size int) DOption {
+	return func(o *decoderOptions) error {
+		o.decodeBufsBelow = size
+		return nil
+	}
+}
+
 // IgnoreChecksum allows to forcibly ignore checksum checking.
 func IgnoreChecksum(b bool) DOption {
 	return func(o *decoderOptions) error {
diff --git a/vendor/github.com/klauspost/compress/zstd/dict.go b/vendor/github.com/klauspost/compress/zstd/dict.go
index a36ae83e..ca095145 100644
--- a/vendor/github.com/klauspost/compress/zstd/dict.go
+++ b/vendor/github.com/klauspost/compress/zstd/dict.go
@@ -1,7 +1,6 @@
 package zstd
 
 import (
-	"bytes"
 	"encoding/binary"
 	"errors"
 	"fmt"
@@ -20,7 +19,10 @@ type dict struct {
 	content []byte
 }
 
-var dictMagic = [4]byte{0x37, 0xa4, 0x30, 0xec}
+const dictMagic = "\x37\xa4\x30\xec"
+
+// Maximum dictionary size for the reference implementation (1.5.3) is 2 GiB.
+const dictMaxLength = 1 << 31
 
 // ID returns the dictionary id or 0 if d is nil.
 func (d *dict) ID() uint32 {
@@ -30,14 +32,38 @@ func (d *dict) ID() uint32 {
 	return d.id
 }
 
-// DictContentSize returns the dictionary content size or 0 if d is nil.
-func (d *dict) DictContentSize() int {
+// ContentSize returns the dictionary content size or 0 if d is nil.
+func (d *dict) ContentSize() int {
 	if d == nil {
 		return 0
 	}
 	return len(d.content)
 }
 
+// Content returns the dictionary content.
+func (d *dict) Content() []byte {
+	if d == nil {
+		return nil
+	}
+	return d.content
+}
+
+// Offsets returns the initial offsets.
+func (d *dict) Offsets() [3]int {
+	if d == nil {
+		return [3]int{}
+	}
+	return d.offsets
+}
+
+// LitEncoder returns the literal encoder.
+func (d *dict) LitEncoder() *huff0.Scratch {
+	if d == nil {
+		return nil
+	}
+	return d.litEnc
+}
+
 // Load a dictionary as described in
 // https://github.com/facebook/zstd/blob/master/doc/zstd_compression_format.md#dictionary-format
 func loadDict(b []byte) (*dict, error) {
@@ -50,7 +76,7 @@ func loadDict(b []byte) (*dict, error) {
 		ofDec: sequenceDec{fse: &fseDecoder{}},
 		mlDec: sequenceDec{fse: &fseDecoder{}},
 	}
-	if !bytes.Equal(b[:4], dictMagic[:]) {
+	if string(b[:4]) != dictMagic {
 		return nil, ErrMagicMismatch
 	}
 	d.id = binary.LittleEndian.Uint32(b[4:8])
@@ -62,7 +88,7 @@ func loadDict(b []byte) (*dict, error) {
 	var err error
 	d.litEnc, b, err = huff0.ReadTable(b[8:], nil)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("loading literal table: %w", err)
 	}
 	d.litEnc.Reuse = huff0.ReusePolicyMust
 
@@ -120,3 +146,16 @@ func loadDict(b []byte) (*dict, error) {
 
 	return &d, nil
 }
+
+// InspectDictionary loads a zstd dictionary and provides functions to inspect the content.
+func InspectDictionary(b []byte) (interface {
+	ID() uint32
+	ContentSize() int
+	Content() []byte
+	Offsets() [3]int
+	LitEncoder() *huff0.Scratch
+}, error) {
+	initPredefined()
+	d, err := loadDict(b)
+	return d, err
+}
diff --git a/vendor/github.com/klauspost/compress/zstd/enc_base.go b/vendor/github.com/klauspost/compress/zstd/enc_base.go
index 15ae8ee8..e008b992 100644
--- a/vendor/github.com/klauspost/compress/zstd/enc_base.go
+++ b/vendor/github.com/klauspost/compress/zstd/enc_base.go
@@ -16,6 +16,7 @@ type fastBase struct {
 	cur int32
 	// maximum offset. Should be at least 2x block size.
 	maxMatchOff int32
+	bufferReset int32
 	hist        []byte
 	crc         *xxhash.Digest
 	tmp         [8]byte
@@ -56,8 +57,8 @@ func (e *fastBase) Block() *blockEnc {
 }
 
 func (e *fastBase) addBlock(src []byte) int32 {
-	if debugAsserts && e.cur > bufferReset {
-		panic(fmt.Sprintf("ecur (%d) > buffer reset (%d)", e.cur, bufferReset))
+	if debugAsserts && e.cur > e.bufferReset {
+		panic(fmt.Sprintf("ecur (%d) > buffer reset (%d)", e.cur, e.bufferReset))
 	}
 	// check if we have space already
 	if len(e.hist)+len(src) > cap(e.hist) {
@@ -126,24 +127,7 @@ func (e *fastBase) matchlen(s, t int32, src []byte) int32 {
 			panic(fmt.Sprintf("len(src)-s (%d) > maxCompressedBlockSize (%d)", len(src)-int(s), maxCompressedBlockSize))
 		}
 	}
-	a := src[s:]
-	b := src[t:]
-	b = b[:len(a)]
-	end := int32((len(a) >> 3) << 3)
-	for i := int32(0); i < end; i += 8 {
-		if diff := load6432(a, i) ^ load6432(b, i); diff != 0 {
-			return i + int32(bits.TrailingZeros64(diff)>>3)
-		}
-	}
-
-	a = a[end:]
-	b = b[end:]
-	for i := range a {
-		if a[i] != b[i] {
-			return int32(i) + end
-		}
-	}
-	return int32(len(a)) + end
+	return int32(matchLen(src[s:], src[t:]))
 }
 
 // Reset the encoding table.
@@ -165,13 +149,13 @@ func (e *fastBase) resetBase(d *dict, singleBlock bool) {
 		if singleBlock {
 			e.lowMem = true
 		}
-		e.ensureHist(d.DictContentSize() + maxCompressedBlockSize)
+		e.ensureHist(d.ContentSize() + maxCompressedBlockSize)
 		e.lowMem = low
 	}
 
 	// We offset current position so everything will be out of reach.
 	// If above reset line, history will be purged.
-	if e.cur < bufferReset {
+	if e.cur < e.bufferReset {
 		e.cur += e.maxMatchOff + int32(len(e.hist))
 	}
 	e.hist = e.hist[:0]
diff --git a/vendor/github.com/klauspost/compress/zstd/enc_best.go b/vendor/github.com/klauspost/compress/zstd/enc_best.go
index 96028ecd..830f5ba7 100644
--- a/vendor/github.com/klauspost/compress/zstd/enc_best.go
+++ b/vendor/github.com/klauspost/compress/zstd/enc_best.go
@@ -32,6 +32,7 @@ type match struct {
 	length int32
 	rep    int32
 	est    int32
+	_      [12]byte // Aligned size to cache line: 4+4+4+4+4 bytes + 12 bytes padding = 32 bytes
 }
 
 const highScore = 25000
@@ -84,14 +85,10 @@ func (e *bestFastEncoder) Encode(blk *blockEnc, src []byte) {
 	)
 
 	// Protect against e.cur wraparound.
-	for e.cur >= bufferReset {
+	for e.cur >= e.bufferReset-int32(len(e.hist)) {
 		if len(e.hist) == 0 {
-			for i := range e.table[:] {
-				e.table[i] = prevEntry{}
-			}
-			for i := range e.longTable[:] {
-				e.longTable[i] = prevEntry{}
-			}
+			e.table = [bestShortTableSize]prevEntry{}
+			e.longTable = [bestLongTableSize]prevEntry{}
 			e.cur = e.maxMatchOff
 			break
 		}
@@ -192,8 +189,8 @@ encodeLoop:
 			panic("offset0 was 0")
 		}
 
-		bestOf := func(a, b match) match {
-			if a.est+(a.s-b.s)*bitsPerByte>>10 < b.est+(b.s-a.s)*bitsPerByte>>10 {
+		bestOf := func(a, b *match) *match {
+			if a.est-b.est+(a.s-b.s)*bitsPerByte>>10 < 0 {
 				return a
 			}
 			return b
@@ -219,22 +216,26 @@ encodeLoop:
 			return m
 		}
 
-		best := bestOf(matchAt(candidateL.offset-e.cur, s, uint32(cv), -1), matchAt(candidateL.prev-e.cur, s, uint32(cv), -1))
-		best = bestOf(best, matchAt(candidateS.offset-e.cur, s, uint32(cv), -1))
-		best = bestOf(best, matchAt(candidateS.prev-e.cur, s, uint32(cv), -1))
+		m1 := matchAt(candidateL.offset-e.cur, s, uint32(cv), -1)
+		m2 := matchAt(candidateL.prev-e.cur, s, uint32(cv), -1)
+		m3 := matchAt(candidateS.offset-e.cur, s, uint32(cv), -1)
+		m4 := matchAt(candidateS.prev-e.cur, s, uint32(cv), -1)
+		best := bestOf(bestOf(&m1, &m2), bestOf(&m3, &m4))
 
 		if canRepeat && best.length < goodEnough {
 			cv32 := uint32(cv >> 8)
 			spp := s + 1
-			best = bestOf(best, matchAt(spp-offset1, spp, cv32, 1))
-			best = bestOf(best, matchAt(spp-offset2, spp, cv32, 2))
-			best = bestOf(best, matchAt(spp-offset3, spp, cv32, 3))
+			m1 := matchAt(spp-offset1, spp, cv32, 1)
+			m2 := matchAt(spp-offset2, spp, cv32, 2)
+			m3 := matchAt(spp-offset3, spp, cv32, 3)
+			best = bestOf(bestOf(best, &m1), bestOf(&m2, &m3))
 			if best.length > 0 {
 				cv32 = uint32(cv >> 24)
 				spp += 2
-				best = bestOf(best, matchAt(spp-offset1, spp, cv32, 1))
-				best = bestOf(best, matchAt(spp-offset2, spp, cv32, 2))
-				best = bestOf(best, matchAt(spp-offset3, spp, cv32, 3))
+				m1 := matchAt(spp-offset1, spp, cv32, 1)
+				m2 := matchAt(spp-offset2, spp, cv32, 2)
+				m3 := matchAt(spp-offset3, spp, cv32, 3)
+				best = bestOf(bestOf(best, &m1), bestOf(&m2, &m3))
 			}
 		}
 		// Load next and check...
@@ -261,26 +262,33 @@ encodeLoop:
 			candidateL2 := e.longTable[hashLen(cv2, bestLongTableBits, bestLongLen)]
 
 			// Short at s+1
-			best = bestOf(best, matchAt(candidateS.offset-e.cur, s, uint32(cv), -1))
+			m1 := matchAt(candidateS.offset-e.cur, s, uint32(cv), -1)
 			// Long at s+1, s+2
-			best = bestOf(best, matchAt(candidateL.offset-e.cur, s, uint32(cv), -1))
-			best = bestOf(best, matchAt(candidateL.prev-e.cur, s, uint32(cv), -1))
-			best = bestOf(best, matchAt(candidateL2.offset-e.cur, s+1, uint32(cv2), -1))
-			best = bestOf(best, matchAt(candidateL2.prev-e.cur, s+1, uint32(cv2), -1))
+			m2 := matchAt(candidateL.offset-e.cur, s, uint32(cv), -1)
+			m3 := matchAt(candidateL.prev-e.cur, s, uint32(cv), -1)
+			m4 := matchAt(candidateL2.offset-e.cur, s+1, uint32(cv2), -1)
+			m5 := matchAt(candidateL2.prev-e.cur, s+1, uint32(cv2), -1)
+			best = bestOf(bestOf(bestOf(best, &m1), &m2), bestOf(bestOf(&m3, &m4), &m5))
 			if false {
 				// Short at s+3.
 				// Too often worse...
-				best = bestOf(best, matchAt(e.table[hashLen(cv2>>8, bestShortTableBits, bestShortLen)].offset-e.cur, s+2, uint32(cv2>>8), -1))
+				m := matchAt(e.table[hashLen(cv2>>8, bestShortTableBits, bestShortLen)].offset-e.cur, s+2, uint32(cv2>>8), -1)
+				best = bestOf(best, &m)
 			}
 			// See if we can find a better match by checking where the current best ends.
 			// Use that offset to see if we can find a better full match.
 			if sAt := best.s + best.length; sAt < sLimit {
 				nextHashL := hashLen(load6432(src, sAt), bestLongTableBits, bestLongLen)
 				candidateEnd := e.longTable[nextHashL]
-				if pos := candidateEnd.offset - e.cur - best.length; pos >= 0 {
-					bestEnd := bestOf(best, matchAt(pos, best.s, load3232(src, best.s), -1))
-					if pos := candidateEnd.prev - e.cur - best.length; pos >= 0 {
-						bestEnd = bestOf(bestEnd, matchAt(pos, best.s, load3232(src, best.s), -1))
+				// Start check at a fixed offset to allow for a few mismatches.
+				// For this compression level 2 yields the best results.
+				const skipBeginning = 2
+				if pos := candidateEnd.offset - e.cur - best.length + skipBeginning; pos >= 0 {
+					m := matchAt(pos, best.s+skipBeginning, load3232(src, best.s+skipBeginning), -1)
+					bestEnd := bestOf(best, &m)
+					if pos := candidateEnd.prev - e.cur - best.length + skipBeginning; pos >= 0 {
+						m := matchAt(pos, best.s+skipBeginning, load3232(src, best.s+skipBeginning), -1)
+						bestEnd = bestOf(bestEnd, &m)
 					}
 					best = bestEnd
 				}
diff --git a/vendor/github.com/klauspost/compress/zstd/enc_better.go b/vendor/github.com/klauspost/compress/zstd/enc_better.go
index c769f694..8582f31a 100644
--- a/vendor/github.com/klauspost/compress/zstd/enc_better.go
+++ b/vendor/github.com/klauspost/compress/zstd/enc_better.go
@@ -62,14 +62,10 @@ func (e *betterFastEncoder) Encode(blk *blockEnc, src []byte) {
 	)
 
 	// Protect against e.cur wraparound.
-	for e.cur >= bufferReset {
+	for e.cur >= e.bufferReset-int32(len(e.hist)) {
 		if len(e.hist) == 0 {
-			for i := range e.table[:] {
-				e.table[i] = tableEntry{}
-			}
-			for i := range e.longTable[:] {
-				e.longTable[i] = prevEntry{}
-			}
+			e.table = [betterShortTableSize]tableEntry{}
+			e.longTable = [betterLongTableSize]prevEntry{}
 			e.cur = e.maxMatchOff
 			break
 		}
@@ -416,15 +412,23 @@ encodeLoop:
 
 		// Try to find a better match by searching for a long match at the end of the current best match
 		if s+matched < sLimit {
+			// Allow some bytes at the beginning to mismatch.
+			// Sweet spot is around 3 bytes, but depends on input.
+			// The skipped bytes are tested in Extend backwards,
+			// and still picked up as part of the match if they do.
+			const skipBeginning = 3
+
 			nextHashL := hashLen(load6432(src, s+matched), betterLongTableBits, betterLongLen)
-			cv := load3232(src, s)
+			s2 := s + skipBeginning
+			cv := load3232(src, s2)
 			candidateL := e.longTable[nextHashL]
-			coffsetL := candidateL.offset - e.cur - matched
-			if coffsetL >= 0 && coffsetL < s && s-coffsetL < e.maxMatchOff && cv == load3232(src, coffsetL) {
+			coffsetL := candidateL.offset - e.cur - matched + skipBeginning
+			if coffsetL >= 0 && coffsetL < s2 && s2-coffsetL < e.maxMatchOff && cv == load3232(src, coffsetL) {
 				// Found a long match, at least 4 bytes.
-				matchedNext := e.matchlen(s+4, coffsetL+4, src) + 4
+				matchedNext := e.matchlen(s2+4, coffsetL+4, src) + 4
 				if matchedNext > matched {
 					t = coffsetL
+					s = s2
 					matched = matchedNext
 					if debugMatches {
 						println("long match at end-of-match")
@@ -434,12 +438,13 @@ encodeLoop:
 
 			// Check prev long...
 			if true {
-				coffsetL = candidateL.prev - e.cur - matched
-				if coffsetL >= 0 && coffsetL < s && s-coffsetL < e.maxMatchOff && cv == load3232(src, coffsetL) {
+				coffsetL = candidateL.prev - e.cur - matched + skipBeginning
+				if coffsetL >= 0 && coffsetL < s2 && s2-coffsetL < e.maxMatchOff && cv == load3232(src, coffsetL) {
 					// Found a long match, at least 4 bytes.
-					matchedNext := e.matchlen(s+4, coffsetL+4, src) + 4
+					matchedNext := e.matchlen(s2+4, coffsetL+4, src) + 4
 					if matchedNext > matched {
 						t = coffsetL
+						s = s2
 						matched = matchedNext
 						if debugMatches {
 							println("prev long match at end-of-match")
@@ -578,7 +583,7 @@ func (e *betterFastEncoderDict) Encode(blk *blockEnc, src []byte) {
 	)
 
 	// Protect against e.cur wraparound.
-	for e.cur >= bufferReset {
+	for e.cur >= e.bufferReset-int32(len(e.hist)) {
 		if len(e.hist) == 0 {
 			for i := range e.table[:] {
 				e.table[i] = tableEntry{}
diff --git a/vendor/github.com/klauspost/compress/zstd/enc_dfast.go b/vendor/github.com/klauspost/compress/zstd/enc_dfast.go
index 7ff0c64f..7d425109 100644
--- a/vendor/github.com/klauspost/compress/zstd/enc_dfast.go
+++ b/vendor/github.com/klauspost/compress/zstd/enc_dfast.go
@@ -44,14 +44,10 @@ func (e *doubleFastEncoder) Encode(blk *blockEnc, src []byte) {
 	)
 
 	// Protect against e.cur wraparound.
-	for e.cur >= bufferReset {
+	for e.cur >= e.bufferReset-int32(len(e.hist)) {
 		if len(e.hist) == 0 {
-			for i := range e.table[:] {
-				e.table[i] = tableEntry{}
-			}
-			for i := range e.longTable[:] {
-				e.longTable[i] = tableEntry{}
-			}
+			e.table = [dFastShortTableSize]tableEntry{}
+			e.longTable = [dFastLongTableSize]tableEntry{}
 			e.cur = e.maxMatchOff
 			break
 		}
@@ -388,7 +384,7 @@ func (e *doubleFastEncoder) EncodeNoHist(blk *blockEnc, src []byte) {
 	)
 
 	// Protect against e.cur wraparound.
-	if e.cur >= bufferReset {
+	if e.cur >= e.bufferReset {
 		for i := range e.table[:] {
 			e.table[i] = tableEntry{}
 		}
@@ -685,7 +681,7 @@ encodeLoop:
 	}
 
 	// We do not store history, so we must offset e.cur to avoid false matches for next user.
-	if e.cur < bufferReset {
+	if e.cur < e.bufferReset {
 		e.cur += int32(len(src))
 	}
 }
@@ -700,7 +696,7 @@ func (e *doubleFastEncoderDict) Encode(blk *blockEnc, src []byte) {
 	)
 
 	// Protect against e.cur wraparound.
-	for e.cur >= bufferReset {
+	for e.cur >= e.bufferReset-int32(len(e.hist)) {
 		if len(e.hist) == 0 {
 			for i := range e.table[:] {
 				e.table[i] = tableEntry{}
@@ -1103,7 +1099,8 @@ func (e *doubleFastEncoderDict) Reset(d *dict, singleBlock bool) {
 	}
 
 	if allDirty || dirtyShardCnt > dLongTableShardCnt/2 {
-		copy(e.longTable[:], e.dictLongTable)
+		//copy(e.longTable[:], e.dictLongTable)
+		e.longTable = *(*[dFastLongTableSize]tableEntry)(e.dictLongTable)
 		for i := range e.longTableShardDirty {
 			e.longTableShardDirty[i] = false
 		}
@@ -1114,7 +1111,9 @@ func (e *doubleFastEncoderDict) Reset(d *dict, singleBlock bool) {
 			continue
 		}
 
-		copy(e.longTable[i*dLongTableShardSize:(i+1)*dLongTableShardSize], e.dictLongTable[i*dLongTableShardSize:(i+1)*dLongTableShardSize])
+		// copy(e.longTable[i*dLongTableShardSize:(i+1)*dLongTableShardSize], e.dictLongTable[i*dLongTableShardSize:(i+1)*dLongTableShardSize])
+		*(*[dLongTableShardSize]tableEntry)(e.longTable[i*dLongTableShardSize:]) = *(*[dLongTableShardSize]tableEntry)(e.dictLongTable[i*dLongTableShardSize:])
+
 		e.longTableShardDirty[i] = false
 	}
 }
diff --git a/vendor/github.com/klauspost/compress/zstd/enc_fast.go b/vendor/github.com/klauspost/compress/zstd/enc_fast.go
index f51ab529..315b1a8f 100644
--- a/vendor/github.com/klauspost/compress/zstd/enc_fast.go
+++ b/vendor/github.com/klauspost/compress/zstd/enc_fast.go
@@ -43,7 +43,7 @@ func (e *fastEncoder) Encode(blk *blockEnc, src []byte) {
 	)
 
 	// Protect against e.cur wraparound.
-	for e.cur >= bufferReset {
+	for e.cur >= e.bufferReset-int32(len(e.hist)) {
 		if len(e.hist) == 0 {
 			for i := range e.table[:] {
 				e.table[i] = tableEntry{}
@@ -304,13 +304,13 @@ func (e *fastEncoder) EncodeNoHist(blk *blockEnc, src []byte) {
 		minNonLiteralBlockSize = 1 + 1 + inputMargin
 	)
 	if debugEncoder {
-		if len(src) > maxBlockSize {
+		if len(src) > maxCompressedBlockSize {
 			panic("src too big")
 		}
 	}
 
 	// Protect against e.cur wraparound.
-	if e.cur >= bufferReset {
+	if e.cur >= e.bufferReset {
 		for i := range e.table[:] {
 			e.table[i] = tableEntry{}
 		}
@@ -538,7 +538,7 @@ encodeLoop:
 		println("returning, recent offsets:", blk.recentOffsets, "extra literals:", blk.extraLits)
 	}
 	// We do not store history, so we must offset e.cur to avoid false matches for next user.
-	if e.cur < bufferReset {
+	if e.cur < e.bufferReset {
 		e.cur += int32(len(src))
 	}
 }
@@ -555,11 +555,9 @@ func (e *fastEncoderDict) Encode(blk *blockEnc, src []byte) {
 		return
 	}
 	// Protect against e.cur wraparound.
-	for e.cur >= bufferReset {
+	for e.cur >= e.bufferReset-int32(len(e.hist)) {
 		if len(e.hist) == 0 {
-			for i := range e.table[:] {
-				e.table[i] = tableEntry{}
-			}
+			e.table = [tableSize]tableEntry{}
 			e.cur = e.maxMatchOff
 			break
 		}
@@ -871,7 +869,8 @@ func (e *fastEncoderDict) Reset(d *dict, singleBlock bool) {
 	const shardCnt = tableShardCnt
 	const shardSize = tableShardSize
 	if e.allDirty || dirtyShardCnt > shardCnt*4/6 {
-		copy(e.table[:], e.dictTable)
+		//copy(e.table[:], e.dictTable)
+		e.table = *(*[tableSize]tableEntry)(e.dictTable)
 		for i := range e.tableShardDirty {
 			e.tableShardDirty[i] = false
 		}
@@ -883,7 +882,8 @@ func (e *fastEncoderDict) Reset(d *dict, singleBlock bool) {
 			continue
 		}
 
-		copy(e.table[i*shardSize:(i+1)*shardSize], e.dictTable[i*shardSize:(i+1)*shardSize])
+		//copy(e.table[i*shardSize:(i+1)*shardSize], e.dictTable[i*shardSize:(i+1)*shardSize])
+		*(*[shardSize]tableEntry)(e.table[i*shardSize:]) = *(*[shardSize]tableEntry)(e.dictTable[i*shardSize:])
 		e.tableShardDirty[i] = false
 	}
 	e.allDirty = false
diff --git a/vendor/github.com/klauspost/compress/zstd/encoder.go b/vendor/github.com/klauspost/compress/zstd/encoder.go
index e6b1d01c..65c6c36d 100644
--- a/vendor/github.com/klauspost/compress/zstd/encoder.go
+++ b/vendor/github.com/klauspost/compress/zstd/encoder.go
@@ -8,6 +8,7 @@ import (
 	"crypto/rand"
 	"fmt"
 	"io"
+	"math"
 	rdebug "runtime/debug"
 	"sync"
 
@@ -528,8 +529,8 @@ func (e *Encoder) EncodeAll(src, dst []byte) []byte {
 		// If a non-single block is needed the encoder will reset again.
 		e.encoders <- enc
 	}()
-	// Use single segments when above minimum window and below 1MB.
-	single := len(src) < 1<<20 && len(src) > MinWindowSize
+	// Use single segments when above minimum window and below window size.
+	single := len(src) <= e.o.windowSize && len(src) > MinWindowSize
 	if e.o.single != nil {
 		single = *e.o.single
 	}
@@ -639,3 +640,37 @@ func (e *Encoder) EncodeAll(src, dst []byte) []byte {
 	}
 	return dst
 }
+
+// MaxEncodedSize returns the expected maximum
+// size of an encoded block or stream.
+func (e *Encoder) MaxEncodedSize(size int) int {
+	frameHeader := 4 + 2 // magic + frame header & window descriptor
+	if e.o.dict != nil {
+		frameHeader += 4
+	}
+	// Frame content size:
+	if size < 256 {
+		frameHeader++
+	} else if size < 65536+256 {
+		frameHeader += 2
+	} else if size < math.MaxInt32 {
+		frameHeader += 4
+	} else {
+		frameHeader += 8
+	}
+	// Final crc
+	if e.o.crc {
+		frameHeader += 4
+	}
+
+	// Max overhead is 3 bytes/block.
+	// There cannot be 0 blocks.
+	blocks := (size + e.o.blockSize) / e.o.blockSize
+
+	// Combine, add padding.
+	maxSz := frameHeader + 3*blocks + size
+	if e.o.pad > 1 {
+		maxSz += calcSkippableFrame(int64(maxSz), int64(e.o.pad))
+	}
+	return maxSz
+}
diff --git a/vendor/github.com/klauspost/compress/zstd/encoder_options.go b/vendor/github.com/klauspost/compress/zstd/encoder_options.go
index 44d8dbd1..8e15be2f 100644
--- a/vendor/github.com/klauspost/compress/zstd/encoder_options.go
+++ b/vendor/github.com/klauspost/compress/zstd/encoder_options.go
@@ -3,6 +3,8 @@ package zstd
 import (
 	"errors"
 	"fmt"
+	"math"
+	"math/bits"
 	"runtime"
 	"strings"
 )
@@ -47,22 +49,22 @@ func (o encoderOptions) encoder() encoder {
 	switch o.level {
 	case SpeedFastest:
 		if o.dict != nil {
-			return &fastEncoderDict{fastEncoder: fastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), lowMem: o.lowMem}}}
+			return &fastEncoderDict{fastEncoder: fastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), bufferReset: math.MaxInt32 - int32(o.windowSize*2), lowMem: o.lowMem}}}
 		}
-		return &fastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), lowMem: o.lowMem}}
+		return &fastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), bufferReset: math.MaxInt32 - int32(o.windowSize*2), lowMem: o.lowMem}}
 
 	case SpeedDefault:
 		if o.dict != nil {
-			return &doubleFastEncoderDict{fastEncoderDict: fastEncoderDict{fastEncoder: fastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), lowMem: o.lowMem}}}}
+			return &doubleFastEncoderDict{fastEncoderDict: fastEncoderDict{fastEncoder: fastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), bufferReset: math.MaxInt32 - int32(o.windowSize*2), lowMem: o.lowMem}}}}
 		}
-		return &doubleFastEncoder{fastEncoder: fastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), lowMem: o.lowMem}}}
+		return &doubleFastEncoder{fastEncoder: fastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), bufferReset: math.MaxInt32 - int32(o.windowSize*2), lowMem: o.lowMem}}}
 	case SpeedBetterCompression:
 		if o.dict != nil {
-			return &betterFastEncoderDict{betterFastEncoder: betterFastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), lowMem: o.lowMem}}}
+			return &betterFastEncoderDict{betterFastEncoder: betterFastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), bufferReset: math.MaxInt32 - int32(o.windowSize*2), lowMem: o.lowMem}}}
 		}
-		return &betterFastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), lowMem: o.lowMem}}
+		return &betterFastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), bufferReset: math.MaxInt32 - int32(o.windowSize*2), lowMem: o.lowMem}}
 	case SpeedBestCompression:
-		return &bestFastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), lowMem: o.lowMem}}
+		return &bestFastEncoder{fastBase: fastBase{maxMatchOff: int32(o.windowSize), bufferReset: math.MaxInt32 - int32(o.windowSize*2), lowMem: o.lowMem}}
 	}
 	panic("unknown compression level")
 }
@@ -283,7 +285,7 @@ func WithNoEntropyCompression(b bool) EOption {
 // a decoder is allowed to reject a compressed frame which requests a memory size beyond decoder's authorized range.
 // For broader compatibility, decoders are recommended to support memory sizes of at least 8 MB.
 // This is only a recommendation, each decoder is free to support higher or lower limits, depending on local limitations.
-// If this is not specified, block encodes will automatically choose this based on the input size.
+// If this is not specified, block encodes will automatically choose this based on the input size and the window size.
 // This setting has no effect on streamed encodes.
 func WithSingleSegment(b bool) EOption {
 	return func(o *encoderOptions) error {
@@ -304,7 +306,13 @@ func WithLowerEncoderMem(b bool) EOption {
 }
 
 // WithEncoderDict allows to register a dictionary that will be used for the encode.
+//
+// The slice dict must be in the [dictionary format] produced by
+// "zstd --train" from the Zstandard reference implementation.
+//
 // The encoder *may* choose to use no dictionary instead for certain payloads.
+//
+// [dictionary format]: https://github.com/facebook/zstd/blob/dev/doc/zstd_compression_format.md#dictionary-format
 func WithEncoderDict(dict []byte) EOption {
 	return func(o *encoderOptions) error {
 		d, err := loadDict(dict)
@@ -315,3 +323,17 @@ func WithEncoderDict(dict []byte) EOption {
 		return nil
 	}
 }
+
+// WithEncoderDictRaw registers a dictionary that may be used by the encoder.
+//
+// The slice content may contain arbitrary data. It will be used as an initial
+// history.
+func WithEncoderDictRaw(id uint32, content []byte) EOption {
+	return func(o *encoderOptions) error {
+		if bits.UintSize > 32 && uint(len(content)) > dictMaxLength {
+			return fmt.Errorf("dictionary of size %d > 2GiB too large", len(content))
+		}
+		o.dict = &dict{id: id, content: content, offsets: [3]int{1, 4, 8}}
+		return nil
+	}
+}
diff --git a/vendor/github.com/klauspost/compress/zstd/framedec.go b/vendor/github.com/klauspost/compress/zstd/framedec.go
index fa0a633f..d8e8a05b 100644
--- a/vendor/github.com/klauspost/compress/zstd/framedec.go
+++ b/vendor/github.com/klauspost/compress/zstd/framedec.go
@@ -5,7 +5,7 @@
 package zstd
 
 import (
-	"bytes"
+	"encoding/binary"
 	"encoding/hex"
 	"errors"
 	"io"
@@ -29,7 +29,7 @@ type frameDec struct {
 
 	FrameContentSize uint64
 
-	DictionaryID  *uint32
+	DictionaryID  uint32
 	HasCheckSum   bool
 	SingleSegment bool
 }
@@ -43,9 +43,9 @@ const (
 	MaxWindowSize = 1 << 29
 )
 
-var (
-	frameMagic          = []byte{0x28, 0xb5, 0x2f, 0xfd}
-	skippableFrameMagic = []byte{0x2a, 0x4d, 0x18}
+const (
+	frameMagic          = "\x28\xb5\x2f\xfd"
+	skippableFrameMagic = "\x2a\x4d\x18"
 )
 
 func newFrameDec(o decoderOptions) *frameDec {
@@ -89,9 +89,9 @@ func (d *frameDec) reset(br byteBuffer) error {
 			copy(signature[1:], b)
 		}
 
-		if !bytes.Equal(signature[1:4], skippableFrameMagic) || signature[0]&0xf0 != 0x50 {
+		if string(signature[1:4]) != skippableFrameMagic || signature[0]&0xf0 != 0x50 {
 			if debugDecoder {
-				println("Not skippable", hex.EncodeToString(signature[:]), hex.EncodeToString(skippableFrameMagic))
+				println("Not skippable", hex.EncodeToString(signature[:]), hex.EncodeToString([]byte(skippableFrameMagic)))
 			}
 			// Break if not skippable frame.
 			break
@@ -106,7 +106,7 @@ func (d *frameDec) reset(br byteBuffer) error {
 		}
 		n := uint32(b[0]) | (uint32(b[1]) << 8) | (uint32(b[2]) << 16) | (uint32(b[3]) << 24)
 		println("Skipping frame with", n, "bytes.")
-		err = br.skipN(int(n))
+		err = br.skipN(int64(n))
 		if err != nil {
 			if debugDecoder {
 				println("Reading discarded frame", err)
@@ -114,9 +114,9 @@ func (d *frameDec) reset(br byteBuffer) error {
 			return err
 		}
 	}
-	if !bytes.Equal(signature[:], frameMagic) {
+	if string(signature[:]) != frameMagic {
 		if debugDecoder {
-			println("Got magic numbers: ", signature, "want:", frameMagic)
+			println("Got magic numbers: ", signature, "want:", []byte(frameMagic))
 		}
 		return ErrMagicMismatch
 	}
@@ -155,7 +155,7 @@ func (d *frameDec) reset(br byteBuffer) error {
 
 	// Read Dictionary_ID
 	// https://github.com/facebook/zstd/blob/dev/doc/zstd_compression_format.md#dictionary_id
-	d.DictionaryID = nil
+	d.DictionaryID = 0
 	if size := fhd & 3; size != 0 {
 		if size == 3 {
 			size = 4
@@ -167,7 +167,7 @@ func (d *frameDec) reset(br byteBuffer) error {
 			return err
 		}
 		var id uint32
-		switch size {
+		switch len(b) {
 		case 1:
 			id = uint32(b[0])
 		case 2:
@@ -178,11 +178,7 @@ func (d *frameDec) reset(br byteBuffer) error {
 		if debugDecoder {
 			println("Dict size", size, "ID:", id)
 		}
-		if id > 0 {
-			// ID 0 means "sorry, no dictionary anyway".
-			// https://github.com/facebook/zstd/blob/dev/doc/zstd_compression_format.md#dictionary-format
-			d.DictionaryID = &id
-		}
+		d.DictionaryID = id
 	}
 
 	// Read Frame_Content_Size
@@ -204,7 +200,7 @@ func (d *frameDec) reset(br byteBuffer) error {
 			println("Reading Frame content", err)
 			return err
 		}
-		switch fcsSize {
+		switch len(b) {
 		case 1:
 			d.FrameContentSize = uint64(b[0])
 		case 2:
@@ -231,20 +227,27 @@ func (d *frameDec) reset(br byteBuffer) error {
 		d.crc.Reset()
 	}
 
+	if d.WindowSize > d.o.maxWindowSize {
+		if debugDecoder {
+			printf("window size %d > max %d\n", d.WindowSize, d.o.maxWindowSize)
+		}
+		return ErrWindowSizeExceeded
+	}
+
 	if d.WindowSize == 0 && d.SingleSegment {
 		// We may not need window in this case.
 		d.WindowSize = d.FrameContentSize
 		if d.WindowSize < MinWindowSize {
 			d.WindowSize = MinWindowSize
 		}
+		if d.WindowSize > d.o.maxDecodedSize {
+			if debugDecoder {
+				printf("window size %d > max %d\n", d.WindowSize, d.o.maxWindowSize)
+			}
+			return ErrDecoderSizeExceeded
+		}
 	}
 
-	if d.WindowSize > uint64(d.o.maxWindowSize) {
-		if debugDecoder {
-			printf("window size %d > max %d\n", d.WindowSize, d.o.maxWindowSize)
-		}
-		return ErrWindowSizeExceeded
-	}
 	// The minimum Window_Size is 1 KB.
 	if d.WindowSize < MinWindowSize {
 		if debugDecoder {
@@ -254,11 +257,16 @@ func (d *frameDec) reset(br byteBuffer) error {
 	}
 	d.history.windowSize = int(d.WindowSize)
 	if !d.o.lowMem || d.history.windowSize < maxBlockSize {
-		// Alloc 2x window size if not low-mem, or very small window size.
+		// Alloc 2x window size if not low-mem, or window size below 2MB.
 		d.history.allocFrameBuffer = d.history.windowSize * 2
 	} else {
-		// Alloc with one additional block
-		d.history.allocFrameBuffer = d.history.windowSize + maxBlockSize
+		if d.o.lowMem {
+			// Alloc with 1MB extra.
+			d.history.allocFrameBuffer = d.history.windowSize + maxBlockSize/2
+		} else {
+			// Alloc with 2MB extra.
+			d.history.allocFrameBuffer = d.history.windowSize + maxBlockSize
+		}
 	}
 
 	if debugDecoder {
@@ -293,7 +301,7 @@ func (d *frameDec) checkCRC() error {
 	}
 
 	// We can overwrite upper tmp now
-	want, err := d.rawInput.readSmall(4)
+	buf, err := d.rawInput.readSmall(4)
 	if err != nil {
 		println("CRC missing?", err)
 		return err
@@ -303,22 +311,17 @@ func (d *frameDec) checkCRC() error {
 		return nil
 	}
 
-	var tmp [4]byte
-	got := d.crc.Sum64()
-	// Flip to match file order.
-	tmp[0] = byte(got >> 0)
-	tmp[1] = byte(got >> 8)
-	tmp[2] = byte(got >> 16)
-	tmp[3] = byte(got >> 24)
+	want := binary.LittleEndian.Uint32(buf[:4])
+	got := uint32(d.crc.Sum64())
 
-	if !bytes.Equal(tmp[:], want) {
+	if got != want {
 		if debugDecoder {
-			println("CRC Check Failed:", tmp[:], "!=", want)
+			printf("CRC check failed: got %08x, want %08x\n", got, want)
 		}
 		return ErrCRCMismatch
 	}
 	if debugDecoder {
-		println("CRC ok", tmp[:])
+		printf("CRC ok %08x\n", got)
 	}
 	return nil
 }
@@ -336,7 +339,7 @@ func (d *frameDec) consumeCRC() error {
 	return nil
 }
 
-// runDecoder will create a sync decoder that will decode a block of data.
+// runDecoder will run the decoder for the remainder of the frame.
 func (d *frameDec) runDecoder(dst []byte, dec *blockDec) ([]byte, error) {
 	saved := d.history.b
 
@@ -346,12 +349,23 @@ func (d *frameDec) runDecoder(dst []byte, dec *blockDec) ([]byte, error) {
 	// Store input length, so we only check new data.
 	crcStart := len(dst)
 	d.history.decoders.maxSyncLen = 0
+	if d.o.limitToCap {
+		d.history.decoders.maxSyncLen = uint64(cap(dst) - len(dst))
+	}
 	if d.FrameContentSize != fcsUnknown {
-		d.history.decoders.maxSyncLen = d.FrameContentSize + uint64(len(dst))
+		if !d.o.limitToCap || d.FrameContentSize+uint64(len(dst)) < d.history.decoders.maxSyncLen {
+			d.history.decoders.maxSyncLen = d.FrameContentSize + uint64(len(dst))
+		}
 		if d.history.decoders.maxSyncLen > d.o.maxDecodedSize {
+			if debugDecoder {
+				println("maxSyncLen:", d.history.decoders.maxSyncLen, "> maxDecodedSize:", d.o.maxDecodedSize)
+			}
 			return dst, ErrDecoderSizeExceeded
 		}
-		if uint64(cap(dst)) < d.history.decoders.maxSyncLen {
+		if debugDecoder {
+			println("maxSyncLen:", d.history.decoders.maxSyncLen)
+		}
+		if !d.o.limitToCap && uint64(cap(dst)) < d.history.decoders.maxSyncLen {
 			// Alloc for output
 			dst2 := make([]byte, len(dst), d.history.decoders.maxSyncLen+compressedBlockOverAlloc)
 			copy(dst2, dst)
@@ -371,7 +385,13 @@ func (d *frameDec) runDecoder(dst []byte, dec *blockDec) ([]byte, error) {
 		if err != nil {
 			break
 		}
-		if uint64(len(d.history.b)) > d.o.maxDecodedSize {
+		if uint64(len(d.history.b)-crcStart) > d.o.maxDecodedSize {
+			println("runDecoder: maxDecodedSize exceeded", uint64(len(d.history.b)-crcStart), ">", d.o.maxDecodedSize)
+			err = ErrDecoderSizeExceeded
+			break
+		}
+		if d.o.limitToCap && len(d.history.b) > cap(dst) {
+			println("runDecoder: cap exceeded", uint64(len(d.history.b)), ">", cap(dst))
 			err = ErrDecoderSizeExceeded
 			break
 		}
diff --git a/vendor/github.com/klauspost/compress/zstd/fse_decoder_amd64.go b/vendor/github.com/klauspost/compress/zstd/fse_decoder_amd64.go
index e74df436..d04a829b 100644
--- a/vendor/github.com/klauspost/compress/zstd/fse_decoder_amd64.go
+++ b/vendor/github.com/klauspost/compress/zstd/fse_decoder_amd64.go
@@ -21,7 +21,8 @@ type buildDtableAsmContext struct {
 
 // buildDtable_asm is an x86 assembly implementation of fseDecoder.buildDtable.
 // Function returns non-zero exit code on error.
-// go:noescape
+//
+//go:noescape
 func buildDtable_asm(s *fseDecoder, ctx *buildDtableAsmContext) int
 
 // please keep in sync with _generate/gen_fse.go
@@ -34,8 +35,8 @@ const (
 // buildDtable will build the decoding table.
 func (s *fseDecoder) buildDtable() error {
 	ctx := buildDtableAsmContext{
-		stateTable: (*uint16)(&s.stateTable[0]),
-		norm:       (*int16)(&s.norm[0]),
+		stateTable: &s.stateTable[0],
+		norm:       &s.norm[0],
 		dt:         (*uint64)(&s.dt[0]),
 	}
 	code := buildDtable_asm(s, &ctx)
diff --git a/vendor/github.com/klauspost/compress/zstd/fse_decoder_amd64.s b/vendor/github.com/klauspost/compress/zstd/fse_decoder_amd64.s
index da32b442..bcde3986 100644
--- a/vendor/github.com/klauspost/compress/zstd/fse_decoder_amd64.s
+++ b/vendor/github.com/klauspost/compress/zstd/fse_decoder_amd64.s
@@ -1,7 +1,6 @@
 // Code generated by command: go run gen_fse.go -out ../fse_decoder_amd64.s -pkg=zstd. DO NOT EDIT.
 
 //go:build !appengine && !noasm && gc && !noasm
-// +build !appengine,!noasm,gc,!noasm
 
 // func buildDtable_asm(s *fseDecoder, ctx *buildDtableAsmContext) int
 TEXT ·buildDtable_asm(SB), $0-24
diff --git a/vendor/github.com/klauspost/compress/zstd/history.go b/vendor/github.com/klauspost/compress/zstd/history.go
index 28b40153..09164856 100644
--- a/vendor/github.com/klauspost/compress/zstd/history.go
+++ b/vendor/github.com/klauspost/compress/zstd/history.go
@@ -37,26 +37,23 @@ func (h *history) reset() {
 	h.ignoreBuffer = 0
 	h.error = false
 	h.recentOffsets = [3]int{1, 4, 8}
-	if f := h.decoders.litLengths.fse; f != nil && !f.preDefined {
-		fseDecoderPool.Put(f)
-	}
-	if f := h.decoders.offsets.fse; f != nil && !f.preDefined {
-		fseDecoderPool.Put(f)
-	}
-	if f := h.decoders.matchLengths.fse; f != nil && !f.preDefined {
-		fseDecoderPool.Put(f)
-	}
+	h.decoders.freeDecoders()
 	h.decoders = sequenceDecs{br: h.decoders.br}
-	if h.huffTree != nil {
-		if h.dict == nil || h.dict.litEnc != h.huffTree {
-			huffDecoderPool.Put(h.huffTree)
-		}
-	}
+	h.freeHuffDecoder()
 	h.huffTree = nil
 	h.dict = nil
 	//printf("history created: %+v (l: %d, c: %d)", *h, len(h.b), cap(h.b))
 }
 
+func (h *history) freeHuffDecoder() {
+	if h.huffTree != nil {
+		if h.dict == nil || h.dict.litEnc != h.huffTree {
+			huffDecoderPool.Put(h.huffTree)
+			h.huffTree = nil
+		}
+	}
+}
+
 func (h *history) setDict(dict *dict) {
 	if dict == nil {
 		return
diff --git a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/README.md b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/README.md
index 69aa3bb5..777290d4 100644
--- a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/README.md
+++ b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/README.md
@@ -2,12 +2,7 @@
 
 VENDORED: Go to [github.com/cespare/xxhash](https://github.com/cespare/xxhash) for original package.
 
-
-[![GoDoc](https://godoc.org/github.com/cespare/xxhash?status.svg)](https://godoc.org/github.com/cespare/xxhash)
-[![Build Status](https://travis-ci.org/cespare/xxhash.svg?branch=master)](https://travis-ci.org/cespare/xxhash)
-
-xxhash is a Go implementation of the 64-bit
-[xxHash](http://cyan4973.github.io/xxHash/) algorithm, XXH64. This is a
+xxhash is a Go implementation of the 64-bit [xxHash] algorithm, XXH64. This is a
 high-quality hashing algorithm that is much faster than anything in the Go
 standard library.
 
@@ -28,31 +23,49 @@ func (*Digest) WriteString(string) (int, error)
 func (*Digest) Sum64() uint64
 ```
 
-This implementation provides a fast pure-Go implementation and an even faster
-assembly implementation for amd64.
+The package is written with optimized pure Go and also contains even faster
+assembly implementations for amd64 and arm64. If desired, the `purego` build tag
+opts into using the Go code even on those architectures.
+
+[xxHash]: http://cyan4973.github.io/xxHash/
+
+## Compatibility
+
+This package is in a module and the latest code is in version 2 of the module.
+You need a version of Go with at least "minimal module compatibility" to use
+github.com/cespare/xxhash/v2:
+
+* 1.9.7+ for Go 1.9
+* 1.10.3+ for Go 1.10
+* Go 1.11 or later
+
+I recommend using the latest release of Go.
 
 ## Benchmarks
 
 Here are some quick benchmarks comparing the pure-Go and assembly
 implementations of Sum64.
 
-| input size | purego | asm |
-| --- | --- | --- |
-| 5 B   |  979.66 MB/s |  1291.17 MB/s  |
-| 100 B | 7475.26 MB/s | 7973.40 MB/s  |
-| 4 KB  | 17573.46 MB/s | 17602.65 MB/s |
-| 10 MB | 17131.46 MB/s | 17142.16 MB/s |
+| input size | purego    | asm       |
+| ---------- | --------- | --------- |
+| 4 B        |  1.3 GB/s |  1.2 GB/s |
+| 16 B       |  2.9 GB/s |  3.5 GB/s |
+| 100 B      |  6.9 GB/s |  8.1 GB/s |
+| 4 KB       | 11.7 GB/s | 16.7 GB/s |
+| 10 MB      | 12.0 GB/s | 17.3 GB/s |
 
-These numbers were generated on Ubuntu 18.04 with an Intel i7-8700K CPU using
-the following commands under Go 1.11.2:
+These numbers were generated on Ubuntu 20.04 with an Intel Xeon Platinum 8252C
+CPU using the following commands under Go 1.19.2:
 
 ```
-$ go test -tags purego -benchtime 10s -bench '/xxhash,direct,bytes'
-$ go test -benchtime 10s -bench '/xxhash,direct,bytes'
+benchstat <(go test -tags purego -benchtime 500ms -count 15 -bench 'Sum64$')
+benchstat <(go test -benchtime 500ms -count 15 -bench 'Sum64$')
 ```
 
 ## Projects using this package
 
 - [InfluxDB](https://github.com/influxdata/influxdb)
 - [Prometheus](https://github.com/prometheus/prometheus)
+- [VictoriaMetrics](https://github.com/VictoriaMetrics/VictoriaMetrics)
 - [FreeCache](https://github.com/coocood/freecache)
+- [FastCache](https://github.com/VictoriaMetrics/fastcache)
diff --git a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash.go b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash.go
index 2c112a0a..fc40c820 100644
--- a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash.go
+++ b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash.go
@@ -18,19 +18,11 @@ const (
 	prime5 uint64 = 2870177450012600261
 )
 
-// NOTE(caleb): I'm using both consts and vars of the primes. Using consts where
-// possible in the Go code is worth a small (but measurable) performance boost
-// by avoiding some MOVQs. Vars are needed for the asm and also are useful for
-// convenience in the Go code in a few places where we need to intentionally
-// avoid constant arithmetic (e.g., v1 := prime1 + prime2 fails because the
-// result overflows a uint64).
-var (
-	prime1v = prime1
-	prime2v = prime2
-	prime3v = prime3
-	prime4v = prime4
-	prime5v = prime5
-)
+// Store the primes in an array as well.
+//
+// The consts are used when possible in Go code to avoid MOVs but we need a
+// contiguous array of the assembly code.
+var primes = [...]uint64{prime1, prime2, prime3, prime4, prime5}
 
 // Digest implements hash.Hash64.
 type Digest struct {
@@ -52,10 +44,10 @@ func New() *Digest {
 
 // Reset clears the Digest's state so that it can be reused.
 func (d *Digest) Reset() {
-	d.v1 = prime1v + prime2
+	d.v1 = primes[0] + prime2
 	d.v2 = prime2
 	d.v3 = 0
-	d.v4 = -prime1v
+	d.v4 = -primes[0]
 	d.total = 0
 	d.n = 0
 }
@@ -71,21 +63,23 @@ func (d *Digest) Write(b []byte) (n int, err error) {
 	n = len(b)
 	d.total += uint64(n)
 
+	memleft := d.mem[d.n&(len(d.mem)-1):]
+
 	if d.n+n < 32 {
 		// This new data doesn't even fill the current block.
-		copy(d.mem[d.n:], b)
+		copy(memleft, b)
 		d.n += n
 		return
 	}
 
 	if d.n > 0 {
 		// Finish off the partial block.
-		copy(d.mem[d.n:], b)
+		c := copy(memleft, b)
 		d.v1 = round(d.v1, u64(d.mem[0:8]))
 		d.v2 = round(d.v2, u64(d.mem[8:16]))
 		d.v3 = round(d.v3, u64(d.mem[16:24]))
 		d.v4 = round(d.v4, u64(d.mem[24:32]))
-		b = b[32-d.n:]
+		b = b[c:]
 		d.n = 0
 	}
 
@@ -135,21 +129,20 @@ func (d *Digest) Sum64() uint64 {
 
 	h += d.total
 
-	i, end := 0, d.n
-	for ; i+8 <= end; i += 8 {
-		k1 := round(0, u64(d.mem[i:i+8]))
+	b := d.mem[:d.n&(len(d.mem)-1)]
+	for ; len(b) >= 8; b = b[8:] {
+		k1 := round(0, u64(b[:8]))
 		h ^= k1
 		h = rol27(h)*prime1 + prime4
 	}
-	if i+4 <= end {
-		h ^= uint64(u32(d.mem[i:i+4])) * prime1
+	if len(b) >= 4 {
+		h ^= uint64(u32(b[:4])) * prime1
 		h = rol23(h)*prime2 + prime3
-		i += 4
+		b = b[4:]
 	}
-	for i < end {
-		h ^= uint64(d.mem[i]) * prime5
+	for ; len(b) > 0; b = b[1:] {
+		h ^= uint64(b[0]) * prime5
 		h = rol11(h) * prime1
-		i++
 	}
 
 	h ^= h >> 33
diff --git a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_amd64.s b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_amd64.s
index cea17856..ddb63aa9 100644
--- a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_amd64.s
+++ b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_amd64.s
@@ -1,3 +1,4 @@
+//go:build !appengine && gc && !purego && !noasm
 // +build !appengine
 // +build gc
 // +build !purego
@@ -5,212 +6,205 @@
 
 #include "textflag.h"
 
-// Register allocation:
-// AX	h
-// SI	pointer to advance through b
-// DX	n
-// BX	loop end
-// R8	v1, k1
-// R9	v2
-// R10	v3
-// R11	v4
-// R12	tmp
-// R13	prime1v
-// R14	prime2v
-// DI	prime4v
+// Registers:
+#define h      AX
+#define d      AX
+#define p      SI // pointer to advance through b
+#define n      DX
+#define end    BX // loop end
+#define v1     R8
+#define v2     R9
+#define v3     R10
+#define v4     R11
+#define x      R12
+#define prime1 R13
+#define prime2 R14
+#define prime4 DI
 
-// round reads from and advances the buffer pointer in SI.
-// It assumes that R13 has prime1v and R14 has prime2v.
-#define round(r) \
-	MOVQ  (SI), R12 \
-	ADDQ  $8, SI    \
-	IMULQ R14, R12  \
-	ADDQ  R12, r    \
-	ROLQ  $31, r    \
-	IMULQ R13, r
+#define round(acc, x) \
+	IMULQ prime2, x   \
+	ADDQ  x, acc      \
+	ROLQ  $31, acc    \
+	IMULQ prime1, acc
 
-// mergeRound applies a merge round on the two registers acc and val.
-// It assumes that R13 has prime1v, R14 has prime2v, and DI has prime4v.
-#define mergeRound(acc, val) \
-	IMULQ R14, val \
-	ROLQ  $31, val \
-	IMULQ R13, val \
-	XORQ  val, acc \
-	IMULQ R13, acc \
-	ADDQ  DI, acc
+// round0 performs the operation x = round(0, x).
+#define round0(x) \
+	IMULQ prime2, x \
+	ROLQ  $31, x    \
+	IMULQ prime1, x
+
+// mergeRound applies a merge round on the two registers acc and x.
+// It assumes that prime1, prime2, and prime4 have been loaded.
+#define mergeRound(acc, x) \
+	round0(x)         \
+	XORQ  x, acc      \
+	IMULQ prime1, acc \
+	ADDQ  prime4, acc
+
+// blockLoop processes as many 32-byte blocks as possible,
+// updating v1, v2, v3, and v4. It assumes that there is at least one block
+// to process.
+#define blockLoop() \
+loop:  \
+	MOVQ +0(p), x  \
+	round(v1, x)   \
+	MOVQ +8(p), x  \
+	round(v2, x)   \
+	MOVQ +16(p), x \
+	round(v3, x)   \
+	MOVQ +24(p), x \
+	round(v4, x)   \
+	ADDQ $32, p    \
+	CMPQ p, end    \
+	JLE  loop
 
 // func Sum64(b []byte) uint64
-TEXT ·Sum64(SB), NOSPLIT, $0-32
+TEXT ·Sum64(SB), NOSPLIT|NOFRAME, $0-32
 	// Load fixed primes.
-	MOVQ ·prime1v(SB), R13
-	MOVQ ·prime2v(SB), R14
-	MOVQ ·prime4v(SB), DI
+	MOVQ ·primes+0(SB), prime1
+	MOVQ ·primes+8(SB), prime2
+	MOVQ ·primes+24(SB), prime4
 
 	// Load slice.
-	MOVQ b_base+0(FP), SI
-	MOVQ b_len+8(FP), DX
-	LEAQ (SI)(DX*1), BX
+	MOVQ b_base+0(FP), p
+	MOVQ b_len+8(FP), n
+	LEAQ (p)(n*1), end
 
 	// The first loop limit will be len(b)-32.
-	SUBQ $32, BX
+	SUBQ $32, end
 
 	// Check whether we have at least one block.
-	CMPQ DX, $32
+	CMPQ n, $32
 	JLT  noBlocks
 
 	// Set up initial state (v1, v2, v3, v4).
-	MOVQ R13, R8
-	ADDQ R14, R8
-	MOVQ R14, R9
-	XORQ R10, R10
-	XORQ R11, R11
-	SUBQ R13, R11
+	MOVQ prime1, v1
+	ADDQ prime2, v1
+	MOVQ prime2, v2
+	XORQ v3, v3
+	XORQ v4, v4
+	SUBQ prime1, v4
 
-	// Loop until SI > BX.
-blockLoop:
-	round(R8)
-	round(R9)
-	round(R10)
-	round(R11)
+	blockLoop()
 
-	CMPQ SI, BX
-	JLE  blockLoop
+	MOVQ v1, h
+	ROLQ $1, h
+	MOVQ v2, x
+	ROLQ $7, x
+	ADDQ x, h
+	MOVQ v3, x
+	ROLQ $12, x
+	ADDQ x, h
+	MOVQ v4, x
+	ROLQ $18, x
+	ADDQ x, h
 
-	MOVQ R8, AX
-	ROLQ $1, AX
-	MOVQ R9, R12
-	ROLQ $7, R12
-	ADDQ R12, AX
-	MOVQ R10, R12
-	ROLQ $12, R12
-	ADDQ R12, AX
-	MOVQ R11, R12
-	ROLQ $18, R12
-	ADDQ R12, AX
-
-	mergeRound(AX, R8)
-	mergeRound(AX, R9)
-	mergeRound(AX, R10)
-	mergeRound(AX, R11)
+	mergeRound(h, v1)
+	mergeRound(h, v2)
+	mergeRound(h, v3)
+	mergeRound(h, v4)
 
 	JMP afterBlocks
 
 noBlocks:
-	MOVQ ·prime5v(SB), AX
+	MOVQ ·primes+32(SB), h
 
 afterBlocks:
-	ADDQ DX, AX
+	ADDQ n, h
 
-	// Right now BX has len(b)-32, and we want to loop until SI > len(b)-8.
-	ADDQ $24, BX
+	ADDQ $24, end
+	CMPQ p, end
+	JG   try4
 
-	CMPQ SI, BX
-	JG   fourByte
+loop8:
+	MOVQ  (p), x
+	ADDQ  $8, p
+	round0(x)
+	XORQ  x, h
+	ROLQ  $27, h
+	IMULQ prime1, h
+	ADDQ  prime4, h
 
-wordLoop:
-	// Calculate k1.
-	MOVQ  (SI), R8
-	ADDQ  $8, SI
-	IMULQ R14, R8
-	ROLQ  $31, R8
-	IMULQ R13, R8
+	CMPQ p, end
+	JLE  loop8
 
-	XORQ  R8, AX
-	ROLQ  $27, AX
-	IMULQ R13, AX
-	ADDQ  DI, AX
+try4:
+	ADDQ $4, end
+	CMPQ p, end
+	JG   try1
 
-	CMPQ SI, BX
-	JLE  wordLoop
+	MOVL  (p), x
+	ADDQ  $4, p
+	IMULQ prime1, x
+	XORQ  x, h
 
-fourByte:
-	ADDQ $4, BX
-	CMPQ SI, BX
-	JG   singles
+	ROLQ  $23, h
+	IMULQ prime2, h
+	ADDQ  ·primes+16(SB), h
 
-	MOVL  (SI), R8
-	ADDQ  $4, SI
-	IMULQ R13, R8
-	XORQ  R8, AX
-
-	ROLQ  $23, AX
-	IMULQ R14, AX
-	ADDQ  ·prime3v(SB), AX
-
-singles:
-	ADDQ $4, BX
-	CMPQ SI, BX
+try1:
+	ADDQ $4, end
+	CMPQ p, end
 	JGE  finalize
 
-singlesLoop:
-	MOVBQZX (SI), R12
-	ADDQ    $1, SI
-	IMULQ   ·prime5v(SB), R12
-	XORQ    R12, AX
+loop1:
+	MOVBQZX (p), x
+	ADDQ    $1, p
+	IMULQ   ·primes+32(SB), x
+	XORQ    x, h
+	ROLQ    $11, h
+	IMULQ   prime1, h
 
-	ROLQ  $11, AX
-	IMULQ R13, AX
-
-	CMPQ SI, BX
-	JL   singlesLoop
+	CMPQ p, end
+	JL   loop1
 
 finalize:
-	MOVQ  AX, R12
-	SHRQ  $33, R12
-	XORQ  R12, AX
-	IMULQ R14, AX
-	MOVQ  AX, R12
-	SHRQ  $29, R12
-	XORQ  R12, AX
-	IMULQ ·prime3v(SB), AX
-	MOVQ  AX, R12
-	SHRQ  $32, R12
-	XORQ  R12, AX
+	MOVQ  h, x
+	SHRQ  $33, x
+	XORQ  x, h
+	IMULQ prime2, h
+	MOVQ  h, x
+	SHRQ  $29, x
+	XORQ  x, h
+	IMULQ ·primes+16(SB), h
+	MOVQ  h, x
+	SHRQ  $32, x
+	XORQ  x, h
 
-	MOVQ AX, ret+24(FP)
+	MOVQ h, ret+24(FP)
 	RET
 
-// writeBlocks uses the same registers as above except that it uses AX to store
-// the d pointer.
-
 // func writeBlocks(d *Digest, b []byte) int
-TEXT ·writeBlocks(SB), NOSPLIT, $0-40
+TEXT ·writeBlocks(SB), NOSPLIT|NOFRAME, $0-40
 	// Load fixed primes needed for round.
-	MOVQ ·prime1v(SB), R13
-	MOVQ ·prime2v(SB), R14
+	MOVQ ·primes+0(SB), prime1
+	MOVQ ·primes+8(SB), prime2
 
 	// Load slice.
-	MOVQ b_base+8(FP), SI
-	MOVQ b_len+16(FP), DX
-	LEAQ (SI)(DX*1), BX
-	SUBQ $32, BX
+	MOVQ b_base+8(FP), p
+	MOVQ b_len+16(FP), n
+	LEAQ (p)(n*1), end
+	SUBQ $32, end
 
 	// Load vN from d.
-	MOVQ d+0(FP), AX
-	MOVQ 0(AX), R8   // v1
-	MOVQ 8(AX), R9   // v2
-	MOVQ 16(AX), R10 // v3
-	MOVQ 24(AX), R11 // v4
+	MOVQ s+0(FP), d
+	MOVQ 0(d), v1
+	MOVQ 8(d), v2
+	MOVQ 16(d), v3
+	MOVQ 24(d), v4
 
 	// We don't need to check the loop condition here; this function is
 	// always called with at least one block of data to process.
-blockLoop:
-	round(R8)
-	round(R9)
-	round(R10)
-	round(R11)
-
-	CMPQ SI, BX
-	JLE  blockLoop
+	blockLoop()
 
 	// Copy vN back to d.
-	MOVQ R8, 0(AX)
-	MOVQ R9, 8(AX)
-	MOVQ R10, 16(AX)
-	MOVQ R11, 24(AX)
+	MOVQ v1, 0(d)
+	MOVQ v2, 8(d)
+	MOVQ v3, 16(d)
+	MOVQ v4, 24(d)
 
-	// The number of bytes written is SI minus the old base pointer.
-	SUBQ b_base+8(FP), SI
-	MOVQ SI, ret+32(FP)
+	// The number of bytes written is p minus the old base pointer.
+	SUBQ b_base+8(FP), p
+	MOVQ p, ret+32(FP)
 
 	RET
diff --git a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_arm64.s b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_arm64.s
index 4d64a17d..17901e08 100644
--- a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_arm64.s
+++ b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_arm64.s
@@ -1,13 +1,17 @@
-// +build gc,!purego,!noasm
+//go:build !appengine && gc && !purego && !noasm
+// +build !appengine
+// +build gc
+// +build !purego
+// +build !noasm
 
 #include "textflag.h"
 
-// Register allocation.
+// Registers:
 #define digest	R1
-#define h	R2 // Return value.
-#define p	R3 // Input pointer.
-#define len	R4
-#define nblocks	R5 // len / 32.
+#define h	R2 // return value
+#define p	R3 // input pointer
+#define n	R4 // input length
+#define nblocks	R5 // n / 32
 #define prime1	R7
 #define prime2	R8
 #define prime3	R9
@@ -25,60 +29,52 @@
 #define round(acc, x) \
 	MADD prime2, acc, x, acc \
 	ROR  $64-31, acc         \
-	MUL  prime1, acc         \
+	MUL  prime1, acc
 
-// x = round(0, x).
+// round0 performs the operation x = round(0, x).
 #define round0(x) \
 	MUL prime2, x \
 	ROR $64-31, x \
-	MUL prime1, x \
+	MUL prime1, x
 
-#define mergeRound(x) \
-	round0(x)                 \
-	EOR  x, h                 \
-	MADD h, prime4, prime1, h \
+#define mergeRound(acc, x) \
+	round0(x)                     \
+	EOR  x, acc                   \
+	MADD acc, prime4, prime1, acc
 
-// Update v[1-4] with 32-byte blocks. Assumes len >= 32.
-#define blocksLoop() \
-	LSR     $5, len, nblocks \
-	PCALIGN $16              \
-	loop:                    \
-	LDP.P   32(p), (x1, x2)  \
-	round(v1, x1)            \
-	LDP     -16(p), (x3, x4) \
-	round(v2, x2)            \
-	SUB     $1, nblocks      \
-	round(v3, x3)            \
-	round(v4, x4)            \
-	CBNZ    nblocks, loop    \
-
-// The primes are repeated here to ensure that they're stored
-// in a contiguous array, so we can load them with LDP.
-DATA primes<> +0(SB)/8, $11400714785074694791
-DATA primes<> +8(SB)/8, $14029467366897019727
-DATA primes<>+16(SB)/8, $1609587929392839161
-DATA primes<>+24(SB)/8, $9650029242287828579
-DATA primes<>+32(SB)/8, $2870177450012600261
-GLOBL primes<>(SB), NOPTR+RODATA, $40
+// blockLoop processes as many 32-byte blocks as possible,
+// updating v1, v2, v3, and v4. It assumes that n >= 32.
+#define blockLoop() \
+	LSR     $5, n, nblocks  \
+	PCALIGN $16             \
+	loop:                   \
+	LDP.P   16(p), (x1, x2) \
+	LDP.P   16(p), (x3, x4) \
+	round(v1, x1)           \
+	round(v2, x2)           \
+	round(v3, x3)           \
+	round(v4, x4)           \
+	SUB     $1, nblocks     \
+	CBNZ    nblocks, loop
 
 // func Sum64(b []byte) uint64
-TEXT ·Sum64(SB), NOFRAME+NOSPLIT, $0-32
-	LDP b_base+0(FP), (p, len)
+TEXT ·Sum64(SB), NOSPLIT|NOFRAME, $0-32
+	LDP b_base+0(FP), (p, n)
 
-	LDP  primes<> +0(SB), (prime1, prime2)
-	LDP  primes<>+16(SB), (prime3, prime4)
-	MOVD primes<>+32(SB), prime5
+	LDP  ·primes+0(SB), (prime1, prime2)
+	LDP  ·primes+16(SB), (prime3, prime4)
+	MOVD ·primes+32(SB), prime5
 
-	CMP  $32, len
-	CSEL LO, prime5, ZR, h // if len < 32 { h = prime5 } else { h = 0 }
-	BLO  afterLoop
+	CMP  $32, n
+	CSEL LT, prime5, ZR, h // if n < 32 { h = prime5 } else { h = 0 }
+	BLT  afterLoop
 
 	ADD  prime1, prime2, v1
 	MOVD prime2, v2
 	MOVD $0, v3
 	NEG  prime1, v4
 
-	blocksLoop()
+	blockLoop()
 
 	ROR $64-1, v1, x1
 	ROR $64-7, v2, x2
@@ -88,71 +84,75 @@ TEXT ·Sum64(SB), NOFRAME+NOSPLIT, $0-32
 	ADD x3, x4
 	ADD x2, x4, h
 
-	mergeRound(v1)
-	mergeRound(v2)
-	mergeRound(v3)
-	mergeRound(v4)
+	mergeRound(h, v1)
+	mergeRound(h, v2)
+	mergeRound(h, v3)
+	mergeRound(h, v4)
 
 afterLoop:
-	ADD len, h
+	ADD n, h
 
-	TBZ   $4, len, try8
+	TBZ   $4, n, try8
 	LDP.P 16(p), (x1, x2)
 
 	round0(x1)
+
+	// NOTE: here and below, sequencing the EOR after the ROR (using a
+	// rotated register) is worth a small but measurable speedup for small
+	// inputs.
 	ROR  $64-27, h
 	EOR  x1 @> 64-27, h, h
 	MADD h, prime4, prime1, h
 
 	round0(x2)
 	ROR  $64-27, h
-	EOR  x2 @> 64-27, h
+	EOR  x2 @> 64-27, h, h
 	MADD h, prime4, prime1, h
 
 try8:
-	TBZ    $3, len, try4
+	TBZ    $3, n, try4
 	MOVD.P 8(p), x1
 
 	round0(x1)
 	ROR  $64-27, h
-	EOR  x1 @> 64-27, h
+	EOR  x1 @> 64-27, h, h
 	MADD h, prime4, prime1, h
 
 try4:
-	TBZ     $2, len, try2
+	TBZ     $2, n, try2
 	MOVWU.P 4(p), x2
 
 	MUL  prime1, x2
 	ROR  $64-23, h
-	EOR  x2 @> 64-23, h
+	EOR  x2 @> 64-23, h, h
 	MADD h, prime3, prime2, h
 
 try2:
-	TBZ     $1, len, try1
+	TBZ     $1, n, try1
 	MOVHU.P 2(p), x3
 	AND     $255, x3, x1
 	LSR     $8, x3, x2
 
 	MUL prime5, x1
 	ROR $64-11, h
-	EOR x1 @> 64-11, h
+	EOR x1 @> 64-11, h, h
 	MUL prime1, h
 
 	MUL prime5, x2
 	ROR $64-11, h
-	EOR x2 @> 64-11, h
+	EOR x2 @> 64-11, h, h
 	MUL prime1, h
 
 try1:
-	TBZ   $0, len, end
+	TBZ   $0, n, finalize
 	MOVBU (p), x4
 
 	MUL prime5, x4
 	ROR $64-11, h
-	EOR x4 @> 64-11, h
+	EOR x4 @> 64-11, h, h
 	MUL prime1, h
 
-end:
+finalize:
 	EOR h >> 33, h
 	MUL prime2, h
 	EOR h >> 29, h
@@ -163,24 +163,22 @@ end:
 	RET
 
 // func writeBlocks(d *Digest, b []byte) int
-//
-// Assumes len(b) >= 32.
-TEXT ·writeBlocks(SB), NOFRAME+NOSPLIT, $0-40
-	LDP primes<>(SB), (prime1, prime2)
+TEXT ·writeBlocks(SB), NOSPLIT|NOFRAME, $0-40
+	LDP ·primes+0(SB), (prime1, prime2)
 
 	// Load state. Assume v[1-4] are stored contiguously.
 	MOVD d+0(FP), digest
 	LDP  0(digest), (v1, v2)
 	LDP  16(digest), (v3, v4)
 
-	LDP b_base+8(FP), (p, len)
+	LDP b_base+8(FP), (p, n)
 
-	blocksLoop()
+	blockLoop()
 
 	// Store updated state.
 	STP (v1, v2), 0(digest)
 	STP (v3, v4), 16(digest)
 
-	BIC  $31, len
-	MOVD len, ret+32(FP)
+	BIC  $31, n
+	MOVD n, ret+32(FP)
 	RET
diff --git a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_asm.go b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_asm.go
index 1a1fac9c..d4221edf 100644
--- a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_asm.go
+++ b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_asm.go
@@ -13,4 +13,4 @@ package xxhash
 func Sum64(b []byte) uint64
 
 //go:noescape
-func writeBlocks(d *Digest, b []byte) int
+func writeBlocks(s *Digest, b []byte) int
diff --git a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_other.go b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_other.go
index 209cb4a9..0be16cef 100644
--- a/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_other.go
+++ b/vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_other.go
@@ -15,10 +15,10 @@ func Sum64(b []byte) uint64 {
 	var h uint64
 
 	if n >= 32 {
-		v1 := prime1v + prime2
+		v1 := primes[0] + prime2
 		v2 := prime2
 		v3 := uint64(0)
-		v4 := -prime1v
+		v4 := -primes[0]
 		for len(b) >= 32 {
 			v1 = round(v1, u64(b[0:8:len(b)]))
 			v2 = round(v2, u64(b[8:16:len(b)]))
@@ -37,19 +37,18 @@ func Sum64(b []byte) uint64 {
 
 	h += uint64(n)
 
-	i, end := 0, len(b)
-	for ; i+8 <= end; i += 8 {
-		k1 := round(0, u64(b[i:i+8:len(b)]))
+	for ; len(b) >= 8; b = b[8:] {
+		k1 := round(0, u64(b[:8]))
 		h ^= k1
 		h = rol27(h)*prime1 + prime4
 	}
-	if i+4 <= end {
-		h ^= uint64(u32(b[i:i+4:len(b)])) * prime1
+	if len(b) >= 4 {
+		h ^= uint64(u32(b[:4])) * prime1
 		h = rol23(h)*prime2 + prime3
-		i += 4
+		b = b[4:]
 	}
-	for ; i < end; i++ {
-		h ^= uint64(b[i]) * prime5
+	for ; len(b) > 0; b = b[1:] {
+		h ^= uint64(b[0]) * prime5
 		h = rol11(h) * prime1
 	}
 
diff --git a/vendor/github.com/klauspost/compress/zstd/seqdec.go b/vendor/github.com/klauspost/compress/zstd/seqdec.go
index df044720..f833d154 100644
--- a/vendor/github.com/klauspost/compress/zstd/seqdec.go
+++ b/vendor/github.com/klauspost/compress/zstd/seqdec.go
@@ -99,6 +99,21 @@ func (s *sequenceDecs) initialize(br *bitReader, hist *history, out []byte) erro
 	return nil
 }
 
+func (s *sequenceDecs) freeDecoders() {
+	if f := s.litLengths.fse; f != nil && !f.preDefined {
+		fseDecoderPool.Put(f)
+		s.litLengths.fse = nil
+	}
+	if f := s.offsets.fse; f != nil && !f.preDefined {
+		fseDecoderPool.Put(f)
+		s.offsets.fse = nil
+	}
+	if f := s.matchLengths.fse; f != nil && !f.preDefined {
+		fseDecoderPool.Put(f)
+		s.matchLengths.fse = nil
+	}
+}
+
 // execute will execute the decoded sequence with the provided history.
 // The sequence must be evaluated before being sent.
 func (s *sequenceDecs) execute(seqs []seqVals, hist []byte) error {
@@ -299,7 +314,10 @@ func (s *sequenceDecs) decodeSync(hist []byte) error {
 		}
 		size := ll + ml + len(out)
 		if size-startSize > maxBlockSize {
-			return fmt.Errorf("output (%d) bigger than max block size (%d)", size-startSize, maxBlockSize)
+			if size-startSize == 424242 {
+				panic("here")
+			}
+			return fmt.Errorf("output bigger than max block size (%d)", maxBlockSize)
 		}
 		if size > cap(out) {
 			// Not enough size, which can happen under high volume block streaming conditions
@@ -411,7 +429,7 @@ func (s *sequenceDecs) decodeSync(hist []byte) error {
 
 	// Check if space for literals
 	if size := len(s.literals) + len(s.out) - startSize; size > maxBlockSize {
-		return fmt.Errorf("output (%d) bigger than max block size (%d)", size, maxBlockSize)
+		return fmt.Errorf("output bigger than max block size (%d)", maxBlockSize)
 	}
 
 	// Add final literals
diff --git a/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.go b/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.go
index 847b322a..191384ad 100644
--- a/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.go
+++ b/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.go
@@ -32,18 +32,22 @@ type decodeSyncAsmContext struct {
 // sequenceDecs_decodeSync_amd64 implements the main loop of sequenceDecs.decodeSync in x86 asm.
 //
 // Please refer to seqdec_generic.go for the reference implementation.
+//
 //go:noescape
 func sequenceDecs_decodeSync_amd64(s *sequenceDecs, br *bitReader, ctx *decodeSyncAsmContext) int
 
 // sequenceDecs_decodeSync_bmi2 implements the main loop of sequenceDecs.decodeSync in x86 asm with BMI2 extensions.
+//
 //go:noescape
 func sequenceDecs_decodeSync_bmi2(s *sequenceDecs, br *bitReader, ctx *decodeSyncAsmContext) int
 
 // sequenceDecs_decodeSync_safe_amd64 does the same as above, but does not write more than output buffer.
+//
 //go:noescape
 func sequenceDecs_decodeSync_safe_amd64(s *sequenceDecs, br *bitReader, ctx *decodeSyncAsmContext) int
 
 // sequenceDecs_decodeSync_safe_bmi2 does the same as above, but does not write more than output buffer.
+//
 //go:noescape
 func sequenceDecs_decodeSync_safe_bmi2(s *sequenceDecs, br *bitReader, ctx *decodeSyncAsmContext) int
 
@@ -55,16 +59,22 @@ func (s *sequenceDecs) decodeSyncSimple(hist []byte) (bool, error) {
 	if s.maxSyncLen == 0 && cap(s.out)-len(s.out) < maxCompressedBlockSize {
 		return false, nil
 	}
-	useSafe := false
-	if s.maxSyncLen == 0 && cap(s.out)-len(s.out) < maxCompressedBlockSizeAlloc {
-		useSafe = true
-	}
-	if s.maxSyncLen > 0 && cap(s.out)-len(s.out)-compressedBlockOverAlloc < int(s.maxSyncLen) {
-		useSafe = true
-	}
-	if cap(s.literals) < len(s.literals)+compressedBlockOverAlloc {
-		useSafe = true
-	}
+
+	// FIXME: Using unsafe memory copies leads to rare, random crashes
+	// with fuzz testing. It is therefore disabled for now.
+	const useSafe = true
+	/*
+		useSafe := false
+		if s.maxSyncLen == 0 && cap(s.out)-len(s.out) < maxCompressedBlockSizeAlloc {
+			useSafe = true
+		}
+		if s.maxSyncLen > 0 && cap(s.out)-len(s.out)-compressedBlockOverAlloc < int(s.maxSyncLen) {
+			useSafe = true
+		}
+		if cap(s.literals) < len(s.literals)+compressedBlockOverAlloc {
+			useSafe = true
+		}
+	*/
 
 	br := s.br
 
@@ -129,7 +139,7 @@ func (s *sequenceDecs) decodeSyncSimple(hist []byte) (bool, error) {
 		if debugDecoder {
 			println("msl:", s.maxSyncLen, "cap", cap(s.out), "bef:", startSize, "sz:", size-startSize, "mbs:", maxBlockSize, "outsz:", cap(s.out)-startSize)
 		}
-		return true, fmt.Errorf("output (%d) bigger than max block size (%d)", size-startSize, maxBlockSize)
+		return true, fmt.Errorf("output bigger than max block size (%d)", maxBlockSize)
 
 	default:
 		return true, fmt.Errorf("sequenceDecs_decode returned erronous code %d", errCode)
@@ -137,7 +147,8 @@ func (s *sequenceDecs) decodeSyncSimple(hist []byte) (bool, error) {
 
 	s.seqSize += ctx.litRemain
 	if s.seqSize > maxBlockSize {
-		return true, fmt.Errorf("output (%d) bigger than max block size (%d)", s.seqSize, maxBlockSize)
+		return true, fmt.Errorf("output bigger than max block size (%d)", maxBlockSize)
+
 	}
 	err := br.close()
 	if err != nil {
@@ -195,20 +206,24 @@ const errorNotEnoughSpace = 5
 // sequenceDecs_decode implements the main loop of sequenceDecs in x86 asm.
 //
 // Please refer to seqdec_generic.go for the reference implementation.
+//
 //go:noescape
 func sequenceDecs_decode_amd64(s *sequenceDecs, br *bitReader, ctx *decodeAsmContext) int
 
 // sequenceDecs_decode implements the main loop of sequenceDecs in x86 asm.
 //
 // Please refer to seqdec_generic.go for the reference implementation.
+//
 //go:noescape
 func sequenceDecs_decode_56_amd64(s *sequenceDecs, br *bitReader, ctx *decodeAsmContext) int
 
 // sequenceDecs_decode implements the main loop of sequenceDecs in x86 asm with BMI2 extensions.
+//
 //go:noescape
 func sequenceDecs_decode_bmi2(s *sequenceDecs, br *bitReader, ctx *decodeAsmContext) int
 
 // sequenceDecs_decode implements the main loop of sequenceDecs in x86 asm with BMI2 extensions.
+//
 //go:noescape
 func sequenceDecs_decode_56_bmi2(s *sequenceDecs, br *bitReader, ctx *decodeAsmContext) int
 
@@ -275,7 +290,7 @@ func (s *sequenceDecs) decode(seqs []seqVals) error {
 
 	s.seqSize += ctx.litRemain
 	if s.seqSize > maxBlockSize {
-		return fmt.Errorf("output (%d) bigger than max block size (%d)", s.seqSize, maxBlockSize)
+		return fmt.Errorf("output bigger than max block size (%d)", maxBlockSize)
 	}
 	err := br.close()
 	if err != nil {
@@ -302,10 +317,12 @@ type executeAsmContext struct {
 // Returns false if a match offset is too big.
 //
 // Please refer to seqdec_generic.go for the reference implementation.
+//
 //go:noescape
 func sequenceDecs_executeSimple_amd64(ctx *executeAsmContext) bool
 
 // Same as above, but with safe memcopies
+//
 //go:noescape
 func sequenceDecs_executeSimple_safe_amd64(ctx *executeAsmContext) bool
 
diff --git a/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.s b/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.s
index 71e64e06..b94993a0 100644
--- a/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.s
+++ b/vendor/github.com/klauspost/compress/zstd/seqdec_amd64.s
@@ -1,7 +1,6 @@
 // Code generated by command: go run gen.go -out ../seqdec_amd64.s -pkg=zstd. DO NOT EDIT.
 
 //go:build !appengine && !noasm && gc && !noasm
-// +build !appengine,!noasm,gc,!noasm
 
 // func sequenceDecs_decode_amd64(s *sequenceDecs, br *bitReader, ctx *decodeAsmContext) int
 // Requires: CMOV
@@ -52,34 +51,46 @@ sequenceDecs_decode_amd64_fill_byte_by_byte:
 
 sequenceDecs_decode_amd64_fill_end:
 	// Update offset
-	MOVQ    R9, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R15
-	SHLQ    CL, R15
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R15
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R15
-	ADDQ    R15, AX
-	MOVQ    AX, 16(R10)
+	MOVQ  R9, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R15
+	SHLQ  CL, R15
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decode_amd64_of_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decode_amd64_of_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decode_amd64_of_update_zero
+	NEGQ  CX
+	SHRQ  CL, R15
+	ADDQ  R15, AX
+
+sequenceDecs_decode_amd64_of_update_zero:
+	MOVQ AX, 16(R10)
 
 	// Update match length
-	MOVQ    R8, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R15
-	SHLQ    CL, R15
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R15
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R15
-	ADDQ    R15, AX
-	MOVQ    AX, 8(R10)
+	MOVQ  R8, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R15
+	SHLQ  CL, R15
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decode_amd64_ml_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decode_amd64_ml_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decode_amd64_ml_update_zero
+	NEGQ  CX
+	SHRQ  CL, R15
+	ADDQ  R15, AX
+
+sequenceDecs_decode_amd64_ml_update_zero:
+	MOVQ AX, 8(R10)
 
 	// Fill bitreader to have enough for the remaining
 	CMPQ SI, $0x08
@@ -107,19 +118,25 @@ sequenceDecs_decode_amd64_fill_2_byte_by_byte:
 
 sequenceDecs_decode_amd64_fill_2_end:
 	// Update literal length
-	MOVQ    DI, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R15
-	SHLQ    CL, R15
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R15
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R15
-	ADDQ    R15, AX
-	MOVQ    AX, (R10)
+	MOVQ  DI, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R15
+	SHLQ  CL, R15
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decode_amd64_ll_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decode_amd64_ll_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decode_amd64_ll_update_zero
+	NEGQ  CX
+	SHRQ  CL, R15
+	ADDQ  R15, AX
+
+sequenceDecs_decode_amd64_ll_update_zero:
+	MOVQ AX, (R10)
 
 	// Fill bitreader for state updates
 	MOVQ    R14, (SP)
@@ -198,7 +215,7 @@ sequenceDecs_decode_amd64_skip_update:
 	MOVQ R12, R13
 	MOVQ R11, R12
 	MOVQ CX, R11
-	JMP  sequenceDecs_decode_amd64_adjust_end
+	JMP  sequenceDecs_decode_amd64_after_adjust
 
 sequenceDecs_decode_amd64_adjust_offsetB_1_or_0:
 	CMPQ (R10), $0x00000000
@@ -210,7 +227,7 @@ sequenceDecs_decode_amd64_adjust_offset_maybezero:
 	TESTQ CX, CX
 	JNZ   sequenceDecs_decode_amd64_adjust_offset_nonzero
 	MOVQ  R11, CX
-	JMP   sequenceDecs_decode_amd64_adjust_end
+	JMP   sequenceDecs_decode_amd64_after_adjust
 
 sequenceDecs_decode_amd64_adjust_offset_nonzero:
 	CMPQ CX, $0x01
@@ -247,7 +264,7 @@ sequenceDecs_decode_amd64_adjust_temp_valid:
 	MOVQ    AX, R11
 	MOVQ    AX, CX
 
-sequenceDecs_decode_amd64_adjust_end:
+sequenceDecs_decode_amd64_after_adjust:
 	MOVQ CX, 16(R10)
 
 	// Check values
@@ -303,10 +320,6 @@ error_not_enough_literals:
 	MOVQ $0x00000004, ret+24(FP)
 	RET
 
-	// Return with not enough output space error
-	MOVQ $0x00000005, ret+24(FP)
-	RET
-
 // func sequenceDecs_decode_56_amd64(s *sequenceDecs, br *bitReader, ctx *decodeAsmContext) int
 // Requires: CMOV
 TEXT ·sequenceDecs_decode_56_amd64(SB), $8-32
@@ -356,49 +369,67 @@ sequenceDecs_decode_56_amd64_fill_byte_by_byte:
 
 sequenceDecs_decode_56_amd64_fill_end:
 	// Update offset
-	MOVQ    R9, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R15
-	SHLQ    CL, R15
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R15
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R15
-	ADDQ    R15, AX
-	MOVQ    AX, 16(R10)
+	MOVQ  R9, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R15
+	SHLQ  CL, R15
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decode_56_amd64_of_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decode_56_amd64_of_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decode_56_amd64_of_update_zero
+	NEGQ  CX
+	SHRQ  CL, R15
+	ADDQ  R15, AX
+
+sequenceDecs_decode_56_amd64_of_update_zero:
+	MOVQ AX, 16(R10)
 
 	// Update match length
-	MOVQ    R8, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R15
-	SHLQ    CL, R15
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R15
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R15
-	ADDQ    R15, AX
-	MOVQ    AX, 8(R10)
+	MOVQ  R8, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R15
+	SHLQ  CL, R15
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decode_56_amd64_ml_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decode_56_amd64_ml_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decode_56_amd64_ml_update_zero
+	NEGQ  CX
+	SHRQ  CL, R15
+	ADDQ  R15, AX
+
+sequenceDecs_decode_56_amd64_ml_update_zero:
+	MOVQ AX, 8(R10)
 
 	// Update literal length
-	MOVQ    DI, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R15
-	SHLQ    CL, R15
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R15
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R15
-	ADDQ    R15, AX
-	MOVQ    AX, (R10)
+	MOVQ  DI, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R15
+	SHLQ  CL, R15
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decode_56_amd64_ll_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decode_56_amd64_ll_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decode_56_amd64_ll_update_zero
+	NEGQ  CX
+	SHRQ  CL, R15
+	ADDQ  R15, AX
+
+sequenceDecs_decode_56_amd64_ll_update_zero:
+	MOVQ AX, (R10)
 
 	// Fill bitreader for state updates
 	MOVQ    R14, (SP)
@@ -477,7 +508,7 @@ sequenceDecs_decode_56_amd64_skip_update:
 	MOVQ R12, R13
 	MOVQ R11, R12
 	MOVQ CX, R11
-	JMP  sequenceDecs_decode_56_amd64_adjust_end
+	JMP  sequenceDecs_decode_56_amd64_after_adjust
 
 sequenceDecs_decode_56_amd64_adjust_offsetB_1_or_0:
 	CMPQ (R10), $0x00000000
@@ -489,7 +520,7 @@ sequenceDecs_decode_56_amd64_adjust_offset_maybezero:
 	TESTQ CX, CX
 	JNZ   sequenceDecs_decode_56_amd64_adjust_offset_nonzero
 	MOVQ  R11, CX
-	JMP   sequenceDecs_decode_56_amd64_adjust_end
+	JMP   sequenceDecs_decode_56_amd64_after_adjust
 
 sequenceDecs_decode_56_amd64_adjust_offset_nonzero:
 	CMPQ CX, $0x01
@@ -526,7 +557,7 @@ sequenceDecs_decode_56_amd64_adjust_temp_valid:
 	MOVQ    AX, R11
 	MOVQ    AX, CX
 
-sequenceDecs_decode_56_amd64_adjust_end:
+sequenceDecs_decode_56_amd64_after_adjust:
 	MOVQ CX, 16(R10)
 
 	// Check values
@@ -582,10 +613,6 @@ error_not_enough_literals:
 	MOVQ $0x00000004, ret+24(FP)
 	RET
 
-	// Return with not enough output space error
-	MOVQ $0x00000005, ret+24(FP)
-	RET
-
 // func sequenceDecs_decode_bmi2(s *sequenceDecs, br *bitReader, ctx *decodeAsmContext) int
 // Requires: BMI, BMI2, CMOV
 TEXT ·sequenceDecs_decode_bmi2(SB), $8-32
@@ -757,7 +784,7 @@ sequenceDecs_decode_bmi2_skip_update:
 	MOVQ R11, R12
 	MOVQ R10, R11
 	MOVQ CX, R10
-	JMP  sequenceDecs_decode_bmi2_adjust_end
+	JMP  sequenceDecs_decode_bmi2_after_adjust
 
 sequenceDecs_decode_bmi2_adjust_offsetB_1_or_0:
 	CMPQ (R9), $0x00000000
@@ -769,7 +796,7 @@ sequenceDecs_decode_bmi2_adjust_offset_maybezero:
 	TESTQ CX, CX
 	JNZ   sequenceDecs_decode_bmi2_adjust_offset_nonzero
 	MOVQ  R10, CX
-	JMP   sequenceDecs_decode_bmi2_adjust_end
+	JMP   sequenceDecs_decode_bmi2_after_adjust
 
 sequenceDecs_decode_bmi2_adjust_offset_nonzero:
 	CMPQ CX, $0x01
@@ -806,7 +833,7 @@ sequenceDecs_decode_bmi2_adjust_temp_valid:
 	MOVQ    R13, R10
 	MOVQ    R13, CX
 
-sequenceDecs_decode_bmi2_adjust_end:
+sequenceDecs_decode_bmi2_after_adjust:
 	MOVQ CX, 16(R9)
 
 	// Check values
@@ -862,10 +889,6 @@ error_not_enough_literals:
 	MOVQ $0x00000004, ret+24(FP)
 	RET
 
-	// Return with not enough output space error
-	MOVQ $0x00000005, ret+24(FP)
-	RET
-
 // func sequenceDecs_decode_56_bmi2(s *sequenceDecs, br *bitReader, ctx *decodeAsmContext) int
 // Requires: BMI, BMI2, CMOV
 TEXT ·sequenceDecs_decode_56_bmi2(SB), $8-32
@@ -1012,7 +1035,7 @@ sequenceDecs_decode_56_bmi2_skip_update:
 	MOVQ R11, R12
 	MOVQ R10, R11
 	MOVQ CX, R10
-	JMP  sequenceDecs_decode_56_bmi2_adjust_end
+	JMP  sequenceDecs_decode_56_bmi2_after_adjust
 
 sequenceDecs_decode_56_bmi2_adjust_offsetB_1_or_0:
 	CMPQ (R9), $0x00000000
@@ -1024,7 +1047,7 @@ sequenceDecs_decode_56_bmi2_adjust_offset_maybezero:
 	TESTQ CX, CX
 	JNZ   sequenceDecs_decode_56_bmi2_adjust_offset_nonzero
 	MOVQ  R10, CX
-	JMP   sequenceDecs_decode_56_bmi2_adjust_end
+	JMP   sequenceDecs_decode_56_bmi2_after_adjust
 
 sequenceDecs_decode_56_bmi2_adjust_offset_nonzero:
 	CMPQ CX, $0x01
@@ -1061,7 +1084,7 @@ sequenceDecs_decode_56_bmi2_adjust_temp_valid:
 	MOVQ    R13, R10
 	MOVQ    R13, CX
 
-sequenceDecs_decode_56_bmi2_adjust_end:
+sequenceDecs_decode_56_bmi2_after_adjust:
 	MOVQ CX, 16(R9)
 
 	// Check values
@@ -1117,10 +1140,6 @@ error_not_enough_literals:
 	MOVQ $0x00000004, ret+24(FP)
 	RET
 
-	// Return with not enough output space error
-	MOVQ $0x00000005, ret+24(FP)
-	RET
-
 // func sequenceDecs_executeSimple_amd64(ctx *executeAsmContext) bool
 // Requires: SSE
 TEXT ·sequenceDecs_executeSimple_amd64(SB), $8-9
@@ -1354,8 +1373,7 @@ loop_finished:
 	MOVQ ctx+0(FP), AX
 	MOVQ DX, 24(AX)
 	MOVQ DI, 104(AX)
-	MOVQ 80(AX), CX
-	SUBQ CX, SI
+	SUBQ 80(AX), SI
 	MOVQ SI, 112(AX)
 	RET
 
@@ -1367,8 +1385,7 @@ error_match_off_too_big:
 	MOVQ ctx+0(FP), AX
 	MOVQ DX, 24(AX)
 	MOVQ DI, 104(AX)
-	MOVQ 80(AX), CX
-	SUBQ CX, SI
+	SUBQ 80(AX), SI
 	MOVQ SI, 112(AX)
 	RET
 
@@ -1712,8 +1729,7 @@ loop_finished:
 	MOVQ ctx+0(FP), AX
 	MOVQ DX, 24(AX)
 	MOVQ DI, 104(AX)
-	MOVQ 80(AX), CX
-	SUBQ CX, SI
+	SUBQ 80(AX), SI
 	MOVQ SI, 112(AX)
 	RET
 
@@ -1725,8 +1741,7 @@ error_match_off_too_big:
 	MOVQ ctx+0(FP), AX
 	MOVQ DX, 24(AX)
 	MOVQ DI, 104(AX)
-	MOVQ 80(AX), CX
-	SUBQ CX, SI
+	SUBQ 80(AX), SI
 	MOVQ SI, 112(AX)
 	RET
 
@@ -1749,6 +1764,10 @@ TEXT ·sequenceDecs_decodeSync_amd64(SB), $64-32
 	MOVQ    72(AX), DI
 	MOVQ    80(AX), R8
 	MOVQ    88(AX), R9
+	XORQ    CX, CX
+	MOVQ    CX, 8(SP)
+	MOVQ    CX, 16(SP)
+	MOVQ    CX, 24(SP)
 	MOVQ    112(AX), R10
 	MOVQ    128(AX), CX
 	MOVQ    CX, 32(SP)
@@ -1798,34 +1817,46 @@ sequenceDecs_decodeSync_amd64_fill_byte_by_byte:
 
 sequenceDecs_decodeSync_amd64_fill_end:
 	// Update offset
-	MOVQ    R9, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R14
-	SHLQ    CL, R14
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R14
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R14
-	ADDQ    R14, AX
-	MOVQ    AX, 8(SP)
+	MOVQ  R9, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R14
+	SHLQ  CL, R14
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decodeSync_amd64_of_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decodeSync_amd64_of_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decodeSync_amd64_of_update_zero
+	NEGQ  CX
+	SHRQ  CL, R14
+	ADDQ  R14, AX
+
+sequenceDecs_decodeSync_amd64_of_update_zero:
+	MOVQ AX, 8(SP)
 
 	// Update match length
-	MOVQ    R8, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R14
-	SHLQ    CL, R14
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R14
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R14
-	ADDQ    R14, AX
-	MOVQ    AX, 16(SP)
+	MOVQ  R8, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R14
+	SHLQ  CL, R14
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decodeSync_amd64_ml_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decodeSync_amd64_ml_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decodeSync_amd64_ml_update_zero
+	NEGQ  CX
+	SHRQ  CL, R14
+	ADDQ  R14, AX
+
+sequenceDecs_decodeSync_amd64_ml_update_zero:
+	MOVQ AX, 16(SP)
 
 	// Fill bitreader to have enough for the remaining
 	CMPQ SI, $0x08
@@ -1853,19 +1884,25 @@ sequenceDecs_decodeSync_amd64_fill_2_byte_by_byte:
 
 sequenceDecs_decodeSync_amd64_fill_2_end:
 	// Update literal length
-	MOVQ    DI, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R14
-	SHLQ    CL, R14
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R14
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R14
-	ADDQ    R14, AX
-	MOVQ    AX, 24(SP)
+	MOVQ  DI, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R14
+	SHLQ  CL, R14
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decodeSync_amd64_ll_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decodeSync_amd64_ll_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decodeSync_amd64_ll_update_zero
+	NEGQ  CX
+	SHRQ  CL, R14
+	ADDQ  R14, AX
+
+sequenceDecs_decodeSync_amd64_ll_update_zero:
+	MOVQ AX, 24(SP)
 
 	// Fill bitreader for state updates
 	MOVQ    R13, (SP)
@@ -1945,7 +1982,7 @@ sequenceDecs_decodeSync_amd64_skip_update:
 	MOVUPS 144(CX), X0
 	MOVQ   R13, 144(CX)
 	MOVUPS X0, 152(CX)
-	JMP    sequenceDecs_decodeSync_amd64_adjust_end
+	JMP    sequenceDecs_decodeSync_amd64_after_adjust
 
 sequenceDecs_decodeSync_amd64_adjust_offsetB_1_or_0:
 	CMPQ 24(SP), $0x00000000
@@ -1957,7 +1994,7 @@ sequenceDecs_decodeSync_amd64_adjust_offset_maybezero:
 	TESTQ R13, R13
 	JNZ   sequenceDecs_decodeSync_amd64_adjust_offset_nonzero
 	MOVQ  144(CX), R13
-	JMP   sequenceDecs_decodeSync_amd64_adjust_end
+	JMP   sequenceDecs_decodeSync_amd64_after_adjust
 
 sequenceDecs_decodeSync_amd64_adjust_offset_nonzero:
 	MOVQ    R13, AX
@@ -1966,8 +2003,7 @@ sequenceDecs_decodeSync_amd64_adjust_offset_nonzero:
 	CMPQ    R13, $0x03
 	CMOVQEQ R14, AX
 	CMOVQEQ R15, R14
-	LEAQ    144(CX), R15
-	ADDQ    (R15)(AX*8), R14
+	ADDQ    144(CX)(AX*8), R14
 	JNZ     sequenceDecs_decodeSync_amd64_adjust_temp_valid
 	MOVQ    $0x00000001, R14
 
@@ -1983,7 +2019,7 @@ sequenceDecs_decodeSync_amd64_adjust_skip:
 	MOVQ R14, 144(CX)
 	MOVQ R14, R13
 
-sequenceDecs_decodeSync_amd64_adjust_end:
+sequenceDecs_decodeSync_amd64_after_adjust:
 	MOVQ R13, 8(SP)
 
 	// Check values
@@ -2280,6 +2316,10 @@ TEXT ·sequenceDecs_decodeSync_bmi2(SB), $64-32
 	MOVQ    72(CX), SI
 	MOVQ    80(CX), DI
 	MOVQ    88(CX), R8
+	XORQ    R9, R9
+	MOVQ    R9, 8(SP)
+	MOVQ    R9, 16(SP)
+	MOVQ    R9, 24(SP)
 	MOVQ    112(CX), R9
 	MOVQ    128(CX), R10
 	MOVQ    R10, 32(SP)
@@ -2452,7 +2492,7 @@ sequenceDecs_decodeSync_bmi2_skip_update:
 	MOVUPS 144(CX), X0
 	MOVQ   R13, 144(CX)
 	MOVUPS X0, 152(CX)
-	JMP    sequenceDecs_decodeSync_bmi2_adjust_end
+	JMP    sequenceDecs_decodeSync_bmi2_after_adjust
 
 sequenceDecs_decodeSync_bmi2_adjust_offsetB_1_or_0:
 	CMPQ 24(SP), $0x00000000
@@ -2464,7 +2504,7 @@ sequenceDecs_decodeSync_bmi2_adjust_offset_maybezero:
 	TESTQ R13, R13
 	JNZ   sequenceDecs_decodeSync_bmi2_adjust_offset_nonzero
 	MOVQ  144(CX), R13
-	JMP   sequenceDecs_decodeSync_bmi2_adjust_end
+	JMP   sequenceDecs_decodeSync_bmi2_after_adjust
 
 sequenceDecs_decodeSync_bmi2_adjust_offset_nonzero:
 	MOVQ    R13, R12
@@ -2473,8 +2513,7 @@ sequenceDecs_decodeSync_bmi2_adjust_offset_nonzero:
 	CMPQ    R13, $0x03
 	CMOVQEQ R14, R12
 	CMOVQEQ R15, R14
-	LEAQ    144(CX), R15
-	ADDQ    (R15)(R12*8), R14
+	ADDQ    144(CX)(R12*8), R14
 	JNZ     sequenceDecs_decodeSync_bmi2_adjust_temp_valid
 	MOVQ    $0x00000001, R14
 
@@ -2490,7 +2529,7 @@ sequenceDecs_decodeSync_bmi2_adjust_skip:
 	MOVQ R14, 144(CX)
 	MOVQ R14, R13
 
-sequenceDecs_decodeSync_bmi2_adjust_end:
+sequenceDecs_decodeSync_bmi2_after_adjust:
 	MOVQ R13, 8(SP)
 
 	// Check values
@@ -2787,6 +2826,10 @@ TEXT ·sequenceDecs_decodeSync_safe_amd64(SB), $64-32
 	MOVQ    72(AX), DI
 	MOVQ    80(AX), R8
 	MOVQ    88(AX), R9
+	XORQ    CX, CX
+	MOVQ    CX, 8(SP)
+	MOVQ    CX, 16(SP)
+	MOVQ    CX, 24(SP)
 	MOVQ    112(AX), R10
 	MOVQ    128(AX), CX
 	MOVQ    CX, 32(SP)
@@ -2836,34 +2879,46 @@ sequenceDecs_decodeSync_safe_amd64_fill_byte_by_byte:
 
 sequenceDecs_decodeSync_safe_amd64_fill_end:
 	// Update offset
-	MOVQ    R9, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R14
-	SHLQ    CL, R14
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R14
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R14
-	ADDQ    R14, AX
-	MOVQ    AX, 8(SP)
+	MOVQ  R9, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R14
+	SHLQ  CL, R14
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decodeSync_safe_amd64_of_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decodeSync_safe_amd64_of_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decodeSync_safe_amd64_of_update_zero
+	NEGQ  CX
+	SHRQ  CL, R14
+	ADDQ  R14, AX
+
+sequenceDecs_decodeSync_safe_amd64_of_update_zero:
+	MOVQ AX, 8(SP)
 
 	// Update match length
-	MOVQ    R8, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R14
-	SHLQ    CL, R14
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R14
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R14
-	ADDQ    R14, AX
-	MOVQ    AX, 16(SP)
+	MOVQ  R8, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R14
+	SHLQ  CL, R14
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decodeSync_safe_amd64_ml_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decodeSync_safe_amd64_ml_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decodeSync_safe_amd64_ml_update_zero
+	NEGQ  CX
+	SHRQ  CL, R14
+	ADDQ  R14, AX
+
+sequenceDecs_decodeSync_safe_amd64_ml_update_zero:
+	MOVQ AX, 16(SP)
 
 	// Fill bitreader to have enough for the remaining
 	CMPQ SI, $0x08
@@ -2891,19 +2946,25 @@ sequenceDecs_decodeSync_safe_amd64_fill_2_byte_by_byte:
 
 sequenceDecs_decodeSync_safe_amd64_fill_2_end:
 	// Update literal length
-	MOVQ    DI, AX
-	MOVQ    BX, CX
-	MOVQ    DX, R14
-	SHLQ    CL, R14
-	MOVB    AH, CL
-	ADDQ    CX, BX
-	NEGL    CX
-	SHRQ    CL, R14
-	SHRQ    $0x20, AX
-	TESTQ   CX, CX
-	CMOVQEQ CX, R14
-	ADDQ    R14, AX
-	MOVQ    AX, 24(SP)
+	MOVQ  DI, AX
+	MOVQ  BX, CX
+	MOVQ  DX, R14
+	SHLQ  CL, R14
+	MOVB  AH, CL
+	SHRQ  $0x20, AX
+	TESTQ CX, CX
+	JZ    sequenceDecs_decodeSync_safe_amd64_ll_update_zero
+	ADDQ  CX, BX
+	CMPQ  BX, $0x40
+	JA    sequenceDecs_decodeSync_safe_amd64_ll_update_zero
+	CMPQ  CX, $0x40
+	JAE   sequenceDecs_decodeSync_safe_amd64_ll_update_zero
+	NEGQ  CX
+	SHRQ  CL, R14
+	ADDQ  R14, AX
+
+sequenceDecs_decodeSync_safe_amd64_ll_update_zero:
+	MOVQ AX, 24(SP)
 
 	// Fill bitreader for state updates
 	MOVQ    R13, (SP)
@@ -2983,7 +3044,7 @@ sequenceDecs_decodeSync_safe_amd64_skip_update:
 	MOVUPS 144(CX), X0
 	MOVQ   R13, 144(CX)
 	MOVUPS X0, 152(CX)
-	JMP    sequenceDecs_decodeSync_safe_amd64_adjust_end
+	JMP    sequenceDecs_decodeSync_safe_amd64_after_adjust
 
 sequenceDecs_decodeSync_safe_amd64_adjust_offsetB_1_or_0:
 	CMPQ 24(SP), $0x00000000
@@ -2995,7 +3056,7 @@ sequenceDecs_decodeSync_safe_amd64_adjust_offset_maybezero:
 	TESTQ R13, R13
 	JNZ   sequenceDecs_decodeSync_safe_amd64_adjust_offset_nonzero
 	MOVQ  144(CX), R13
-	JMP   sequenceDecs_decodeSync_safe_amd64_adjust_end
+	JMP   sequenceDecs_decodeSync_safe_amd64_after_adjust
 
 sequenceDecs_decodeSync_safe_amd64_adjust_offset_nonzero:
 	MOVQ    R13, AX
@@ -3004,8 +3065,7 @@ sequenceDecs_decodeSync_safe_amd64_adjust_offset_nonzero:
 	CMPQ    R13, $0x03
 	CMOVQEQ R14, AX
 	CMOVQEQ R15, R14
-	LEAQ    144(CX), R15
-	ADDQ    (R15)(AX*8), R14
+	ADDQ    144(CX)(AX*8), R14
 	JNZ     sequenceDecs_decodeSync_safe_amd64_adjust_temp_valid
 	MOVQ    $0x00000001, R14
 
@@ -3021,7 +3081,7 @@ sequenceDecs_decodeSync_safe_amd64_adjust_skip:
 	MOVQ R14, 144(CX)
 	MOVQ R14, R13
 
-sequenceDecs_decodeSync_safe_amd64_adjust_end:
+sequenceDecs_decodeSync_safe_amd64_after_adjust:
 	MOVQ R13, 8(SP)
 
 	// Check values
@@ -3420,6 +3480,10 @@ TEXT ·sequenceDecs_decodeSync_safe_bmi2(SB), $64-32
 	MOVQ    72(CX), SI
 	MOVQ    80(CX), DI
 	MOVQ    88(CX), R8
+	XORQ    R9, R9
+	MOVQ    R9, 8(SP)
+	MOVQ    R9, 16(SP)
+	MOVQ    R9, 24(SP)
 	MOVQ    112(CX), R9
 	MOVQ    128(CX), R10
 	MOVQ    R10, 32(SP)
@@ -3592,7 +3656,7 @@ sequenceDecs_decodeSync_safe_bmi2_skip_update:
 	MOVUPS 144(CX), X0
 	MOVQ   R13, 144(CX)
 	MOVUPS X0, 152(CX)
-	JMP    sequenceDecs_decodeSync_safe_bmi2_adjust_end
+	JMP    sequenceDecs_decodeSync_safe_bmi2_after_adjust
 
 sequenceDecs_decodeSync_safe_bmi2_adjust_offsetB_1_or_0:
 	CMPQ 24(SP), $0x00000000
@@ -3604,7 +3668,7 @@ sequenceDecs_decodeSync_safe_bmi2_adjust_offset_maybezero:
 	TESTQ R13, R13
 	JNZ   sequenceDecs_decodeSync_safe_bmi2_adjust_offset_nonzero
 	MOVQ  144(CX), R13
-	JMP   sequenceDecs_decodeSync_safe_bmi2_adjust_end
+	JMP   sequenceDecs_decodeSync_safe_bmi2_after_adjust
 
 sequenceDecs_decodeSync_safe_bmi2_adjust_offset_nonzero:
 	MOVQ    R13, R12
@@ -3613,8 +3677,7 @@ sequenceDecs_decodeSync_safe_bmi2_adjust_offset_nonzero:
 	CMPQ    R13, $0x03
 	CMOVQEQ R14, R12
 	CMOVQEQ R15, R14
-	LEAQ    144(CX), R15
-	ADDQ    (R15)(R12*8), R14
+	ADDQ    144(CX)(R12*8), R14
 	JNZ     sequenceDecs_decodeSync_safe_bmi2_adjust_temp_valid
 	MOVQ    $0x00000001, R14
 
@@ -3630,7 +3693,7 @@ sequenceDecs_decodeSync_safe_bmi2_adjust_skip:
 	MOVQ R14, 144(CX)
 	MOVQ R14, R13
 
-sequenceDecs_decodeSync_safe_bmi2_adjust_end:
+sequenceDecs_decodeSync_safe_bmi2_after_adjust:
 	MOVQ R13, 8(SP)
 
 	// Check values
diff --git a/vendor/github.com/klauspost/compress/zstd/seqdec_generic.go b/vendor/github.com/klauspost/compress/zstd/seqdec_generic.go
index c3452bc3..ac2a80d2 100644
--- a/vendor/github.com/klauspost/compress/zstd/seqdec_generic.go
+++ b/vendor/github.com/klauspost/compress/zstd/seqdec_generic.go
@@ -111,7 +111,7 @@ func (s *sequenceDecs) decode(seqs []seqVals) error {
 		}
 		s.seqSize += ll + ml
 		if s.seqSize > maxBlockSize {
-			return fmt.Errorf("output (%d) bigger than max block size (%d)", s.seqSize, maxBlockSize)
+			return fmt.Errorf("output bigger than max block size (%d)", maxBlockSize)
 		}
 		litRemain -= ll
 		if litRemain < 0 {
@@ -149,7 +149,7 @@ func (s *sequenceDecs) decode(seqs []seqVals) error {
 	}
 	s.seqSize += litRemain
 	if s.seqSize > maxBlockSize {
-		return fmt.Errorf("output (%d) bigger than max block size (%d)", s.seqSize, maxBlockSize)
+		return fmt.Errorf("output bigger than max block size (%d)", maxBlockSize)
 	}
 	err := br.close()
 	if err != nil {
diff --git a/vendor/github.com/klauspost/compress/zstd/zstd.go b/vendor/github.com/klauspost/compress/zstd/zstd.go
index 3eb3f1c8..5ffa82f5 100644
--- a/vendor/github.com/klauspost/compress/zstd/zstd.go
+++ b/vendor/github.com/klauspost/compress/zstd/zstd.go
@@ -36,9 +36,6 @@ const forcePreDef = false
 // zstdMinMatch is the minimum zstd match length.
 const zstdMinMatch = 3
 
-// Reset the buffer offset when reaching this.
-const bufferReset = math.MaxInt32 - MaxWindowSize
-
 // fcsUnknown is used for unknown frame content size.
 const fcsUnknown = math.MaxUint64
 
@@ -75,7 +72,6 @@ var (
 	ErrDecoderSizeExceeded = errors.New("decompressed size exceeds configured limit")
 
 	// ErrUnknownDictionary is returned if the dictionary ID is unknown.
-	// For the time being dictionaries are not supported.
 	ErrUnknownDictionary = errors.New("unknown dictionary")
 
 	// ErrFrameSizeExceeded is returned if the stated frame size is exceeded.
@@ -110,26 +106,25 @@ func printf(format string, a ...interface{}) {
 	}
 }
 
-// matchLen returns the maximum length.
+// matchLen returns the maximum common prefix length of a and b.
 // a must be the shortest of the two.
-// The function also returns whether all bytes matched.
-func matchLen(a, b []byte) int {
-	b = b[:len(a)]
-	for i := 0; i < len(a)-7; i += 8 {
-		if diff := load64(a, i) ^ load64(b, i); diff != 0 {
-			return i + (bits.TrailingZeros64(diff) >> 3)
+func matchLen(a, b []byte) (n int) {
+	for ; len(a) >= 8 && len(b) >= 8; a, b = a[8:], b[8:] {
+		diff := binary.LittleEndian.Uint64(a) ^ binary.LittleEndian.Uint64(b)
+		if diff != 0 {
+			return n + bits.TrailingZeros64(diff)>>3
 		}
+		n += 8
 	}
 
-	checked := (len(a) >> 3) << 3
-	a = a[checked:]
-	b = b[checked:]
 	for i := range a {
 		if a[i] != b[i] {
-			return i + checked
+			break
 		}
+		n++
 	}
-	return len(a) + checked
+	return n
+
 }
 
 func load3232(b []byte, i int32) uint32 {
@@ -140,10 +135,6 @@ func load6432(b []byte, i int32) uint64 {
 	return binary.LittleEndian.Uint64(b[i:])
 }
 
-func load64(b []byte, i int) uint64 {
-	return binary.LittleEndian.Uint64(b[i:])
-}
-
 type byter interface {
 	Bytes() []byte
 	Len() int
diff --git a/vendor/github.com/klauspost/cpuid/v2/README.md b/vendor/github.com/klauspost/cpuid/v2/README.md
index bc2f98f0..857a93e5 100644
--- a/vendor/github.com/klauspost/cpuid/v2/README.md
+++ b/vendor/github.com/klauspost/cpuid/v2/README.md
@@ -16,10 +16,17 @@ Package home: https://github.com/klauspost/cpuid
 
 ## installing
 
-`go get -u github.com/klauspost/cpuid/v2` using modules. 
-
+`go get -u github.com/klauspost/cpuid/v2` using modules.
 Drop `v2` for others.
 
+### Homebrew
+
+For macOS/Linux users, you can install via [brew](https://brew.sh/)
+
+```sh
+$ brew install cpuid
+```
+
 ## example
 
 ```Go
@@ -77,10 +84,14 @@ We have Streaming SIMD 2 Extensions
 The `cpuid.CPU` provides access to CPU features. Use `cpuid.CPU.Supports()` to check for CPU features.
 A faster `cpuid.CPU.Has()` is provided which will usually be inlined by the gc compiler.  
 
+To test a larger number of features, they can be combined using `f := CombineFeatures(CMOV, CMPXCHG8, X87, FXSR, MMX, SYSCALL, SSE, SSE2)`, etc.
+This can be using with `cpuid.CPU.HasAll(f)` to quickly test if all features are supported.
+
 Note that for some cpu/os combinations some features will not be detected.
 `amd64` has rather good support and should work reliably on all platforms.
 
-Note that hypervisors may not pass through all CPU features.
+Note that hypervisors may not pass through all CPU features through to the guest OS,
+so even if your host supports a feature it may not be visible on guests.
 
 ## arm64 feature detection
 
@@ -132,6 +143,339 @@ func main() {
 }
 ```
 
+## commandline
+
+Download as binary from: https://github.com/klauspost/cpuid/releases
+
+Install from source:
+
+`go install github.com/klauspost/cpuid/v2/cmd/cpuid@latest`
+
+### Example
+
+```
+λ cpuid
+Name: AMD Ryzen 9 3950X 16-Core Processor
+Vendor String: AuthenticAMD
+Vendor ID: AMD
+PhysicalCores: 16
+Threads Per Core: 2
+Logical Cores: 32
+CPU Family 23 Model: 113
+Features: ADX,AESNI,AVX,AVX2,BMI1,BMI2,CLMUL,CLZERO,CMOV,CMPXCHG8,CPBOOST,CX16,F16C,FMA3,FXSR,FXSROPT,HTT,HYPERVISOR,LAHF,LZCNT,MCAOVERFLOW,MMX,MMXEXT,MOVBE,NX,OSXSAVE,POPCNT,RDRAND,RDSEED,RDTSCP,SCE,SHA,SSE,SSE2,SSE3,SSE4,SSE42,SSE4A,SSSE3,SUCCOR,X87,XSAVE
+Microarchitecture level: 3
+Cacheline bytes: 64
+L1 Instruction Cache: 32768 bytes
+L1 Data Cache: 32768 bytes
+L2 Cache: 524288 bytes
+L3 Cache: 16777216 bytes
+
+```
+### JSON Output:
+
+```
+λ cpuid --json
+{
+  "BrandName": "AMD Ryzen 9 3950X 16-Core Processor",
+  "VendorID": 2,
+  "VendorString": "AuthenticAMD",
+  "PhysicalCores": 16,
+  "ThreadsPerCore": 2,
+  "LogicalCores": 32,
+  "Family": 23,
+  "Model": 113,
+  "CacheLine": 64,
+  "Hz": 0,
+  "BoostFreq": 0,
+  "Cache": {
+    "L1I": 32768,
+    "L1D": 32768,
+    "L2": 524288,
+    "L3": 16777216
+  },
+  "SGX": {
+    "Available": false,
+    "LaunchControl": false,
+    "SGX1Supported": false,
+    "SGX2Supported": false,
+    "MaxEnclaveSizeNot64": 0,
+    "MaxEnclaveSize64": 0,
+    "EPCSections": null
+  },
+  "Features": [
+    "ADX",
+    "AESNI",
+    "AVX",
+    "AVX2",
+    "BMI1",
+    "BMI2",
+    "CLMUL",
+    "CLZERO",
+    "CMOV",
+    "CMPXCHG8",
+    "CPBOOST",
+    "CX16",
+    "F16C",
+    "FMA3",
+    "FXSR",
+    "FXSROPT",
+    "HTT",
+    "HYPERVISOR",
+    "LAHF",
+    "LZCNT",
+    "MCAOVERFLOW",
+    "MMX",
+    "MMXEXT",
+    "MOVBE",
+    "NX",
+    "OSXSAVE",
+    "POPCNT",
+    "RDRAND",
+    "RDSEED",
+    "RDTSCP",
+    "SCE",
+    "SHA",
+    "SSE",
+    "SSE2",
+    "SSE3",
+    "SSE4",
+    "SSE42",
+    "SSE4A",
+    "SSSE3",
+    "SUCCOR",
+    "X87",
+    "XSAVE"
+  ],
+  "X64Level": 3
+}
+```
+
+### Check CPU microarch level
+
+```
+λ cpuid --check-level=3
+2022/03/18 17:04:40 AMD Ryzen 9 3950X 16-Core Processor
+2022/03/18 17:04:40 Microarchitecture level 3 is supported. Max level is 3.
+Exit Code 0
+
+λ cpuid --check-level=4
+2022/03/18 17:06:18 AMD Ryzen 9 3950X 16-Core Processor
+2022/03/18 17:06:18 Microarchitecture level 4 not supported. Max level is 3.
+Exit Code 1
+```
+
+
+## Available flags
+
+### x86 & amd64 
+
+| Feature Flag       | Description                                                                                                                                                                        |
+|--------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| ADX                | Intel ADX (Multi-Precision Add-Carry Instruction Extensions)                                                                                                                       |
+| AESNI              | Advanced Encryption Standard New Instructions                                                                                                                                      |
+| AMD3DNOW           | AMD 3DNOW                                                                                                                                                                          |
+| AMD3DNOWEXT        | AMD 3DNowExt                                                                                                                                                                       |
+| AMXBF16            | Tile computational operations on BFLOAT16 numbers                                                                                                                                  |
+| AMXINT8            | Tile computational operations on 8-bit integers                                                                                                                                    |
+| AMXFP16            | Tile computational operations on FP16 numbers                                                                                                                                      |
+| AMXTILE            | Tile architecture                                                                                                                                                                  |
+| AVX                | AVX functions                                                                                                                                                                      |
+| AVX2               | AVX2 functions                                                                                                                                                                     |
+| AVX512BF16         | AVX-512 BFLOAT16 Instructions                                                                                                                                                      |
+| AVX512BITALG       | AVX-512 Bit Algorithms                                                                                                                                                             |
+| AVX512BW           | AVX-512 Byte and Word Instructions                                                                                                                                                 |
+| AVX512CD           | AVX-512 Conflict Detection Instructions                                                                                                                                            |
+| AVX512DQ           | AVX-512 Doubleword and Quadword Instructions                                                                                                                                       |
+| AVX512ER           | AVX-512 Exponential and Reciprocal Instructions                                                                                                                                    |
+| AVX512F            | AVX-512 Foundation                                                                                                                                                                 |
+| AVX512FP16         | AVX-512 FP16 Instructions                                                                                                                                                          |
+| AVX512IFMA         | AVX-512 Integer Fused Multiply-Add Instructions                                                                                                                                    |
+| AVX512PF           | AVX-512 Prefetch Instructions                                                                                                                                                      |
+| AVX512VBMI         | AVX-512 Vector Bit Manipulation Instructions                                                                                                                                       |
+| AVX512VBMI2        | AVX-512 Vector Bit Manipulation Instructions, Version 2                                                                                                                            |
+| AVX512VL           | AVX-512 Vector Length Extensions                                                                                                                                                   |
+| AVX512VNNI         | AVX-512 Vector Neural Network Instructions                                                                                                                                         |
+| AVX512VP2INTERSECT | AVX-512 Intersect for D/Q                                                                                                                                                          |
+| AVX512VPOPCNTDQ    | AVX-512 Vector Population Count Doubleword and Quadword                                                                                                                            |
+| AVXIFMA            | AVX-IFMA instructions                                                                                                                                                              |
+| AVXNECONVERT       | AVX-NE-CONVERT instructions                                                                                                                                                        |
+| AVXSLOW            | Indicates the CPU performs 2 128 bit operations instead of one                                                                                                                     |
+| AVXVNNI            | AVX (VEX encoded) VNNI neural network instructions                                                                                                                                 |
+| AVXVNNIINT8        | AVX-VNNI-INT8 instructions                                                                                                                                                         |
+| BMI1               | Bit Manipulation Instruction Set 1                                                                                                                                                 |
+| BMI2               | Bit Manipulation Instruction Set 2                                                                                                                                                 |
+| CETIBT             | Intel CET Indirect Branch Tracking                                                                                                                                                 |
+| CETSS              | Intel CET Shadow Stack                                                                                                                                                             |
+| CLDEMOTE           | Cache Line Demote                                                                                                                                                                  |
+| CLMUL              | Carry-less Multiplication                                                                                                                                                          |
+| CLZERO             | CLZERO instruction supported                                                                                                                                                       |
+| CMOV               | i686 CMOV                                                                                                                                                                          |
+| CMPCCXADD          | CMPCCXADD instructions                                                                                                                                                             |
+| CMPSB_SCADBS_SHORT | Fast short CMPSB and SCASB                                                                                                                                                         |
+| CMPXCHG8           | CMPXCHG8 instruction                                                                                                                                                               |
+| CPBOOST            | Core Performance Boost                                                                                                                                                             |
+| CPPC               | AMD: Collaborative Processor Performance Control                                                                                                                                   |
+| CX16               | CMPXCHG16B Instruction                                                                                                                                                             |
+| EFER_LMSLE_UNS     | AMD: =Core::X86::Msr::EFER[LMSLE] is not supported, and MBZ                                                                                                                        |
+| ENQCMD             | Enqueue Command                                                                                                                                                                    |
+| ERMS               | Enhanced REP MOVSB/STOSB                                                                                                                                                           |
+| F16C               | Half-precision floating-point conversion                                                                                                                                           |
+| FLUSH_L1D          | Flush L1D cache                                                                                                                                                                    |
+| FMA3               | Intel FMA 3. Does not imply AVX.                                                                                                                                                   |
+| FMA4               | Bulldozer FMA4 functions                                                                                                                                                           |
+| FP128              | AMD: When set, the internal FP/SIMD execution datapath is 128-bits wide                                                                                                            |
+| FP256              | AMD: When set, the internal FP/SIMD execution datapath is 256-bits wide                                                                                                            |
+| FSRM               | Fast Short Rep Mov                                                                                                                                                                 |
+| FXSR               | FXSAVE, FXRESTOR instructions, CR4 bit 9                                                                                                                                           |
+| FXSROPT            | FXSAVE/FXRSTOR optimizations                                                                                                                                                       |
+| GFNI               | Galois Field New Instructions. May require other features (AVX, AVX512VL,AVX512F) based on usage.                                                                                  |
+| HLE                | Hardware Lock Elision                                                                                                                                                              |
+| HRESET             | If set CPU supports history reset and the IA32_HRESET_ENABLE MSR                                                                                                                   |
+| HTT                | Hyperthreading (enabled)                                                                                                                                                           |
+| HWA                | Hardware assert supported. Indicates support for MSRC001_10                                                                                                                        |
+| HYBRID_CPU         | This part has CPUs of more than one type.                                                                                                                                          |
+| HYPERVISOR         | This bit has been reserved by Intel & AMD for use by hypervisors                                                                                                                   |
+| IA32_ARCH_CAP      | IA32_ARCH_CAPABILITIES MSR (Intel)                                                                                                                                                 |
+| IA32_CORE_CAP      | IA32_CORE_CAPABILITIES MSR                                                                                                                                                         |
+| IBPB               | Indirect Branch Restricted Speculation (IBRS) and Indirect Branch Predictor Barrier (IBPB)                                                                                         |
+| IBRS               | AMD: Indirect Branch Restricted Speculation                                                                                                                                        |
+| IBRS_PREFERRED     | AMD: IBRS is preferred over software solution                                                                                                                                      |
+| IBRS_PROVIDES_SMP  | AMD: IBRS provides Same Mode Protection                                                                                                                                            |
+| IBS                | Instruction Based Sampling (AMD)                                                                                                                                                   |
+| IBSBRNTRGT         | Instruction Based Sampling Feature (AMD)                                                                                                                                           |
+| IBSFETCHSAM        | Instruction Based Sampling Feature (AMD)                                                                                                                                           |
+| IBSFFV             | Instruction Based Sampling Feature (AMD)                                                                                                                                           |
+| IBSOPCNT           | Instruction Based Sampling Feature (AMD)                                                                                                                                           |
+| IBSOPCNTEXT        | Instruction Based Sampling Feature (AMD)                                                                                                                                           |
+| IBSOPSAM           | Instruction Based Sampling Feature (AMD)                                                                                                                                           |
+| IBSRDWROPCNT       | Instruction Based Sampling Feature (AMD)                                                                                                                                           |
+| IBSRIPINVALIDCHK   | Instruction Based Sampling Feature (AMD)                                                                                                                                           |
+| IBS_FETCH_CTLX     | AMD: IBS fetch control extended MSR supported                                                                                                                                      |
+| IBS_OPDATA4        | AMD: IBS op data 4 MSR supported                                                                                                                                                   |
+| IBS_OPFUSE         | AMD: Indicates support for IbsOpFuse                                                                                                                                               |
+| IBS_PREVENTHOST    | Disallowing IBS use by the host supported                                                                                                                                          |
+| IBS_ZEN4           | Fetch and Op IBS support IBS extensions added with Zen4                                                                                                                            |
+| INT_WBINVD         | WBINVD/WBNOINVD are interruptible.                                                                                                                                                 |
+| INVLPGB            | NVLPGB and TLBSYNC instruction supported                                                                                                                                           |
+| LAHF               | LAHF/SAHF in long mode                                                                                                                                                             |
+| LAM                | If set, CPU supports Linear Address Masking                                                                                                                                        |
+| LBRVIRT            | LBR virtualization                                                                                                                                                                 |
+| LZCNT              | LZCNT instruction                                                                                                                                                                  |
+| MCAOVERFLOW        | MCA overflow recovery support.                                                                                                                                                     |
+| MCDT_NO            | Processor do not exhibit MXCSR Configuration Dependent Timing behavior and do not need to mitigate it.                                                                             |
+| MCOMMIT            | MCOMMIT instruction supported                                                                                                                                                      |
+| MD_CLEAR           | VERW clears CPU buffers                                                                                                                                                            |
+| MMX                | standard MMX                                                                                                                                                                       |
+| MMXEXT             | SSE integer functions or AMD MMX ext                                                                                                                                               |
+| MOVBE              | MOVBE instruction (big-endian)                                                                                                                                                     |
+| MOVDIR64B          | Move 64 Bytes as Direct Store                                                                                                                                                      |
+| MOVDIRI            | Move Doubleword as Direct Store                                                                                                                                                    |
+| MOVSB_ZL           | Fast Zero-Length MOVSB                                                                                                                                                             |
+| MPX                | Intel MPX (Memory Protection Extensions)                                                                                                                                           |
+| MOVU               | MOVU SSE instructions are more efficient and should be preferred to SSE	MOVL/MOVH. MOVUPS is more efficient than MOVLPS/MOVHPS. MOVUPD is more efficient than MOVLPD/MOVHPD        |
+| MSRIRC             | Instruction Retired Counter MSR available                                                                                                                                          |
+| MSR_PAGEFLUSH      | Page Flush MSR available                                                                                                                                                           |
+| NRIPS              | Indicates support for NRIP save on VMEXIT                                                                                                                                          |
+| NX                 | NX (No-Execute) bit                                                                                                                                                                |
+| OSXSAVE            | XSAVE enabled by OS                                                                                                                                                                |
+| PCONFIG            | PCONFIG for Intel Multi-Key Total Memory Encryption                                                                                                                                |
+| POPCNT             | POPCNT instruction                                                                                                                                                                 |
+| PPIN               | AMD: Protected Processor Inventory Number support. Indicates that Protected Processor Inventory Number (PPIN) capability can be enabled                                            |
+| PREFETCHI          | PREFETCHIT0/1 instructions                                            |
+| PSFD               | AMD: Predictive Store Forward Disable                                                                                                                                              |
+| RDPRU              | RDPRU instruction supported                                                                                                                                                        |
+| RDRAND             | RDRAND instruction is available                                                                                                                                                    |
+| RDSEED             | RDSEED instruction is available                                                                                                                                                    |
+| RDTSCP             | RDTSCP Instruction                                                                                                                                                                 |
+| RTM                | Restricted Transactional Memory                                                                                                                                                    |
+| RTM_ALWAYS_ABORT   | Indicates that the loaded microcode is forcing RTM abort.                                                                                                                          |
+| SERIALIZE          | Serialize Instruction Execution                                                                                                                                                    |
+| SEV                | AMD Secure Encrypted Virtualization supported                                                                                                                                      |
+| SEV_64BIT          | AMD SEV guest execution only allowed from a 64-bit host                                                                                                                            |
+| SEV_ALTERNATIVE    | AMD SEV Alternate Injection supported                                                                                                                                              |
+| SEV_DEBUGSWAP      | Full debug state swap supported for SEV-ES guests                                                                                                                                  |
+| SEV_ES             | AMD SEV Encrypted State supported                                                                                                                                                  |
+| SEV_RESTRICTED     | AMD SEV Restricted Injection supported                                                                                                                                             |
+| SEV_SNP            | AMD SEV Secure Nested Paging supported                                                                                                                                             |
+| SGX                | Software Guard Extensions                                                                                                                                                          |
+| SGXLC              | Software Guard Extensions Launch Control                                                                                                                                           |
+| SHA                | Intel SHA Extensions                                                                                                                                                               |
+| SME                | AMD Secure Memory Encryption supported                                                                                                                                             |
+| SME_COHERENT       | AMD Hardware cache coherency across encryption domains enforced                                                                                                                    |
+| SPEC_CTRL_SSBD     | Speculative Store Bypass Disable                                                                                                                                                   |
+| SRBDS_CTRL         | SRBDS mitigation MSR available                                                                                                                                                     |
+| SSE                | SSE functions                                                                                                                                                                      |
+| SSE2               | P4 SSE functions                                                                                                                                                                   |
+| SSE3               | Prescott SSE3 functions                                                                                                                                                            |
+| SSE4               | Penryn SSE4.1 functions                                                                                                                                                            |
+| SSE42              | Nehalem SSE4.2 functions                                                                                                                                                           |
+| SSE4A              | AMD Barcelona microarchitecture SSE4a instructions                                                                                                                                 |
+| SSSE3              | Conroe SSSE3 functions                                                                                                                                                             |
+| STIBP              | Single Thread Indirect Branch Predictors                                                                                                                                           |
+| STIBP_ALWAYSON     | AMD: Single Thread Indirect Branch Prediction Mode has Enhanced Performance and may be left Always On                                                                              |
+| STOSB_SHORT        | Fast short STOSB                                                                                                                                                                   |
+| SUCCOR             | Software uncorrectable error containment and recovery capability.                                                                                                                  |
+| SVM                | AMD Secure Virtual Machine                                                                                                                                                         |
+| SVMDA              | Indicates support for the SVM decode assists.                                                                                                                                      |
+| SVMFBASID          | SVM, Indicates that TLB flush events, including CR3 writes and CR4.PGE toggles, flush only the current ASID's TLB entries. Also indicates support for the extended VMCBTLB_Control |
+| SVML               | AMD SVM lock. Indicates support for SVM-Lock.                                                                                                                                      |
+| SVMNP              | AMD SVM nested paging                                                                                                                                                              |
+| SVMPF              | SVM pause intercept filter. Indicates support for the pause intercept filter                                                                                                       |
+| SVMPFT             | SVM PAUSE filter threshold. Indicates support for the PAUSE filter cycle count threshold                                                                                           |
+| SYSCALL            | System-Call Extension (SCE): SYSCALL and SYSRET instructions.                                                                                                                      |
+| SYSEE              | SYSENTER and SYSEXIT instructions                                                                                                                                                  |
+| TBM                | AMD Trailing Bit Manipulation                                                                                                                                                      |
+| TLB_FLUSH_NESTED   | AMD: Flushing includes all the nested translations for guest translations                                                                                                          |
+| TME                | Intel Total Memory Encryption. The following MSRs are supported: IA32_TME_CAPABILITY, IA32_TME_ACTIVATE, IA32_TME_EXCLUDE_MASK, and IA32_TME_EXCLUDE_BASE.                         |
+| TOPEXT             | TopologyExtensions: topology extensions support. Indicates support for CPUID Fn8000_001D_EAX_x[N:0]-CPUID Fn8000_001E_EDX.                                                         |
+| TSCRATEMSR         | MSR based TSC rate control. Indicates support for MSR TSC ratio MSRC000_0104                                                                                                       |
+| TSXLDTRK           | Intel TSX Suspend Load Address Tracking                                                                                                                                            |
+| VAES               | Vector AES. AVX(512) versions requires additional checks.                                                                                                                          |
+| VMCBCLEAN          | VMCB clean bits. Indicates support for VMCB clean bits.                                                                                                                            |
+| VMPL               | AMD VM Permission Levels supported                                                                                                                                                 |
+| VMSA_REGPROT       | AMD VMSA Register Protection supported                                                                                                                                             |
+| VMX                | Virtual Machine Extensions                                                                                                                                                         |
+| VPCLMULQDQ         | Carry-Less Multiplication Quadword. Requires AVX for 3 register versions.                                                                                                          |
+| VTE                | AMD Virtual Transparent Encryption supported                                                                                                                                       |
+| WAITPKG            | TPAUSE, UMONITOR, UMWAIT                                                                                                                                                           |
+| WBNOINVD           | Write Back and Do Not Invalidate Cache                                                                                                                                             |
+| X87                | FPU                                                                                                                                                                                |
+| XGETBV1            | Supports XGETBV with ECX = 1                                                                                                                                                       |
+| XOP                | Bulldozer XOP functions                                                                                                                                                            |
+| XSAVE              | XSAVE, XRESTOR, XSETBV, XGETBV                                                                                                                                                     |
+| XSAVEC             | Supports XSAVEC and the compacted form of XRSTOR.                                                                                                                                  |
+| XSAVEOPT           | XSAVEOPT available                                                                                                                                                                 |
+| XSAVES             | Supports XSAVES/XRSTORS and IA32_XSS                                                                                                                                               |
+
+# ARM features:
+
+| Feature Flag | Description                                                      |
+|--------------|------------------------------------------------------------------|
+| AESARM       | AES instructions                                                 |
+| ARMCPUID     | Some CPU ID registers readable at user-level                     |
+| ASIMD        | Advanced SIMD                                                    |
+| ASIMDDP      | SIMD Dot Product                                                 |
+| ASIMDHP      | Advanced SIMD half-precision floating point                      |
+| ASIMDRDM     | Rounding Double Multiply Accumulate/Subtract (SQRDMLAH/SQRDMLSH) |
+| ATOMICS      | Large System Extensions (LSE)                                    |
+| CRC32        | CRC32/CRC32C instructions                                        |
+| DCPOP        | Data cache clean to Point of Persistence (DC CVAP)               |
+| EVTSTRM      | Generic timer                                                    |
+| FCMA         | Floatin point complex number addition and multiplication         |
+| FP           | Single-precision and double-precision floating point             |
+| FPHP         | Half-precision floating point                                    |
+| GPA          | Generic Pointer Authentication                                   |
+| JSCVT        | Javascript-style double->int convert (FJCVTZS)                   |
+| LRCPC        | Weaker release consistency (LDAPR, etc)                          |
+| PMULL        | Polynomial Multiply instructions (PMULL/PMULL2)                  |
+| SHA1         | SHA-1 instructions (SHA1C, etc)                                  |
+| SHA2         | SHA-2 instructions (SHA256H, etc)                                |
+| SHA3         | SHA-3 instructions (EOR3, RAXI, XAR, BCAX)                       |
+| SHA512       | SHA512 instructions                                              |
+| SM3          | SM3 instructions                                                 |
+| SM4          | SM4 instructions                                                 |
+| SVE          | Scalable Vector Extension                                        |
+
 # license
 
 This code is published under an MIT license. See LICENSE file for more information.
diff --git a/vendor/github.com/klauspost/cpuid/v2/cpuid.go b/vendor/github.com/klauspost/cpuid/v2/cpuid.go
index 3d543ce9..cf2ae9c5 100644
--- a/vendor/github.com/klauspost/cpuid/v2/cpuid.go
+++ b/vendor/github.com/klauspost/cpuid/v2/cpuid.go
@@ -14,6 +14,7 @@ import (
 	"flag"
 	"fmt"
 	"math"
+	"math/bits"
 	"os"
 	"runtime"
 	"strings"
@@ -72,6 +73,7 @@ const (
 	AMD3DNOW                            // AMD 3DNOW
 	AMD3DNOWEXT                         // AMD 3DNowExt
 	AMXBF16                             // Tile computational operations on BFLOAT16 numbers
+	AMXFP16                             // Tile computational operations on FP16 numbers
 	AMXINT8                             // Tile computational operations on 8-bit integers
 	AMXTILE                             // Tile architecture
 	AVX                                 // AVX functions
@@ -92,7 +94,11 @@ const (
 	AVX512VNNI                          // AVX-512 Vector Neural Network Instructions
 	AVX512VP2INTERSECT                  // AVX-512 Intersect for D/Q
 	AVX512VPOPCNTDQ                     // AVX-512 Vector Population Count Doubleword and Quadword
-	AVXSLOW                             // Indicates the CPU performs 2 128 bit operations instead of one.
+	AVXIFMA                             // AVX-IFMA instructions
+	AVXNECONVERT                        // AVX-NE-CONVERT instructions
+	AVXSLOW                             // Indicates the CPU performs 2 128 bit operations instead of one
+	AVXVNNI                             // AVX (VEX encoded) VNNI neural network instructions
+	AVXVNNIINT8                         // AVX-VNNI-INT8 instructions
 	BMI1                                // Bit Manipulation Instruction Set 1
 	BMI2                                // Bit Manipulation Instruction Set 2
 	CETIBT                              // Intel CET Indirect Branch Tracking
@@ -101,22 +107,37 @@ const (
 	CLMUL                               // Carry-less Multiplication
 	CLZERO                              // CLZERO instruction supported
 	CMOV                                // i686 CMOV
+	CMPCCXADD                           // CMPCCXADD instructions
+	CMPSB_SCADBS_SHORT                  // Fast short CMPSB and SCASB
 	CMPXCHG8                            // CMPXCHG8 instruction
 	CPBOOST                             // Core Performance Boost
+	CPPC                                // AMD: Collaborative Processor Performance Control
 	CX16                                // CMPXCHG16B Instruction
+	EFER_LMSLE_UNS                      // AMD: =Core::X86::Msr::EFER[LMSLE] is not supported, and MBZ
 	ENQCMD                              // Enqueue Command
 	ERMS                                // Enhanced REP MOVSB/STOSB
 	F16C                                // Half-precision floating-point conversion
+	FLUSH_L1D                           // Flush L1D cache
 	FMA3                                // Intel FMA 3. Does not imply AVX.
 	FMA4                                // Bulldozer FMA4 functions
+	FP128                               // AMD: When set, the internal FP/SIMD execution datapath is no more than 128-bits wide
+	FP256                               // AMD: When set, the internal FP/SIMD execution datapath is no more than 256-bits wide
+	FSRM                                // Fast Short Rep Mov
 	FXSR                                // FXSAVE, FXRESTOR instructions, CR4 bit 9
 	FXSROPT                             // FXSAVE/FXRSTOR optimizations
-	GFNI                                // Galois Field New Instructions
+	GFNI                                // Galois Field New Instructions. May require other features (AVX, AVX512VL,AVX512F) based on usage.
 	HLE                                 // Hardware Lock Elision
+	HRESET                              // If set CPU supports history reset and the IA32_HRESET_ENABLE MSR
 	HTT                                 // Hyperthreading (enabled)
 	HWA                                 // Hardware assert supported. Indicates support for MSRC001_10
+	HYBRID_CPU                          // This part has CPUs of more than one type.
 	HYPERVISOR                          // This bit has been reserved by Intel & AMD for use by hypervisors
+	IA32_ARCH_CAP                       // IA32_ARCH_CAPABILITIES MSR (Intel)
+	IA32_CORE_CAP                       // IA32_CORE_CAPABILITIES MSR
 	IBPB                                // Indirect Branch Restricted Speculation (IBRS) and Indirect Branch Predictor Barrier (IBPB)
+	IBRS                                // AMD: Indirect Branch Restricted Speculation
+	IBRS_PREFERRED                      // AMD: IBRS is preferred over software solution
+	IBRS_PROVIDES_SMP                   // AMD: IBRS provides Same Mode Protection
 	IBS                                 // Instruction Based Sampling (AMD)
 	IBSBRNTRGT                          // Instruction Based Sampling Feature (AMD)
 	IBSFETCHSAM                         // Instruction Based Sampling Feature (AMD)
@@ -126,33 +147,60 @@ const (
 	IBSOPSAM                            // Instruction Based Sampling Feature (AMD)
 	IBSRDWROPCNT                        // Instruction Based Sampling Feature (AMD)
 	IBSRIPINVALIDCHK                    // Instruction Based Sampling Feature (AMD)
+	IBS_FETCH_CTLX                      // AMD: IBS fetch control extended MSR supported
+	IBS_OPDATA4                         // AMD: IBS op data 4 MSR supported
+	IBS_OPFUSE                          // AMD: Indicates support for IbsOpFuse
+	IBS_PREVENTHOST                     // Disallowing IBS use by the host supported
+	IBS_ZEN4                            // AMD: Fetch and Op IBS support IBS extensions added with Zen4
 	INT_WBINVD                          // WBINVD/WBNOINVD are interruptible.
 	INVLPGB                             // NVLPGB and TLBSYNC instruction supported
 	LAHF                                // LAHF/SAHF in long mode
+	LAM                                 // If set, CPU supports Linear Address Masking
+	LBRVIRT                             // LBR virtualization
 	LZCNT                               // LZCNT instruction
 	MCAOVERFLOW                         // MCA overflow recovery support.
+	MCDT_NO                             // Processor do not exhibit MXCSR Configuration Dependent Timing behavior and do not need to mitigate it.
 	MCOMMIT                             // MCOMMIT instruction supported
+	MD_CLEAR                            // VERW clears CPU buffers
 	MMX                                 // standard MMX
 	MMXEXT                              // SSE integer functions or AMD MMX ext
 	MOVBE                               // MOVBE instruction (big-endian)
 	MOVDIR64B                           // Move 64 Bytes as Direct Store
 	MOVDIRI                             // Move Doubleword as Direct Store
+	MOVSB_ZL                            // Fast Zero-Length MOVSB
+	MOVU                                // AMD: MOVU SSE instructions are more efficient and should be preferred to SSE	MOVL/MOVH. MOVUPS is more efficient than MOVLPS/MOVHPS. MOVUPD is more efficient than MOVLPD/MOVHPD
 	MPX                                 // Intel MPX (Memory Protection Extensions)
 	MSRIRC                              // Instruction Retired Counter MSR available
+	MSR_PAGEFLUSH                       // Page Flush MSR available
+	NRIPS                               // Indicates support for NRIP save on VMEXIT
 	NX                                  // NX (No-Execute) bit
 	OSXSAVE                             // XSAVE enabled by OS
+	PCONFIG                             // PCONFIG for Intel Multi-Key Total Memory Encryption
 	POPCNT                              // POPCNT instruction
+	PPIN                                // AMD: Protected Processor Inventory Number support. Indicates that Protected Processor Inventory Number (PPIN) capability can be enabled
+	PREFETCHI                           // PREFETCHIT0/1 instructions
+	PSFD                                // AMD: Predictive Store Forward Disable
 	RDPRU                               // RDPRU instruction supported
 	RDRAND                              // RDRAND instruction is available
 	RDSEED                              // RDSEED instruction is available
 	RDTSCP                              // RDTSCP Instruction
 	RTM                                 // Restricted Transactional Memory
 	RTM_ALWAYS_ABORT                    // Indicates that the loaded microcode is forcing RTM abort.
-	SCE                                 // SYSENTER and SYSEXIT instructions
 	SERIALIZE                           // Serialize Instruction Execution
+	SEV                                 // AMD Secure Encrypted Virtualization supported
+	SEV_64BIT                           // AMD SEV guest execution only allowed from a 64-bit host
+	SEV_ALTERNATIVE                     // AMD SEV Alternate Injection supported
+	SEV_DEBUGSWAP                       // Full debug state swap supported for SEV-ES guests
+	SEV_ES                              // AMD SEV Encrypted State supported
+	SEV_RESTRICTED                      // AMD SEV Restricted Injection supported
+	SEV_SNP                             // AMD SEV Secure Nested Paging supported
 	SGX                                 // Software Guard Extensions
 	SGXLC                               // Software Guard Extensions Launch Control
 	SHA                                 // Intel SHA Extensions
+	SME                                 // AMD Secure Memory Encryption supported
+	SME_COHERENT                        // AMD Hardware cache coherency across encryption domains enforced
+	SPEC_CTRL_SSBD                      // Speculative Store Bypass Disable
+	SRBDS_CTRL                          // SRBDS mitigation MSR available
 	SSE                                 // SSE functions
 	SSE2                                // P4 SSE functions
 	SSE3                                // Prescott SSE3 functions
@@ -161,17 +209,40 @@ const (
 	SSE4A                               // AMD Barcelona microarchitecture SSE4a instructions
 	SSSE3                               // Conroe SSSE3 functions
 	STIBP                               // Single Thread Indirect Branch Predictors
+	STIBP_ALWAYSON                      // AMD: Single Thread Indirect Branch Prediction Mode has Enhanced Performance and may be left Always On
+	STOSB_SHORT                         // Fast short STOSB
 	SUCCOR                              // Software uncorrectable error containment and recovery capability.
+	SVM                                 // AMD Secure Virtual Machine
+	SVMDA                               // Indicates support for the SVM decode assists.
+	SVMFBASID                           // SVM, Indicates that TLB flush events, including CR3 writes and CR4.PGE toggles, flush only the current ASID's TLB entries. Also indicates support for the extended VMCBTLB_Control
+	SVML                                // AMD SVM lock. Indicates support for SVM-Lock.
+	SVMNP                               // AMD SVM nested paging
+	SVMPF                               // SVM pause intercept filter. Indicates support for the pause intercept filter
+	SVMPFT                              // SVM PAUSE filter threshold. Indicates support for the PAUSE filter cycle count threshold
+	SYSCALL                             // System-Call Extension (SCE): SYSCALL and SYSRET instructions.
+	SYSEE                               // SYSENTER and SYSEXIT instructions
 	TBM                                 // AMD Trailing Bit Manipulation
+	TLB_FLUSH_NESTED                    // AMD: Flushing includes all the nested translations for guest translations
+	TME                                 // Intel Total Memory Encryption. The following MSRs are supported: IA32_TME_CAPABILITY, IA32_TME_ACTIVATE, IA32_TME_EXCLUDE_MASK, and IA32_TME_EXCLUDE_BASE.
+	TOPEXT                              // TopologyExtensions: topology extensions support. Indicates support for CPUID Fn8000_001D_EAX_x[N:0]-CPUID Fn8000_001E_EDX.
+	TSCRATEMSR                          // MSR based TSC rate control. Indicates support for MSR TSC ratio MSRC000_0104
 	TSXLDTRK                            // Intel TSX Suspend Load Address Tracking
-	VAES                                // Vector AES
+	VAES                                // Vector AES. AVX(512) versions requires additional checks.
+	VMCBCLEAN                           // VMCB clean bits. Indicates support for VMCB clean bits.
+	VMPL                                // AMD VM Permission Levels supported
+	VMSA_REGPROT                        // AMD VMSA Register Protection supported
 	VMX                                 // Virtual Machine Extensions
-	VPCLMULQDQ                          // Carry-Less Multiplication Quadword
+	VPCLMULQDQ                          // Carry-Less Multiplication Quadword. Requires AVX for 3 register versions.
+	VTE                                 // AMD Virtual Transparent Encryption supported
 	WAITPKG                             // TPAUSE, UMONITOR, UMWAIT
 	WBNOINVD                            // Write Back and Do Not Invalidate Cache
 	X87                                 // FPU
+	XGETBV1                             // Supports XGETBV with ECX = 1
 	XOP                                 // Bulldozer XOP functions
 	XSAVE                               // XSAVE, XRESTOR, XSETBV, XGETBV
+	XSAVEC                              // Supports XSAVEC and the compacted form of XRSTOR.
+	XSAVEOPT                            // XSAVEOPT available
+	XSAVES                              // Supports XSAVES/XRSTORS and IA32_XSS
 
 	// ARM features:
 	AESARM   // AES instructions
@@ -198,7 +269,6 @@ const (
 	SM3      // SM3 instructions
 	SM4      // SM4 instructions
 	SVE      // Scalable Vector Extension
-
 	// Keep it last. It automatically defines the size of []flagSet
 	lastID
 
@@ -216,6 +286,7 @@ type CPUInfo struct {
 	LogicalCores   int     // Number of physical cores times threads that can run on each core through the use of hyperthreading. Will be 0 if undetectable.
 	Family         int     // CPU family number
 	Model          int     // CPU model number
+	Stepping       int     // CPU stepping info
 	CacheLine      int     // Cache line size in bytes. Will be 0 if undetectable.
 	Hz             int64   // Clock speed, if known, 0 otherwise. Will attempt to contain base clock speed.
 	BoostFreq      int64   // Max clock speed, if known, 0 otherwise
@@ -318,30 +389,61 @@ func (c CPUInfo) Supports(ids ...FeatureID) bool {
 
 // Has allows for checking a single feature.
 // Should be inlined by the compiler.
-func (c CPUInfo) Has(id FeatureID) bool {
+func (c *CPUInfo) Has(id FeatureID) bool {
 	return c.featureSet.inSet(id)
 }
 
+// AnyOf returns whether the CPU supports one or more of the requested features.
+func (c CPUInfo) AnyOf(ids ...FeatureID) bool {
+	for _, id := range ids {
+		if c.featureSet.inSet(id) {
+			return true
+		}
+	}
+	return false
+}
+
+// Features contains several features combined for a fast check using
+// CpuInfo.HasAll
+type Features *flagSet
+
+// CombineFeatures allows to combine several features for a close to constant time lookup.
+func CombineFeatures(ids ...FeatureID) Features {
+	var v flagSet
+	for _, id := range ids {
+		v.set(id)
+	}
+	return &v
+}
+
+func (c *CPUInfo) HasAll(f Features) bool {
+	return c.featureSet.hasSetP(f)
+}
+
 // https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels
-var level1Features = flagSetWith(CMOV, CMPXCHG8, X87, FXSR, MMX, SCE, SSE, SSE2)
-var level2Features = flagSetWith(CMOV, CMPXCHG8, X87, FXSR, MMX, SCE, SSE, SSE2, CX16, LAHF, POPCNT, SSE3, SSE4, SSE42, SSSE3)
-var level3Features = flagSetWith(CMOV, CMPXCHG8, X87, FXSR, MMX, SCE, SSE, SSE2, CX16, LAHF, POPCNT, SSE3, SSE4, SSE42, SSSE3, AVX, AVX2, BMI1, BMI2, F16C, FMA3, LZCNT, MOVBE, OSXSAVE)
-var level4Features = flagSetWith(CMOV, CMPXCHG8, X87, FXSR, MMX, SCE, SSE, SSE2, CX16, LAHF, POPCNT, SSE3, SSE4, SSE42, SSSE3, AVX, AVX2, BMI1, BMI2, F16C, FMA3, LZCNT, MOVBE, OSXSAVE, AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL)
+var oneOfLevel = CombineFeatures(SYSEE, SYSCALL)
+var level1Features = CombineFeatures(CMOV, CMPXCHG8, X87, FXSR, MMX, SSE, SSE2)
+var level2Features = CombineFeatures(CMOV, CMPXCHG8, X87, FXSR, MMX, SSE, SSE2, CX16, LAHF, POPCNT, SSE3, SSE4, SSE42, SSSE3)
+var level3Features = CombineFeatures(CMOV, CMPXCHG8, X87, FXSR, MMX, SSE, SSE2, CX16, LAHF, POPCNT, SSE3, SSE4, SSE42, SSSE3, AVX, AVX2, BMI1, BMI2, F16C, FMA3, LZCNT, MOVBE, OSXSAVE)
+var level4Features = CombineFeatures(CMOV, CMPXCHG8, X87, FXSR, MMX, SSE, SSE2, CX16, LAHF, POPCNT, SSE3, SSE4, SSE42, SSSE3, AVX, AVX2, BMI1, BMI2, F16C, FMA3, LZCNT, MOVBE, OSXSAVE, AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL)
 
 // X64Level returns the microarchitecture level detected on the CPU.
 // If features are lacking or non x64 mode, 0 is returned.
 // See https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels
 func (c CPUInfo) X64Level() int {
-	if c.featureSet.hasSet(level4Features) {
+	if !c.featureSet.hasOneOf(oneOfLevel) {
+		return 0
+	}
+	if c.featureSet.hasSetP(level4Features) {
 		return 4
 	}
-	if c.featureSet.hasSet(level3Features) {
+	if c.featureSet.hasSetP(level3Features) {
 		return 3
 	}
-	if c.featureSet.hasSet(level2Features) {
+	if c.featureSet.hasSetP(level2Features) {
 		return 2
 	}
-	if c.featureSet.hasSet(level1Features) {
+	if c.featureSet.hasSetP(level1Features) {
 		return 1
 	}
 	return 0
@@ -369,8 +471,9 @@ func (c CPUInfo) IsVendor(v Vendor) bool {
 	return c.VendorID == v
 }
 
+// FeatureSet returns all available features as strings.
 func (c CPUInfo) FeatureSet() []string {
-	s := make([]string, 0)
+	s := make([]string, 0, c.featureSet.nEnabled())
 	s = append(s, c.featureSet.Strings()...)
 	return s
 }
@@ -504,7 +607,7 @@ const flagMask = flagBits - 1
 // flagSet contains detected cpu features and characteristics in an array of flags
 type flagSet [(lastID + flagMask) / flagBits]flags
 
-func (s flagSet) inSet(feat FeatureID) bool {
+func (s *flagSet) inSet(feat FeatureID) bool {
 	return s[feat>>flagBitsLog2]&(1<<(feat&flagMask)) != 0
 }
 
@@ -534,7 +637,7 @@ func (s *flagSet) or(other flagSet) {
 }
 
 // hasSet returns whether all features are present.
-func (s flagSet) hasSet(other flagSet) bool {
+func (s *flagSet) hasSet(other flagSet) bool {
 	for i, v := range other[:] {
 		if s[i]&v != v {
 			return false
@@ -543,6 +646,34 @@ func (s flagSet) hasSet(other flagSet) bool {
 	return true
 }
 
+// hasSet returns whether all features are present.
+func (s *flagSet) hasSetP(other *flagSet) bool {
+	for i, v := range other[:] {
+		if s[i]&v != v {
+			return false
+		}
+	}
+	return true
+}
+
+// hasOneOf returns whether one or more features are present.
+func (s *flagSet) hasOneOf(other *flagSet) bool {
+	for i, v := range other[:] {
+		if s[i]&v != 0 {
+			return true
+		}
+	}
+	return false
+}
+
+// nEnabled will return the number of enabled flags.
+func (s *flagSet) nEnabled() (n int) {
+	for _, v := range s[:] {
+		n += bits.OnesCount64(uint64(v))
+	}
+	return n
+}
+
 func flagSetWith(feat ...FeatureID) flagSet {
 	var res flagSet
 	for _, f := range feat {
@@ -631,7 +762,7 @@ func threadsPerCore() int {
 		if vend == AMD {
 			// Workaround for AMD returning 0, assume 2 if >= Zen 2
 			// It will be more correct than not.
-			fam, _ := familyModel()
+			fam, _, _ := familyModel()
 			_, _, _, d := cpuid(1)
 			if (d&(1<<28)) != 0 && fam >= 23 {
 				return 2
@@ -669,14 +800,27 @@ func logicalCores() int {
 	}
 }
 
-func familyModel() (int, int) {
+func familyModel() (family, model, stepping int) {
 	if maxFunctionID() < 0x1 {
-		return 0, 0
+		return 0, 0, 0
 	}
 	eax, _, _, _ := cpuid(1)
-	family := ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff)
-	model := ((eax >> 4) & 0xf) + ((eax >> 12) & 0xf0)
-	return int(family), int(model)
+	// If BaseFamily[3:0] is less than Fh then ExtendedFamily[7:0] is reserved and Family is equal to BaseFamily[3:0].
+	family = int((eax >> 8) & 0xf)
+	extFam := family == 0x6 // Intel is 0x6, needs extended model.
+	if family == 0xf {
+		// Add ExtFamily
+		family += int((eax >> 20) & 0xff)
+		extFam = true
+	}
+	// If BaseFamily[3:0] is less than 0Fh then ExtendedModel[3:0] is reserved and Model is equal to BaseModel[3:0].
+	model = int((eax >> 4) & 0xf)
+	if extFam {
+		// Add ExtModel
+		model += int((eax >> 12) & 0xf0)
+	}
+	stepping = int(eax & 0xf)
+	return family, model, stepping
 }
 
 func physicalCores() int {
@@ -811,9 +955,14 @@ func (c *CPUInfo) cacheSize() {
 		c.Cache.L2 = int(((ecx >> 16) & 0xFFFF) * 1024)
 
 		// CPUID Fn8000_001D_EAX_x[N:0] Cache Properties
-		if maxExtendedFunction() < 0x8000001D {
+		if maxExtendedFunction() < 0x8000001D || !c.Has(TOPEXT) {
 			return
 		}
+
+		// Xen Hypervisor is buggy and returns the same entry no matter ECX value.
+		// Hack: When we encounter the same entry 100 times we break.
+		nSame := 0
+		var last uint32
 		for i := uint32(0); i < math.MaxUint32; i++ {
 			eax, ebx, ecx, _ := cpuidex(0x8000001D, i)
 
@@ -829,6 +978,16 @@ func (c *CPUInfo) cacheSize() {
 				return
 			}
 
+			// Check for the same value repeated.
+			comb := eax ^ ebx ^ ecx
+			if comb == last {
+				nSame++
+				if nSame == 100 {
+					return
+				}
+			}
+			last = comb
+
 			switch level {
 			case 1:
 				switch typ {
@@ -913,14 +1072,13 @@ func support() flagSet {
 	if mfi < 0x1 {
 		return fs
 	}
-	family, model := familyModel()
+	family, model, _ := familyModel()
 
 	_, _, c, d := cpuid(1)
 	fs.setIf((d&(1<<0)) != 0, X87)
 	fs.setIf((d&(1<<8)) != 0, CMPXCHG8)
-	fs.setIf((d&(1<<11)) != 0, SCE)
+	fs.setIf((d&(1<<11)) != 0, SYSEE)
 	fs.setIf((d&(1<<15)) != 0, CMOV)
-	fs.setIf((d&(1<<22)) != 0, MMXEXT)
 	fs.setIf((d&(1<<23)) != 0, MMX)
 	fs.setIf((d&(1<<24)) != 0, FXSR)
 	fs.setIf((d&(1<<25)) != 0, FXSROPT)
@@ -928,9 +1086,9 @@ func support() flagSet {
 	fs.setIf((d&(1<<26)) != 0, SSE2)
 	fs.setIf((c&1) != 0, SSE3)
 	fs.setIf((c&(1<<5)) != 0, VMX)
-	fs.setIf((c&0x00000200) != 0, SSSE3)
-	fs.setIf((c&0x00080000) != 0, SSE4)
-	fs.setIf((c&0x00100000) != 0, SSE42)
+	fs.setIf((c&(1<<9)) != 0, SSSE3)
+	fs.setIf((c&(1<<19)) != 0, SSE4)
+	fs.setIf((c&(1<<20)) != 0, SSE42)
 	fs.setIf((c&(1<<25)) != 0, AESNI)
 	fs.setIf((c&(1<<1)) != 0, CLMUL)
 	fs.setIf(c&(1<<22) != 0, MOVBE)
@@ -976,7 +1134,6 @@ func support() flagSet {
 	// Check AVX2, AVX2 requires OS support, but BMI1/2 don't.
 	if mfi >= 7 {
 		_, ebx, ecx, edx := cpuidex(7, 0)
-		eax1, _, _, _ := cpuidex(7, 1)
 		if fs.inSet(AVX) && (ebx&0x00000020) != 0 {
 			fs.set(AVX2)
 		}
@@ -993,21 +1150,52 @@ func support() flagSet {
 		fs.setIf(ebx&(1<<18) != 0, RDSEED)
 		fs.setIf(ebx&(1<<19) != 0, ADX)
 		fs.setIf(ebx&(1<<29) != 0, SHA)
+
 		// CPUID.(EAX=7, ECX=0).ECX
 		fs.setIf(ecx&(1<<5) != 0, WAITPKG)
 		fs.setIf(ecx&(1<<7) != 0, CETSS)
+		fs.setIf(ecx&(1<<8) != 0, GFNI)
+		fs.setIf(ecx&(1<<9) != 0, VAES)
+		fs.setIf(ecx&(1<<10) != 0, VPCLMULQDQ)
+		fs.setIf(ecx&(1<<13) != 0, TME)
 		fs.setIf(ecx&(1<<25) != 0, CLDEMOTE)
 		fs.setIf(ecx&(1<<27) != 0, MOVDIRI)
 		fs.setIf(ecx&(1<<28) != 0, MOVDIR64B)
 		fs.setIf(ecx&(1<<29) != 0, ENQCMD)
 		fs.setIf(ecx&(1<<30) != 0, SGXLC)
+
 		// CPUID.(EAX=7, ECX=0).EDX
+		fs.setIf(edx&(1<<4) != 0, FSRM)
+		fs.setIf(edx&(1<<9) != 0, SRBDS_CTRL)
+		fs.setIf(edx&(1<<10) != 0, MD_CLEAR)
 		fs.setIf(edx&(1<<11) != 0, RTM_ALWAYS_ABORT)
 		fs.setIf(edx&(1<<14) != 0, SERIALIZE)
+		fs.setIf(edx&(1<<15) != 0, HYBRID_CPU)
 		fs.setIf(edx&(1<<16) != 0, TSXLDTRK)
+		fs.setIf(edx&(1<<18) != 0, PCONFIG)
 		fs.setIf(edx&(1<<20) != 0, CETIBT)
 		fs.setIf(edx&(1<<26) != 0, IBPB)
 		fs.setIf(edx&(1<<27) != 0, STIBP)
+		fs.setIf(edx&(1<<28) != 0, FLUSH_L1D)
+		fs.setIf(edx&(1<<29) != 0, IA32_ARCH_CAP)
+		fs.setIf(edx&(1<<30) != 0, IA32_CORE_CAP)
+		fs.setIf(edx&(1<<31) != 0, SPEC_CTRL_SSBD)
+
+		// CPUID.(EAX=7, ECX=1).EDX
+		fs.setIf(edx&(1<<4) != 0, AVXVNNIINT8)
+		fs.setIf(edx&(1<<5) != 0, AVXNECONVERT)
+		fs.setIf(edx&(1<<14) != 0, PREFETCHI)
+
+		// CPUID.(EAX=7, ECX=1).EAX
+		eax1, _, _, _ := cpuidex(7, 1)
+		fs.setIf(fs.inSet(AVX) && eax1&(1<<4) != 0, AVXVNNI)
+		fs.setIf(eax1&(1<<7) != 0, CMPCCXADD)
+		fs.setIf(eax1&(1<<10) != 0, MOVSB_ZL)
+		fs.setIf(eax1&(1<<11) != 0, STOSB_SHORT)
+		fs.setIf(eax1&(1<<12) != 0, CMPSB_SCADBS_SHORT)
+		fs.setIf(eax1&(1<<22) != 0, HRESET)
+		fs.setIf(eax1&(1<<23) != 0, AVXIFMA)
+		fs.setIf(eax1&(1<<26) != 0, LAM)
 
 		// Only detect AVX-512 features if XGETBV is supported
 		if c&((1<<26)|(1<<27)) == (1<<26)|(1<<27) {
@@ -1033,9 +1221,6 @@ func support() flagSet {
 				// ecx
 				fs.setIf(ecx&(1<<1) != 0, AVX512VBMI)
 				fs.setIf(ecx&(1<<6) != 0, AVX512VBMI2)
-				fs.setIf(ecx&(1<<8) != 0, GFNI)
-				fs.setIf(ecx&(1<<9) != 0, VAES)
-				fs.setIf(ecx&(1<<10) != 0, VPCLMULQDQ)
 				fs.setIf(ecx&(1<<11) != 0, AVX512VNNI)
 				fs.setIf(ecx&(1<<12) != 0, AVX512BITALG)
 				fs.setIf(ecx&(1<<14) != 0, AVX512VPOPCNTDQ)
@@ -1047,31 +1232,66 @@ func support() flagSet {
 				fs.setIf(edx&(1<<25) != 0, AMXINT8)
 				// eax1 = CPUID.(EAX=7, ECX=1).EAX
 				fs.setIf(eax1&(1<<5) != 0, AVX512BF16)
+				fs.setIf(eax1&(1<<21) != 0, AMXFP16)
 			}
 		}
+
+		// CPUID.(EAX=7, ECX=2)
+		_, _, _, edx = cpuidex(7, 2)
+		fs.setIf(edx&(1<<5) != 0, MCDT_NO)
 	}
 
+	// Processor Extended State Enumeration Sub-leaf (EAX = 0DH, ECX = 1)
+	// EAX
+	// Bit 00: XSAVEOPT is available.
+	// Bit 01: Supports XSAVEC and the compacted form of XRSTOR if set.
+	// Bit 02: Supports XGETBV with ECX = 1 if set.
+	// Bit 03: Supports XSAVES/XRSTORS and IA32_XSS if set.
+	// Bits 31 - 04: Reserved.
+	// EBX
+	// Bits 31 - 00: The size in bytes of the XSAVE area containing all states enabled by XCRO | IA32_XSS.
+	// ECX
+	// Bits 31 - 00: Reports the supported bits of the lower 32 bits of the IA32_XSS MSR. IA32_XSS[n] can be set to 1 only if ECX[n] is 1.
+	// EDX?
+	// Bits 07 - 00: Used for XCR0. Bit 08: PT state. Bit 09: Used for XCR0. Bits 12 - 10: Reserved. Bit 13: HWP state. Bits 31 - 14: Reserved.
+	if mfi >= 0xd {
+		if fs.inSet(XSAVE) {
+			eax, _, _, _ := cpuidex(0xd, 1)
+			fs.setIf(eax&(1<<0) != 0, XSAVEOPT)
+			fs.setIf(eax&(1<<1) != 0, XSAVEC)
+			fs.setIf(eax&(1<<2) != 0, XGETBV1)
+			fs.setIf(eax&(1<<3) != 0, XSAVES)
+		}
+	}
 	if maxExtendedFunction() >= 0x80000001 {
 		_, _, c, d := cpuid(0x80000001)
 		if (c & (1 << 5)) != 0 {
 			fs.set(LZCNT)
 			fs.set(POPCNT)
 		}
+		// ECX
 		fs.setIf((c&(1<<0)) != 0, LAHF)
-		fs.setIf((c&(1<<10)) != 0, IBS)
-		fs.setIf((d&(1<<31)) != 0, AMD3DNOW)
-		fs.setIf((d&(1<<30)) != 0, AMD3DNOWEXT)
-		fs.setIf((d&(1<<23)) != 0, MMX)
-		fs.setIf((d&(1<<22)) != 0, MMXEXT)
+		fs.setIf((c&(1<<2)) != 0, SVM)
 		fs.setIf((c&(1<<6)) != 0, SSE4A)
+		fs.setIf((c&(1<<10)) != 0, IBS)
+		fs.setIf((c&(1<<22)) != 0, TOPEXT)
+
+		// EDX
+		fs.setIf(d&(1<<11) != 0, SYSCALL)
 		fs.setIf(d&(1<<20) != 0, NX)
+		fs.setIf(d&(1<<22) != 0, MMXEXT)
+		fs.setIf(d&(1<<23) != 0, MMX)
+		fs.setIf(d&(1<<24) != 0, FXSR)
+		fs.setIf(d&(1<<25) != 0, FXSROPT)
 		fs.setIf(d&(1<<27) != 0, RDTSCP)
+		fs.setIf(d&(1<<30) != 0, AMD3DNOWEXT)
+		fs.setIf(d&(1<<31) != 0, AMD3DNOW)
 
 		/* XOP and FMA4 use the AVX instruction coding scheme, so they can't be
 		 * used unless the OS has AVX support. */
 		if fs.inSet(AVX) {
-			fs.setIf((c&0x00000800) != 0, XOP)
-			fs.setIf((c&0x00010000) != 0, FMA4)
+			fs.setIf((c&(1<<11)) != 0, XOP)
+			fs.setIf((c&(1<<16)) != 0, FMA4)
 		}
 
 	}
@@ -1085,15 +1305,48 @@ func support() flagSet {
 
 	if maxExtendedFunction() >= 0x80000008 {
 		_, b, _, _ := cpuid(0x80000008)
+		fs.setIf(b&(1<<28) != 0, PSFD)
+		fs.setIf(b&(1<<27) != 0, CPPC)
+		fs.setIf(b&(1<<24) != 0, SPEC_CTRL_SSBD)
+		fs.setIf(b&(1<<23) != 0, PPIN)
+		fs.setIf(b&(1<<21) != 0, TLB_FLUSH_NESTED)
+		fs.setIf(b&(1<<20) != 0, EFER_LMSLE_UNS)
+		fs.setIf(b&(1<<19) != 0, IBRS_PROVIDES_SMP)
+		fs.setIf(b&(1<<18) != 0, IBRS_PREFERRED)
+		fs.setIf(b&(1<<17) != 0, STIBP_ALWAYSON)
+		fs.setIf(b&(1<<15) != 0, STIBP)
+		fs.setIf(b&(1<<14) != 0, IBRS)
+		fs.setIf((b&(1<<13)) != 0, INT_WBINVD)
+		fs.setIf(b&(1<<12) != 0, IBPB)
 		fs.setIf((b&(1<<9)) != 0, WBNOINVD)
 		fs.setIf((b&(1<<8)) != 0, MCOMMIT)
-		fs.setIf((b&(1<<13)) != 0, INT_WBINVD)
 		fs.setIf((b&(1<<4)) != 0, RDPRU)
 		fs.setIf((b&(1<<3)) != 0, INVLPGB)
 		fs.setIf((b&(1<<1)) != 0, MSRIRC)
 		fs.setIf((b&(1<<0)) != 0, CLZERO)
 	}
 
+	if fs.inSet(SVM) && maxExtendedFunction() >= 0x8000000A {
+		_, _, _, edx := cpuid(0x8000000A)
+		fs.setIf((edx>>0)&1 == 1, SVMNP)
+		fs.setIf((edx>>1)&1 == 1, LBRVIRT)
+		fs.setIf((edx>>2)&1 == 1, SVML)
+		fs.setIf((edx>>3)&1 == 1, NRIPS)
+		fs.setIf((edx>>4)&1 == 1, TSCRATEMSR)
+		fs.setIf((edx>>5)&1 == 1, VMCBCLEAN)
+		fs.setIf((edx>>6)&1 == 1, SVMFBASID)
+		fs.setIf((edx>>7)&1 == 1, SVMDA)
+		fs.setIf((edx>>10)&1 == 1, SVMPF)
+		fs.setIf((edx>>12)&1 == 1, SVMPFT)
+	}
+
+	if maxExtendedFunction() >= 0x8000001a {
+		eax, _, _, _ := cpuid(0x8000001a)
+		fs.setIf((eax>>0)&1 == 1, FP128)
+		fs.setIf((eax>>1)&1 == 1, MOVU)
+		fs.setIf((eax>>2)&1 == 1, FP256)
+	}
+
 	if maxExtendedFunction() >= 0x8000001b && fs.inSet(IBS) {
 		eax, _, _, _ := cpuid(0x8000001b)
 		fs.setIf((eax>>0)&1 == 1, IBSFFV)
@@ -1104,6 +1357,28 @@ func support() flagSet {
 		fs.setIf((eax>>5)&1 == 1, IBSBRNTRGT)
 		fs.setIf((eax>>6)&1 == 1, IBSOPCNTEXT)
 		fs.setIf((eax>>7)&1 == 1, IBSRIPINVALIDCHK)
+		fs.setIf((eax>>8)&1 == 1, IBS_OPFUSE)
+		fs.setIf((eax>>9)&1 == 1, IBS_FETCH_CTLX)
+		fs.setIf((eax>>10)&1 == 1, IBS_OPDATA4) // Doc says "Fixed,0. IBS op data 4 MSR supported", but assuming they mean 1.
+		fs.setIf((eax>>11)&1 == 1, IBS_ZEN4)
+	}
+
+	if maxExtendedFunction() >= 0x8000001f && vend == AMD {
+		a, _, _, _ := cpuid(0x8000001f)
+		fs.setIf((a>>0)&1 == 1, SME)
+		fs.setIf((a>>1)&1 == 1, SEV)
+		fs.setIf((a>>2)&1 == 1, MSR_PAGEFLUSH)
+		fs.setIf((a>>3)&1 == 1, SEV_ES)
+		fs.setIf((a>>4)&1 == 1, SEV_SNP)
+		fs.setIf((a>>5)&1 == 1, VMPL)
+		fs.setIf((a>>10)&1 == 1, SME_COHERENT)
+		fs.setIf((a>>11)&1 == 1, SEV_64BIT)
+		fs.setIf((a>>12)&1 == 1, SEV_RESTRICTED)
+		fs.setIf((a>>13)&1 == 1, SEV_ALTERNATIVE)
+		fs.setIf((a>>14)&1 == 1, SEV_DEBUGSWAP)
+		fs.setIf((a>>15)&1 == 1, IBS_PREVENTHOST)
+		fs.setIf((a>>16)&1 == 1, VTE)
+		fs.setIf((a>>24)&1 == 1, VMSA_REGPROT)
 	}
 
 	return fs
diff --git a/vendor/github.com/klauspost/cpuid/v2/detect_x86.go b/vendor/github.com/klauspost/cpuid/v2/detect_x86.go
index 35678d8a..c946824e 100644
--- a/vendor/github.com/klauspost/cpuid/v2/detect_x86.go
+++ b/vendor/github.com/klauspost/cpuid/v2/detect_x86.go
@@ -24,7 +24,7 @@ func addInfo(c *CPUInfo, safe bool) {
 	c.maxExFunc = maxExtendedFunction()
 	c.BrandName = brandName()
 	c.CacheLine = cacheLine()
-	c.Family, c.Model = familyModel()
+	c.Family, c.Model, c.Stepping = familyModel()
 	c.featureSet = support()
 	c.SGX = hasSGX(c.featureSet.inSet(SGX), c.featureSet.inSet(SGXLC))
 	c.ThreadsPerCore = threadsPerCore()
diff --git a/vendor/github.com/klauspost/cpuid/v2/featureid_string.go b/vendor/github.com/klauspost/cpuid/v2/featureid_string.go
index 02fe232a..8b6cd2b7 100644
--- a/vendor/github.com/klauspost/cpuid/v2/featureid_string.go
+++ b/vendor/github.com/klauspost/cpuid/v2/featureid_string.go
@@ -13,137 +13,207 @@ func _() {
 	_ = x[AMD3DNOW-3]
 	_ = x[AMD3DNOWEXT-4]
 	_ = x[AMXBF16-5]
-	_ = x[AMXINT8-6]
-	_ = x[AMXTILE-7]
-	_ = x[AVX-8]
-	_ = x[AVX2-9]
-	_ = x[AVX512BF16-10]
-	_ = x[AVX512BITALG-11]
-	_ = x[AVX512BW-12]
-	_ = x[AVX512CD-13]
-	_ = x[AVX512DQ-14]
-	_ = x[AVX512ER-15]
-	_ = x[AVX512F-16]
-	_ = x[AVX512FP16-17]
-	_ = x[AVX512IFMA-18]
-	_ = x[AVX512PF-19]
-	_ = x[AVX512VBMI-20]
-	_ = x[AVX512VBMI2-21]
-	_ = x[AVX512VL-22]
-	_ = x[AVX512VNNI-23]
-	_ = x[AVX512VP2INTERSECT-24]
-	_ = x[AVX512VPOPCNTDQ-25]
-	_ = x[AVXSLOW-26]
-	_ = x[BMI1-27]
-	_ = x[BMI2-28]
-	_ = x[CETIBT-29]
-	_ = x[CETSS-30]
-	_ = x[CLDEMOTE-31]
-	_ = x[CLMUL-32]
-	_ = x[CLZERO-33]
-	_ = x[CMOV-34]
-	_ = x[CMPXCHG8-35]
-	_ = x[CPBOOST-36]
-	_ = x[CX16-37]
-	_ = x[ENQCMD-38]
-	_ = x[ERMS-39]
-	_ = x[F16C-40]
-	_ = x[FMA3-41]
-	_ = x[FMA4-42]
-	_ = x[FXSR-43]
-	_ = x[FXSROPT-44]
-	_ = x[GFNI-45]
-	_ = x[HLE-46]
-	_ = x[HTT-47]
-	_ = x[HWA-48]
-	_ = x[HYPERVISOR-49]
-	_ = x[IBPB-50]
-	_ = x[IBS-51]
-	_ = x[IBSBRNTRGT-52]
-	_ = x[IBSFETCHSAM-53]
-	_ = x[IBSFFV-54]
-	_ = x[IBSOPCNT-55]
-	_ = x[IBSOPCNTEXT-56]
-	_ = x[IBSOPSAM-57]
-	_ = x[IBSRDWROPCNT-58]
-	_ = x[IBSRIPINVALIDCHK-59]
-	_ = x[INT_WBINVD-60]
-	_ = x[INVLPGB-61]
-	_ = x[LAHF-62]
-	_ = x[LZCNT-63]
-	_ = x[MCAOVERFLOW-64]
-	_ = x[MCOMMIT-65]
-	_ = x[MMX-66]
-	_ = x[MMXEXT-67]
-	_ = x[MOVBE-68]
-	_ = x[MOVDIR64B-69]
-	_ = x[MOVDIRI-70]
-	_ = x[MPX-71]
-	_ = x[MSRIRC-72]
-	_ = x[NX-73]
-	_ = x[OSXSAVE-74]
-	_ = x[POPCNT-75]
-	_ = x[RDPRU-76]
-	_ = x[RDRAND-77]
-	_ = x[RDSEED-78]
-	_ = x[RDTSCP-79]
-	_ = x[RTM-80]
-	_ = x[RTM_ALWAYS_ABORT-81]
-	_ = x[SCE-82]
-	_ = x[SERIALIZE-83]
-	_ = x[SGX-84]
-	_ = x[SGXLC-85]
-	_ = x[SHA-86]
-	_ = x[SSE-87]
-	_ = x[SSE2-88]
-	_ = x[SSE3-89]
-	_ = x[SSE4-90]
-	_ = x[SSE42-91]
-	_ = x[SSE4A-92]
-	_ = x[SSSE3-93]
-	_ = x[STIBP-94]
-	_ = x[SUCCOR-95]
-	_ = x[TBM-96]
-	_ = x[TSXLDTRK-97]
-	_ = x[VAES-98]
-	_ = x[VMX-99]
-	_ = x[VPCLMULQDQ-100]
-	_ = x[WAITPKG-101]
-	_ = x[WBNOINVD-102]
-	_ = x[X87-103]
-	_ = x[XOP-104]
-	_ = x[XSAVE-105]
-	_ = x[AESARM-106]
-	_ = x[ARMCPUID-107]
-	_ = x[ASIMD-108]
-	_ = x[ASIMDDP-109]
-	_ = x[ASIMDHP-110]
-	_ = x[ASIMDRDM-111]
-	_ = x[ATOMICS-112]
-	_ = x[CRC32-113]
-	_ = x[DCPOP-114]
-	_ = x[EVTSTRM-115]
-	_ = x[FCMA-116]
-	_ = x[FP-117]
-	_ = x[FPHP-118]
-	_ = x[GPA-119]
-	_ = x[JSCVT-120]
-	_ = x[LRCPC-121]
-	_ = x[PMULL-122]
-	_ = x[SHA1-123]
-	_ = x[SHA2-124]
-	_ = x[SHA3-125]
-	_ = x[SHA512-126]
-	_ = x[SM3-127]
-	_ = x[SM4-128]
-	_ = x[SVE-129]
-	_ = x[lastID-130]
+	_ = x[AMXFP16-6]
+	_ = x[AMXINT8-7]
+	_ = x[AMXTILE-8]
+	_ = x[AVX-9]
+	_ = x[AVX2-10]
+	_ = x[AVX512BF16-11]
+	_ = x[AVX512BITALG-12]
+	_ = x[AVX512BW-13]
+	_ = x[AVX512CD-14]
+	_ = x[AVX512DQ-15]
+	_ = x[AVX512ER-16]
+	_ = x[AVX512F-17]
+	_ = x[AVX512FP16-18]
+	_ = x[AVX512IFMA-19]
+	_ = x[AVX512PF-20]
+	_ = x[AVX512VBMI-21]
+	_ = x[AVX512VBMI2-22]
+	_ = x[AVX512VL-23]
+	_ = x[AVX512VNNI-24]
+	_ = x[AVX512VP2INTERSECT-25]
+	_ = x[AVX512VPOPCNTDQ-26]
+	_ = x[AVXIFMA-27]
+	_ = x[AVXNECONVERT-28]
+	_ = x[AVXSLOW-29]
+	_ = x[AVXVNNI-30]
+	_ = x[AVXVNNIINT8-31]
+	_ = x[BMI1-32]
+	_ = x[BMI2-33]
+	_ = x[CETIBT-34]
+	_ = x[CETSS-35]
+	_ = x[CLDEMOTE-36]
+	_ = x[CLMUL-37]
+	_ = x[CLZERO-38]
+	_ = x[CMOV-39]
+	_ = x[CMPCCXADD-40]
+	_ = x[CMPSB_SCADBS_SHORT-41]
+	_ = x[CMPXCHG8-42]
+	_ = x[CPBOOST-43]
+	_ = x[CPPC-44]
+	_ = x[CX16-45]
+	_ = x[EFER_LMSLE_UNS-46]
+	_ = x[ENQCMD-47]
+	_ = x[ERMS-48]
+	_ = x[F16C-49]
+	_ = x[FLUSH_L1D-50]
+	_ = x[FMA3-51]
+	_ = x[FMA4-52]
+	_ = x[FP128-53]
+	_ = x[FP256-54]
+	_ = x[FSRM-55]
+	_ = x[FXSR-56]
+	_ = x[FXSROPT-57]
+	_ = x[GFNI-58]
+	_ = x[HLE-59]
+	_ = x[HRESET-60]
+	_ = x[HTT-61]
+	_ = x[HWA-62]
+	_ = x[HYBRID_CPU-63]
+	_ = x[HYPERVISOR-64]
+	_ = x[IA32_ARCH_CAP-65]
+	_ = x[IA32_CORE_CAP-66]
+	_ = x[IBPB-67]
+	_ = x[IBRS-68]
+	_ = x[IBRS_PREFERRED-69]
+	_ = x[IBRS_PROVIDES_SMP-70]
+	_ = x[IBS-71]
+	_ = x[IBSBRNTRGT-72]
+	_ = x[IBSFETCHSAM-73]
+	_ = x[IBSFFV-74]
+	_ = x[IBSOPCNT-75]
+	_ = x[IBSOPCNTEXT-76]
+	_ = x[IBSOPSAM-77]
+	_ = x[IBSRDWROPCNT-78]
+	_ = x[IBSRIPINVALIDCHK-79]
+	_ = x[IBS_FETCH_CTLX-80]
+	_ = x[IBS_OPDATA4-81]
+	_ = x[IBS_OPFUSE-82]
+	_ = x[IBS_PREVENTHOST-83]
+	_ = x[IBS_ZEN4-84]
+	_ = x[INT_WBINVD-85]
+	_ = x[INVLPGB-86]
+	_ = x[LAHF-87]
+	_ = x[LAM-88]
+	_ = x[LBRVIRT-89]
+	_ = x[LZCNT-90]
+	_ = x[MCAOVERFLOW-91]
+	_ = x[MCDT_NO-92]
+	_ = x[MCOMMIT-93]
+	_ = x[MD_CLEAR-94]
+	_ = x[MMX-95]
+	_ = x[MMXEXT-96]
+	_ = x[MOVBE-97]
+	_ = x[MOVDIR64B-98]
+	_ = x[MOVDIRI-99]
+	_ = x[MOVSB_ZL-100]
+	_ = x[MOVU-101]
+	_ = x[MPX-102]
+	_ = x[MSRIRC-103]
+	_ = x[MSR_PAGEFLUSH-104]
+	_ = x[NRIPS-105]
+	_ = x[NX-106]
+	_ = x[OSXSAVE-107]
+	_ = x[PCONFIG-108]
+	_ = x[POPCNT-109]
+	_ = x[PPIN-110]
+	_ = x[PREFETCHI-111]
+	_ = x[PSFD-112]
+	_ = x[RDPRU-113]
+	_ = x[RDRAND-114]
+	_ = x[RDSEED-115]
+	_ = x[RDTSCP-116]
+	_ = x[RTM-117]
+	_ = x[RTM_ALWAYS_ABORT-118]
+	_ = x[SERIALIZE-119]
+	_ = x[SEV-120]
+	_ = x[SEV_64BIT-121]
+	_ = x[SEV_ALTERNATIVE-122]
+	_ = x[SEV_DEBUGSWAP-123]
+	_ = x[SEV_ES-124]
+	_ = x[SEV_RESTRICTED-125]
+	_ = x[SEV_SNP-126]
+	_ = x[SGX-127]
+	_ = x[SGXLC-128]
+	_ = x[SHA-129]
+	_ = x[SME-130]
+	_ = x[SME_COHERENT-131]
+	_ = x[SPEC_CTRL_SSBD-132]
+	_ = x[SRBDS_CTRL-133]
+	_ = x[SSE-134]
+	_ = x[SSE2-135]
+	_ = x[SSE3-136]
+	_ = x[SSE4-137]
+	_ = x[SSE42-138]
+	_ = x[SSE4A-139]
+	_ = x[SSSE3-140]
+	_ = x[STIBP-141]
+	_ = x[STIBP_ALWAYSON-142]
+	_ = x[STOSB_SHORT-143]
+	_ = x[SUCCOR-144]
+	_ = x[SVM-145]
+	_ = x[SVMDA-146]
+	_ = x[SVMFBASID-147]
+	_ = x[SVML-148]
+	_ = x[SVMNP-149]
+	_ = x[SVMPF-150]
+	_ = x[SVMPFT-151]
+	_ = x[SYSCALL-152]
+	_ = x[SYSEE-153]
+	_ = x[TBM-154]
+	_ = x[TLB_FLUSH_NESTED-155]
+	_ = x[TME-156]
+	_ = x[TOPEXT-157]
+	_ = x[TSCRATEMSR-158]
+	_ = x[TSXLDTRK-159]
+	_ = x[VAES-160]
+	_ = x[VMCBCLEAN-161]
+	_ = x[VMPL-162]
+	_ = x[VMSA_REGPROT-163]
+	_ = x[VMX-164]
+	_ = x[VPCLMULQDQ-165]
+	_ = x[VTE-166]
+	_ = x[WAITPKG-167]
+	_ = x[WBNOINVD-168]
+	_ = x[X87-169]
+	_ = x[XGETBV1-170]
+	_ = x[XOP-171]
+	_ = x[XSAVE-172]
+	_ = x[XSAVEC-173]
+	_ = x[XSAVEOPT-174]
+	_ = x[XSAVES-175]
+	_ = x[AESARM-176]
+	_ = x[ARMCPUID-177]
+	_ = x[ASIMD-178]
+	_ = x[ASIMDDP-179]
+	_ = x[ASIMDHP-180]
+	_ = x[ASIMDRDM-181]
+	_ = x[ATOMICS-182]
+	_ = x[CRC32-183]
+	_ = x[DCPOP-184]
+	_ = x[EVTSTRM-185]
+	_ = x[FCMA-186]
+	_ = x[FP-187]
+	_ = x[FPHP-188]
+	_ = x[GPA-189]
+	_ = x[JSCVT-190]
+	_ = x[LRCPC-191]
+	_ = x[PMULL-192]
+	_ = x[SHA1-193]
+	_ = x[SHA2-194]
+	_ = x[SHA3-195]
+	_ = x[SHA512-196]
+	_ = x[SM3-197]
+	_ = x[SM4-198]
+	_ = x[SVE-199]
+	_ = x[lastID-200]
 	_ = x[firstID-0]
 }
 
-const _FeatureID_name = "firstIDADXAESNIAMD3DNOWAMD3DNOWEXTAMXBF16AMXINT8AMXTILEAVXAVX2AVX512BF16AVX512BITALGAVX512BWAVX512CDAVX512DQAVX512ERAVX512FAVX512FP16AVX512IFMAAVX512PFAVX512VBMIAVX512VBMI2AVX512VLAVX512VNNIAVX512VP2INTERSECTAVX512VPOPCNTDQAVXSLOWBMI1BMI2CETIBTCETSSCLDEMOTECLMULCLZEROCMOVCMPXCHG8CPBOOSTCX16ENQCMDERMSF16CFMA3FMA4FXSRFXSROPTGFNIHLEHTTHWAHYPERVISORIBPBIBSIBSBRNTRGTIBSFETCHSAMIBSFFVIBSOPCNTIBSOPCNTEXTIBSOPSAMIBSRDWROPCNTIBSRIPINVALIDCHKINT_WBINVDINVLPGBLAHFLZCNTMCAOVERFLOWMCOMMITMMXMMXEXTMOVBEMOVDIR64BMOVDIRIMPXMSRIRCNXOSXSAVEPOPCNTRDPRURDRANDRDSEEDRDTSCPRTMRTM_ALWAYS_ABORTSCESERIALIZESGXSGXLCSHASSESSE2SSE3SSE4SSE42SSE4ASSSE3STIBPSUCCORTBMTSXLDTRKVAESVMXVPCLMULQDQWAITPKGWBNOINVDX87XOPXSAVEAESARMARMCPUIDASIMDASIMDDPASIMDHPASIMDRDMATOMICSCRC32DCPOPEVTSTRMFCMAFPFPHPGPAJSCVTLRCPCPMULLSHA1SHA2SHA3SHA512SM3SM4SVElastID"
+const _FeatureID_name = "firstIDADXAESNIAMD3DNOWAMD3DNOWEXTAMXBF16AMXFP16AMXINT8AMXTILEAVXAVX2AVX512BF16AVX512BITALGAVX512BWAVX512CDAVX512DQAVX512ERAVX512FAVX512FP16AVX512IFMAAVX512PFAVX512VBMIAVX512VBMI2AVX512VLAVX512VNNIAVX512VP2INTERSECTAVX512VPOPCNTDQAVXIFMAAVXNECONVERTAVXSLOWAVXVNNIAVXVNNIINT8BMI1BMI2CETIBTCETSSCLDEMOTECLMULCLZEROCMOVCMPCCXADDCMPSB_SCADBS_SHORTCMPXCHG8CPBOOSTCPPCCX16EFER_LMSLE_UNSENQCMDERMSF16CFLUSH_L1DFMA3FMA4FP128FP256FSRMFXSRFXSROPTGFNIHLEHRESETHTTHWAHYBRID_CPUHYPERVISORIA32_ARCH_CAPIA32_CORE_CAPIBPBIBRSIBRS_PREFERREDIBRS_PROVIDES_SMPIBSIBSBRNTRGTIBSFETCHSAMIBSFFVIBSOPCNTIBSOPCNTEXTIBSOPSAMIBSRDWROPCNTIBSRIPINVALIDCHKIBS_FETCH_CTLXIBS_OPDATA4IBS_OPFUSEIBS_PREVENTHOSTIBS_ZEN4INT_WBINVDINVLPGBLAHFLAMLBRVIRTLZCNTMCAOVERFLOWMCDT_NOMCOMMITMD_CLEARMMXMMXEXTMOVBEMOVDIR64BMOVDIRIMOVSB_ZLMOVUMPXMSRIRCMSR_PAGEFLUSHNRIPSNXOSXSAVEPCONFIGPOPCNTPPINPREFETCHIPSFDRDPRURDRANDRDSEEDRDTSCPRTMRTM_ALWAYS_ABORTSERIALIZESEVSEV_64BITSEV_ALTERNATIVESEV_DEBUGSWAPSEV_ESSEV_RESTRICTEDSEV_SNPSGXSGXLCSHASMESME_COHERENTSPEC_CTRL_SSBDSRBDS_CTRLSSESSE2SSE3SSE4SSE42SSE4ASSSE3STIBPSTIBP_ALWAYSONSTOSB_SHORTSUCCORSVMSVMDASVMFBASIDSVMLSVMNPSVMPFSVMPFTSYSCALLSYSEETBMTLB_FLUSH_NESTEDTMETOPEXTTSCRATEMSRTSXLDTRKVAESVMCBCLEANVMPLVMSA_REGPROTVMXVPCLMULQDQVTEWAITPKGWBNOINVDX87XGETBV1XOPXSAVEXSAVECXSAVEOPTXSAVESAESARMARMCPUIDASIMDASIMDDPASIMDHPASIMDRDMATOMICSCRC32DCPOPEVTSTRMFCMAFPFPHPGPAJSCVTLRCPCPMULLSHA1SHA2SHA3SHA512SM3SM4SVElastID"
 
-var _FeatureID_index = [...]uint16{0, 7, 10, 15, 23, 34, 41, 48, 55, 58, 62, 72, 84, 92, 100, 108, 116, 123, 133, 143, 151, 161, 172, 180, 190, 208, 223, 230, 234, 238, 244, 249, 257, 262, 268, 272, 280, 287, 291, 297, 301, 305, 309, 313, 317, 324, 328, 331, 334, 337, 347, 351, 354, 364, 375, 381, 389, 400, 408, 420, 436, 446, 453, 457, 462, 473, 480, 483, 489, 494, 503, 510, 513, 519, 521, 528, 534, 539, 545, 551, 557, 560, 576, 579, 588, 591, 596, 599, 602, 606, 610, 614, 619, 624, 629, 634, 640, 643, 651, 655, 658, 668, 675, 683, 686, 689, 694, 700, 708, 713, 720, 727, 735, 742, 747, 752, 759, 763, 765, 769, 772, 777, 782, 787, 791, 795, 799, 805, 808, 811, 814, 820}
+var _FeatureID_index = [...]uint16{0, 7, 10, 15, 23, 34, 41, 48, 55, 62, 65, 69, 79, 91, 99, 107, 115, 123, 130, 140, 150, 158, 168, 179, 187, 197, 215, 230, 237, 249, 256, 263, 274, 278, 282, 288, 293, 301, 306, 312, 316, 325, 343, 351, 358, 362, 366, 380, 386, 390, 394, 403, 407, 411, 416, 421, 425, 429, 436, 440, 443, 449, 452, 455, 465, 475, 488, 501, 505, 509, 523, 540, 543, 553, 564, 570, 578, 589, 597, 609, 625, 639, 650, 660, 675, 683, 693, 700, 704, 707, 714, 719, 730, 737, 744, 752, 755, 761, 766, 775, 782, 790, 794, 797, 803, 816, 821, 823, 830, 837, 843, 847, 856, 860, 865, 871, 877, 883, 886, 902, 911, 914, 923, 938, 951, 957, 971, 978, 981, 986, 989, 992, 1004, 1018, 1028, 1031, 1035, 1039, 1043, 1048, 1053, 1058, 1063, 1077, 1088, 1094, 1097, 1102, 1111, 1115, 1120, 1125, 1131, 1138, 1143, 1146, 1162, 1165, 1171, 1181, 1189, 1193, 1202, 1206, 1218, 1221, 1231, 1234, 1241, 1249, 1252, 1259, 1262, 1267, 1273, 1281, 1287, 1293, 1301, 1306, 1313, 1320, 1328, 1335, 1340, 1345, 1352, 1356, 1358, 1362, 1365, 1370, 1375, 1380, 1384, 1388, 1392, 1398, 1401, 1404, 1407, 1413}
 
 func (i FeatureID) String() string {
 	if i < 0 || i >= FeatureID(len(_FeatureID_index)-1) {
diff --git a/vendor/github.com/klauspost/cpuid/v2/os_darwin_arm64.go b/vendor/github.com/klauspost/cpuid/v2/os_darwin_arm64.go
index 8d2cb036..84b1acd2 100644
--- a/vendor/github.com/klauspost/cpuid/v2/os_darwin_arm64.go
+++ b/vendor/github.com/klauspost/cpuid/v2/os_darwin_arm64.go
@@ -2,18 +2,120 @@
 
 package cpuid
 
-import "runtime"
+import (
+	"runtime"
+	"strings"
+
+	"golang.org/x/sys/unix"
+)
 
 func detectOS(c *CPUInfo) bool {
+	if runtime.GOOS != "ios" {
+		tryToFillCPUInfoFomSysctl(c)
+	}
 	// There are no hw.optional sysctl values for the below features on Mac OS 11.0
 	// to detect their supported state dynamically. Assume the CPU features that
 	// Apple Silicon M1 supports to be available as a minimal set of features
 	// to all Go programs running on darwin/arm64.
 	// TODO: Add more if we know them.
 	c.featureSet.setIf(runtime.GOOS != "ios", AESARM, PMULL, SHA1, SHA2)
-	c.PhysicalCores = runtime.NumCPU()
-	// For now assuming 1 thread per core...
-	c.ThreadsPerCore = 1
-	c.LogicalCores = c.PhysicalCores
+
 	return true
 }
+
+func sysctlGetBool(name string) bool {
+	value, err := unix.SysctlUint32(name)
+	if err != nil {
+		return false
+	}
+	return value != 0
+}
+
+func sysctlGetString(name string) string {
+	value, err := unix.Sysctl(name)
+	if err != nil {
+		return ""
+	}
+	return value
+}
+
+func sysctlGetInt(unknown int, names ...string) int {
+	for _, name := range names {
+		value, err := unix.SysctlUint32(name)
+		if err != nil {
+			continue
+		}
+		if value != 0 {
+			return int(value)
+		}
+	}
+	return unknown
+}
+
+func sysctlGetInt64(unknown int, names ...string) int {
+	for _, name := range names {
+		value64, err := unix.SysctlUint64(name)
+		if err != nil {
+			continue
+		}
+		if int(value64) != unknown {
+			return int(value64)
+		}
+	}
+	return unknown
+}
+
+func setFeature(c *CPUInfo, name string, feature FeatureID) {
+	c.featureSet.setIf(sysctlGetBool(name), feature)
+}
+func tryToFillCPUInfoFomSysctl(c *CPUInfo) {
+	c.BrandName = sysctlGetString("machdep.cpu.brand_string")
+
+	if len(c.BrandName) != 0 {
+		c.VendorString = strings.Fields(c.BrandName)[0]
+	}
+
+	c.PhysicalCores = sysctlGetInt(runtime.NumCPU(), "hw.physicalcpu")
+	c.ThreadsPerCore = sysctlGetInt(1, "machdep.cpu.thread_count", "kern.num_threads") /
+		sysctlGetInt(1, "hw.physicalcpu")
+	c.LogicalCores = sysctlGetInt(runtime.NumCPU(), "machdep.cpu.core_count")
+	c.Family = sysctlGetInt(0, "machdep.cpu.family", "hw.cpufamily")
+	c.Model = sysctlGetInt(0, "machdep.cpu.model")
+	c.CacheLine = sysctlGetInt64(0, "hw.cachelinesize")
+	c.Cache.L1I = sysctlGetInt64(-1, "hw.l1icachesize")
+	c.Cache.L1D = sysctlGetInt64(-1, "hw.l1dcachesize")
+	c.Cache.L2 = sysctlGetInt64(-1, "hw.l2cachesize")
+	c.Cache.L3 = sysctlGetInt64(-1, "hw.l3cachesize")
+
+	// from https://developer.arm.com/downloads/-/exploration-tools/feature-names-for-a-profile
+	setFeature(c, "hw.optional.arm.FEAT_AES", AESARM)
+	setFeature(c, "hw.optional.AdvSIMD", ASIMD)
+	setFeature(c, "hw.optional.arm.FEAT_DotProd", ASIMDDP)
+	setFeature(c, "hw.optional.arm.FEAT_RDM", ASIMDRDM)
+	setFeature(c, "hw.optional.FEAT_CRC32", CRC32)
+	setFeature(c, "hw.optional.arm.FEAT_DPB", DCPOP)
+	// setFeature(c, "", EVTSTRM)
+	setFeature(c, "hw.optional.arm.FEAT_FCMA", FCMA)
+	setFeature(c, "hw.optional.arm.FEAT_FP", FP)
+	setFeature(c, "hw.optional.arm.FEAT_FP16", FPHP)
+	setFeature(c, "hw.optional.arm.FEAT_PAuth", GPA)
+	setFeature(c, "hw.optional.arm.FEAT_JSCVT", JSCVT)
+	setFeature(c, "hw.optional.arm.FEAT_LRCPC", LRCPC)
+	setFeature(c, "hw.optional.arm.FEAT_PMULL", PMULL)
+	setFeature(c, "hw.optional.arm.FEAT_SHA1", SHA1)
+	setFeature(c, "hw.optional.arm.FEAT_SHA256", SHA2)
+	setFeature(c, "hw.optional.arm.FEAT_SHA3", SHA3)
+	setFeature(c, "hw.optional.arm.FEAT_SHA512", SHA512)
+	// setFeature(c, "", SM3)
+	// setFeature(c, "", SM4)
+	setFeature(c, "hw.optional.arm.FEAT_SVE", SVE)
+
+	// from empirical observation
+	setFeature(c, "hw.optional.AdvSIMD_HPFPCvt", ASIMDHP)
+	setFeature(c, "hw.optional.armv8_1_atomics", ATOMICS)
+	setFeature(c, "hw.optional.floatingpoint", FP)
+	setFeature(c, "hw.optional.armv8_2_sha3", SHA3)
+	setFeature(c, "hw.optional.armv8_2_sha512", SHA512)
+	setFeature(c, "hw.optional.armv8_3_compnum", FCMA)
+	setFeature(c, "hw.optional.armv8_crc32", CRC32)
+}
diff --git a/vendor/github.com/kyokomi/emoji/v2/emoji.go b/vendor/github.com/kyokomi/emoji/v2/emoji.go
index 6913a2ea..245e2f0e 100644
--- a/vendor/github.com/kyokomi/emoji/v2/emoji.go
+++ b/vendor/github.com/kyokomi/emoji/v2/emoji.go
@@ -49,7 +49,8 @@ func NormalizeShortCode(shortCode string) string {
 // regular expression that matches :flag-[countrycode]:
 var flagRegexp = regexp.MustCompile(":flag-([a-z]{2}):")
 
-func emojize(x string) string {
+// Emojize Converts the string passed as an argument to a emoji. For unsupported emoji, the string passed as an argument is returned as is.
+func Emojize(x string) string {
 	str, ok := emojiCode()[x]
 	if ok {
 		return str + ReplacePadding
@@ -83,7 +84,7 @@ func replaseEmoji(input *bytes.Buffer) string {
 		case unicode.IsSpace(i):
 			return emoji.String()
 		case i == ':':
-			return emojize(emoji.String())
+			return Emojize(emoji.String())
 		}
 	}
 }
diff --git a/vendor/github.com/labstack/echo/v4/.travis.yml b/vendor/github.com/labstack/echo/v4/.travis.yml
deleted file mode 100644
index 67d45ad7..00000000
--- a/vendor/github.com/labstack/echo/v4/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-arch:
-  - amd64
-  - ppc64le
-  
-language: go
-go:
-  - 1.14.x
-  - 1.15.x
-  - tip
-env:
-  - GO111MODULE=on
-install:
-  - go get -v golang.org/x/lint/golint
-script:
-  - golint -set_exit_status ./...
-  - go test -race -coverprofile=coverage.txt -covermode=atomic ./...
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
-matrix:
-  allow_failures:
-    - go: tip
diff --git a/vendor/github.com/labstack/echo/v4/CHANGELOG.md b/vendor/github.com/labstack/echo/v4/CHANGELOG.md
index c1c3c107..83184249 100644
--- a/vendor/github.com/labstack/echo/v4/CHANGELOG.md
+++ b/vendor/github.com/labstack/echo/v4/CHANGELOG.md
@@ -1,5 +1,32 @@
 # Changelog
 
+## v4.10.2 - 2023-02-22
+
+**Security**
+
+* `filepath.Clean` behaviour has changed in Go 1.20 - adapt to it [#2406](https://github.com/labstack/echo/pull/2406)
+* Add `middleware.CORSConfig.UnsafeWildcardOriginWithAllowCredentials` to make UNSAFE usages of wildcard origin + allow cretentials less likely [#2405](https://github.com/labstack/echo/pull/2405)
+
+**Enhancements**
+
+* Add more HTTP error values [#2277](https://github.com/labstack/echo/pull/2277)
+
+
+## v4.10.1 - 2023-02-19
+
+**Security**
+
+* Upgrade deps due to the latest golang.org/x/net vulnerability [#2402](https://github.com/labstack/echo/pull/2402)
+
+
+**Enhancements**
+
+* Add new JWT repository to the README [#2377](https://github.com/labstack/echo/pull/2377)
+* Return an empty string for ctx.path if there is no registered path [#2385](https://github.com/labstack/echo/pull/2385)
+* Add context timeout middleware [#2380](https://github.com/labstack/echo/pull/2380)
+* Update link to jaegertracing [#2394](https://github.com/labstack/echo/pull/2394)
+
+
 ## v4.10.0 - 2022-12-27
 
 **Security**
diff --git a/vendor/github.com/labstack/echo/v4/README.md b/vendor/github.com/labstack/echo/v4/README.md
index 509b9735..fe78b6ed 100644
--- a/vendor/github.com/labstack/echo/v4/README.md
+++ b/vendor/github.com/labstack/echo/v4/README.md
@@ -11,12 +11,12 @@
 
 ## Supported Go versions
 
-Latest version of Echo supports last four Go major [releases](https://go.dev/doc/devel/release) and might work with older versions.
+Latest version of Echo supports last four Go major [releases](https://go.dev/doc/devel/release) and might work with
+older versions.
 
 As of version 4.0.0, Echo is available as a [Go module](https://github.com/golang/go/wiki/Modules).
 Therefore a Go version capable of understanding /vN suffixed imports is required:
 
-
 Any of these versions will allow you to import Echo as `github.com/labstack/echo/v4` which is the recommended
 way of using Echo going forward.
 
@@ -90,18 +90,29 @@ func hello(c echo.Context) error {
 }
 ```
 
-# Third-party middlewares
+# Official middleware repositories
 
-| Repository                                                                                           | Description                                                                                                                                                                                                                                                                                                                                  |
-|------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [github.com/labstack/echo-contrib](https://github.com/labstack/echo-contrib)                         | (by Echo team) [casbin](https://github.com/casbin/casbin), [gorilla/sessions](https://github.com/gorilla/sessions), [jaegertracing](github.com/uber/jaeger-client-go), [prometheus](https://github.com/prometheus/client_golang/), [pprof](https://pkg.go.dev/net/http/pprof), [zipkin](https://github.com/openzipkin/zipkin-go) middlewares | 
-| [deepmap/oapi-codegen](https://github.com/deepmap/oapi-codegen)                                      | Automatically generate RESTful API documentation with [OpenAPI](https://swagger.io/specification/) Client and Server Code Generator                                                                                                                                                                                                          |
-| [github.com/swaggo/echo-swagger](https://github.com/swaggo/echo-swagger)                             | Automatically generate RESTful API documentation with [Swagger](https://swagger.io/) 2.0.                                                                                                                                                                                                                                                    |
-| [github.com/ziflex/lecho](https://github.com/ziflex/lecho)                                           | [Zerolog](https://github.com/rs/zerolog) logging library wrapper for Echo logger interface.                                                                                                                                                                                                                                                  |
-| [github.com/brpaz/echozap](https://github.com/brpaz/echozap)                                         | Uber´s [Zap](https://github.com/uber-go/zap) logging library wrapper for Echo logger interface.                                                                                                                                                                                                                                              |
-| [github.com/darkweak/souin/plugins/echo](https://github.com/darkweak/souin/tree/master/plugins/echo) | HTTP cache system based on [Souin](https://github.com/darkweak/souin) to automatically get your endpoints cached. It supports some distributed and non-distributed storage systems depending your needs.                                                                                                                                     |
-| [github.com/mikestefanello/pagoda](https://github.com/mikestefanello/pagoda)                         | Rapid, easy full-stack web development starter kit built with Echo.                                                                                                                                                                                                                                                                          |
-| [github.com/go-woo/protoc-gen-echo](https://github.com/go-woo/protoc-gen-echo)                       | ProtoBuf generate Echo server side code                                                                                                                                                                                                                                                                                                      |
+Following list of middleware is maintained by Echo team.
+
+| Repository                                                                   | Description                                                                                                                                                                                                                                                                                                                   |
+|------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [github.com/labstack/echo-jwt](https://github.com/labstack/echo-jwt)         | [JWT](https://github.com/golang-jwt/jwt) middleware                                                                                                                                                                                                                                                                           | 
+| [github.com/labstack/echo-contrib](https://github.com/labstack/echo-contrib) | [casbin](https://github.com/casbin/casbin), [gorilla/sessions](https://github.com/gorilla/sessions), [jaegertracing](https://github.com/uber/jaeger-client-go), [prometheus](https://github.com/prometheus/client_golang/), [pprof](https://pkg.go.dev/net/http/pprof), [zipkin](https://github.com/openzipkin/zipkin-go) middlewares | 
+
+# Third-party middleware repositories
+
+Be careful when adding 3rd party middleware. Echo teams does not have time or manpower to guarantee safety and quality
+of middlewares in this list.
+
+| Repository                                                                                           | Description                                                                                                                                                                                              |
+|------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [deepmap/oapi-codegen](https://github.com/deepmap/oapi-codegen)                                      | Automatically generate RESTful API documentation with [OpenAPI](https://swagger.io/specification/) Client and Server Code Generator                                                                      |
+| [github.com/swaggo/echo-swagger](https://github.com/swaggo/echo-swagger)                             | Automatically generate RESTful API documentation with [Swagger](https://swagger.io/) 2.0.                                                                                                                |
+| [github.com/ziflex/lecho](https://github.com/ziflex/lecho)                                           | [Zerolog](https://github.com/rs/zerolog) logging library wrapper for Echo logger interface.                                                                                                              |
+| [github.com/brpaz/echozap](https://github.com/brpaz/echozap)                                         | Uber´s [Zap](https://github.com/uber-go/zap) logging library wrapper for Echo logger interface.                                                                                                          |
+| [github.com/darkweak/souin/plugins/echo](https://github.com/darkweak/souin/tree/master/plugins/echo) | HTTP cache system based on [Souin](https://github.com/darkweak/souin) to automatically get your endpoints cached. It supports some distributed and non-distributed storage systems depending your needs. |
+| [github.com/mikestefanello/pagoda](https://github.com/mikestefanello/pagoda)                         | Rapid, easy full-stack web development starter kit built with Echo.                                                                                                                                      |
+| [github.com/go-woo/protoc-gen-echo](https://github.com/go-woo/protoc-gen-echo)                       | ProtoBuf generate Echo server side code                                                                                                                                                                  |
 
 Please send a PR to add your own library here.
 
diff --git a/vendor/github.com/labstack/echo/v4/echo.go b/vendor/github.com/labstack/echo/v4/echo.go
index f6d89b96..085a3a7f 100644
--- a/vendor/github.com/labstack/echo/v4/echo.go
+++ b/vendor/github.com/labstack/echo/v4/echo.go
@@ -258,7 +258,7 @@ const (
 
 const (
 	// Version of Echo
-	Version = "4.10.0"
+	Version = "4.10.2"
 	website = "https://echo.labstack.com"
 	// http://patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Echo
 	banner = `
@@ -291,24 +291,53 @@ var (
 
 // Errors
 var (
-	ErrUnsupportedMediaType        = NewHTTPError(http.StatusUnsupportedMediaType)
-	ErrNotFound                    = NewHTTPError(http.StatusNotFound)
-	ErrUnauthorized                = NewHTTPError(http.StatusUnauthorized)
-	ErrForbidden                   = NewHTTPError(http.StatusForbidden)
-	ErrMethodNotAllowed            = NewHTTPError(http.StatusMethodNotAllowed)
-	ErrStatusRequestEntityTooLarge = NewHTTPError(http.StatusRequestEntityTooLarge)
-	ErrTooManyRequests             = NewHTTPError(http.StatusTooManyRequests)
-	ErrBadRequest                  = NewHTTPError(http.StatusBadRequest)
-	ErrBadGateway                  = NewHTTPError(http.StatusBadGateway)
-	ErrInternalServerError         = NewHTTPError(http.StatusInternalServerError)
-	ErrRequestTimeout              = NewHTTPError(http.StatusRequestTimeout)
-	ErrServiceUnavailable          = NewHTTPError(http.StatusServiceUnavailable)
-	ErrValidatorNotRegistered      = errors.New("validator not registered")
-	ErrRendererNotRegistered       = errors.New("renderer not registered")
-	ErrInvalidRedirectCode         = errors.New("invalid redirect status code")
-	ErrCookieNotFound              = errors.New("cookie not found")
-	ErrInvalidCertOrKeyType        = errors.New("invalid cert or key type, must be string or []byte")
-	ErrInvalidListenerNetwork      = errors.New("invalid listener network")
+	ErrBadRequest                    = NewHTTPError(http.StatusBadRequest)                    // HTTP 400 Bad Request
+	ErrUnauthorized                  = NewHTTPError(http.StatusUnauthorized)                  // HTTP 401 Unauthorized
+	ErrPaymentRequired               = NewHTTPError(http.StatusPaymentRequired)               // HTTP 402 Payment Required
+	ErrForbidden                     = NewHTTPError(http.StatusForbidden)                     // HTTP 403 Forbidden
+	ErrNotFound                      = NewHTTPError(http.StatusNotFound)                      // HTTP 404 Not Found
+	ErrMethodNotAllowed              = NewHTTPError(http.StatusMethodNotAllowed)              // HTTP 405 Method Not Allowed
+	ErrNotAcceptable                 = NewHTTPError(http.StatusNotAcceptable)                 // HTTP 406 Not Acceptable
+	ErrProxyAuthRequired             = NewHTTPError(http.StatusProxyAuthRequired)             // HTTP 407 Proxy AuthRequired
+	ErrRequestTimeout                = NewHTTPError(http.StatusRequestTimeout)                // HTTP 408 Request Timeout
+	ErrConflict                      = NewHTTPError(http.StatusConflict)                      // HTTP 409 Conflict
+	ErrGone                          = NewHTTPError(http.StatusGone)                          // HTTP 410 Gone
+	ErrLengthRequired                = NewHTTPError(http.StatusLengthRequired)                // HTTP 411 Length Required
+	ErrPreconditionFailed            = NewHTTPError(http.StatusPreconditionFailed)            // HTTP 412 Precondition Failed
+	ErrStatusRequestEntityTooLarge   = NewHTTPError(http.StatusRequestEntityTooLarge)         // HTTP 413 Payload Too Large
+	ErrRequestURITooLong             = NewHTTPError(http.StatusRequestURITooLong)             // HTTP 414 URI Too Long
+	ErrUnsupportedMediaType          = NewHTTPError(http.StatusUnsupportedMediaType)          // HTTP 415 Unsupported Media Type
+	ErrRequestedRangeNotSatisfiable  = NewHTTPError(http.StatusRequestedRangeNotSatisfiable)  // HTTP 416 Range Not Satisfiable
+	ErrExpectationFailed             = NewHTTPError(http.StatusExpectationFailed)             // HTTP 417 Expectation Failed
+	ErrTeapot                        = NewHTTPError(http.StatusTeapot)                        // HTTP 418 I'm a teapot
+	ErrMisdirectedRequest            = NewHTTPError(http.StatusMisdirectedRequest)            // HTTP 421 Misdirected Request
+	ErrUnprocessableEntity           = NewHTTPError(http.StatusUnprocessableEntity)           // HTTP 422 Unprocessable Entity
+	ErrLocked                        = NewHTTPError(http.StatusLocked)                        // HTTP 423 Locked
+	ErrFailedDependency              = NewHTTPError(http.StatusFailedDependency)              // HTTP 424 Failed Dependency
+	ErrTooEarly                      = NewHTTPError(http.StatusTooEarly)                      // HTTP 425 Too Early
+	ErrUpgradeRequired               = NewHTTPError(http.StatusUpgradeRequired)               // HTTP 426 Upgrade Required
+	ErrPreconditionRequired          = NewHTTPError(http.StatusPreconditionRequired)          // HTTP 428 Precondition Required
+	ErrTooManyRequests               = NewHTTPError(http.StatusTooManyRequests)               // HTTP 429 Too Many Requests
+	ErrRequestHeaderFieldsTooLarge   = NewHTTPError(http.StatusRequestHeaderFieldsTooLarge)   // HTTP 431 Request Header Fields Too Large
+	ErrUnavailableForLegalReasons    = NewHTTPError(http.StatusUnavailableForLegalReasons)    // HTTP 451 Unavailable For Legal Reasons
+	ErrInternalServerError           = NewHTTPError(http.StatusInternalServerError)           // HTTP 500 Internal Server Error
+	ErrNotImplemented                = NewHTTPError(http.StatusNotImplemented)                // HTTP 501 Not Implemented
+	ErrBadGateway                    = NewHTTPError(http.StatusBadGateway)                    // HTTP 502 Bad Gateway
+	ErrServiceUnavailable            = NewHTTPError(http.StatusServiceUnavailable)            // HTTP 503 Service Unavailable
+	ErrGatewayTimeout                = NewHTTPError(http.StatusGatewayTimeout)                // HTTP 504 Gateway Timeout
+	ErrHTTPVersionNotSupported       = NewHTTPError(http.StatusHTTPVersionNotSupported)       // HTTP 505 HTTP Version Not Supported
+	ErrVariantAlsoNegotiates         = NewHTTPError(http.StatusVariantAlsoNegotiates)         // HTTP 506 Variant Also Negotiates
+	ErrInsufficientStorage           = NewHTTPError(http.StatusInsufficientStorage)           // HTTP 507 Insufficient Storage
+	ErrLoopDetected                  = NewHTTPError(http.StatusLoopDetected)                  // HTTP 508 Loop Detected
+	ErrNotExtended                   = NewHTTPError(http.StatusNotExtended)                   // HTTP 510 Not Extended
+	ErrNetworkAuthenticationRequired = NewHTTPError(http.StatusNetworkAuthenticationRequired) // HTTP 511 Network Authentication Required
+
+	ErrValidatorNotRegistered = errors.New("validator not registered")
+	ErrRendererNotRegistered  = errors.New("renderer not registered")
+	ErrInvalidRedirectCode    = errors.New("invalid redirect status code")
+	ErrCookieNotFound         = errors.New("cookie not found")
+	ErrInvalidCertOrKeyType   = errors.New("invalid cert or key type, must be string or []byte")
+	ErrInvalidListenerNetwork = errors.New("invalid listener network")
 )
 
 // Error handlers
diff --git a/vendor/github.com/labstack/echo/v4/middleware/context_timeout.go b/vendor/github.com/labstack/echo/v4/middleware/context_timeout.go
new file mode 100644
index 00000000..be260e18
--- /dev/null
+++ b/vendor/github.com/labstack/echo/v4/middleware/context_timeout.go
@@ -0,0 +1,72 @@
+package middleware
+
+import (
+	"context"
+	"errors"
+	"time"
+
+	"github.com/labstack/echo/v4"
+)
+
+// ContextTimeoutConfig defines the config for ContextTimeout middleware.
+type ContextTimeoutConfig struct {
+	// Skipper defines a function to skip middleware.
+	Skipper Skipper
+
+	// ErrorHandler is a function when error aries in middeware execution.
+	ErrorHandler func(err error, c echo.Context) error
+
+	// Timeout configures a timeout for the middleware, defaults to 0 for no timeout
+	Timeout time.Duration
+}
+
+// ContextTimeout returns a middleware which returns error (503 Service Unavailable error) to client
+// when underlying method returns context.DeadlineExceeded error.
+func ContextTimeout(timeout time.Duration) echo.MiddlewareFunc {
+	return ContextTimeoutWithConfig(ContextTimeoutConfig{Timeout: timeout})
+}
+
+// ContextTimeoutWithConfig returns a Timeout middleware with config.
+func ContextTimeoutWithConfig(config ContextTimeoutConfig) echo.MiddlewareFunc {
+	mw, err := config.ToMiddleware()
+	if err != nil {
+		panic(err)
+	}
+	return mw
+}
+
+// ToMiddleware converts Config to middleware.
+func (config ContextTimeoutConfig) ToMiddleware() (echo.MiddlewareFunc, error) {
+	if config.Timeout == 0 {
+		return nil, errors.New("timeout must be set")
+	}
+	if config.Skipper == nil {
+		config.Skipper = DefaultSkipper
+	}
+	if config.ErrorHandler == nil {
+		config.ErrorHandler = func(err error, c echo.Context) error {
+			if err != nil && errors.Is(err, context.DeadlineExceeded) {
+				return echo.ErrServiceUnavailable.WithInternal(err)
+			}
+			return err
+		}
+	}
+
+	return func(next echo.HandlerFunc) echo.HandlerFunc {
+		return func(c echo.Context) error {
+			if config.Skipper(c) {
+				return next(c)
+			}
+
+			timeoutContext, cancel := context.WithTimeout(c.Request().Context(), config.Timeout)
+			defer cancel()
+
+			c.SetRequest(c.Request().WithContext(timeoutContext))
+
+			if err := next(c); err != nil {
+				return config.ErrorHandler(err, c)
+			}
+			return nil
+		}
+	}, nil
+}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/cors.go b/vendor/github.com/labstack/echo/v4/middleware/cors.go
index 25cf983a..149de347 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/cors.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/cors.go
@@ -79,6 +79,15 @@ type (
 		// See also: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials
 		AllowCredentials bool `yaml:"allow_credentials"`
 
+		// UnsafeWildcardOriginWithAllowCredentials UNSAFE/INSECURE: allows wildcard '*' origin to be used with AllowCredentials
+		// flag. In that case we consider any origin allowed and send it back to the client with `Access-Control-Allow-Origin` header.
+		//
+		// This is INSECURE and potentially leads to [cross-origin](https://portswigger.net/research/exploiting-cors-misconfigurations-for-bitcoins-and-bounties)
+		// attacks. See: https://github.com/labstack/echo/issues/2400 for discussion on the subject.
+		//
+		// Optional. Default value is false.
+		UnsafeWildcardOriginWithAllowCredentials bool `yaml:"unsafe_wildcard_origin_with_allow_credentials"`
+
 		// ExposeHeaders determines the value of Access-Control-Expose-Headers, which
 		// defines a list of headers that clients are allowed to access.
 		//
@@ -203,7 +212,7 @@ func CORSWithConfig(config CORSConfig) echo.MiddlewareFunc {
 			} else {
 				// Check allowed origins
 				for _, o := range config.AllowOrigins {
-					if o == "*" && config.AllowCredentials {
+					if o == "*" && config.AllowCredentials && config.UnsafeWildcardOriginWithAllowCredentials {
 						allowOrigin = origin
 						break
 					}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/csrf.go b/vendor/github.com/labstack/echo/v4/middleware/csrf.go
index 8661c9f8..6899700c 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/csrf.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/csrf.go
@@ -119,9 +119,9 @@ func CSRFWithConfig(config CSRFConfig) echo.MiddlewareFunc {
 		config.CookieSecure = true
 	}
 
-	extractors, err := CreateExtractors(config.TokenLookup)
-	if err != nil {
-		panic(err)
+	extractors, cErr := CreateExtractors(config.TokenLookup)
+	if cErr != nil {
+		panic(cErr)
 	}
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
diff --git a/vendor/github.com/labstack/echo/v4/middleware/jwt.go b/vendor/github.com/labstack/echo/v4/middleware/jwt.go
index bd628264..bc318c97 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/jwt.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/jwt.go
@@ -196,9 +196,9 @@ func JWTWithConfig(config JWTConfig) echo.MiddlewareFunc {
 		config.ParseTokenFunc = config.defaultParseToken
 	}
 
-	extractors, err := createExtractors(config.TokenLookup, config.AuthScheme)
-	if err != nil {
-		panic(err)
+	extractors, cErr := createExtractors(config.TokenLookup, config.AuthScheme)
+	if cErr != nil {
+		panic(cErr)
 	}
 	if len(config.TokenLookupFuncs) > 0 {
 		extractors = append(config.TokenLookupFuncs, extractors...)
diff --git a/vendor/github.com/labstack/echo/v4/middleware/key_auth.go b/vendor/github.com/labstack/echo/v4/middleware/key_auth.go
index e8a6b085..f6fcc5d6 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/key_auth.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/key_auth.go
@@ -108,9 +108,9 @@ func KeyAuthWithConfig(config KeyAuthConfig) echo.MiddlewareFunc {
 		panic("echo: key-auth middleware requires a validator function")
 	}
 
-	extractors, err := createExtractors(config.KeyLookup, config.AuthScheme)
-	if err != nil {
-		panic(err)
+	extractors, cErr := createExtractors(config.KeyLookup, config.AuthScheme)
+	if cErr != nil {
+		panic(cErr)
 	}
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
diff --git a/vendor/github.com/labstack/echo/v4/middleware/static.go b/vendor/github.com/labstack/echo/v4/middleware/static.go
index 27ccf411..24a5f59b 100644
--- a/vendor/github.com/labstack/echo/v4/middleware/static.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/static.go
@@ -8,7 +8,6 @@ import (
 	"net/url"
 	"os"
 	"path"
-	"path/filepath"
 	"strings"
 
 	"github.com/labstack/echo/v4"
@@ -157,9 +156,9 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
 	}
 
 	// Index template
-	t, err := template.New("index").Parse(html)
-	if err != nil {
-		panic(fmt.Sprintf("echo: %v", err))
+	t, tErr := template.New("index").Parse(html)
+	if tErr != nil {
+		panic(fmt.Errorf("echo: %w", tErr))
 	}
 
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
@@ -176,7 +175,7 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
 			if err != nil {
 				return
 			}
-			name := filepath.Join(config.Root, filepath.Clean("/"+p)) // "/"+ for security
+			name := path.Join(config.Root, path.Clean("/"+p)) // "/"+ for security
 
 			if config.IgnoreBase {
 				routePath := path.Base(strings.TrimRight(c.Path(), "/*"))
@@ -187,12 +186,14 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
 				}
 			}
 
-			file, err := openFile(config.Filesystem, name)
+			file, err := config.Filesystem.Open(name)
 			if err != nil {
-				if !os.IsNotExist(err) {
+				if !isIgnorableOpenFileError(err) {
 					return err
 				}
 
+				// file with that path did not exist, so we continue down in middleware/handler chain, hoping that we end up in
+				// handler that is meant to handle this request
 				if err = next(c); err == nil {
 					return err
 				}
@@ -202,7 +203,7 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
 					return err
 				}
 
-				file, err = openFile(config.Filesystem, filepath.Join(config.Root, config.Index))
+				file, err = config.Filesystem.Open(path.Join(config.Root, config.Index))
 				if err != nil {
 					return err
 				}
@@ -216,15 +217,13 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
 			}
 
 			if info.IsDir() {
-				index, err := openFile(config.Filesystem, filepath.Join(name, config.Index))
+				index, err := config.Filesystem.Open(path.Join(name, config.Index))
 				if err != nil {
 					if config.Browse {
 						return listDir(t, name, file, c.Response())
 					}
 
-					if os.IsNotExist(err) {
-						return next(c)
-					}
+					return next(c)
 				}
 
 				defer index.Close()
@@ -242,11 +241,6 @@ func StaticWithConfig(config StaticConfig) echo.MiddlewareFunc {
 	}
 }
 
-func openFile(fs http.FileSystem, name string) (http.File, error) {
-	pathWithSlashes := filepath.ToSlash(name)
-	return fs.Open(pathWithSlashes)
-}
-
 func serveFile(c echo.Context, file http.File, info os.FileInfo) error {
 	http.ServeContent(c.Response(), c.Request(), info.Name(), info.ModTime(), file)
 	return nil
diff --git a/vendor/github.com/labstack/echo/v4/middleware/static_other.go b/vendor/github.com/labstack/echo/v4/middleware/static_other.go
new file mode 100644
index 00000000..0337b22a
--- /dev/null
+++ b/vendor/github.com/labstack/echo/v4/middleware/static_other.go
@@ -0,0 +1,12 @@
+//go:build !windows
+
+package middleware
+
+import (
+	"os"
+)
+
+// We ignore these errors as there could be handler that matches request path.
+func isIgnorableOpenFileError(err error) bool {
+	return os.IsNotExist(err)
+}
diff --git a/vendor/github.com/labstack/echo/v4/middleware/static_windows.go b/vendor/github.com/labstack/echo/v4/middleware/static_windows.go
new file mode 100644
index 00000000..0ab11985
--- /dev/null
+++ b/vendor/github.com/labstack/echo/v4/middleware/static_windows.go
@@ -0,0 +1,23 @@
+package middleware
+
+import (
+	"os"
+)
+
+// We ignore these errors as there could be handler that matches request path.
+//
+// As of Go 1.20 filepath.Clean has different behaviour on OS related filesystems so we need to use path.Clean
+// on Windows which has some caveats. The Open methods might return different errors than earlier versions and
+// as of 1.20 path checks are more strict on the provided path and considers [UNC](https://en.wikipedia.org/wiki/Path_(computing)#UNC)
+// paths with missing host etc parts as invalid. Previously it would result you `fs.ErrNotExist`.
+//
+// For 1.20@Windows we need to treat those errors the same as `fs.ErrNotExists` so we can continue handling
+// errors in the middleware/handler chain. Otherwise we might end up with status 500 instead of finding a route
+// or return 404 not found.
+func isIgnorableOpenFileError(err error) bool {
+	if os.IsNotExist(err) {
+		return true
+	}
+	errTxt := err.Error()
+	return errTxt == "http: invalid or unsafe file path" || errTxt == "invalid path"
+}
diff --git a/vendor/github.com/labstack/echo/v4/router.go b/vendor/github.com/labstack/echo/v4/router.go
index 86a986a2..597660d3 100644
--- a/vendor/github.com/labstack/echo/v4/router.go
+++ b/vendor/github.com/labstack/echo/v4/router.go
@@ -524,7 +524,6 @@ func optionsMethodHandler(allowMethods string) func(c Context) error {
 // - Return it `Echo#ReleaseContext()`.
 func (r *Router) Find(method, path string, c Context) {
 	ctx := c.(*context)
-	ctx.path = path
 	currentNode := r.tree // Current node as root
 
 	var (
diff --git a/vendor/github.com/matterbridge/matterclient/channels.go b/vendor/github.com/matterbridge/matterclient/channels.go
index 6bf22a68..c1facf8b 100644
--- a/vendor/github.com/matterbridge/matterclient/channels.go
+++ b/vendor/github.com/matterbridge/matterclient/channels.go
@@ -80,7 +80,14 @@ func (m *Client) getChannelIDTeam(name string, teamID string) string {
 		}
 	}
 
-	return ""
+	// Fallback if it's not found in the t.Channels or t.MoreChannels cache.
+	// This also let's us join private channels.
+	channel, _, err := m.Client.GetChannelByName(name, teamID, "")
+	if err != nil {
+		return ""
+	}
+
+	return channel.Id
 }
 
 func (m *Client) GetChannelName(channelID string) string {
@@ -224,8 +231,13 @@ func (m *Client) UpdateChannelsTeam(teamID string) error {
 		}
 	}
 
+	idx := 0
+	max := 200
+
+	var moreChannels []*model.Channel
+
 	for {
-		mmchannels, resp, err = m.Client.GetPublicChannelsForTeam(teamID, 0, 5000, "")
+		mmchannels, resp, err = m.Client.GetPublicChannelsForTeam(teamID, idx, max, "")
 		if err == nil {
 			break
 		}
@@ -235,10 +247,27 @@ func (m *Client) UpdateChannelsTeam(teamID string) error {
 		}
 	}
 
+	for len(mmchannels) > 0 {
+		moreChannels = append(moreChannels, mmchannels...)
+
+		for {
+			mmchannels, resp, err = m.Client.GetPublicChannelsForTeam(teamID, idx, max, "")
+			if err == nil {
+				idx++
+
+				break
+			}
+
+			if err := m.HandleRatelimit("GetPublicChannelsForTeam", resp); err != nil {
+				return err
+			}
+		}
+	}
+
 	for idx, t := range m.OtherTeams {
 		if t.ID == teamID {
 			m.Lock()
-			m.OtherTeams[idx].MoreChannels = mmchannels
+			m.OtherTeams[idx].MoreChannels = moreChannels
 			m.Unlock()
 		}
 	}
@@ -252,6 +281,10 @@ func (m *Client) UpdateChannels() error {
 	}
 
 	for _, t := range m.OtherTeams {
+		// We've already populated users/channels for team in the above.
+		if t.ID == m.Team.ID {
+			continue
+		}
 		if err := m.UpdateChannelsTeam(t.ID); err != nil {
 			return err
 		}
diff --git a/vendor/github.com/matterbridge/matterclient/matterclient.go b/vendor/github.com/matterbridge/matterclient/matterclient.go
index 0652fe73..fe845efc 100644
--- a/vendor/github.com/matterbridge/matterclient/matterclient.go
+++ b/vendor/github.com/matterbridge/matterclient/matterclient.go
@@ -144,6 +144,10 @@ func (m *Client) Login() error {
 		return err
 	}
 
+	if err := m.initUserChannels(); err != nil {
+		return err
+	}
+
 	if m.Team == nil {
 		validTeamNames := make([]string, len(m.OtherTeams))
 		for i, t := range m.OtherTeams {
@@ -332,8 +336,11 @@ func (m *Client) initUser() error {
 
 			time.Sleep(time.Millisecond * 200)
 		}
-
-		m.logger.Infof("found %d users in team %s", len(usermap), team.Name)
+		m.logger.Debugf("found %d users in team %s", len(usermap), team.Name)
+		// add all users
+		for k, v := range usermap {
+			m.Users[k] = v
+		}
 
 		t := &Team{
 			Team:  team,
@@ -341,29 +348,25 @@ func (m *Client) initUser() error {
 			ID:    team.Id,
 		}
 
-		mmchannels, _, err := m.Client.GetChannelsForTeamForUser(team.Id, m.User.Id, false, "")
-		if err != nil {
-			return err
-		}
-
-		t.Channels = mmchannels
-
-		mmchannels, _, err = m.Client.GetPublicChannelsForTeam(team.Id, 0, 5000, "")
-		if err != nil {
-			return err
-		}
-
-		t.MoreChannels = mmchannels
 		m.OtherTeams = append(m.OtherTeams, t)
 
 		if team.Name == m.Credentials.Team {
 			m.Team = t
 			m.logger.Debugf("initUser(): found our team %s (id: %s)", team.Name, team.Id)
 		}
-		// add all users
-		for k, v := range t.Users {
-			m.Users[k] = v
-		}
+	}
+
+	return nil
+}
+
+func (m *Client) initUserChannels() error {
+	if err := m.UpdateChannels(); err != nil {
+		return err
+	}
+
+	for _, t := range m.OtherTeams {
+		m.logger.Debugf("found %d channels for user in team %s", len(t.Channels), t.Team.Name)
+		m.logger.Debugf("found %d public channels in team %s", len(t.MoreChannels), t.Team.Name)
 	}
 
 	return nil
diff --git a/vendor/github.com/mattn/go-isatty/isatty_bsd.go b/vendor/github.com/mattn/go-isatty/isatty_bsd.go
index 39bbcf00..d569c0c9 100644
--- a/vendor/github.com/mattn/go-isatty/isatty_bsd.go
+++ b/vendor/github.com/mattn/go-isatty/isatty_bsd.go
@@ -1,5 +1,5 @@
-//go:build (darwin || freebsd || openbsd || netbsd || dragonfly) && !appengine
-// +build darwin freebsd openbsd netbsd dragonfly
+//go:build (darwin || freebsd || openbsd || netbsd || dragonfly || hurd) && !appengine
+// +build darwin freebsd openbsd netbsd dragonfly hurd
 // +build !appengine
 
 package isatty
diff --git a/vendor/github.com/remyoudompheng/bigfft/README b/vendor/github.com/remyoudompheng/bigfft/README
index 303c6177..0fcd39d9 100644
--- a/vendor/github.com/remyoudompheng/bigfft/README
+++ b/vendor/github.com/remyoudompheng/bigfft/README
@@ -1,3 +1,14 @@
+This library is a toy proof-of-concept implementation of the
+well-known Schonhage-Strassen method for multiplying integers.
+It is not expected to have a real life usecase outside number
+theory computations, nor is it expected to be used in any production
+system.
+
+If you are using it in your project, you may want to carefully
+examine the actual requirement or problem you are trying to solve.
+
+# Comparison with the standard library and GMP
+
 Benchmarking math/big vs. bigfft
 
 Number size    old ns/op    new ns/op    delta
diff --git a/vendor/github.com/remyoudompheng/bigfft/arith_386.s b/vendor/github.com/remyoudompheng/bigfft/arith_386.s
deleted file mode 100644
index cc50a017..00000000
--- a/vendor/github.com/remyoudompheng/bigfft/arith_386.s
+++ /dev/null
@@ -1,36 +0,0 @@
-// Trampolines to math/big assembly implementations.
-
-#include "textflag.h"
-
-// func addVV(z, x, y []Word) (c Word)
-TEXT ·addVV(SB),NOSPLIT,$0
-	JMP	math∕big·addVV(SB)
-
-// func subVV(z, x, y []Word) (c Word)
-TEXT ·subVV(SB),NOSPLIT,$0
-	JMP	math∕big·subVV(SB)
-
-// func addVW(z, x []Word, y Word) (c Word)
-TEXT ·addVW(SB),NOSPLIT,$0
-	JMP	math∕big·addVW(SB)
-
-// func subVW(z, x []Word, y Word) (c Word)
-TEXT ·subVW(SB),NOSPLIT,$0
-	JMP	math∕big·subVW(SB)
-
-// func shlVU(z, x []Word, s uint) (c Word)
-TEXT ·shlVU(SB),NOSPLIT,$0
-	JMP	math∕big·shlVU(SB)
-
-// func shrVU(z, x []Word, s uint) (c Word)
-TEXT ·shrVU(SB),NOSPLIT,$0
-	JMP	math∕big·shrVU(SB)
-
-// func mulAddVWW(z, x []Word, y, r Word) (c Word)
-TEXT ·mulAddVWW(SB),NOSPLIT,$0
-	JMP	math∕big·mulAddVWW(SB)
-
-// func addMulVVW(z, x []Word, y Word) (c Word)
-TEXT ·addMulVVW(SB),NOSPLIT,$0
-	JMP	math∕big·addMulVVW(SB)
-
diff --git a/vendor/github.com/remyoudompheng/bigfft/arith_amd64.s b/vendor/github.com/remyoudompheng/bigfft/arith_amd64.s
deleted file mode 100644
index 0b79335f..00000000
--- a/vendor/github.com/remyoudompheng/bigfft/arith_amd64.s
+++ /dev/null
@@ -1,38 +0,0 @@
-// Trampolines to math/big assembly implementations.
-
-#include "textflag.h"
-
-// func addVV(z, x, y []Word) (c Word)
-TEXT ·addVV(SB),NOSPLIT,$0
-	JMP	math∕big·addVV(SB)
-
-// func subVV(z, x, y []Word) (c Word)
-// (same as addVV except for SBBQ instead of ADCQ and label names)
-TEXT ·subVV(SB),NOSPLIT,$0
-	JMP	math∕big·subVV(SB)
-
-// func addVW(z, x []Word, y Word) (c Word)
-TEXT ·addVW(SB),NOSPLIT,$0
-	JMP	math∕big·addVW(SB)
-
-// func subVW(z, x []Word, y Word) (c Word)
-// (same as addVW except for SUBQ/SBBQ instead of ADDQ/ADCQ and label names)
-TEXT ·subVW(SB),NOSPLIT,$0
-	JMP	math∕big·subVW(SB)
-
-// func shlVU(z, x []Word, s uint) (c Word)
-TEXT ·shlVU(SB),NOSPLIT,$0
-	JMP	math∕big·shlVU(SB)
-
-// func shrVU(z, x []Word, s uint) (c Word)
-TEXT ·shrVU(SB),NOSPLIT,$0
-	JMP	math∕big·shrVU(SB)
-
-// func mulAddVWW(z, x []Word, y, r Word) (c Word)
-TEXT ·mulAddVWW(SB),NOSPLIT,$0
-	JMP	math∕big·mulAddVWW(SB)
-
-// func addMulVVW(z, x []Word, y Word) (c Word)
-TEXT ·addMulVVW(SB),NOSPLIT,$0
-	JMP	math∕big·addMulVVW(SB)
-
diff --git a/vendor/github.com/remyoudompheng/bigfft/arith_arm.s b/vendor/github.com/remyoudompheng/bigfft/arith_arm.s
deleted file mode 100644
index 0ed60f5c..00000000
--- a/vendor/github.com/remyoudompheng/bigfft/arith_arm.s
+++ /dev/null
@@ -1,36 +0,0 @@
-// Trampolines to math/big assembly implementations.
-
-#include "textflag.h"
-
-// func addVV(z, x, y []Word) (c Word)
-TEXT ·addVV(SB),NOSPLIT,$0
-	B	math∕big·addVV(SB)
-
-// func subVV(z, x, y []Word) (c Word)
-TEXT ·subVV(SB),NOSPLIT,$0
-	B	math∕big·subVV(SB)
-
-// func addVW(z, x []Word, y Word) (c Word)
-TEXT ·addVW(SB),NOSPLIT,$0
-	B	math∕big·addVW(SB)
-
-// func subVW(z, x []Word, y Word) (c Word)
-TEXT ·subVW(SB),NOSPLIT,$0
-	B	math∕big·subVW(SB)
-
-// func shlVU(z, x []Word, s uint) (c Word)
-TEXT ·shlVU(SB),NOSPLIT,$0
-	B	math∕big·shlVU(SB)
-
-// func shrVU(z, x []Word, s uint) (c Word)
-TEXT ·shrVU(SB),NOSPLIT,$0
-	B	math∕big·shrVU(SB)
-
-// func mulAddVWW(z, x []Word, y, r Word) (c Word)
-TEXT ·mulAddVWW(SB),NOSPLIT,$0
-	B	math∕big·mulAddVWW(SB)
-
-// func addMulVVW(z, x []Word, y Word) (c Word)
-TEXT ·addMulVVW(SB),NOSPLIT,$0
-	B	math∕big·addMulVVW(SB)
-
diff --git a/vendor/github.com/remyoudompheng/bigfft/arith_arm64.s b/vendor/github.com/remyoudompheng/bigfft/arith_arm64.s
deleted file mode 100644
index 0ed60f5c..00000000
--- a/vendor/github.com/remyoudompheng/bigfft/arith_arm64.s
+++ /dev/null
@@ -1,36 +0,0 @@
-// Trampolines to math/big assembly implementations.
-
-#include "textflag.h"
-
-// func addVV(z, x, y []Word) (c Word)
-TEXT ·addVV(SB),NOSPLIT,$0
-	B	math∕big·addVV(SB)
-
-// func subVV(z, x, y []Word) (c Word)
-TEXT ·subVV(SB),NOSPLIT,$0
-	B	math∕big·subVV(SB)
-
-// func addVW(z, x []Word, y Word) (c Word)
-TEXT ·addVW(SB),NOSPLIT,$0
-	B	math∕big·addVW(SB)
-
-// func subVW(z, x []Word, y Word) (c Word)
-TEXT ·subVW(SB),NOSPLIT,$0
-	B	math∕big·subVW(SB)
-
-// func shlVU(z, x []Word, s uint) (c Word)
-TEXT ·shlVU(SB),NOSPLIT,$0
-	B	math∕big·shlVU(SB)
-
-// func shrVU(z, x []Word, s uint) (c Word)
-TEXT ·shrVU(SB),NOSPLIT,$0
-	B	math∕big·shrVU(SB)
-
-// func mulAddVWW(z, x []Word, y, r Word) (c Word)
-TEXT ·mulAddVWW(SB),NOSPLIT,$0
-	B	math∕big·mulAddVWW(SB)
-
-// func addMulVVW(z, x []Word, y Word) (c Word)
-TEXT ·addMulVVW(SB),NOSPLIT,$0
-	B	math∕big·addMulVVW(SB)
-
diff --git a/vendor/github.com/remyoudompheng/bigfft/arith_decl.go b/vendor/github.com/remyoudompheng/bigfft/arith_decl.go
index 7659b019..96937dff 100644
--- a/vendor/github.com/remyoudompheng/bigfft/arith_decl.go
+++ b/vendor/github.com/remyoudompheng/bigfft/arith_decl.go
@@ -4,13 +4,30 @@
 
 package bigfft
 
-import . "math/big"
+import (
+	"math/big"
+	_ "unsafe"
+)
 
-// implemented in arith_$GOARCH.s
+type Word = big.Word
+
+//go:linkname addVV math/big.addVV
 func addVV(z, x, y []Word) (c Word)
+
+//go:linkname subVV math/big.subVV
 func subVV(z, x, y []Word) (c Word)
+
+//go:linkname addVW math/big.addVW
 func addVW(z, x []Word, y Word) (c Word)
+
+//go:linkname subVW math/big.subVW
 func subVW(z, x []Word, y Word) (c Word)
+
+//go:linkname shlVU math/big.shlVU
 func shlVU(z, x []Word, s uint) (c Word)
+
+//go:linkname mulAddVWW math/big.mulAddVWW
 func mulAddVWW(z, x []Word, y, r Word) (c Word)
+
+//go:linkname addMulVVW math/big.addMulVVW
 func addMulVVW(z, x []Word, y Word) (c Word)
diff --git a/vendor/github.com/remyoudompheng/bigfft/arith_mips64x.s b/vendor/github.com/remyoudompheng/bigfft/arith_mips64x.s
deleted file mode 100644
index 82443882..00000000
--- a/vendor/github.com/remyoudompheng/bigfft/arith_mips64x.s
+++ /dev/null
@@ -1,40 +0,0 @@
-// Trampolines to math/big assembly implementations.
-
-// +build mips64 mips64le
-
-#include "textflag.h"
-
-// func addVV(z, x, y []Word) (c Word)
-TEXT ·addVV(SB),NOSPLIT,$0
-	JMP	math∕big·addVV(SB)
-
-// func subVV(z, x, y []Word) (c Word)
-// (same as addVV except for SBBQ instead of ADCQ and label names)
-TEXT ·subVV(SB),NOSPLIT,$0
-	JMP	math∕big·subVV(SB)
-
-// func addVW(z, x []Word, y Word) (c Word)
-TEXT ·addVW(SB),NOSPLIT,$0
-	JMP	math∕big·addVW(SB)
-
-// func subVW(z, x []Word, y Word) (c Word)
-// (same as addVW except for SUBQ/SBBQ instead of ADDQ/ADCQ and label names)
-TEXT ·subVW(SB),NOSPLIT,$0
-	JMP	math∕big·subVW(SB)
-
-// func shlVU(z, x []Word, s uint) (c Word)
-TEXT ·shlVU(SB),NOSPLIT,$0
-	JMP	math∕big·shlVU(SB)
-
-// func shrVU(z, x []Word, s uint) (c Word)
-TEXT ·shrVU(SB),NOSPLIT,$0
-	JMP	math∕big·shrVU(SB)
-
-// func mulAddVWW(z, x []Word, y, r Word) (c Word)
-TEXT ·mulAddVWW(SB),NOSPLIT,$0
-	JMP	math∕big·mulAddVWW(SB)
-
-// func addMulVVW(z, x []Word, y Word) (c Word)
-TEXT ·addMulVVW(SB),NOSPLIT,$0
-	JMP	math∕big·addMulVVW(SB)
-
diff --git a/vendor/github.com/remyoudompheng/bigfft/arith_mipsx.s b/vendor/github.com/remyoudompheng/bigfft/arith_mipsx.s
deleted file mode 100644
index 6c0e92e5..00000000
--- a/vendor/github.com/remyoudompheng/bigfft/arith_mipsx.s
+++ /dev/null
@@ -1,40 +0,0 @@
-// Trampolines to math/big assembly implementations.
-
-// +build mips mipsle
-
-#include "textflag.h"
-
-// func addVV(z, x, y []Word) (c Word)
-TEXT ·addVV(SB),NOSPLIT,$0
-	JMP	math∕big·addVV(SB)
-
-// func subVV(z, x, y []Word) (c Word)
-// (same as addVV except for SBBQ instead of ADCQ and label names)
-TEXT ·subVV(SB),NOSPLIT,$0
-	JMP	math∕big·subVV(SB)
-
-// func addVW(z, x []Word, y Word) (c Word)
-TEXT ·addVW(SB),NOSPLIT,$0
-	JMP	math∕big·addVW(SB)
-
-// func subVW(z, x []Word, y Word) (c Word)
-// (same as addVW except for SUBQ/SBBQ instead of ADDQ/ADCQ and label names)
-TEXT ·subVW(SB),NOSPLIT,$0
-	JMP	math∕big·subVW(SB)
-
-// func shlVU(z, x []Word, s uint) (c Word)
-TEXT ·shlVU(SB),NOSPLIT,$0
-	JMP	math∕big·shlVU(SB)
-
-// func shrVU(z, x []Word, s uint) (c Word)
-TEXT ·shrVU(SB),NOSPLIT,$0
-	JMP	math∕big·shrVU(SB)
-
-// func mulAddVWW(z, x []Word, y, r Word) (c Word)
-TEXT ·mulAddVWW(SB),NOSPLIT,$0
-	JMP	math∕big·mulAddVWW(SB)
-
-// func addMulVVW(z, x []Word, y Word) (c Word)
-TEXT ·addMulVVW(SB),NOSPLIT,$0
-	JMP	math∕big·addMulVVW(SB)
-
diff --git a/vendor/github.com/remyoudompheng/bigfft/arith_ppc64x.s b/vendor/github.com/remyoudompheng/bigfft/arith_ppc64x.s
deleted file mode 100644
index 16c7f153..00000000
--- a/vendor/github.com/remyoudompheng/bigfft/arith_ppc64x.s
+++ /dev/null
@@ -1,38 +0,0 @@
-// Trampolines to math/big assembly implementations.
-
-// +build ppc64 ppc64le
-
-#include "textflag.h"
-
-// func addVV(z, x, y []Word) (c Word)
-TEXT ·addVV(SB),NOSPLIT,$0
-	BR	math∕big·addVV(SB)
-
-// func subVV(z, x, y []Word) (c Word)
-TEXT ·subVV(SB),NOSPLIT,$0
-	BR	math∕big·subVV(SB)
-
-// func addVW(z, x []Word, y Word) (c Word)
-TEXT ·addVW(SB),NOSPLIT,$0
-	BR	math∕big·addVW(SB)
-
-// func subVW(z, x []Word, y Word) (c Word)
-TEXT ·subVW(SB),NOSPLIT,$0
-	BR	math∕big·subVW(SB)
-
-// func shlVU(z, x []Word, s uint) (c Word)
-TEXT ·shlVU(SB),NOSPLIT,$0
-	BR	math∕big·shlVU(SB)
-
-// func shrVU(z, x []Word, s uint) (c Word)
-TEXT ·shrVU(SB),NOSPLIT,$0
-	BR	math∕big·shrVU(SB)
-
-// func mulAddVWW(z, x []Word, y, r Word) (c Word)
-TEXT ·mulAddVWW(SB),NOSPLIT,$0
-	BR	math∕big·mulAddVWW(SB)
-
-// func addMulVVW(z, x []Word, y Word) (c Word)
-TEXT ·addMulVVW(SB),NOSPLIT,$0
-	BR	math∕big·addMulVVW(SB)
-
diff --git a/vendor/github.com/remyoudompheng/bigfft/arith_s390x.s b/vendor/github.com/remyoudompheng/bigfft/arith_s390x.s
deleted file mode 100644
index f72ab053..00000000
--- a/vendor/github.com/remyoudompheng/bigfft/arith_s390x.s
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// Trampolines to math/big assembly implementations.
-
-#include "textflag.h"
-
-// func addVV(z, x, y []Word) (c Word)
-TEXT ·addVV(SB),NOSPLIT,$0
-	BR	math∕big·addVV(SB)
-
-// func subVV(z, x, y []Word) (c Word)
-TEXT ·subVV(SB),NOSPLIT,$0
-	BR	math∕big·subVV(SB)
-
-// func addVW(z, x []Word, y Word) (c Word)
-TEXT ·addVW(SB),NOSPLIT,$0
-	BR	math∕big·addVW(SB)
-
-// func subVW(z, x []Word, y Word) (c Word)
-TEXT ·subVW(SB),NOSPLIT,$0
-	BR	math∕big·subVW(SB)
-
-// func shlVU(z, x []Word, s uint) (c Word)
-TEXT ·shlVU(SB),NOSPLIT,$0
-	BR	math∕big·shlVU(SB)
-
-// func shrVU(z, x []Word, s uint) (c Word)
-TEXT ·shrVU(SB),NOSPLIT,$0
-	BR	math∕big·shrVU(SB)
-
-// func mulAddVWW(z, x []Word, y, r Word) (c Word)
-TEXT ·mulAddVWW(SB),NOSPLIT,$0
-	BR	math∕big·mulAddVWW(SB)
-
-// func addMulVVW(z, x []Word, y Word) (c Word)
-TEXT ·addMulVVW(SB),NOSPLIT,$0
-	BR	math∕big·addMulVVW(SB)
-
diff --git a/vendor/go.mau.fi/whatsmeow/appstate.go b/vendor/go.mau.fi/whatsmeow/appstate.go
index 7e99b513..7493a030 100644
--- a/vendor/go.mau.fi/whatsmeow/appstate.go
+++ b/vendor/go.mau.fi/whatsmeow/appstate.go
@@ -271,7 +271,7 @@ func (cli *Client) requestAppStateKeys(ctx context.Context, rawKeyIDs [][]byte)
 		},
 	}
 	ownID := cli.getOwnID().ToNonAD()
-	if ownID.IsEmpty() {
+	if ownID.IsEmpty() || len(debugKeyIDs) == 0 {
 		return
 	}
 	cli.Log.Infof("Sending key request for app state keys %+v", debugKeyIDs)
diff --git a/vendor/go.mau.fi/whatsmeow/binary/proto/def.pb.go b/vendor/go.mau.fi/whatsmeow/binary/proto/def.pb.go
index 046bebe2..16a9928c 100644
--- a/vendor/go.mau.fi/whatsmeow/binary/proto/def.pb.go
+++ b/vendor/go.mau.fi/whatsmeow/binary/proto/def.pb.go
@@ -22,65 +22,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type PeerDataOperationRequestType int32
-
-const (
-	PeerDataOperationRequestType_UPLOAD_STICKER                PeerDataOperationRequestType = 0
-	PeerDataOperationRequestType_SEND_RECENT_STICKER_BOOTSTRAP PeerDataOperationRequestType = 1
-	PeerDataOperationRequestType_GENERATE_LINK_PREVIEW         PeerDataOperationRequestType = 2
-)
-
-// Enum value maps for PeerDataOperationRequestType.
-var (
-	PeerDataOperationRequestType_name = map[int32]string{
-		0: "UPLOAD_STICKER",
-		1: "SEND_RECENT_STICKER_BOOTSTRAP",
-		2: "GENERATE_LINK_PREVIEW",
-	}
-	PeerDataOperationRequestType_value = map[string]int32{
-		"UPLOAD_STICKER":                0,
-		"SEND_RECENT_STICKER_BOOTSTRAP": 1,
-		"GENERATE_LINK_PREVIEW":         2,
-	}
-)
-
-func (x PeerDataOperationRequestType) Enum() *PeerDataOperationRequestType {
-	p := new(PeerDataOperationRequestType)
-	*p = x
-	return p
-}
-
-func (x PeerDataOperationRequestType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (PeerDataOperationRequestType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[0].Descriptor()
-}
-
-func (PeerDataOperationRequestType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[0]
-}
-
-func (x PeerDataOperationRequestType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *PeerDataOperationRequestType) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = PeerDataOperationRequestType(num)
-	return nil
-}
-
-// Deprecated: Use PeerDataOperationRequestType.Descriptor instead.
-func (PeerDataOperationRequestType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{0}
-}
-
 type KeepType int32
 
 const (
@@ -114,11 +55,11 @@ func (x KeepType) String() string {
 }
 
 func (KeepType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[1].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[0].Descriptor()
 }
 
 func (KeepType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[1]
+	return &file_binary_proto_def_proto_enumTypes[0]
 }
 
 func (x KeepType) Number() protoreflect.EnumNumber {
@@ -137,6 +78,68 @@ func (x *KeepType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use KeepType.Descriptor instead.
 func (KeepType) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{0}
+}
+
+type PeerDataOperationRequestType int32
+
+const (
+	PeerDataOperationRequestType_UPLOAD_STICKER                PeerDataOperationRequestType = 0
+	PeerDataOperationRequestType_SEND_RECENT_STICKER_BOOTSTRAP PeerDataOperationRequestType = 1
+	PeerDataOperationRequestType_GENERATE_LINK_PREVIEW         PeerDataOperationRequestType = 2
+	PeerDataOperationRequestType_HISTORY_SYNC_ON_DEMAND        PeerDataOperationRequestType = 3
+)
+
+// Enum value maps for PeerDataOperationRequestType.
+var (
+	PeerDataOperationRequestType_name = map[int32]string{
+		0: "UPLOAD_STICKER",
+		1: "SEND_RECENT_STICKER_BOOTSTRAP",
+		2: "GENERATE_LINK_PREVIEW",
+		3: "HISTORY_SYNC_ON_DEMAND",
+	}
+	PeerDataOperationRequestType_value = map[string]int32{
+		"UPLOAD_STICKER":                0,
+		"SEND_RECENT_STICKER_BOOTSTRAP": 1,
+		"GENERATE_LINK_PREVIEW":         2,
+		"HISTORY_SYNC_ON_DEMAND":        3,
+	}
+)
+
+func (x PeerDataOperationRequestType) Enum() *PeerDataOperationRequestType {
+	p := new(PeerDataOperationRequestType)
+	*p = x
+	return p
+}
+
+func (x PeerDataOperationRequestType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (PeerDataOperationRequestType) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[1].Descriptor()
+}
+
+func (PeerDataOperationRequestType) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[1]
+}
+
+func (x PeerDataOperationRequestType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *PeerDataOperationRequestType) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = PeerDataOperationRequestType(num)
+	return nil
+}
+
+// Deprecated: Use PeerDataOperationRequestType.Descriptor instead.
+func (PeerDataOperationRequestType) EnumDescriptor() ([]byte, []int) {
 	return file_binary_proto_def_proto_rawDescGZIP(), []int{1}
 }
 
@@ -202,20 +205,24 @@ func (MediaVisibility) EnumDescriptor() ([]byte, []int) {
 type DeviceProps_PlatformType int32
 
 const (
-	DeviceProps_UNKNOWN        DeviceProps_PlatformType = 0
-	DeviceProps_CHROME         DeviceProps_PlatformType = 1
-	DeviceProps_FIREFOX        DeviceProps_PlatformType = 2
-	DeviceProps_IE             DeviceProps_PlatformType = 3
-	DeviceProps_OPERA          DeviceProps_PlatformType = 4
-	DeviceProps_SAFARI         DeviceProps_PlatformType = 5
-	DeviceProps_EDGE           DeviceProps_PlatformType = 6
-	DeviceProps_DESKTOP        DeviceProps_PlatformType = 7
-	DeviceProps_IPAD           DeviceProps_PlatformType = 8
-	DeviceProps_ANDROID_TABLET DeviceProps_PlatformType = 9
-	DeviceProps_OHANA          DeviceProps_PlatformType = 10
-	DeviceProps_ALOHA          DeviceProps_PlatformType = 11
-	DeviceProps_CATALINA       DeviceProps_PlatformType = 12
-	DeviceProps_TCL_TV         DeviceProps_PlatformType = 13
+	DeviceProps_UNKNOWN           DeviceProps_PlatformType = 0
+	DeviceProps_CHROME            DeviceProps_PlatformType = 1
+	DeviceProps_FIREFOX           DeviceProps_PlatformType = 2
+	DeviceProps_IE                DeviceProps_PlatformType = 3
+	DeviceProps_OPERA             DeviceProps_PlatformType = 4
+	DeviceProps_SAFARI            DeviceProps_PlatformType = 5
+	DeviceProps_EDGE              DeviceProps_PlatformType = 6
+	DeviceProps_DESKTOP           DeviceProps_PlatformType = 7
+	DeviceProps_IPAD              DeviceProps_PlatformType = 8
+	DeviceProps_ANDROID_TABLET    DeviceProps_PlatformType = 9
+	DeviceProps_OHANA             DeviceProps_PlatformType = 10
+	DeviceProps_ALOHA             DeviceProps_PlatformType = 11
+	DeviceProps_CATALINA          DeviceProps_PlatformType = 12
+	DeviceProps_TCL_TV            DeviceProps_PlatformType = 13
+	DeviceProps_IOS_PHONE         DeviceProps_PlatformType = 14
+	DeviceProps_IOS_CATALYST      DeviceProps_PlatformType = 15
+	DeviceProps_ANDROID_PHONE     DeviceProps_PlatformType = 16
+	DeviceProps_ANDROID_AMBIGUOUS DeviceProps_PlatformType = 17
 )
 
 // Enum value maps for DeviceProps_PlatformType.
@@ -235,22 +242,30 @@ var (
 		11: "ALOHA",
 		12: "CATALINA",
 		13: "TCL_TV",
+		14: "IOS_PHONE",
+		15: "IOS_CATALYST",
+		16: "ANDROID_PHONE",
+		17: "ANDROID_AMBIGUOUS",
 	}
 	DeviceProps_PlatformType_value = map[string]int32{
-		"UNKNOWN":        0,
-		"CHROME":         1,
-		"FIREFOX":        2,
-		"IE":             3,
-		"OPERA":          4,
-		"SAFARI":         5,
-		"EDGE":           6,
-		"DESKTOP":        7,
-		"IPAD":           8,
-		"ANDROID_TABLET": 9,
-		"OHANA":          10,
-		"ALOHA":          11,
-		"CATALINA":       12,
-		"TCL_TV":         13,
+		"UNKNOWN":           0,
+		"CHROME":            1,
+		"FIREFOX":           2,
+		"IE":                3,
+		"OPERA":             4,
+		"SAFARI":            5,
+		"EDGE":              6,
+		"DESKTOP":           7,
+		"IPAD":              8,
+		"ANDROID_TABLET":    9,
+		"OHANA":             10,
+		"ALOHA":             11,
+		"CATALINA":          12,
+		"TCL_TV":            13,
+		"IOS_PHONE":         14,
+		"IOS_CATALYST":      15,
+		"ANDROID_PHONE":     16,
+		"ANDROID_AMBIGUOUS": 17,
 	}
 )
 
@@ -350,7 +365,7 @@ func (x *PaymentInviteMessage_ServiceType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use PaymentInviteMessage_ServiceType.Descriptor instead.
 func (PaymentInviteMessage_ServiceType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{7, 0}
 }
 
 type OrderMessage_OrderSurface int32
@@ -403,7 +418,7 @@ func (x *OrderMessage_OrderSurface) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use OrderMessage_OrderSurface.Descriptor instead.
 func (OrderMessage_OrderSurface) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{9, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 0}
 }
 
 type OrderMessage_OrderStatus int32
@@ -456,7 +471,7 @@ func (x *OrderMessage_OrderStatus) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use OrderMessage_OrderStatus.Descriptor instead.
 func (OrderMessage_OrderStatus) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{9, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{8, 1}
 }
 
 type ListResponseMessage_ListType int32
@@ -512,7 +527,7 @@ func (x *ListResponseMessage_ListType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ListResponseMessage_ListType.Descriptor instead.
 func (ListResponseMessage_ListType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{11, 0}
 }
 
 type ListMessage_ListType int32
@@ -571,7 +586,7 @@ func (x *ListMessage_ListType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ListMessage_ListType.Descriptor instead.
 func (ListMessage_ListType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{13, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 0}
 }
 
 type InvoiceMessage_AttachmentType int32
@@ -627,7 +642,7 @@ func (x *InvoiceMessage_AttachmentType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use InvoiceMessage_AttachmentType.Descriptor instead.
 func (InvoiceMessage_AttachmentType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{15, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{14, 0}
 }
 
 type InteractiveMessage_ShopMessage_Surface int32
@@ -689,7 +704,7 @@ func (x *InteractiveMessage_ShopMessage_Surface) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use InteractiveMessage_ShopMessage_Surface.Descriptor instead.
 func (InteractiveMessage_ShopMessage_Surface) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{17, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 0, 0}
 }
 
 type HistorySyncNotification_HistorySyncType int32
@@ -701,6 +716,7 @@ const (
 	HistorySyncNotification_RECENT            HistorySyncNotification_HistorySyncType = 3
 	HistorySyncNotification_PUSH_NAME         HistorySyncNotification_HistorySyncType = 4
 	HistorySyncNotification_NON_BLOCKING_DATA HistorySyncNotification_HistorySyncType = 5
+	HistorySyncNotification_ON_DEMAND         HistorySyncNotification_HistorySyncType = 6
 )
 
 // Enum value maps for HistorySyncNotification_HistorySyncType.
@@ -712,6 +728,7 @@ var (
 		3: "RECENT",
 		4: "PUSH_NAME",
 		5: "NON_BLOCKING_DATA",
+		6: "ON_DEMAND",
 	}
 	HistorySyncNotification_HistorySyncType_value = map[string]int32{
 		"INITIAL_BOOTSTRAP": 0,
@@ -720,6 +737,7 @@ var (
 		"RECENT":            3,
 		"PUSH_NAME":         4,
 		"NON_BLOCKING_DATA": 5,
+		"ON_DEMAND":         6,
 	}
 )
 
@@ -757,7 +775,7 @@ func (x *HistorySyncNotification_HistorySyncType) UnmarshalJSON(b []byte) error
 
 // Deprecated: Use HistorySyncNotification_HistorySyncType.Descriptor instead.
 func (HistorySyncNotification_HistorySyncType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{20, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{19, 0}
 }
 
 type HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_DayOfWeekType int32
@@ -828,7 +846,7 @@ func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTime
 
 // Deprecated: Use HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_DayOfWeekType.Descriptor instead.
 func (HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_DayOfWeekType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{21, 0, 0, 1, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{20, 0, 0, 1, 0}
 }
 
 type HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_CalendarType int32
@@ -884,7 +902,7 @@ func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTime
 
 // Deprecated: Use HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_CalendarType.Descriptor instead.
 func (HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_CalendarType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{21, 0, 0, 1, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{20, 0, 0, 1, 1}
 }
 
 type GroupInviteMessage_GroupType int32
@@ -940,7 +958,7 @@ func (x *GroupInviteMessage_GroupType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use GroupInviteMessage_GroupType.Descriptor instead.
 func (GroupInviteMessage_GroupType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{22, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{21, 0}
 }
 
 type ExtendedTextMessage_PreviewType int32
@@ -996,7 +1014,7 @@ func (x *ExtendedTextMessage_PreviewType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ExtendedTextMessage_PreviewType.Descriptor instead.
 func (ExtendedTextMessage_PreviewType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{24, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{23, 0}
 }
 
 type ExtendedTextMessage_InviteLinkGroupType int32
@@ -1058,37 +1076,52 @@ func (x *ExtendedTextMessage_InviteLinkGroupType) UnmarshalJSON(b []byte) error
 
 // Deprecated: Use ExtendedTextMessage_InviteLinkGroupType.Descriptor instead.
 func (ExtendedTextMessage_InviteLinkGroupType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{24, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{23, 1}
 }
 
 type ExtendedTextMessage_FontType int32
 
 const (
-	ExtendedTextMessage_SANS_SERIF        ExtendedTextMessage_FontType = 0
-	ExtendedTextMessage_SERIF             ExtendedTextMessage_FontType = 1
-	ExtendedTextMessage_NORICAN_REGULAR   ExtendedTextMessage_FontType = 2
-	ExtendedTextMessage_BRYNDAN_WRITE     ExtendedTextMessage_FontType = 3
-	ExtendedTextMessage_BEBASNEUE_REGULAR ExtendedTextMessage_FontType = 4
-	ExtendedTextMessage_OSWALD_HEAVY      ExtendedTextMessage_FontType = 5
+	ExtendedTextMessage_SANS_SERIF            ExtendedTextMessage_FontType = 0
+	ExtendedTextMessage_SERIF                 ExtendedTextMessage_FontType = 1
+	ExtendedTextMessage_NORICAN_REGULAR       ExtendedTextMessage_FontType = 2
+	ExtendedTextMessage_BRYNDAN_WRITE         ExtendedTextMessage_FontType = 3
+	ExtendedTextMessage_BEBASNEUE_REGULAR     ExtendedTextMessage_FontType = 4
+	ExtendedTextMessage_OSWALD_HEAVY          ExtendedTextMessage_FontType = 5
+	ExtendedTextMessage_DAMION_REGULAR        ExtendedTextMessage_FontType = 6
+	ExtendedTextMessage_MORNINGBREEZE_REGULAR ExtendedTextMessage_FontType = 7
+	ExtendedTextMessage_CALISTOGA_REGULAR     ExtendedTextMessage_FontType = 8
+	ExtendedTextMessage_EXO2_EXTRABOLD        ExtendedTextMessage_FontType = 9
+	ExtendedTextMessage_COURIERPRIME_BOLD     ExtendedTextMessage_FontType = 10
 )
 
 // Enum value maps for ExtendedTextMessage_FontType.
 var (
 	ExtendedTextMessage_FontType_name = map[int32]string{
-		0: "SANS_SERIF",
-		1: "SERIF",
-		2: "NORICAN_REGULAR",
-		3: "BRYNDAN_WRITE",
-		4: "BEBASNEUE_REGULAR",
-		5: "OSWALD_HEAVY",
+		0:  "SANS_SERIF",
+		1:  "SERIF",
+		2:  "NORICAN_REGULAR",
+		3:  "BRYNDAN_WRITE",
+		4:  "BEBASNEUE_REGULAR",
+		5:  "OSWALD_HEAVY",
+		6:  "DAMION_REGULAR",
+		7:  "MORNINGBREEZE_REGULAR",
+		8:  "CALISTOGA_REGULAR",
+		9:  "EXO2_EXTRABOLD",
+		10: "COURIERPRIME_BOLD",
 	}
 	ExtendedTextMessage_FontType_value = map[string]int32{
-		"SANS_SERIF":        0,
-		"SERIF":             1,
-		"NORICAN_REGULAR":   2,
-		"BRYNDAN_WRITE":     3,
-		"BEBASNEUE_REGULAR": 4,
-		"OSWALD_HEAVY":      5,
+		"SANS_SERIF":            0,
+		"SERIF":                 1,
+		"NORICAN_REGULAR":       2,
+		"BRYNDAN_WRITE":         3,
+		"BEBASNEUE_REGULAR":     4,
+		"OSWALD_HEAVY":          5,
+		"DAMION_REGULAR":        6,
+		"MORNINGBREEZE_REGULAR": 7,
+		"CALISTOGA_REGULAR":     8,
+		"EXO2_EXTRABOLD":        9,
+		"COURIERPRIME_BOLD":     10,
 	}
 )
 
@@ -1126,7 +1159,7 @@ func (x *ExtendedTextMessage_FontType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ExtendedTextMessage_FontType.Descriptor instead.
 func (ExtendedTextMessage_FontType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{24, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{23, 2}
 }
 
 type ButtonsResponseMessage_Type int32
@@ -1182,7 +1215,7 @@ func (x *ButtonsResponseMessage_Type) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ButtonsResponseMessage_Type.Descriptor instead.
 func (ButtonsResponseMessage_Type) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{34, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{33, 0}
 }
 
 type ButtonsMessage_HeaderType int32
@@ -1253,7 +1286,7 @@ func (x *ButtonsMessage_HeaderType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ButtonsMessage_HeaderType.Descriptor instead.
 func (ButtonsMessage_HeaderType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{35, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{34, 0}
 }
 
 type ButtonsMessage_Button_Type int32
@@ -1312,7 +1345,7 @@ func (x *ButtonsMessage_Button_Type) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ButtonsMessage_Button_Type.Descriptor instead.
 func (ButtonsMessage_Button_Type) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{35, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{34, 0, 0}
 }
 
 type DisappearingMode_Initiator int32
@@ -1430,7 +1463,7 @@ func (x *ContextInfo_ExternalAdReplyInfo_MediaType) UnmarshalJSON(b []byte) erro
 
 // Deprecated: Use ContextInfo_ExternalAdReplyInfo_MediaType.Descriptor instead.
 func (ContextInfo_ExternalAdReplyInfo_MediaType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{49, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{49, 1, 0}
 }
 
 type ContextInfo_AdReplyInfo_MediaType int32
@@ -1489,7 +1522,7 @@ func (x *ContextInfo_AdReplyInfo_MediaType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ContextInfo_AdReplyInfo_MediaType.Descriptor instead.
 func (ContextInfo_AdReplyInfo_MediaType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{49, 1, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{49, 2, 0}
 }
 
 type PaymentBackground_Type int32
@@ -1607,6 +1640,121 @@ func (VideoMessage_Attribution) EnumDescriptor() ([]byte, []int) {
 	return file_binary_proto_def_proto_rawDescGZIP(), []int{57, 0}
 }
 
+type ScheduledCallEditMessage_EditType int32
+
+const (
+	ScheduledCallEditMessage_UNKNOWN ScheduledCallEditMessage_EditType = 0
+	ScheduledCallEditMessage_CANCEL  ScheduledCallEditMessage_EditType = 1
+)
+
+// Enum value maps for ScheduledCallEditMessage_EditType.
+var (
+	ScheduledCallEditMessage_EditType_name = map[int32]string{
+		0: "UNKNOWN",
+		1: "CANCEL",
+	}
+	ScheduledCallEditMessage_EditType_value = map[string]int32{
+		"UNKNOWN": 0,
+		"CANCEL":  1,
+	}
+)
+
+func (x ScheduledCallEditMessage_EditType) Enum() *ScheduledCallEditMessage_EditType {
+	p := new(ScheduledCallEditMessage_EditType)
+	*p = x
+	return p
+}
+
+func (x ScheduledCallEditMessage_EditType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (ScheduledCallEditMessage_EditType) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[26].Descriptor()
+}
+
+func (ScheduledCallEditMessage_EditType) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[26]
+}
+
+func (x ScheduledCallEditMessage_EditType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *ScheduledCallEditMessage_EditType) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = ScheduledCallEditMessage_EditType(num)
+	return nil
+}
+
+// Deprecated: Use ScheduledCallEditMessage_EditType.Descriptor instead.
+func (ScheduledCallEditMessage_EditType) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{64, 0}
+}
+
+type ScheduledCallCreationMessage_CallType int32
+
+const (
+	ScheduledCallCreationMessage_UNKNOWN ScheduledCallCreationMessage_CallType = 0
+	ScheduledCallCreationMessage_VOICE   ScheduledCallCreationMessage_CallType = 1
+	ScheduledCallCreationMessage_VIDEO   ScheduledCallCreationMessage_CallType = 2
+)
+
+// Enum value maps for ScheduledCallCreationMessage_CallType.
+var (
+	ScheduledCallCreationMessage_CallType_name = map[int32]string{
+		0: "UNKNOWN",
+		1: "VOICE",
+		2: "VIDEO",
+	}
+	ScheduledCallCreationMessage_CallType_value = map[string]int32{
+		"UNKNOWN": 0,
+		"VOICE":   1,
+		"VIDEO":   2,
+	}
+)
+
+func (x ScheduledCallCreationMessage_CallType) Enum() *ScheduledCallCreationMessage_CallType {
+	p := new(ScheduledCallCreationMessage_CallType)
+	*p = x
+	return p
+}
+
+func (x ScheduledCallCreationMessage_CallType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (ScheduledCallCreationMessage_CallType) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[27].Descriptor()
+}
+
+func (ScheduledCallCreationMessage_CallType) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[27]
+}
+
+func (x ScheduledCallCreationMessage_CallType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *ScheduledCallCreationMessage_CallType) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = ScheduledCallCreationMessage_CallType(num)
+	return nil
+}
+
+// Deprecated: Use ScheduledCallCreationMessage_CallType.Descriptor instead.
+func (ScheduledCallCreationMessage_CallType) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{65, 0}
+}
+
 type ProtocolMessage_Type int32
 
 const (
@@ -1670,11 +1818,11 @@ func (x ProtocolMessage_Type) String() string {
 }
 
 func (ProtocolMessage_Type) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[26].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[28].Descriptor()
 }
 
 func (ProtocolMessage_Type) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[26]
+	return &file_binary_proto_def_proto_enumTypes[28]
 }
 
 func (x ProtocolMessage_Type) Number() protoreflect.EnumNumber {
@@ -1693,7 +1841,66 @@ func (x *ProtocolMessage_Type) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ProtocolMessage_Type.Descriptor instead.
 func (ProtocolMessage_Type) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{67, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{69, 0}
+}
+
+type PinMessage_PinMessageType int32
+
+const (
+	PinMessage_UNKNOWN_PIN_MESSAGE_TYPE PinMessage_PinMessageType = 0
+	PinMessage_PIN_FOR_ALL              PinMessage_PinMessageType = 1
+	PinMessage_UNPIN_FOR_ALL            PinMessage_PinMessageType = 2
+)
+
+// Enum value maps for PinMessage_PinMessageType.
+var (
+	PinMessage_PinMessageType_name = map[int32]string{
+		0: "UNKNOWN_PIN_MESSAGE_TYPE",
+		1: "PIN_FOR_ALL",
+		2: "UNPIN_FOR_ALL",
+	}
+	PinMessage_PinMessageType_value = map[string]int32{
+		"UNKNOWN_PIN_MESSAGE_TYPE": 0,
+		"PIN_FOR_ALL":              1,
+		"UNPIN_FOR_ALL":            2,
+	}
+)
+
+func (x PinMessage_PinMessageType) Enum() *PinMessage_PinMessageType {
+	p := new(PinMessage_PinMessageType)
+	*p = x
+	return p
+}
+
+func (x PinMessage_PinMessageType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (PinMessage_PinMessageType) Descriptor() protoreflect.EnumDescriptor {
+	return file_binary_proto_def_proto_enumTypes[29].Descriptor()
+}
+
+func (PinMessage_PinMessageType) Type() protoreflect.EnumType {
+	return &file_binary_proto_def_proto_enumTypes[29]
+}
+
+func (x PinMessage_PinMessageType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *PinMessage_PinMessageType) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = PinMessage_PinMessageType(num)
+	return nil
+}
+
+// Deprecated: Use PinMessage_PinMessageType.Descriptor instead.
+func (PinMessage_PinMessageType) EnumDescriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{76, 0}
 }
 
 type PastParticipant_LeaveReason int32
@@ -1726,11 +1933,11 @@ func (x PastParticipant_LeaveReason) String() string {
 }
 
 func (PastParticipant_LeaveReason) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[27].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[30].Descriptor()
 }
 
 func (PastParticipant_LeaveReason) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[27]
+	return &file_binary_proto_def_proto_enumTypes[30]
 }
 
 func (x PastParticipant_LeaveReason) Number() protoreflect.EnumNumber {
@@ -1749,7 +1956,7 @@ func (x *PastParticipant_LeaveReason) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use PastParticipant_LeaveReason.Descriptor instead.
 func (PastParticipant_LeaveReason) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{79, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{83, 0}
 }
 
 type HistorySync_HistorySyncType int32
@@ -1761,6 +1968,7 @@ const (
 	HistorySync_RECENT            HistorySync_HistorySyncType = 3
 	HistorySync_PUSH_NAME         HistorySync_HistorySyncType = 4
 	HistorySync_NON_BLOCKING_DATA HistorySync_HistorySyncType = 5
+	HistorySync_ON_DEMAND         HistorySync_HistorySyncType = 6
 )
 
 // Enum value maps for HistorySync_HistorySyncType.
@@ -1772,6 +1980,7 @@ var (
 		3: "RECENT",
 		4: "PUSH_NAME",
 		5: "NON_BLOCKING_DATA",
+		6: "ON_DEMAND",
 	}
 	HistorySync_HistorySyncType_value = map[string]int32{
 		"INITIAL_BOOTSTRAP": 0,
@@ -1780,6 +1989,7 @@ var (
 		"RECENT":            3,
 		"PUSH_NAME":         4,
 		"NON_BLOCKING_DATA": 5,
+		"ON_DEMAND":         6,
 	}
 )
 
@@ -1794,11 +2004,11 @@ func (x HistorySync_HistorySyncType) String() string {
 }
 
 func (HistorySync_HistorySyncType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[28].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[31].Descriptor()
 }
 
 func (HistorySync_HistorySyncType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[28]
+	return &file_binary_proto_def_proto_enumTypes[31]
 }
 
 func (x HistorySync_HistorySyncType) Number() protoreflect.EnumNumber {
@@ -1817,7 +2027,7 @@ func (x *HistorySync_HistorySyncType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use HistorySync_HistorySyncType.Descriptor instead.
 func (HistorySync_HistorySyncType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{80, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{84, 0}
 }
 
 type GroupParticipant_Rank int32
@@ -1853,11 +2063,11 @@ func (x GroupParticipant_Rank) String() string {
 }
 
 func (GroupParticipant_Rank) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[29].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[32].Descriptor()
 }
 
 func (GroupParticipant_Rank) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[29]
+	return &file_binary_proto_def_proto_enumTypes[32]
 }
 
 func (x GroupParticipant_Rank) Number() protoreflect.EnumNumber {
@@ -1876,7 +2086,7 @@ func (x *GroupParticipant_Rank) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use GroupParticipant_Rank.Descriptor instead.
 func (GroupParticipant_Rank) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{82, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{86, 0}
 }
 
 type Conversation_EndOfHistoryTransferType int32
@@ -1909,11 +2119,11 @@ func (x Conversation_EndOfHistoryTransferType) String() string {
 }
 
 func (Conversation_EndOfHistoryTransferType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[30].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[33].Descriptor()
 }
 
 func (Conversation_EndOfHistoryTransferType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[30]
+	return &file_binary_proto_def_proto_enumTypes[33]
 }
 
 func (x Conversation_EndOfHistoryTransferType) Number() protoreflect.EnumNumber {
@@ -1932,7 +2142,7 @@ func (x *Conversation_EndOfHistoryTransferType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use Conversation_EndOfHistoryTransferType.Descriptor instead.
 func (Conversation_EndOfHistoryTransferType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{84, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{88, 0}
 }
 
 type MediaRetryNotification_ResultType int32
@@ -1971,11 +2181,11 @@ func (x MediaRetryNotification_ResultType) String() string {
 }
 
 func (MediaRetryNotification_ResultType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[31].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[34].Descriptor()
 }
 
 func (MediaRetryNotification_ResultType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[31]
+	return &file_binary_proto_def_proto_enumTypes[34]
 }
 
 func (x MediaRetryNotification_ResultType) Number() protoreflect.EnumNumber {
@@ -1994,7 +2204,7 @@ func (x *MediaRetryNotification_ResultType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use MediaRetryNotification_ResultType.Descriptor instead.
 func (MediaRetryNotification_ResultType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{90, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{94, 0}
 }
 
 type SyncdMutation_SyncdOperation int32
@@ -2027,11 +2237,11 @@ func (x SyncdMutation_SyncdOperation) String() string {
 }
 
 func (SyncdMutation_SyncdOperation) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[32].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[35].Descriptor()
 }
 
 func (SyncdMutation_SyncdOperation) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[32]
+	return &file_binary_proto_def_proto_enumTypes[35]
 }
 
 func (x SyncdMutation_SyncdOperation) Number() protoreflect.EnumNumber {
@@ -2050,7 +2260,7 @@ func (x *SyncdMutation_SyncdOperation) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use SyncdMutation_SyncdOperation.Descriptor instead.
 func (SyncdMutation_SyncdOperation) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{98, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{102, 0}
 }
 
 type BizIdentityInfo_VerifiedLevelValue int32
@@ -2086,11 +2296,11 @@ func (x BizIdentityInfo_VerifiedLevelValue) String() string {
 }
 
 func (BizIdentityInfo_VerifiedLevelValue) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[33].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[36].Descriptor()
 }
 
 func (BizIdentityInfo_VerifiedLevelValue) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[33]
+	return &file_binary_proto_def_proto_enumTypes[36]
 }
 
 func (x BizIdentityInfo_VerifiedLevelValue) Number() protoreflect.EnumNumber {
@@ -2109,7 +2319,7 @@ func (x *BizIdentityInfo_VerifiedLevelValue) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use BizIdentityInfo_VerifiedLevelValue.Descriptor instead.
 func (BizIdentityInfo_VerifiedLevelValue) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{141, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{145, 0}
 }
 
 type BizIdentityInfo_HostStorageType int32
@@ -2142,11 +2352,11 @@ func (x BizIdentityInfo_HostStorageType) String() string {
 }
 
 func (BizIdentityInfo_HostStorageType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[34].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[37].Descriptor()
 }
 
 func (BizIdentityInfo_HostStorageType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[34]
+	return &file_binary_proto_def_proto_enumTypes[37]
 }
 
 func (x BizIdentityInfo_HostStorageType) Number() protoreflect.EnumNumber {
@@ -2165,7 +2375,7 @@ func (x *BizIdentityInfo_HostStorageType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use BizIdentityInfo_HostStorageType.Descriptor instead.
 func (BizIdentityInfo_HostStorageType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{141, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{145, 1}
 }
 
 type BizIdentityInfo_ActualActorsType int32
@@ -2198,11 +2408,11 @@ func (x BizIdentityInfo_ActualActorsType) String() string {
 }
 
 func (BizIdentityInfo_ActualActorsType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[35].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[38].Descriptor()
 }
 
 func (BizIdentityInfo_ActualActorsType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[35]
+	return &file_binary_proto_def_proto_enumTypes[38]
 }
 
 func (x BizIdentityInfo_ActualActorsType) Number() protoreflect.EnumNumber {
@@ -2221,7 +2431,7 @@ func (x *BizIdentityInfo_ActualActorsType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use BizIdentityInfo_ActualActorsType.Descriptor instead.
 func (BizIdentityInfo_ActualActorsType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{141, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{145, 2}
 }
 
 type BizAccountLinkInfo_HostStorageType int32
@@ -2254,11 +2464,11 @@ func (x BizAccountLinkInfo_HostStorageType) String() string {
 }
 
 func (BizAccountLinkInfo_HostStorageType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[36].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[39].Descriptor()
 }
 
 func (BizAccountLinkInfo_HostStorageType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[36]
+	return &file_binary_proto_def_proto_enumTypes[39]
 }
 
 func (x BizAccountLinkInfo_HostStorageType) Number() protoreflect.EnumNumber {
@@ -2277,7 +2487,7 @@ func (x *BizAccountLinkInfo_HostStorageType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use BizAccountLinkInfo_HostStorageType.Descriptor instead.
 func (BizAccountLinkInfo_HostStorageType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{143, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{147, 0}
 }
 
 type BizAccountLinkInfo_AccountType int32
@@ -2307,11 +2517,11 @@ func (x BizAccountLinkInfo_AccountType) String() string {
 }
 
 func (BizAccountLinkInfo_AccountType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[37].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[40].Descriptor()
 }
 
 func (BizAccountLinkInfo_AccountType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[37]
+	return &file_binary_proto_def_proto_enumTypes[40]
 }
 
 func (x BizAccountLinkInfo_AccountType) Number() protoreflect.EnumNumber {
@@ -2330,7 +2540,7 @@ func (x *BizAccountLinkInfo_AccountType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use BizAccountLinkInfo_AccountType.Descriptor instead.
 func (BizAccountLinkInfo_AccountType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{143, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{147, 1}
 }
 
 type ClientPayload_Product int32
@@ -2363,11 +2573,11 @@ func (x ClientPayload_Product) String() string {
 }
 
 func (ClientPayload_Product) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[38].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[41].Descriptor()
 }
 
 func (ClientPayload_Product) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[38]
+	return &file_binary_proto_def_proto_enumTypes[41]
 }
 
 func (x ClientPayload_Product) Number() protoreflect.EnumNumber {
@@ -2386,7 +2596,7 @@ func (x *ClientPayload_Product) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ClientPayload_Product.Descriptor instead.
 func (ClientPayload_Product) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 0}
 }
 
 type ClientPayload_IOSAppExtension int32
@@ -2422,11 +2632,11 @@ func (x ClientPayload_IOSAppExtension) String() string {
 }
 
 func (ClientPayload_IOSAppExtension) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[39].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[42].Descriptor()
 }
 
 func (ClientPayload_IOSAppExtension) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[39]
+	return &file_binary_proto_def_proto_enumTypes[42]
 }
 
 func (x ClientPayload_IOSAppExtension) Number() protoreflect.EnumNumber {
@@ -2445,7 +2655,7 @@ func (x *ClientPayload_IOSAppExtension) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ClientPayload_IOSAppExtension.Descriptor instead.
 func (ClientPayload_IOSAppExtension) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 1}
 }
 
 type ClientPayload_ConnectType int32
@@ -2517,11 +2727,11 @@ func (x ClientPayload_ConnectType) String() string {
 }
 
 func (ClientPayload_ConnectType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[40].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[43].Descriptor()
 }
 
 func (ClientPayload_ConnectType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[40]
+	return &file_binary_proto_def_proto_enumTypes[43]
 }
 
 func (x ClientPayload_ConnectType) Number() protoreflect.EnumNumber {
@@ -2540,7 +2750,7 @@ func (x *ClientPayload_ConnectType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ClientPayload_ConnectType.Descriptor instead.
 func (ClientPayload_ConnectType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 2}
 }
 
 type ClientPayload_ConnectReason int32
@@ -2585,11 +2795,11 @@ func (x ClientPayload_ConnectReason) String() string {
 }
 
 func (ClientPayload_ConnectReason) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[41].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[44].Descriptor()
 }
 
 func (ClientPayload_ConnectReason) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[41]
+	return &file_binary_proto_def_proto_enumTypes[44]
 }
 
 func (x ClientPayload_ConnectReason) Number() protoreflect.EnumNumber {
@@ -2608,66 +2818,7 @@ func (x *ClientPayload_ConnectReason) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ClientPayload_ConnectReason.Descriptor instead.
 func (ClientPayload_ConnectReason) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 3}
-}
-
-type ClientPayload_BizMarketSegment int32
-
-const (
-	ClientPayload_DEFAULT ClientPayload_BizMarketSegment = 0
-	ClientPayload_DEVX    ClientPayload_BizMarketSegment = 1
-	ClientPayload_INBOX   ClientPayload_BizMarketSegment = 2
-)
-
-// Enum value maps for ClientPayload_BizMarketSegment.
-var (
-	ClientPayload_BizMarketSegment_name = map[int32]string{
-		0: "DEFAULT",
-		1: "DEVX",
-		2: "INBOX",
-	}
-	ClientPayload_BizMarketSegment_value = map[string]int32{
-		"DEFAULT": 0,
-		"DEVX":    1,
-		"INBOX":   2,
-	}
-)
-
-func (x ClientPayload_BizMarketSegment) Enum() *ClientPayload_BizMarketSegment {
-	p := new(ClientPayload_BizMarketSegment)
-	*p = x
-	return p
-}
-
-func (x ClientPayload_BizMarketSegment) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ClientPayload_BizMarketSegment) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[42].Descriptor()
-}
-
-func (ClientPayload_BizMarketSegment) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[42]
-}
-
-func (x ClientPayload_BizMarketSegment) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Do not use.
-func (x *ClientPayload_BizMarketSegment) UnmarshalJSON(b []byte) error {
-	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
-	if err != nil {
-		return err
-	}
-	*x = ClientPayload_BizMarketSegment(num)
-	return nil
-}
-
-// Deprecated: Use ClientPayload_BizMarketSegment.Descriptor instead.
-func (ClientPayload_BizMarketSegment) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 4}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 3}
 }
 
 type ClientPayload_WebInfo_WebSubPlatform int32
@@ -2709,11 +2860,11 @@ func (x ClientPayload_WebInfo_WebSubPlatform) String() string {
 }
 
 func (ClientPayload_WebInfo_WebSubPlatform) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[43].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[45].Descriptor()
 }
 
 func (ClientPayload_WebInfo_WebSubPlatform) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[43]
+	return &file_binary_proto_def_proto_enumTypes[45]
 }
 
 func (x ClientPayload_WebInfo_WebSubPlatform) Number() protoreflect.EnumNumber {
@@ -2732,7 +2883,7 @@ func (x *ClientPayload_WebInfo_WebSubPlatform) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ClientPayload_WebInfo_WebSubPlatform.Descriptor instead.
 func (ClientPayload_WebInfo_WebSubPlatform) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 0, 0}
 }
 
 type ClientPayload_UserAgent_ReleaseChannel int32
@@ -2771,11 +2922,11 @@ func (x ClientPayload_UserAgent_ReleaseChannel) String() string {
 }
 
 func (ClientPayload_UserAgent_ReleaseChannel) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[44].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[46].Descriptor()
 }
 
 func (ClientPayload_UserAgent_ReleaseChannel) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[44]
+	return &file_binary_proto_def_proto_enumTypes[46]
 }
 
 func (x ClientPayload_UserAgent_ReleaseChannel) Number() protoreflect.EnumNumber {
@@ -2794,7 +2945,7 @@ func (x *ClientPayload_UserAgent_ReleaseChannel) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ClientPayload_UserAgent_ReleaseChannel.Descriptor instead.
 func (ClientPayload_UserAgent_ReleaseChannel) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 1, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 1, 0}
 }
 
 type ClientPayload_UserAgent_Platform int32
@@ -2832,6 +2983,7 @@ const (
 	ClientPayload_UserAgent_WEAROS         ClientPayload_UserAgent_Platform = 29
 	ClientPayload_UserAgent_ARDEVICE       ClientPayload_UserAgent_Platform = 30
 	ClientPayload_UserAgent_VRDEVICE       ClientPayload_UserAgent_Platform = 31
+	ClientPayload_UserAgent_BLUE_WEB       ClientPayload_UserAgent_Platform = 32
 )
 
 // Enum value maps for ClientPayload_UserAgent_Platform.
@@ -2869,6 +3021,7 @@ var (
 		29: "WEAROS",
 		30: "ARDEVICE",
 		31: "VRDEVICE",
+		32: "BLUE_WEB",
 	}
 	ClientPayload_UserAgent_Platform_value = map[string]int32{
 		"ANDROID":        0,
@@ -2903,6 +3056,7 @@ var (
 		"WEAROS":         29,
 		"ARDEVICE":       30,
 		"VRDEVICE":       31,
+		"BLUE_WEB":       32,
 	}
 )
 
@@ -2917,11 +3071,11 @@ func (x ClientPayload_UserAgent_Platform) String() string {
 }
 
 func (ClientPayload_UserAgent_Platform) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[45].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[47].Descriptor()
 }
 
 func (ClientPayload_UserAgent_Platform) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[45]
+	return &file_binary_proto_def_proto_enumTypes[47]
 }
 
 func (x ClientPayload_UserAgent_Platform) Number() protoreflect.EnumNumber {
@@ -2940,7 +3094,7 @@ func (x *ClientPayload_UserAgent_Platform) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use ClientPayload_UserAgent_Platform.Descriptor instead.
 func (ClientPayload_UserAgent_Platform) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 1, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 1, 1}
 }
 
 type ClientPayload_DNSSource_DNSResolutionMethod int32
@@ -2982,11 +3136,11 @@ func (x ClientPayload_DNSSource_DNSResolutionMethod) String() string {
 }
 
 func (ClientPayload_DNSSource_DNSResolutionMethod) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[46].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[48].Descriptor()
 }
 
 func (ClientPayload_DNSSource_DNSResolutionMethod) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[46]
+	return &file_binary_proto_def_proto_enumTypes[48]
 }
 
 func (x ClientPayload_DNSSource_DNSResolutionMethod) Number() protoreflect.EnumNumber {
@@ -3005,7 +3159,7 @@ func (x *ClientPayload_DNSSource_DNSResolutionMethod) UnmarshalJSON(b []byte) er
 
 // Deprecated: Use ClientPayload_DNSSource_DNSResolutionMethod.Descriptor instead.
 func (ClientPayload_DNSSource_DNSResolutionMethod) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 3, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 3, 0}
 }
 
 type WebMessageInfo_StubType int32
@@ -3518,11 +3672,11 @@ func (x WebMessageInfo_StubType) String() string {
 }
 
 func (WebMessageInfo_StubType) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[47].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[49].Descriptor()
 }
 
 func (WebMessageInfo_StubType) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[47]
+	return &file_binary_proto_def_proto_enumTypes[49]
 }
 
 func (x WebMessageInfo_StubType) Number() protoreflect.EnumNumber {
@@ -3541,7 +3695,7 @@ func (x *WebMessageInfo_StubType) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use WebMessageInfo_StubType.Descriptor instead.
 func (WebMessageInfo_StubType) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{150, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{154, 0}
 }
 
 type WebMessageInfo_Status int32
@@ -3586,11 +3740,11 @@ func (x WebMessageInfo_Status) String() string {
 }
 
 func (WebMessageInfo_Status) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[48].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[50].Descriptor()
 }
 
 func (WebMessageInfo_Status) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[48]
+	return &file_binary_proto_def_proto_enumTypes[50]
 }
 
 func (x WebMessageInfo_Status) Number() protoreflect.EnumNumber {
@@ -3609,7 +3763,7 @@ func (x *WebMessageInfo_Status) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use WebMessageInfo_Status.Descriptor instead.
 func (WebMessageInfo_Status) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{150, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{154, 1}
 }
 
 type WebMessageInfo_BizPrivacyStatus int32
@@ -3648,11 +3802,11 @@ func (x WebMessageInfo_BizPrivacyStatus) String() string {
 }
 
 func (WebMessageInfo_BizPrivacyStatus) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[49].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[51].Descriptor()
 }
 
 func (WebMessageInfo_BizPrivacyStatus) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[49]
+	return &file_binary_proto_def_proto_enumTypes[51]
 }
 
 func (x WebMessageInfo_BizPrivacyStatus) Number() protoreflect.EnumNumber {
@@ -3671,7 +3825,7 @@ func (x *WebMessageInfo_BizPrivacyStatus) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use WebMessageInfo_BizPrivacyStatus.Descriptor instead.
 func (WebMessageInfo_BizPrivacyStatus) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{150, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{154, 2}
 }
 
 type WebFeatures_Flag int32
@@ -3710,11 +3864,11 @@ func (x WebFeatures_Flag) String() string {
 }
 
 func (WebFeatures_Flag) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[50].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[52].Descriptor()
 }
 
 func (WebFeatures_Flag) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[50]
+	return &file_binary_proto_def_proto_enumTypes[52]
 }
 
 func (x WebFeatures_Flag) Number() protoreflect.EnumNumber {
@@ -3733,7 +3887,7 @@ func (x *WebFeatures_Flag) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use WebFeatures_Flag.Descriptor instead.
 func (WebFeatures_Flag) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{151, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{155, 0}
 }
 
 type PaymentInfo_TxnStatus int32
@@ -3856,11 +4010,11 @@ func (x PaymentInfo_TxnStatus) String() string {
 }
 
 func (PaymentInfo_TxnStatus) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[51].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[53].Descriptor()
 }
 
 func (PaymentInfo_TxnStatus) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[51]
+	return &file_binary_proto_def_proto_enumTypes[53]
 }
 
 func (x PaymentInfo_TxnStatus) Number() protoreflect.EnumNumber {
@@ -3879,7 +4033,7 @@ func (x *PaymentInfo_TxnStatus) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use PaymentInfo_TxnStatus.Descriptor instead.
 func (PaymentInfo_TxnStatus) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{158, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{162, 0}
 }
 
 type PaymentInfo_Status int32
@@ -3942,11 +4096,11 @@ func (x PaymentInfo_Status) String() string {
 }
 
 func (PaymentInfo_Status) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[52].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[54].Descriptor()
 }
 
 func (PaymentInfo_Status) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[52]
+	return &file_binary_proto_def_proto_enumTypes[54]
 }
 
 func (x PaymentInfo_Status) Number() protoreflect.EnumNumber {
@@ -3965,7 +4119,7 @@ func (x *PaymentInfo_Status) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use PaymentInfo_Status.Descriptor instead.
 func (PaymentInfo_Status) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{158, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{162, 1}
 }
 
 type PaymentInfo_Currency int32
@@ -3998,11 +4152,11 @@ func (x PaymentInfo_Currency) String() string {
 }
 
 func (PaymentInfo_Currency) Descriptor() protoreflect.EnumDescriptor {
-	return file_binary_proto_def_proto_enumTypes[53].Descriptor()
+	return file_binary_proto_def_proto_enumTypes[55].Descriptor()
 }
 
 func (PaymentInfo_Currency) Type() protoreflect.EnumType {
-	return &file_binary_proto_def_proto_enumTypes[53]
+	return &file_binary_proto_def_proto_enumTypes[55]
 }
 
 func (x PaymentInfo_Currency) Number() protoreflect.EnumNumber {
@@ -4021,7 +4175,7 @@ func (x *PaymentInfo_Currency) UnmarshalJSON(b []byte) error {
 
 // Deprecated: Use PaymentInfo_Currency.Descriptor instead.
 func (PaymentInfo_Currency) EnumDescriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{158, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{162, 2}
 }
 
 type ADVSignedKeyIndexList struct {
@@ -4418,83 +4572,21 @@ func (x *DeviceProps) GetHistorySyncConfig() *DeviceProps_HistorySyncConfig {
 	return nil
 }
 
-type PeerDataOperationRequestResponseMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PeerDataOperationRequestType *PeerDataOperationRequestType                                      `protobuf:"varint,1,opt,name=peerDataOperationRequestType,enum=proto.PeerDataOperationRequestType" json:"peerDataOperationRequestType,omitempty"`
-	StanzaId                     *string                                                            `protobuf:"bytes,2,opt,name=stanzaId" json:"stanzaId,omitempty"`
-	PeerDataOperationResult      []*PeerDataOperationRequestResponseMessage_PeerDataOperationResult `protobuf:"bytes,3,rep,name=peerDataOperationResult" json:"peerDataOperationResult,omitempty"`
-}
-
-func (x *PeerDataOperationRequestResponseMessage) Reset() {
-	*x = PeerDataOperationRequestResponseMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeerDataOperationRequestResponseMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeerDataOperationRequestResponseMessage) ProtoMessage() {}
-
-func (x *PeerDataOperationRequestResponseMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeerDataOperationRequestResponseMessage.ProtoReflect.Descriptor instead.
-func (*PeerDataOperationRequestResponseMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *PeerDataOperationRequestResponseMessage) GetPeerDataOperationRequestType() PeerDataOperationRequestType {
-	if x != nil && x.PeerDataOperationRequestType != nil {
-		return *x.PeerDataOperationRequestType
-	}
-	return PeerDataOperationRequestType_UPLOAD_STICKER
-}
-
-func (x *PeerDataOperationRequestResponseMessage) GetStanzaId() string {
-	if x != nil && x.StanzaId != nil {
-		return *x.StanzaId
-	}
-	return ""
-}
-
-func (x *PeerDataOperationRequestResponseMessage) GetPeerDataOperationResult() []*PeerDataOperationRequestResponseMessage_PeerDataOperationResult {
-	if x != nil {
-		return x.PeerDataOperationResult
-	}
-	return nil
-}
-
 type PeerDataOperationRequestMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	PeerDataOperationRequestType *PeerDataOperationRequestType                             `protobuf:"varint,1,opt,name=peerDataOperationRequestType,enum=proto.PeerDataOperationRequestType" json:"peerDataOperationRequestType,omitempty"`
-	RequestStickerReupload       []*PeerDataOperationRequestMessage_RequestStickerReupload `protobuf:"bytes,2,rep,name=requestStickerReupload" json:"requestStickerReupload,omitempty"`
-	RequestUrlPreview            []*PeerDataOperationRequestMessage_RequestUrlPreview      `protobuf:"bytes,3,rep,name=requestUrlPreview" json:"requestUrlPreview,omitempty"`
+	PeerDataOperationRequestType *PeerDataOperationRequestType                               `protobuf:"varint,1,opt,name=peerDataOperationRequestType,enum=proto.PeerDataOperationRequestType" json:"peerDataOperationRequestType,omitempty"`
+	RequestStickerReupload       []*PeerDataOperationRequestMessage_RequestStickerReupload   `protobuf:"bytes,2,rep,name=requestStickerReupload" json:"requestStickerReupload,omitempty"`
+	RequestUrlPreview            []*PeerDataOperationRequestMessage_RequestUrlPreview        `protobuf:"bytes,3,rep,name=requestUrlPreview" json:"requestUrlPreview,omitempty"`
+	HistorySyncOnDemandRequest   *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest `protobuf:"bytes,4,opt,name=historySyncOnDemandRequest" json:"historySyncOnDemandRequest,omitempty"`
 }
 
 func (x *PeerDataOperationRequestMessage) Reset() {
 	*x = PeerDataOperationRequestMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[7]
+		mi := &file_binary_proto_def_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4507,7 +4599,7 @@ func (x *PeerDataOperationRequestMessage) String() string {
 func (*PeerDataOperationRequestMessage) ProtoMessage() {}
 
 func (x *PeerDataOperationRequestMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[7]
+	mi := &file_binary_proto_def_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4520,7 +4612,7 @@ func (x *PeerDataOperationRequestMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PeerDataOperationRequestMessage.ProtoReflect.Descriptor instead.
 func (*PeerDataOperationRequestMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{7}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *PeerDataOperationRequestMessage) GetPeerDataOperationRequestType() PeerDataOperationRequestType {
@@ -4544,6 +4636,13 @@ func (x *PeerDataOperationRequestMessage) GetRequestUrlPreview() []*PeerDataOper
 	return nil
 }
 
+func (x *PeerDataOperationRequestMessage) GetHistorySyncOnDemandRequest() *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest {
+	if x != nil {
+		return x.HistorySyncOnDemandRequest
+	}
+	return nil
+}
+
 type PaymentInviteMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4556,7 +4655,7 @@ type PaymentInviteMessage struct {
 func (x *PaymentInviteMessage) Reset() {
 	*x = PaymentInviteMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[8]
+		mi := &file_binary_proto_def_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4569,7 +4668,7 @@ func (x *PaymentInviteMessage) String() string {
 func (*PaymentInviteMessage) ProtoMessage() {}
 
 func (x *PaymentInviteMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[8]
+	mi := &file_binary_proto_def_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4582,7 +4681,7 @@ func (x *PaymentInviteMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PaymentInviteMessage.ProtoReflect.Descriptor instead.
 func (*PaymentInviteMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{8}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *PaymentInviteMessage) GetServiceType() PaymentInviteMessage_ServiceType {
@@ -4621,7 +4720,7 @@ type OrderMessage struct {
 func (x *OrderMessage) Reset() {
 	*x = OrderMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[9]
+		mi := &file_binary_proto_def_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4634,7 +4733,7 @@ func (x *OrderMessage) String() string {
 func (*OrderMessage) ProtoMessage() {}
 
 func (x *OrderMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[9]
+	mi := &file_binary_proto_def_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4647,7 +4746,7 @@ func (x *OrderMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use OrderMessage.ProtoReflect.Descriptor instead.
 func (*OrderMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{9}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *OrderMessage) GetOrderId() string {
@@ -4756,7 +4855,7 @@ type LocationMessage struct {
 func (x *LocationMessage) Reset() {
 	*x = LocationMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[10]
+		mi := &file_binary_proto_def_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4769,7 +4868,7 @@ func (x *LocationMessage) String() string {
 func (*LocationMessage) ProtoMessage() {}
 
 func (x *LocationMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[10]
+	mi := &file_binary_proto_def_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4782,7 +4881,7 @@ func (x *LocationMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LocationMessage.ProtoReflect.Descriptor instead.
 func (*LocationMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{10}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *LocationMessage) GetDegreesLatitude() float64 {
@@ -4889,7 +4988,7 @@ type LiveLocationMessage struct {
 func (x *LiveLocationMessage) Reset() {
 	*x = LiveLocationMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[11]
+		mi := &file_binary_proto_def_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4902,7 +5001,7 @@ func (x *LiveLocationMessage) String() string {
 func (*LiveLocationMessage) ProtoMessage() {}
 
 func (x *LiveLocationMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[11]
+	mi := &file_binary_proto_def_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4915,7 +5014,7 @@ func (x *LiveLocationMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LiveLocationMessage.ProtoReflect.Descriptor instead.
 func (*LiveLocationMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{11}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *LiveLocationMessage) GetDegreesLatitude() float64 {
@@ -5003,7 +5102,7 @@ type ListResponseMessage struct {
 func (x *ListResponseMessage) Reset() {
 	*x = ListResponseMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[12]
+		mi := &file_binary_proto_def_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5016,7 +5115,7 @@ func (x *ListResponseMessage) String() string {
 func (*ListResponseMessage) ProtoMessage() {}
 
 func (x *ListResponseMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[12]
+	mi := &file_binary_proto_def_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5029,7 +5128,7 @@ func (x *ListResponseMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListResponseMessage.ProtoReflect.Descriptor instead.
 func (*ListResponseMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{12}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *ListResponseMessage) GetTitle() string {
@@ -5085,7 +5184,7 @@ type ListMessage struct {
 func (x *ListMessage) Reset() {
 	*x = ListMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[13]
+		mi := &file_binary_proto_def_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5098,7 +5197,7 @@ func (x *ListMessage) String() string {
 func (*ListMessage) ProtoMessage() {}
 
 func (x *ListMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[13]
+	mi := &file_binary_proto_def_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5111,7 +5210,7 @@ func (x *ListMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListMessage.ProtoReflect.Descriptor instead.
 func (*ListMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{13}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *ListMessage) GetTitle() string {
@@ -5183,7 +5282,7 @@ type KeepInChatMessage struct {
 func (x *KeepInChatMessage) Reset() {
 	*x = KeepInChatMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[14]
+		mi := &file_binary_proto_def_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5196,7 +5295,7 @@ func (x *KeepInChatMessage) String() string {
 func (*KeepInChatMessage) ProtoMessage() {}
 
 func (x *KeepInChatMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[14]
+	mi := &file_binary_proto_def_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5209,7 +5308,7 @@ func (x *KeepInChatMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use KeepInChatMessage.ProtoReflect.Descriptor instead.
 func (*KeepInChatMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{14}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *KeepInChatMessage) GetKey() *MessageKey {
@@ -5253,7 +5352,7 @@ type InvoiceMessage struct {
 func (x *InvoiceMessage) Reset() {
 	*x = InvoiceMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[15]
+		mi := &file_binary_proto_def_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5266,7 +5365,7 @@ func (x *InvoiceMessage) String() string {
 func (*InvoiceMessage) ProtoMessage() {}
 
 func (x *InvoiceMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[15]
+	mi := &file_binary_proto_def_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5279,7 +5378,7 @@ func (x *InvoiceMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InvoiceMessage.ProtoReflect.Descriptor instead.
 func (*InvoiceMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{15}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *InvoiceMessage) GetNote() string {
@@ -5368,7 +5467,7 @@ type InteractiveResponseMessage struct {
 func (x *InteractiveResponseMessage) Reset() {
 	*x = InteractiveResponseMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[16]
+		mi := &file_binary_proto_def_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5381,7 +5480,7 @@ func (x *InteractiveResponseMessage) String() string {
 func (*InteractiveResponseMessage) ProtoMessage() {}
 
 func (x *InteractiveResponseMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[16]
+	mi := &file_binary_proto_def_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5394,7 +5493,7 @@ func (x *InteractiveResponseMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InteractiveResponseMessage.ProtoReflect.Descriptor instead.
 func (*InteractiveResponseMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{16}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *InteractiveResponseMessage) GetBody() *InteractiveResponseMessage_Body {
@@ -5456,7 +5555,7 @@ type InteractiveMessage struct {
 func (x *InteractiveMessage) Reset() {
 	*x = InteractiveMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[17]
+		mi := &file_binary_proto_def_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5469,7 +5568,7 @@ func (x *InteractiveMessage) String() string {
 func (*InteractiveMessage) ProtoMessage() {}
 
 func (x *InteractiveMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[17]
+	mi := &file_binary_proto_def_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5482,7 +5581,7 @@ func (x *InteractiveMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InteractiveMessage.ProtoReflect.Descriptor instead.
 func (*InteractiveMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{17}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *InteractiveMessage) GetHeader() *InteractiveMessage_Header {
@@ -5574,7 +5673,7 @@ type InitialSecurityNotificationSettingSync struct {
 func (x *InitialSecurityNotificationSettingSync) Reset() {
 	*x = InitialSecurityNotificationSettingSync{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[18]
+		mi := &file_binary_proto_def_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5587,7 +5686,7 @@ func (x *InitialSecurityNotificationSettingSync) String() string {
 func (*InitialSecurityNotificationSettingSync) ProtoMessage() {}
 
 func (x *InitialSecurityNotificationSettingSync) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[18]
+	mi := &file_binary_proto_def_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5600,7 +5699,7 @@ func (x *InitialSecurityNotificationSettingSync) ProtoReflect() protoreflect.Mes
 
 // Deprecated: Use InitialSecurityNotificationSettingSync.ProtoReflect.Descriptor instead.
 func (*InitialSecurityNotificationSettingSync) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{18}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *InitialSecurityNotificationSettingSync) GetSecurityNotificationEnabled() bool {
@@ -5646,7 +5745,7 @@ type ImageMessage struct {
 func (x *ImageMessage) Reset() {
 	*x = ImageMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[19]
+		mi := &file_binary_proto_def_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5659,7 +5758,7 @@ func (x *ImageMessage) String() string {
 func (*ImageMessage) ProtoMessage() {}
 
 func (x *ImageMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[19]
+	mi := &file_binary_proto_def_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5672,7 +5771,7 @@ func (x *ImageMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ImageMessage.ProtoReflect.Descriptor instead.
 func (*ImageMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{19}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *ImageMessage) GetUrl() string {
@@ -5877,7 +5976,7 @@ type HistorySyncNotification struct {
 func (x *HistorySyncNotification) Reset() {
 	*x = HistorySyncNotification{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[20]
+		mi := &file_binary_proto_def_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5890,7 +5989,7 @@ func (x *HistorySyncNotification) String() string {
 func (*HistorySyncNotification) ProtoMessage() {}
 
 func (x *HistorySyncNotification) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[20]
+	mi := &file_binary_proto_def_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5903,7 +6002,7 @@ func (x *HistorySyncNotification) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistorySyncNotification.ProtoReflect.Descriptor instead.
 func (*HistorySyncNotification) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{20}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *HistorySyncNotification) GetFileSha256() []byte {
@@ -5995,7 +6094,7 @@ type HighlyStructuredMessage struct {
 func (x *HighlyStructuredMessage) Reset() {
 	*x = HighlyStructuredMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[21]
+		mi := &file_binary_proto_def_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6008,7 +6107,7 @@ func (x *HighlyStructuredMessage) String() string {
 func (*HighlyStructuredMessage) ProtoMessage() {}
 
 func (x *HighlyStructuredMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[21]
+	mi := &file_binary_proto_def_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6021,7 +6120,7 @@ func (x *HighlyStructuredMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HighlyStructuredMessage.ProtoReflect.Descriptor instead.
 func (*HighlyStructuredMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{21}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *HighlyStructuredMessage) GetNamespace() string {
@@ -6105,7 +6204,7 @@ type GroupInviteMessage struct {
 func (x *GroupInviteMessage) Reset() {
 	*x = GroupInviteMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[22]
+		mi := &file_binary_proto_def_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6118,7 +6217,7 @@ func (x *GroupInviteMessage) String() string {
 func (*GroupInviteMessage) ProtoMessage() {}
 
 func (x *GroupInviteMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[22]
+	mi := &file_binary_proto_def_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6131,7 +6230,7 @@ func (x *GroupInviteMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GroupInviteMessage.ProtoReflect.Descriptor instead.
 func (*GroupInviteMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{22}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *GroupInviteMessage) GetGroupJid() string {
@@ -6201,7 +6300,7 @@ type FutureProofMessage struct {
 func (x *FutureProofMessage) Reset() {
 	*x = FutureProofMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[23]
+		mi := &file_binary_proto_def_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6214,7 +6313,7 @@ func (x *FutureProofMessage) String() string {
 func (*FutureProofMessage) ProtoMessage() {}
 
 func (x *FutureProofMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[23]
+	mi := &file_binary_proto_def_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6227,7 +6326,7 @@ func (x *FutureProofMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FutureProofMessage.ProtoReflect.Descriptor instead.
 func (*FutureProofMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{23}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *FutureProofMessage) GetMessage() *Message {
@@ -6271,7 +6370,7 @@ type ExtendedTextMessage struct {
 func (x *ExtendedTextMessage) Reset() {
 	*x = ExtendedTextMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[24]
+		mi := &file_binary_proto_def_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6284,7 +6383,7 @@ func (x *ExtendedTextMessage) String() string {
 func (*ExtendedTextMessage) ProtoMessage() {}
 
 func (x *ExtendedTextMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[24]
+	mi := &file_binary_proto_def_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6297,7 +6396,7 @@ func (x *ExtendedTextMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExtendedTextMessage.ProtoReflect.Descriptor instead.
 func (*ExtendedTextMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{24}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *ExtendedTextMessage) GetText() string {
@@ -6481,7 +6580,7 @@ type EncReactionMessage struct {
 func (x *EncReactionMessage) Reset() {
 	*x = EncReactionMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[25]
+		mi := &file_binary_proto_def_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6494,7 +6593,7 @@ func (x *EncReactionMessage) String() string {
 func (*EncReactionMessage) ProtoMessage() {}
 
 func (x *EncReactionMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[25]
+	mi := &file_binary_proto_def_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6507,7 +6606,7 @@ func (x *EncReactionMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use EncReactionMessage.ProtoReflect.Descriptor instead.
 func (*EncReactionMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{25}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *EncReactionMessage) GetTargetMessageKey() *MessageKey {
@@ -6561,7 +6660,7 @@ type DocumentMessage struct {
 func (x *DocumentMessage) Reset() {
 	*x = DocumentMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[26]
+		mi := &file_binary_proto_def_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6574,7 +6673,7 @@ func (x *DocumentMessage) String() string {
 func (*DocumentMessage) ProtoMessage() {}
 
 func (x *DocumentMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[26]
+	mi := &file_binary_proto_def_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6587,7 +6686,7 @@ func (x *DocumentMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DocumentMessage.ProtoReflect.Descriptor instead.
 func (*DocumentMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{26}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *DocumentMessage) GetUrl() string {
@@ -6743,7 +6842,7 @@ type DeviceSentMessage struct {
 func (x *DeviceSentMessage) Reset() {
 	*x = DeviceSentMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[27]
+		mi := &file_binary_proto_def_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6756,7 +6855,7 @@ func (x *DeviceSentMessage) String() string {
 func (*DeviceSentMessage) ProtoMessage() {}
 
 func (x *DeviceSentMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[27]
+	mi := &file_binary_proto_def_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6769,7 +6868,7 @@ func (x *DeviceSentMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeviceSentMessage.ProtoReflect.Descriptor instead.
 func (*DeviceSentMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{27}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *DeviceSentMessage) GetDestinationJid() string {
@@ -6804,7 +6903,7 @@ type DeclinePaymentRequestMessage struct {
 func (x *DeclinePaymentRequestMessage) Reset() {
 	*x = DeclinePaymentRequestMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[28]
+		mi := &file_binary_proto_def_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6817,7 +6916,7 @@ func (x *DeclinePaymentRequestMessage) String() string {
 func (*DeclinePaymentRequestMessage) ProtoMessage() {}
 
 func (x *DeclinePaymentRequestMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[28]
+	mi := &file_binary_proto_def_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6830,7 +6929,7 @@ func (x *DeclinePaymentRequestMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeclinePaymentRequestMessage.ProtoReflect.Descriptor instead.
 func (*DeclinePaymentRequestMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{28}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *DeclinePaymentRequestMessage) GetKey() *MessageKey {
@@ -6853,7 +6952,7 @@ type ContactsArrayMessage struct {
 func (x *ContactsArrayMessage) Reset() {
 	*x = ContactsArrayMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[29]
+		mi := &file_binary_proto_def_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6866,7 +6965,7 @@ func (x *ContactsArrayMessage) String() string {
 func (*ContactsArrayMessage) ProtoMessage() {}
 
 func (x *ContactsArrayMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[29]
+	mi := &file_binary_proto_def_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6879,7 +6978,7 @@ func (x *ContactsArrayMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ContactsArrayMessage.ProtoReflect.Descriptor instead.
 func (*ContactsArrayMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{29}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *ContactsArrayMessage) GetDisplayName() string {
@@ -6916,7 +7015,7 @@ type ContactMessage struct {
 func (x *ContactMessage) Reset() {
 	*x = ContactMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[30]
+		mi := &file_binary_proto_def_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6929,7 +7028,7 @@ func (x *ContactMessage) String() string {
 func (*ContactMessage) ProtoMessage() {}
 
 func (x *ContactMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[30]
+	mi := &file_binary_proto_def_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6942,7 +7041,7 @@ func (x *ContactMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ContactMessage.ProtoReflect.Descriptor instead.
 func (*ContactMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{30}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *ContactMessage) GetDisplayName() string {
@@ -6978,7 +7077,7 @@ type Chat struct {
 func (x *Chat) Reset() {
 	*x = Chat{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[31]
+		mi := &file_binary_proto_def_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6991,7 +7090,7 @@ func (x *Chat) String() string {
 func (*Chat) ProtoMessage() {}
 
 func (x *Chat) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[31]
+	mi := &file_binary_proto_def_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7004,7 +7103,7 @@ func (x *Chat) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Chat.ProtoReflect.Descriptor instead.
 func (*Chat) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{31}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *Chat) GetDisplayName() string {
@@ -7032,7 +7131,7 @@ type CancelPaymentRequestMessage struct {
 func (x *CancelPaymentRequestMessage) Reset() {
 	*x = CancelPaymentRequestMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[32]
+		mi := &file_binary_proto_def_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7045,7 +7144,7 @@ func (x *CancelPaymentRequestMessage) String() string {
 func (*CancelPaymentRequestMessage) ProtoMessage() {}
 
 func (x *CancelPaymentRequestMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[32]
+	mi := &file_binary_proto_def_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7058,7 +7157,7 @@ func (x *CancelPaymentRequestMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CancelPaymentRequestMessage.ProtoReflect.Descriptor instead.
 func (*CancelPaymentRequestMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{32}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *CancelPaymentRequestMessage) GetKey() *MessageKey {
@@ -7082,7 +7181,7 @@ type Call struct {
 func (x *Call) Reset() {
 	*x = Call{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[33]
+		mi := &file_binary_proto_def_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7095,7 +7194,7 @@ func (x *Call) String() string {
 func (*Call) ProtoMessage() {}
 
 func (x *Call) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[33]
+	mi := &file_binary_proto_def_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7108,7 +7207,7 @@ func (x *Call) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Call.ProtoReflect.Descriptor instead.
 func (*Call) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{33}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{32}
 }
 
 func (x *Call) GetCallKey() []byte {
@@ -7156,7 +7255,7 @@ type ButtonsResponseMessage struct {
 func (x *ButtonsResponseMessage) Reset() {
 	*x = ButtonsResponseMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[34]
+		mi := &file_binary_proto_def_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7169,7 +7268,7 @@ func (x *ButtonsResponseMessage) String() string {
 func (*ButtonsResponseMessage) ProtoMessage() {}
 
 func (x *ButtonsResponseMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[34]
+	mi := &file_binary_proto_def_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7182,7 +7281,7 @@ func (x *ButtonsResponseMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ButtonsResponseMessage.ProtoReflect.Descriptor instead.
 func (*ButtonsResponseMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{34}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *ButtonsResponseMessage) GetSelectedButtonId() string {
@@ -7253,7 +7352,7 @@ type ButtonsMessage struct {
 func (x *ButtonsMessage) Reset() {
 	*x = ButtonsMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[35]
+		mi := &file_binary_proto_def_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7266,7 +7365,7 @@ func (x *ButtonsMessage) String() string {
 func (*ButtonsMessage) ProtoMessage() {}
 
 func (x *ButtonsMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[35]
+	mi := &file_binary_proto_def_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7279,7 +7378,7 @@ func (x *ButtonsMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ButtonsMessage.ProtoReflect.Descriptor instead.
 func (*ButtonsMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{35}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *ButtonsMessage) GetContentText() string {
@@ -7412,12 +7511,13 @@ type AudioMessage struct {
 	StreamingSidecar  []byte       `protobuf:"bytes,18,opt,name=streamingSidecar" json:"streamingSidecar,omitempty"`
 	Waveform          []byte       `protobuf:"bytes,19,opt,name=waveform" json:"waveform,omitempty"`
 	BackgroundArgb    *uint32      `protobuf:"fixed32,20,opt,name=backgroundArgb" json:"backgroundArgb,omitempty"`
+	ViewOnce          *bool        `protobuf:"varint,21,opt,name=viewOnce" json:"viewOnce,omitempty"`
 }
 
 func (x *AudioMessage) Reset() {
 	*x = AudioMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[36]
+		mi := &file_binary_proto_def_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7430,7 +7530,7 @@ func (x *AudioMessage) String() string {
 func (*AudioMessage) ProtoMessage() {}
 
 func (x *AudioMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[36]
+	mi := &file_binary_proto_def_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7443,7 +7543,7 @@ func (x *AudioMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AudioMessage.ProtoReflect.Descriptor instead.
 func (*AudioMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{36}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *AudioMessage) GetUrl() string {
@@ -7544,6 +7644,13 @@ func (x *AudioMessage) GetBackgroundArgb() uint32 {
 	return 0
 }
 
+func (x *AudioMessage) GetViewOnce() bool {
+	if x != nil && x.ViewOnce != nil {
+		return *x.ViewOnce
+	}
+	return false
+}
+
 type AppStateSyncKey struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7556,7 +7663,7 @@ type AppStateSyncKey struct {
 func (x *AppStateSyncKey) Reset() {
 	*x = AppStateSyncKey{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[37]
+		mi := &file_binary_proto_def_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7569,7 +7676,7 @@ func (x *AppStateSyncKey) String() string {
 func (*AppStateSyncKey) ProtoMessage() {}
 
 func (x *AppStateSyncKey) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[37]
+	mi := &file_binary_proto_def_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7582,7 +7689,7 @@ func (x *AppStateSyncKey) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AppStateSyncKey.ProtoReflect.Descriptor instead.
 func (*AppStateSyncKey) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{37}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *AppStateSyncKey) GetKeyId() *AppStateSyncKeyId {
@@ -7610,7 +7717,7 @@ type AppStateSyncKeyShare struct {
 func (x *AppStateSyncKeyShare) Reset() {
 	*x = AppStateSyncKeyShare{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[38]
+		mi := &file_binary_proto_def_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7623,7 +7730,7 @@ func (x *AppStateSyncKeyShare) String() string {
 func (*AppStateSyncKeyShare) ProtoMessage() {}
 
 func (x *AppStateSyncKeyShare) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[38]
+	mi := &file_binary_proto_def_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7636,7 +7743,7 @@ func (x *AppStateSyncKeyShare) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AppStateSyncKeyShare.ProtoReflect.Descriptor instead.
 func (*AppStateSyncKeyShare) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{38}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *AppStateSyncKeyShare) GetKeys() []*AppStateSyncKey {
@@ -7657,7 +7764,7 @@ type AppStateSyncKeyRequest struct {
 func (x *AppStateSyncKeyRequest) Reset() {
 	*x = AppStateSyncKeyRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[39]
+		mi := &file_binary_proto_def_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7670,7 +7777,7 @@ func (x *AppStateSyncKeyRequest) String() string {
 func (*AppStateSyncKeyRequest) ProtoMessage() {}
 
 func (x *AppStateSyncKeyRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[39]
+	mi := &file_binary_proto_def_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7683,7 +7790,7 @@ func (x *AppStateSyncKeyRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AppStateSyncKeyRequest.ProtoReflect.Descriptor instead.
 func (*AppStateSyncKeyRequest) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{39}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *AppStateSyncKeyRequest) GetKeyIds() []*AppStateSyncKeyId {
@@ -7704,7 +7811,7 @@ type AppStateSyncKeyId struct {
 func (x *AppStateSyncKeyId) Reset() {
 	*x = AppStateSyncKeyId{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[40]
+		mi := &file_binary_proto_def_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7717,7 +7824,7 @@ func (x *AppStateSyncKeyId) String() string {
 func (*AppStateSyncKeyId) ProtoMessage() {}
 
 func (x *AppStateSyncKeyId) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[40]
+	mi := &file_binary_proto_def_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7730,7 +7837,7 @@ func (x *AppStateSyncKeyId) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AppStateSyncKeyId.ProtoReflect.Descriptor instead.
 func (*AppStateSyncKeyId) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{40}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{39}
 }
 
 func (x *AppStateSyncKeyId) GetKeyId() []byte {
@@ -7753,7 +7860,7 @@ type AppStateSyncKeyFingerprint struct {
 func (x *AppStateSyncKeyFingerprint) Reset() {
 	*x = AppStateSyncKeyFingerprint{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[41]
+		mi := &file_binary_proto_def_proto_msgTypes[40]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7766,7 +7873,7 @@ func (x *AppStateSyncKeyFingerprint) String() string {
 func (*AppStateSyncKeyFingerprint) ProtoMessage() {}
 
 func (x *AppStateSyncKeyFingerprint) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[41]
+	mi := &file_binary_proto_def_proto_msgTypes[40]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7779,7 +7886,7 @@ func (x *AppStateSyncKeyFingerprint) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AppStateSyncKeyFingerprint.ProtoReflect.Descriptor instead.
 func (*AppStateSyncKeyFingerprint) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{41}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{40}
 }
 
 func (x *AppStateSyncKeyFingerprint) GetRawId() uint32 {
@@ -7816,7 +7923,7 @@ type AppStateSyncKeyData struct {
 func (x *AppStateSyncKeyData) Reset() {
 	*x = AppStateSyncKeyData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[42]
+		mi := &file_binary_proto_def_proto_msgTypes[41]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7829,7 +7936,7 @@ func (x *AppStateSyncKeyData) String() string {
 func (*AppStateSyncKeyData) ProtoMessage() {}
 
 func (x *AppStateSyncKeyData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[42]
+	mi := &file_binary_proto_def_proto_msgTypes[41]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7842,7 +7949,7 @@ func (x *AppStateSyncKeyData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AppStateSyncKeyData.ProtoReflect.Descriptor instead.
 func (*AppStateSyncKeyData) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{42}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{41}
 }
 
 func (x *AppStateSyncKeyData) GetKeyData() []byte {
@@ -7878,7 +7985,7 @@ type AppStateFatalExceptionNotification struct {
 func (x *AppStateFatalExceptionNotification) Reset() {
 	*x = AppStateFatalExceptionNotification{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[43]
+		mi := &file_binary_proto_def_proto_msgTypes[42]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7891,7 +7998,7 @@ func (x *AppStateFatalExceptionNotification) String() string {
 func (*AppStateFatalExceptionNotification) ProtoMessage() {}
 
 func (x *AppStateFatalExceptionNotification) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[43]
+	mi := &file_binary_proto_def_proto_msgTypes[42]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7904,7 +8011,7 @@ func (x *AppStateFatalExceptionNotification) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use AppStateFatalExceptionNotification.ProtoReflect.Descriptor instead.
 func (*AppStateFatalExceptionNotification) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{43}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{42}
 }
 
 func (x *AppStateFatalExceptionNotification) GetCollectionNames() []string {
@@ -7934,7 +8041,7 @@ type Location struct {
 func (x *Location) Reset() {
 	*x = Location{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[44]
+		mi := &file_binary_proto_def_proto_msgTypes[43]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7947,7 +8054,7 @@ func (x *Location) String() string {
 func (*Location) ProtoMessage() {}
 
 func (x *Location) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[44]
+	mi := &file_binary_proto_def_proto_msgTypes[43]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7960,7 +8067,7 @@ func (x *Location) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Location.ProtoReflect.Descriptor instead.
 func (*Location) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{44}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{43}
 }
 
 func (x *Location) GetDegreesLatitude() float64 {
@@ -7999,7 +8106,7 @@ type InteractiveAnnotation struct {
 func (x *InteractiveAnnotation) Reset() {
 	*x = InteractiveAnnotation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[45]
+		mi := &file_binary_proto_def_proto_msgTypes[44]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8012,7 +8119,7 @@ func (x *InteractiveAnnotation) String() string {
 func (*InteractiveAnnotation) ProtoMessage() {}
 
 func (x *InteractiveAnnotation) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[45]
+	mi := &file_binary_proto_def_proto_msgTypes[44]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8025,7 +8132,7 @@ func (x *InteractiveAnnotation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InteractiveAnnotation.ProtoReflect.Descriptor instead.
 func (*InteractiveAnnotation) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{45}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{44}
 }
 
 func (x *InteractiveAnnotation) GetPolygonVertices() []*Point {
@@ -8076,7 +8183,7 @@ type HydratedTemplateButton struct {
 func (x *HydratedTemplateButton) Reset() {
 	*x = HydratedTemplateButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[46]
+		mi := &file_binary_proto_def_proto_msgTypes[45]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8089,7 +8196,7 @@ func (x *HydratedTemplateButton) String() string {
 func (*HydratedTemplateButton) ProtoMessage() {}
 
 func (x *HydratedTemplateButton) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[46]
+	mi := &file_binary_proto_def_proto_msgTypes[45]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8102,7 +8209,7 @@ func (x *HydratedTemplateButton) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HydratedTemplateButton.ProtoReflect.Descriptor instead.
 func (*HydratedTemplateButton) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{46}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{45}
 }
 
 func (x *HydratedTemplateButton) GetIndex() uint32 {
@@ -8162,6 +8269,61 @@ func (*HydratedTemplateButton_UrlButton) isHydratedTemplateButton_HydratedButton
 
 func (*HydratedTemplateButton_CallButton) isHydratedTemplateButton_HydratedButton() {}
 
+type GroupMention struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	GroupJid     *string `protobuf:"bytes,1,opt,name=groupJid" json:"groupJid,omitempty"`
+	GroupSubject *string `protobuf:"bytes,2,opt,name=groupSubject" json:"groupSubject,omitempty"`
+}
+
+func (x *GroupMention) Reset() {
+	*x = GroupMention{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[46]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GroupMention) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GroupMention) ProtoMessage() {}
+
+func (x *GroupMention) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[46]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GroupMention.ProtoReflect.Descriptor instead.
+func (*GroupMention) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{46}
+}
+
+func (x *GroupMention) GetGroupJid() string {
+	if x != nil && x.GroupJid != nil {
+		return *x.GroupJid
+	}
+	return ""
+}
+
+func (x *GroupMention) GetGroupSubject() string {
+	if x != nil && x.GroupSubject != nil {
+		return *x.GroupSubject
+	}
+	return ""
+}
+
 type DisappearingMode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8327,6 +8489,8 @@ type ContextInfo struct {
 	TrustBannerType                  *string                          `protobuf:"bytes,37,opt,name=trustBannerType" json:"trustBannerType,omitempty"`
 	TrustBannerAction                *uint32                          `protobuf:"varint,38,opt,name=trustBannerAction" json:"trustBannerAction,omitempty"`
 	IsSampled                        *bool                            `protobuf:"varint,39,opt,name=isSampled" json:"isSampled,omitempty"`
+	GroupMentions                    []*GroupMention                  `protobuf:"bytes,40,rep,name=groupMentions" json:"groupMentions,omitempty"`
+	Utm                              *ContextInfo_UTMInfo             `protobuf:"bytes,41,opt,name=utm" json:"utm,omitempty"`
 }
 
 func (x *ContextInfo) Reset() {
@@ -8543,6 +8707,20 @@ func (x *ContextInfo) GetIsSampled() bool {
 	return false
 }
 
+func (x *ContextInfo) GetGroupMentions() []*GroupMention {
+	if x != nil {
+		return x.GroupMentions
+	}
+	return nil
+}
+
+func (x *ContextInfo) GetUtm() *ContextInfo_UTMInfo {
+	if x != nil {
+		return x.Utm
+	}
+	return nil
+}
+
 type ActionLink struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -9009,6 +9187,12 @@ type Message struct {
 	EditedMessage                              *FutureProofMessage           `protobuf:"bytes,58,opt,name=editedMessage" json:"editedMessage,omitempty"`
 	ViewOnceMessageV2Extension                 *FutureProofMessage           `protobuf:"bytes,59,opt,name=viewOnceMessageV2Extension" json:"viewOnceMessageV2Extension,omitempty"`
 	PollCreationMessageV2                      *PollCreationMessage          `protobuf:"bytes,60,opt,name=pollCreationMessageV2" json:"pollCreationMessageV2,omitempty"`
+	ScheduledCallCreationMessage               *ScheduledCallCreationMessage `protobuf:"bytes,61,opt,name=scheduledCallCreationMessage" json:"scheduledCallCreationMessage,omitempty"`
+	GroupMentionedMessage                      *FutureProofMessage           `protobuf:"bytes,62,opt,name=groupMentionedMessage" json:"groupMentionedMessage,omitempty"`
+	PinMessage                                 *PinMessage                   `protobuf:"bytes,63,opt,name=pinMessage" json:"pinMessage,omitempty"`
+	PollCreationMessageV3                      *PollCreationMessage          `protobuf:"bytes,64,opt,name=pollCreationMessageV3" json:"pollCreationMessageV3,omitempty"`
+	ScheduledCallEditMessage                   *ScheduledCallEditMessage     `protobuf:"bytes,65,opt,name=scheduledCallEditMessage" json:"scheduledCallEditMessage,omitempty"`
+	PtvMessage                                 *VideoMessage                 `protobuf:"bytes,66,opt,name=ptvMessage" json:"ptvMessage,omitempty"`
 }
 
 func (x *Message) Reset() {
@@ -9393,6 +9577,48 @@ func (x *Message) GetPollCreationMessageV2() *PollCreationMessage {
 	return nil
 }
 
+func (x *Message) GetScheduledCallCreationMessage() *ScheduledCallCreationMessage {
+	if x != nil {
+		return x.ScheduledCallCreationMessage
+	}
+	return nil
+}
+
+func (x *Message) GetGroupMentionedMessage() *FutureProofMessage {
+	if x != nil {
+		return x.GroupMentionedMessage
+	}
+	return nil
+}
+
+func (x *Message) GetPinMessage() *PinMessage {
+	if x != nil {
+		return x.PinMessage
+	}
+	return nil
+}
+
+func (x *Message) GetPollCreationMessageV3() *PollCreationMessage {
+	if x != nil {
+		return x.PollCreationMessageV3
+	}
+	return nil
+}
+
+func (x *Message) GetScheduledCallEditMessage() *ScheduledCallEditMessage {
+	if x != nil {
+		return x.ScheduledCallEditMessage
+	}
+	return nil
+}
+
+func (x *Message) GetPtvMessage() *VideoMessage {
+	if x != nil {
+		return x.PtvMessage
+	}
+	return nil
+}
+
 type MessageContextInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -10233,6 +10459,124 @@ func (x *SendPaymentMessage) GetBackground() *PaymentBackground {
 	return nil
 }
 
+type ScheduledCallEditMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Key      *MessageKey                        `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	EditType *ScheduledCallEditMessage_EditType `protobuf:"varint,2,opt,name=editType,enum=proto.ScheduledCallEditMessage_EditType" json:"editType,omitempty"`
+}
+
+func (x *ScheduledCallEditMessage) Reset() {
+	*x = ScheduledCallEditMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[64]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ScheduledCallEditMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ScheduledCallEditMessage) ProtoMessage() {}
+
+func (x *ScheduledCallEditMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[64]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ScheduledCallEditMessage.ProtoReflect.Descriptor instead.
+func (*ScheduledCallEditMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{64}
+}
+
+func (x *ScheduledCallEditMessage) GetKey() *MessageKey {
+	if x != nil {
+		return x.Key
+	}
+	return nil
+}
+
+func (x *ScheduledCallEditMessage) GetEditType() ScheduledCallEditMessage_EditType {
+	if x != nil && x.EditType != nil {
+		return *x.EditType
+	}
+	return ScheduledCallEditMessage_UNKNOWN
+}
+
+type ScheduledCallCreationMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ScheduledTimestampMs *int64                                 `protobuf:"varint,1,opt,name=scheduledTimestampMs" json:"scheduledTimestampMs,omitempty"`
+	CallType             *ScheduledCallCreationMessage_CallType `protobuf:"varint,2,opt,name=callType,enum=proto.ScheduledCallCreationMessage_CallType" json:"callType,omitempty"`
+	Title                *string                                `protobuf:"bytes,3,opt,name=title" json:"title,omitempty"`
+}
+
+func (x *ScheduledCallCreationMessage) Reset() {
+	*x = ScheduledCallCreationMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[65]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ScheduledCallCreationMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ScheduledCallCreationMessage) ProtoMessage() {}
+
+func (x *ScheduledCallCreationMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[65]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ScheduledCallCreationMessage.ProtoReflect.Descriptor instead.
+func (*ScheduledCallCreationMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{65}
+}
+
+func (x *ScheduledCallCreationMessage) GetScheduledTimestampMs() int64 {
+	if x != nil && x.ScheduledTimestampMs != nil {
+		return *x.ScheduledTimestampMs
+	}
+	return 0
+}
+
+func (x *ScheduledCallCreationMessage) GetCallType() ScheduledCallCreationMessage_CallType {
+	if x != nil && x.CallType != nil {
+		return *x.CallType
+	}
+	return ScheduledCallCreationMessage_UNKNOWN
+}
+
+func (x *ScheduledCallCreationMessage) GetTitle() string {
+	if x != nil && x.Title != nil {
+		return *x.Title
+	}
+	return ""
+}
+
 type RequestPhoneNumberMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -10244,7 +10588,7 @@ type RequestPhoneNumberMessage struct {
 func (x *RequestPhoneNumberMessage) Reset() {
 	*x = RequestPhoneNumberMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[64]
+		mi := &file_binary_proto_def_proto_msgTypes[66]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10257,7 +10601,7 @@ func (x *RequestPhoneNumberMessage) String() string {
 func (*RequestPhoneNumberMessage) ProtoMessage() {}
 
 func (x *RequestPhoneNumberMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[64]
+	mi := &file_binary_proto_def_proto_msgTypes[66]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10270,7 +10614,7 @@ func (x *RequestPhoneNumberMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RequestPhoneNumberMessage.ProtoReflect.Descriptor instead.
 func (*RequestPhoneNumberMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{64}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{66}
 }
 
 func (x *RequestPhoneNumberMessage) GetContextInfo() *ContextInfo {
@@ -10297,7 +10641,7 @@ type RequestPaymentMessage struct {
 func (x *RequestPaymentMessage) Reset() {
 	*x = RequestPaymentMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[65]
+		mi := &file_binary_proto_def_proto_msgTypes[67]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10310,7 +10654,7 @@ func (x *RequestPaymentMessage) String() string {
 func (*RequestPaymentMessage) ProtoMessage() {}
 
 func (x *RequestPaymentMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[65]
+	mi := &file_binary_proto_def_proto_msgTypes[67]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10323,7 +10667,7 @@ func (x *RequestPaymentMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RequestPaymentMessage.ProtoReflect.Descriptor instead.
 func (*RequestPaymentMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{65}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{67}
 }
 
 func (x *RequestPaymentMessage) GetNoteMessage() *Message {
@@ -10389,7 +10733,7 @@ type ReactionMessage struct {
 func (x *ReactionMessage) Reset() {
 	*x = ReactionMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[66]
+		mi := &file_binary_proto_def_proto_msgTypes[68]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10402,7 +10746,7 @@ func (x *ReactionMessage) String() string {
 func (*ReactionMessage) ProtoMessage() {}
 
 func (x *ReactionMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[66]
+	mi := &file_binary_proto_def_proto_msgTypes[68]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10415,7 +10759,7 @@ func (x *ReactionMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ReactionMessage.ProtoReflect.Descriptor instead.
 func (*ReactionMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{66}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{68}
 }
 
 func (x *ReactionMessage) GetKey() *MessageKey {
@@ -10470,7 +10814,7 @@ type ProtocolMessage struct {
 func (x *ProtocolMessage) Reset() {
 	*x = ProtocolMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[67]
+		mi := &file_binary_proto_def_proto_msgTypes[69]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10483,7 +10827,7 @@ func (x *ProtocolMessage) String() string {
 func (*ProtocolMessage) ProtoMessage() {}
 
 func (x *ProtocolMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[67]
+	mi := &file_binary_proto_def_proto_msgTypes[69]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10496,7 +10840,7 @@ func (x *ProtocolMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProtocolMessage.ProtoReflect.Descriptor instead.
 func (*ProtocolMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{67}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{69}
 }
 
 func (x *ProtocolMessage) GetKey() *MessageKey {
@@ -10613,7 +10957,7 @@ type ProductMessage struct {
 func (x *ProductMessage) Reset() {
 	*x = ProductMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[68]
+		mi := &file_binary_proto_def_proto_msgTypes[70]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10626,7 +10970,7 @@ func (x *ProductMessage) String() string {
 func (*ProductMessage) ProtoMessage() {}
 
 func (x *ProductMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[68]
+	mi := &file_binary_proto_def_proto_msgTypes[70]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10639,7 +10983,7 @@ func (x *ProductMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProductMessage.ProtoReflect.Descriptor instead.
 func (*ProductMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{68}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{70}
 }
 
 func (x *ProductMessage) GetProduct() *ProductMessage_ProductSnapshot {
@@ -10695,7 +11039,7 @@ type PollVoteMessage struct {
 func (x *PollVoteMessage) Reset() {
 	*x = PollVoteMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[69]
+		mi := &file_binary_proto_def_proto_msgTypes[71]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10708,7 +11052,7 @@ func (x *PollVoteMessage) String() string {
 func (*PollVoteMessage) ProtoMessage() {}
 
 func (x *PollVoteMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[69]
+	mi := &file_binary_proto_def_proto_msgTypes[71]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10721,7 +11065,7 @@ func (x *PollVoteMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PollVoteMessage.ProtoReflect.Descriptor instead.
 func (*PollVoteMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{69}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{71}
 }
 
 func (x *PollVoteMessage) GetSelectedOptions() [][]byte {
@@ -10745,7 +11089,7 @@ type PollUpdateMessage struct {
 func (x *PollUpdateMessage) Reset() {
 	*x = PollUpdateMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[70]
+		mi := &file_binary_proto_def_proto_msgTypes[72]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10758,7 +11102,7 @@ func (x *PollUpdateMessage) String() string {
 func (*PollUpdateMessage) ProtoMessage() {}
 
 func (x *PollUpdateMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[70]
+	mi := &file_binary_proto_def_proto_msgTypes[72]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10771,7 +11115,7 @@ func (x *PollUpdateMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PollUpdateMessage.ProtoReflect.Descriptor instead.
 func (*PollUpdateMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{70}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{72}
 }
 
 func (x *PollUpdateMessage) GetPollCreationMessageKey() *MessageKey {
@@ -10811,7 +11155,7 @@ type PollUpdateMessageMetadata struct {
 func (x *PollUpdateMessageMetadata) Reset() {
 	*x = PollUpdateMessageMetadata{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[71]
+		mi := &file_binary_proto_def_proto_msgTypes[73]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10824,7 +11168,7 @@ func (x *PollUpdateMessageMetadata) String() string {
 func (*PollUpdateMessageMetadata) ProtoMessage() {}
 
 func (x *PollUpdateMessageMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[71]
+	mi := &file_binary_proto_def_proto_msgTypes[73]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10837,7 +11181,7 @@ func (x *PollUpdateMessageMetadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PollUpdateMessageMetadata.ProtoReflect.Descriptor instead.
 func (*PollUpdateMessageMetadata) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{71}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{73}
 }
 
 type PollEncValue struct {
@@ -10852,7 +11196,7 @@ type PollEncValue struct {
 func (x *PollEncValue) Reset() {
 	*x = PollEncValue{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[72]
+		mi := &file_binary_proto_def_proto_msgTypes[74]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10865,7 +11209,7 @@ func (x *PollEncValue) String() string {
 func (*PollEncValue) ProtoMessage() {}
 
 func (x *PollEncValue) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[72]
+	mi := &file_binary_proto_def_proto_msgTypes[74]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10878,7 +11222,7 @@ func (x *PollEncValue) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PollEncValue.ProtoReflect.Descriptor instead.
 func (*PollEncValue) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{72}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{74}
 }
 
 func (x *PollEncValue) GetEncPayload() []byte {
@@ -10910,7 +11254,7 @@ type PollCreationMessage struct {
 func (x *PollCreationMessage) Reset() {
 	*x = PollCreationMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[73]
+		mi := &file_binary_proto_def_proto_msgTypes[75]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10923,7 +11267,7 @@ func (x *PollCreationMessage) String() string {
 func (*PollCreationMessage) ProtoMessage() {}
 
 func (x *PollCreationMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[73]
+	mi := &file_binary_proto_def_proto_msgTypes[75]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -10936,7 +11280,7 @@ func (x *PollCreationMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PollCreationMessage.ProtoReflect.Descriptor instead.
 func (*PollCreationMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{73}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{75}
 }
 
 func (x *PollCreationMessage) GetEncKey() []byte {
@@ -10974,6 +11318,132 @@ func (x *PollCreationMessage) GetContextInfo() *ContextInfo {
 	return nil
 }
 
+type PinMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Key               *MessageKey                `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"`
+	PinMessageType    *PinMessage_PinMessageType `protobuf:"varint,2,opt,name=pinMessageType,enum=proto.PinMessage_PinMessageType" json:"pinMessageType,omitempty"`
+	SenderTimestampMs *int64                     `protobuf:"varint,3,opt,name=senderTimestampMs" json:"senderTimestampMs,omitempty"`
+}
+
+func (x *PinMessage) Reset() {
+	*x = PinMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[76]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PinMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PinMessage) ProtoMessage() {}
+
+func (x *PinMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[76]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PinMessage.ProtoReflect.Descriptor instead.
+func (*PinMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{76}
+}
+
+func (x *PinMessage) GetKey() *MessageKey {
+	if x != nil {
+		return x.Key
+	}
+	return nil
+}
+
+func (x *PinMessage) GetPinMessageType() PinMessage_PinMessageType {
+	if x != nil && x.PinMessageType != nil {
+		return *x.PinMessageType
+	}
+	return PinMessage_UNKNOWN_PIN_MESSAGE_TYPE
+}
+
+func (x *PinMessage) GetSenderTimestampMs() int64 {
+	if x != nil && x.SenderTimestampMs != nil {
+		return *x.SenderTimestampMs
+	}
+	return 0
+}
+
+type PeerDataOperationRequestResponseMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	PeerDataOperationRequestType *PeerDataOperationRequestType                                      `protobuf:"varint,1,opt,name=peerDataOperationRequestType,enum=proto.PeerDataOperationRequestType" json:"peerDataOperationRequestType,omitempty"`
+	StanzaId                     *string                                                            `protobuf:"bytes,2,opt,name=stanzaId" json:"stanzaId,omitempty"`
+	PeerDataOperationResult      []*PeerDataOperationRequestResponseMessage_PeerDataOperationResult `protobuf:"bytes,3,rep,name=peerDataOperationResult" json:"peerDataOperationResult,omitempty"`
+}
+
+func (x *PeerDataOperationRequestResponseMessage) Reset() {
+	*x = PeerDataOperationRequestResponseMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[77]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeerDataOperationRequestResponseMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeerDataOperationRequestResponseMessage) ProtoMessage() {}
+
+func (x *PeerDataOperationRequestResponseMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[77]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeerDataOperationRequestResponseMessage.ProtoReflect.Descriptor instead.
+func (*PeerDataOperationRequestResponseMessage) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{77}
+}
+
+func (x *PeerDataOperationRequestResponseMessage) GetPeerDataOperationRequestType() PeerDataOperationRequestType {
+	if x != nil && x.PeerDataOperationRequestType != nil {
+		return *x.PeerDataOperationRequestType
+	}
+	return PeerDataOperationRequestType_UPLOAD_STICKER
+}
+
+func (x *PeerDataOperationRequestResponseMessage) GetStanzaId() string {
+	if x != nil && x.StanzaId != nil {
+		return *x.StanzaId
+	}
+	return ""
+}
+
+func (x *PeerDataOperationRequestResponseMessage) GetPeerDataOperationResult() []*PeerDataOperationRequestResponseMessage_PeerDataOperationResult {
+	if x != nil {
+		return x.PeerDataOperationResult
+	}
+	return nil
+}
+
 type EphemeralSetting struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -10986,7 +11456,7 @@ type EphemeralSetting struct {
 func (x *EphemeralSetting) Reset() {
 	*x = EphemeralSetting{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[74]
+		mi := &file_binary_proto_def_proto_msgTypes[78]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -10999,7 +11469,7 @@ func (x *EphemeralSetting) String() string {
 func (*EphemeralSetting) ProtoMessage() {}
 
 func (x *EphemeralSetting) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[74]
+	mi := &file_binary_proto_def_proto_msgTypes[78]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11012,7 +11482,7 @@ func (x *EphemeralSetting) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use EphemeralSetting.ProtoReflect.Descriptor instead.
 func (*EphemeralSetting) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{74}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{78}
 }
 
 func (x *EphemeralSetting) GetDuration() int32 {
@@ -11041,7 +11511,7 @@ type WallpaperSettings struct {
 func (x *WallpaperSettings) Reset() {
 	*x = WallpaperSettings{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[75]
+		mi := &file_binary_proto_def_proto_msgTypes[79]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11054,7 +11524,7 @@ func (x *WallpaperSettings) String() string {
 func (*WallpaperSettings) ProtoMessage() {}
 
 func (x *WallpaperSettings) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[75]
+	mi := &file_binary_proto_def_proto_msgTypes[79]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11067,7 +11537,7 @@ func (x *WallpaperSettings) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WallpaperSettings.ProtoReflect.Descriptor instead.
 func (*WallpaperSettings) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{75}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{79}
 }
 
 func (x *WallpaperSettings) GetFilename() string {
@@ -11105,7 +11575,7 @@ type StickerMetadata struct {
 func (x *StickerMetadata) Reset() {
 	*x = StickerMetadata{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[76]
+		mi := &file_binary_proto_def_proto_msgTypes[80]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11118,7 +11588,7 @@ func (x *StickerMetadata) String() string {
 func (*StickerMetadata) ProtoMessage() {}
 
 func (x *StickerMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[76]
+	mi := &file_binary_proto_def_proto_msgTypes[80]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11131,7 +11601,7 @@ func (x *StickerMetadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StickerMetadata.ProtoReflect.Descriptor instead.
 func (*StickerMetadata) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{76}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{80}
 }
 
 func (x *StickerMetadata) GetUrl() string {
@@ -11223,7 +11693,7 @@ type Pushname struct {
 func (x *Pushname) Reset() {
 	*x = Pushname{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[77]
+		mi := &file_binary_proto_def_proto_msgTypes[81]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11236,7 +11706,7 @@ func (x *Pushname) String() string {
 func (*Pushname) ProtoMessage() {}
 
 func (x *Pushname) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[77]
+	mi := &file_binary_proto_def_proto_msgTypes[81]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11249,7 +11719,7 @@ func (x *Pushname) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Pushname.ProtoReflect.Descriptor instead.
 func (*Pushname) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{77}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{81}
 }
 
 func (x *Pushname) GetId() string {
@@ -11278,7 +11748,7 @@ type PastParticipants struct {
 func (x *PastParticipants) Reset() {
 	*x = PastParticipants{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[78]
+		mi := &file_binary_proto_def_proto_msgTypes[82]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11291,7 +11761,7 @@ func (x *PastParticipants) String() string {
 func (*PastParticipants) ProtoMessage() {}
 
 func (x *PastParticipants) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[78]
+	mi := &file_binary_proto_def_proto_msgTypes[82]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11304,7 +11774,7 @@ func (x *PastParticipants) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PastParticipants.ProtoReflect.Descriptor instead.
 func (*PastParticipants) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{78}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{82}
 }
 
 func (x *PastParticipants) GetGroupJid() string {
@@ -11334,7 +11804,7 @@ type PastParticipant struct {
 func (x *PastParticipant) Reset() {
 	*x = PastParticipant{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[79]
+		mi := &file_binary_proto_def_proto_msgTypes[83]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11347,7 +11817,7 @@ func (x *PastParticipant) String() string {
 func (*PastParticipant) ProtoMessage() {}
 
 func (x *PastParticipant) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[79]
+	mi := &file_binary_proto_def_proto_msgTypes[83]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11360,7 +11830,7 @@ func (x *PastParticipant) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PastParticipant.ProtoReflect.Descriptor instead.
 func (*PastParticipant) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{79}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{83}
 }
 
 func (x *PastParticipant) GetUserJid() string {
@@ -11405,7 +11875,7 @@ type HistorySync struct {
 func (x *HistorySync) Reset() {
 	*x = HistorySync{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[80]
+		mi := &file_binary_proto_def_proto_msgTypes[84]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11418,7 +11888,7 @@ func (x *HistorySync) String() string {
 func (*HistorySync) ProtoMessage() {}
 
 func (x *HistorySync) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[80]
+	mi := &file_binary_proto_def_proto_msgTypes[84]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11431,7 +11901,7 @@ func (x *HistorySync) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistorySync.ProtoReflect.Descriptor instead.
 func (*HistorySync) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{80}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{84}
 }
 
 func (x *HistorySync) GetSyncType() HistorySync_HistorySyncType {
@@ -11523,7 +11993,7 @@ type HistorySyncMsg struct {
 func (x *HistorySyncMsg) Reset() {
 	*x = HistorySyncMsg{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[81]
+		mi := &file_binary_proto_def_proto_msgTypes[85]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11536,7 +12006,7 @@ func (x *HistorySyncMsg) String() string {
 func (*HistorySyncMsg) ProtoMessage() {}
 
 func (x *HistorySyncMsg) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[81]
+	mi := &file_binary_proto_def_proto_msgTypes[85]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11549,7 +12019,7 @@ func (x *HistorySyncMsg) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HistorySyncMsg.ProtoReflect.Descriptor instead.
 func (*HistorySyncMsg) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{81}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{85}
 }
 
 func (x *HistorySyncMsg) GetMessage() *WebMessageInfo {
@@ -11578,7 +12048,7 @@ type GroupParticipant struct {
 func (x *GroupParticipant) Reset() {
 	*x = GroupParticipant{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[82]
+		mi := &file_binary_proto_def_proto_msgTypes[86]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11591,7 +12061,7 @@ func (x *GroupParticipant) String() string {
 func (*GroupParticipant) ProtoMessage() {}
 
 func (x *GroupParticipant) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[82]
+	mi := &file_binary_proto_def_proto_msgTypes[86]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11604,7 +12074,7 @@ func (x *GroupParticipant) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GroupParticipant.ProtoReflect.Descriptor instead.
 func (*GroupParticipant) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{82}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{86}
 }
 
 func (x *GroupParticipant) GetUserJid() string {
@@ -11642,7 +12112,7 @@ type GlobalSettings struct {
 func (x *GlobalSettings) Reset() {
 	*x = GlobalSettings{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[83]
+		mi := &file_binary_proto_def_proto_msgTypes[87]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11655,7 +12125,7 @@ func (x *GlobalSettings) String() string {
 func (*GlobalSettings) ProtoMessage() {}
 
 func (x *GlobalSettings) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[83]
+	mi := &file_binary_proto_def_proto_msgTypes[87]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11668,7 +12138,7 @@ func (x *GlobalSettings) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GlobalSettings.ProtoReflect.Descriptor instead.
 func (*GlobalSettings) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{83}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{87}
 }
 
 func (x *GlobalSettings) GetLightThemeWallpaper() *WallpaperSettings {
@@ -11788,8 +12258,8 @@ type Conversation struct {
 	Description               *string                                `protobuf:"bytes,33,opt,name=description" json:"description,omitempty"`
 	Support                   *bool                                  `protobuf:"varint,34,opt,name=support" json:"support,omitempty"`
 	IsParentGroup             *bool                                  `protobuf:"varint,35,opt,name=isParentGroup" json:"isParentGroup,omitempty"`
-	IsDefaultSubgroup         *bool                                  `protobuf:"varint,36,opt,name=isDefaultSubgroup" json:"isDefaultSubgroup,omitempty"`
 	ParentGroupId             *string                                `protobuf:"bytes,37,opt,name=parentGroupId" json:"parentGroupId,omitempty"`
+	IsDefaultSubgroup         *bool                                  `protobuf:"varint,36,opt,name=isDefaultSubgroup" json:"isDefaultSubgroup,omitempty"`
 	DisplayName               *string                                `protobuf:"bytes,38,opt,name=displayName" json:"displayName,omitempty"`
 	PnJid                     *string                                `protobuf:"bytes,39,opt,name=pnJid" json:"pnJid,omitempty"`
 	ShareOwnPn                *bool                                  `protobuf:"varint,40,opt,name=shareOwnPn" json:"shareOwnPn,omitempty"`
@@ -11800,7 +12270,7 @@ type Conversation struct {
 func (x *Conversation) Reset() {
 	*x = Conversation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[84]
+		mi := &file_binary_proto_def_proto_msgTypes[88]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -11813,7 +12283,7 @@ func (x *Conversation) String() string {
 func (*Conversation) ProtoMessage() {}
 
 func (x *Conversation) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[84]
+	mi := &file_binary_proto_def_proto_msgTypes[88]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -11826,7 +12296,7 @@ func (x *Conversation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Conversation.ProtoReflect.Descriptor instead.
 func (*Conversation) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{84}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{88}
 }
 
 func (x *Conversation) GetId() string {
@@ -12074,13 +12544,6 @@ func (x *Conversation) GetIsParentGroup() bool {
 	return false
 }
 
-func (x *Conversation) GetIsDefaultSubgroup() bool {
-	if x != nil && x.IsDefaultSubgroup != nil {
-		return *x.IsDefaultSubgroup
-	}
-	return false
-}
-
 func (x *Conversation) GetParentGroupId() string {
 	if x != nil && x.ParentGroupId != nil {
 		return *x.ParentGroupId
@@ -12088,6 +12551,13 @@ func (x *Conversation) GetParentGroupId() string {
 	return ""
 }
 
+func (x *Conversation) GetIsDefaultSubgroup() bool {
+	if x != nil && x.IsDefaultSubgroup != nil {
+		return *x.IsDefaultSubgroup
+	}
+	return false
+}
+
 func (x *Conversation) GetDisplayName() string {
 	if x != nil && x.DisplayName != nil {
 		return *x.DisplayName
@@ -12135,7 +12605,7 @@ type AvatarUserSettings struct {
 func (x *AvatarUserSettings) Reset() {
 	*x = AvatarUserSettings{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[85]
+		mi := &file_binary_proto_def_proto_msgTypes[89]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12148,7 +12618,7 @@ func (x *AvatarUserSettings) String() string {
 func (*AvatarUserSettings) ProtoMessage() {}
 
 func (x *AvatarUserSettings) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[85]
+	mi := &file_binary_proto_def_proto_msgTypes[89]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12161,7 +12631,7 @@ func (x *AvatarUserSettings) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AvatarUserSettings.ProtoReflect.Descriptor instead.
 func (*AvatarUserSettings) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{85}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{89}
 }
 
 func (x *AvatarUserSettings) GetFbid() string {
@@ -12192,7 +12662,7 @@ type AutoDownloadSettings struct {
 func (x *AutoDownloadSettings) Reset() {
 	*x = AutoDownloadSettings{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[86]
+		mi := &file_binary_proto_def_proto_msgTypes[90]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12205,7 +12675,7 @@ func (x *AutoDownloadSettings) String() string {
 func (*AutoDownloadSettings) ProtoMessage() {}
 
 func (x *AutoDownloadSettings) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[86]
+	mi := &file_binary_proto_def_proto_msgTypes[90]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12218,7 +12688,7 @@ func (x *AutoDownloadSettings) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AutoDownloadSettings.ProtoReflect.Descriptor instead.
 func (*AutoDownloadSettings) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{86}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{90}
 }
 
 func (x *AutoDownloadSettings) GetDownloadImages() bool {
@@ -12261,7 +12731,7 @@ type MsgRowOpaqueData struct {
 func (x *MsgRowOpaqueData) Reset() {
 	*x = MsgRowOpaqueData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[87]
+		mi := &file_binary_proto_def_proto_msgTypes[91]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12274,7 +12744,7 @@ func (x *MsgRowOpaqueData) String() string {
 func (*MsgRowOpaqueData) ProtoMessage() {}
 
 func (x *MsgRowOpaqueData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[87]
+	mi := &file_binary_proto_def_proto_msgTypes[91]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12287,7 +12757,7 @@ func (x *MsgRowOpaqueData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MsgRowOpaqueData.ProtoReflect.Descriptor instead.
 func (*MsgRowOpaqueData) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{87}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{91}
 }
 
 func (x *MsgRowOpaqueData) GetCurrentMsg() *MsgOpaqueData {
@@ -12340,7 +12810,7 @@ type MsgOpaqueData struct {
 func (x *MsgOpaqueData) Reset() {
 	*x = MsgOpaqueData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[88]
+		mi := &file_binary_proto_def_proto_msgTypes[92]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12353,7 +12823,7 @@ func (x *MsgOpaqueData) String() string {
 func (*MsgOpaqueData) ProtoMessage() {}
 
 func (x *MsgOpaqueData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[88]
+	mi := &file_binary_proto_def_proto_msgTypes[92]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12366,7 +12836,7 @@ func (x *MsgOpaqueData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MsgOpaqueData.ProtoReflect.Descriptor instead.
 func (*MsgOpaqueData) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{88}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{92}
 }
 
 func (x *MsgOpaqueData) GetBody() string {
@@ -12562,7 +13032,7 @@ type ServerErrorReceipt struct {
 func (x *ServerErrorReceipt) Reset() {
 	*x = ServerErrorReceipt{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[89]
+		mi := &file_binary_proto_def_proto_msgTypes[93]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12575,7 +13045,7 @@ func (x *ServerErrorReceipt) String() string {
 func (*ServerErrorReceipt) ProtoMessage() {}
 
 func (x *ServerErrorReceipt) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[89]
+	mi := &file_binary_proto_def_proto_msgTypes[93]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12588,7 +13058,7 @@ func (x *ServerErrorReceipt) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ServerErrorReceipt.ProtoReflect.Descriptor instead.
 func (*ServerErrorReceipt) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{89}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{93}
 }
 
 func (x *ServerErrorReceipt) GetStanzaId() string {
@@ -12611,7 +13081,7 @@ type MediaRetryNotification struct {
 func (x *MediaRetryNotification) Reset() {
 	*x = MediaRetryNotification{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[90]
+		mi := &file_binary_proto_def_proto_msgTypes[94]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12624,7 +13094,7 @@ func (x *MediaRetryNotification) String() string {
 func (*MediaRetryNotification) ProtoMessage() {}
 
 func (x *MediaRetryNotification) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[90]
+	mi := &file_binary_proto_def_proto_msgTypes[94]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12637,7 +13107,7 @@ func (x *MediaRetryNotification) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MediaRetryNotification.ProtoReflect.Descriptor instead.
 func (*MediaRetryNotification) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{90}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{94}
 }
 
 func (x *MediaRetryNotification) GetStanzaId() string {
@@ -12675,7 +13145,7 @@ type MessageKey struct {
 func (x *MessageKey) Reset() {
 	*x = MessageKey{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[91]
+		mi := &file_binary_proto_def_proto_msgTypes[95]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12688,7 +13158,7 @@ func (x *MessageKey) String() string {
 func (*MessageKey) ProtoMessage() {}
 
 func (x *MessageKey) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[91]
+	mi := &file_binary_proto_def_proto_msgTypes[95]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12701,7 +13171,7 @@ func (x *MessageKey) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MessageKey.ProtoReflect.Descriptor instead.
 func (*MessageKey) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{91}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{95}
 }
 
 func (x *MessageKey) GetRemoteJid() string {
@@ -12743,7 +13213,7 @@ type SyncdVersion struct {
 func (x *SyncdVersion) Reset() {
 	*x = SyncdVersion{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[92]
+		mi := &file_binary_proto_def_proto_msgTypes[96]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12756,7 +13226,7 @@ func (x *SyncdVersion) String() string {
 func (*SyncdVersion) ProtoMessage() {}
 
 func (x *SyncdVersion) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[92]
+	mi := &file_binary_proto_def_proto_msgTypes[96]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12769,7 +13239,7 @@ func (x *SyncdVersion) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncdVersion.ProtoReflect.Descriptor instead.
 func (*SyncdVersion) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{92}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{96}
 }
 
 func (x *SyncdVersion) GetVersion() uint64 {
@@ -12790,7 +13260,7 @@ type SyncdValue struct {
 func (x *SyncdValue) Reset() {
 	*x = SyncdValue{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[93]
+		mi := &file_binary_proto_def_proto_msgTypes[97]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12803,7 +13273,7 @@ func (x *SyncdValue) String() string {
 func (*SyncdValue) ProtoMessage() {}
 
 func (x *SyncdValue) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[93]
+	mi := &file_binary_proto_def_proto_msgTypes[97]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12816,7 +13286,7 @@ func (x *SyncdValue) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncdValue.ProtoReflect.Descriptor instead.
 func (*SyncdValue) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{93}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{97}
 }
 
 func (x *SyncdValue) GetBlob() []byte {
@@ -12840,7 +13310,7 @@ type SyncdSnapshot struct {
 func (x *SyncdSnapshot) Reset() {
 	*x = SyncdSnapshot{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[94]
+		mi := &file_binary_proto_def_proto_msgTypes[98]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12853,7 +13323,7 @@ func (x *SyncdSnapshot) String() string {
 func (*SyncdSnapshot) ProtoMessage() {}
 
 func (x *SyncdSnapshot) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[94]
+	mi := &file_binary_proto_def_proto_msgTypes[98]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12866,7 +13336,7 @@ func (x *SyncdSnapshot) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncdSnapshot.ProtoReflect.Descriptor instead.
 func (*SyncdSnapshot) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{94}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{98}
 }
 
 func (x *SyncdSnapshot) GetVersion() *SyncdVersion {
@@ -12910,7 +13380,7 @@ type SyncdRecord struct {
 func (x *SyncdRecord) Reset() {
 	*x = SyncdRecord{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[95]
+		mi := &file_binary_proto_def_proto_msgTypes[99]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12923,7 +13393,7 @@ func (x *SyncdRecord) String() string {
 func (*SyncdRecord) ProtoMessage() {}
 
 func (x *SyncdRecord) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[95]
+	mi := &file_binary_proto_def_proto_msgTypes[99]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -12936,7 +13406,7 @@ func (x *SyncdRecord) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncdRecord.ProtoReflect.Descriptor instead.
 func (*SyncdRecord) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{95}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{99}
 }
 
 func (x *SyncdRecord) GetIndex() *SyncdIndex {
@@ -12978,7 +13448,7 @@ type SyncdPatch struct {
 func (x *SyncdPatch) Reset() {
 	*x = SyncdPatch{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[96]
+		mi := &file_binary_proto_def_proto_msgTypes[100]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -12991,7 +13461,7 @@ func (x *SyncdPatch) String() string {
 func (*SyncdPatch) ProtoMessage() {}
 
 func (x *SyncdPatch) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[96]
+	mi := &file_binary_proto_def_proto_msgTypes[100]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13004,7 +13474,7 @@ func (x *SyncdPatch) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncdPatch.ProtoReflect.Descriptor instead.
 func (*SyncdPatch) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{96}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{100}
 }
 
 func (x *SyncdPatch) GetVersion() *SyncdVersion {
@@ -13074,7 +13544,7 @@ type SyncdMutations struct {
 func (x *SyncdMutations) Reset() {
 	*x = SyncdMutations{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[97]
+		mi := &file_binary_proto_def_proto_msgTypes[101]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13087,7 +13557,7 @@ func (x *SyncdMutations) String() string {
 func (*SyncdMutations) ProtoMessage() {}
 
 func (x *SyncdMutations) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[97]
+	mi := &file_binary_proto_def_proto_msgTypes[101]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13100,7 +13570,7 @@ func (x *SyncdMutations) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncdMutations.ProtoReflect.Descriptor instead.
 func (*SyncdMutations) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{97}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{101}
 }
 
 func (x *SyncdMutations) GetMutations() []*SyncdMutation {
@@ -13122,7 +13592,7 @@ type SyncdMutation struct {
 func (x *SyncdMutation) Reset() {
 	*x = SyncdMutation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[98]
+		mi := &file_binary_proto_def_proto_msgTypes[102]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13135,7 +13605,7 @@ func (x *SyncdMutation) String() string {
 func (*SyncdMutation) ProtoMessage() {}
 
 func (x *SyncdMutation) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[98]
+	mi := &file_binary_proto_def_proto_msgTypes[102]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13148,7 +13618,7 @@ func (x *SyncdMutation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncdMutation.ProtoReflect.Descriptor instead.
 func (*SyncdMutation) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{98}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{102}
 }
 
 func (x *SyncdMutation) GetOperation() SyncdMutation_SyncdOperation {
@@ -13176,7 +13646,7 @@ type SyncdIndex struct {
 func (x *SyncdIndex) Reset() {
 	*x = SyncdIndex{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[99]
+		mi := &file_binary_proto_def_proto_msgTypes[103]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13189,7 +13659,7 @@ func (x *SyncdIndex) String() string {
 func (*SyncdIndex) ProtoMessage() {}
 
 func (x *SyncdIndex) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[99]
+	mi := &file_binary_proto_def_proto_msgTypes[103]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13202,7 +13672,7 @@ func (x *SyncdIndex) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncdIndex.ProtoReflect.Descriptor instead.
 func (*SyncdIndex) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{99}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{103}
 }
 
 func (x *SyncdIndex) GetBlob() []byte {
@@ -13223,7 +13693,7 @@ type KeyId struct {
 func (x *KeyId) Reset() {
 	*x = KeyId{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[100]
+		mi := &file_binary_proto_def_proto_msgTypes[104]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13236,7 +13706,7 @@ func (x *KeyId) String() string {
 func (*KeyId) ProtoMessage() {}
 
 func (x *KeyId) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[100]
+	mi := &file_binary_proto_def_proto_msgTypes[104]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13249,7 +13719,7 @@ func (x *KeyId) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use KeyId.ProtoReflect.Descriptor instead.
 func (*KeyId) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{100}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{104}
 }
 
 func (x *KeyId) GetId() []byte {
@@ -13275,7 +13745,7 @@ type ExternalBlobReference struct {
 func (x *ExternalBlobReference) Reset() {
 	*x = ExternalBlobReference{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[101]
+		mi := &file_binary_proto_def_proto_msgTypes[105]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13288,7 +13758,7 @@ func (x *ExternalBlobReference) String() string {
 func (*ExternalBlobReference) ProtoMessage() {}
 
 func (x *ExternalBlobReference) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[101]
+	mi := &file_binary_proto_def_proto_msgTypes[105]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13301,7 +13771,7 @@ func (x *ExternalBlobReference) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExternalBlobReference.ProtoReflect.Descriptor instead.
 func (*ExternalBlobReference) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{101}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{105}
 }
 
 func (x *ExternalBlobReference) GetMediaKey() []byte {
@@ -13358,7 +13828,7 @@ type ExitCode struct {
 func (x *ExitCode) Reset() {
 	*x = ExitCode{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[102]
+		mi := &file_binary_proto_def_proto_msgTypes[106]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13371,7 +13841,7 @@ func (x *ExitCode) String() string {
 func (*ExitCode) ProtoMessage() {}
 
 func (x *ExitCode) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[102]
+	mi := &file_binary_proto_def_proto_msgTypes[106]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13384,7 +13854,7 @@ func (x *ExitCode) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExitCode.ProtoReflect.Descriptor instead.
 func (*ExitCode) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{102}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{106}
 }
 
 func (x *ExitCode) GetCode() uint64 {
@@ -13443,7 +13913,7 @@ type SyncActionValue struct {
 func (x *SyncActionValue) Reset() {
 	*x = SyncActionValue{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[103]
+		mi := &file_binary_proto_def_proto_msgTypes[107]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13456,7 +13926,7 @@ func (x *SyncActionValue) String() string {
 func (*SyncActionValue) ProtoMessage() {}
 
 func (x *SyncActionValue) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[103]
+	mi := &file_binary_proto_def_proto_msgTypes[107]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13469,7 +13939,7 @@ func (x *SyncActionValue) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncActionValue.ProtoReflect.Descriptor instead.
 func (*SyncActionValue) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{103}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{107}
 }
 
 func (x *SyncActionValue) GetTimestamp() int64 {
@@ -13707,7 +14177,7 @@ type UserStatusMuteAction struct {
 func (x *UserStatusMuteAction) Reset() {
 	*x = UserStatusMuteAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[104]
+		mi := &file_binary_proto_def_proto_msgTypes[108]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13720,7 +14190,7 @@ func (x *UserStatusMuteAction) String() string {
 func (*UserStatusMuteAction) ProtoMessage() {}
 
 func (x *UserStatusMuteAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[104]
+	mi := &file_binary_proto_def_proto_msgTypes[108]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13733,7 +14203,7 @@ func (x *UserStatusMuteAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserStatusMuteAction.ProtoReflect.Descriptor instead.
 func (*UserStatusMuteAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{104}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{108}
 }
 
 func (x *UserStatusMuteAction) GetMuted() bool {
@@ -13754,7 +14224,7 @@ type UnarchiveChatsSetting struct {
 func (x *UnarchiveChatsSetting) Reset() {
 	*x = UnarchiveChatsSetting{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[105]
+		mi := &file_binary_proto_def_proto_msgTypes[109]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13767,7 +14237,7 @@ func (x *UnarchiveChatsSetting) String() string {
 func (*UnarchiveChatsSetting) ProtoMessage() {}
 
 func (x *UnarchiveChatsSetting) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[105]
+	mi := &file_binary_proto_def_proto_msgTypes[109]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13780,7 +14250,7 @@ func (x *UnarchiveChatsSetting) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UnarchiveChatsSetting.ProtoReflect.Descriptor instead.
 func (*UnarchiveChatsSetting) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{105}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{109}
 }
 
 func (x *UnarchiveChatsSetting) GetUnarchiveChats() bool {
@@ -13801,7 +14271,7 @@ type TimeFormatAction struct {
 func (x *TimeFormatAction) Reset() {
 	*x = TimeFormatAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[106]
+		mi := &file_binary_proto_def_proto_msgTypes[110]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13814,7 +14284,7 @@ func (x *TimeFormatAction) String() string {
 func (*TimeFormatAction) ProtoMessage() {}
 
 func (x *TimeFormatAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[106]
+	mi := &file_binary_proto_def_proto_msgTypes[110]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13827,7 +14297,7 @@ func (x *TimeFormatAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TimeFormatAction.ProtoReflect.Descriptor instead.
 func (*TimeFormatAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{106}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{110}
 }
 
 func (x *TimeFormatAction) GetIsTwentyFourHourFormatEnabled() bool {
@@ -13849,7 +14319,7 @@ type SyncActionMessage struct {
 func (x *SyncActionMessage) Reset() {
 	*x = SyncActionMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[107]
+		mi := &file_binary_proto_def_proto_msgTypes[111]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13862,7 +14332,7 @@ func (x *SyncActionMessage) String() string {
 func (*SyncActionMessage) ProtoMessage() {}
 
 func (x *SyncActionMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[107]
+	mi := &file_binary_proto_def_proto_msgTypes[111]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13875,7 +14345,7 @@ func (x *SyncActionMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncActionMessage.ProtoReflect.Descriptor instead.
 func (*SyncActionMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{107}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{111}
 }
 
 func (x *SyncActionMessage) GetKey() *MessageKey {
@@ -13905,7 +14375,7 @@ type SyncActionMessageRange struct {
 func (x *SyncActionMessageRange) Reset() {
 	*x = SyncActionMessageRange{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[108]
+		mi := &file_binary_proto_def_proto_msgTypes[112]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13918,7 +14388,7 @@ func (x *SyncActionMessageRange) String() string {
 func (*SyncActionMessageRange) ProtoMessage() {}
 
 func (x *SyncActionMessageRange) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[108]
+	mi := &file_binary_proto_def_proto_msgTypes[112]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13931,7 +14401,7 @@ func (x *SyncActionMessageRange) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncActionMessageRange.ProtoReflect.Descriptor instead.
 func (*SyncActionMessageRange) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{108}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{112}
 }
 
 func (x *SyncActionMessageRange) GetLastMessageTimestamp() int64 {
@@ -13968,7 +14438,7 @@ type SubscriptionAction struct {
 func (x *SubscriptionAction) Reset() {
 	*x = SubscriptionAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[109]
+		mi := &file_binary_proto_def_proto_msgTypes[113]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -13981,7 +14451,7 @@ func (x *SubscriptionAction) String() string {
 func (*SubscriptionAction) ProtoMessage() {}
 
 func (x *SubscriptionAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[109]
+	mi := &file_binary_proto_def_proto_msgTypes[113]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -13994,7 +14464,7 @@ func (x *SubscriptionAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SubscriptionAction.ProtoReflect.Descriptor instead.
 func (*SubscriptionAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{109}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{113}
 }
 
 func (x *SubscriptionAction) GetIsDeactivated() bool {
@@ -14038,7 +14508,7 @@ type StickerAction struct {
 func (x *StickerAction) Reset() {
 	*x = StickerAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[110]
+		mi := &file_binary_proto_def_proto_msgTypes[114]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14051,7 +14521,7 @@ func (x *StickerAction) String() string {
 func (*StickerAction) ProtoMessage() {}
 
 func (x *StickerAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[110]
+	mi := &file_binary_proto_def_proto_msgTypes[114]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14064,7 +14534,7 @@ func (x *StickerAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StickerAction.ProtoReflect.Descriptor instead.
 func (*StickerAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{110}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{114}
 }
 
 func (x *StickerAction) GetUrl() string {
@@ -14148,7 +14618,7 @@ type StarAction struct {
 func (x *StarAction) Reset() {
 	*x = StarAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[111]
+		mi := &file_binary_proto_def_proto_msgTypes[115]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14161,7 +14631,7 @@ func (x *StarAction) String() string {
 func (*StarAction) ProtoMessage() {}
 
 func (x *StarAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[111]
+	mi := &file_binary_proto_def_proto_msgTypes[115]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14174,7 +14644,7 @@ func (x *StarAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StarAction.ProtoReflect.Descriptor instead.
 func (*StarAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{111}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{115}
 }
 
 func (x *StarAction) GetStarred() bool {
@@ -14195,7 +14665,7 @@ type SecurityNotificationSetting struct {
 func (x *SecurityNotificationSetting) Reset() {
 	*x = SecurityNotificationSetting{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[112]
+		mi := &file_binary_proto_def_proto_msgTypes[116]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14208,7 +14678,7 @@ func (x *SecurityNotificationSetting) String() string {
 func (*SecurityNotificationSetting) ProtoMessage() {}
 
 func (x *SecurityNotificationSetting) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[112]
+	mi := &file_binary_proto_def_proto_msgTypes[116]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14221,7 +14691,7 @@ func (x *SecurityNotificationSetting) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SecurityNotificationSetting.ProtoReflect.Descriptor instead.
 func (*SecurityNotificationSetting) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{112}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{116}
 }
 
 func (x *SecurityNotificationSetting) GetShowNotification() bool {
@@ -14242,7 +14712,7 @@ type RemoveRecentStickerAction struct {
 func (x *RemoveRecentStickerAction) Reset() {
 	*x = RemoveRecentStickerAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[113]
+		mi := &file_binary_proto_def_proto_msgTypes[117]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14255,7 +14725,7 @@ func (x *RemoveRecentStickerAction) String() string {
 func (*RemoveRecentStickerAction) ProtoMessage() {}
 
 func (x *RemoveRecentStickerAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[113]
+	mi := &file_binary_proto_def_proto_msgTypes[117]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14268,7 +14738,7 @@ func (x *RemoveRecentStickerAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RemoveRecentStickerAction.ProtoReflect.Descriptor instead.
 func (*RemoveRecentStickerAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{113}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{117}
 }
 
 func (x *RemoveRecentStickerAction) GetLastStickerSentTs() int64 {
@@ -14289,7 +14759,7 @@ type RecentEmojiWeightsAction struct {
 func (x *RecentEmojiWeightsAction) Reset() {
 	*x = RecentEmojiWeightsAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[114]
+		mi := &file_binary_proto_def_proto_msgTypes[118]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14302,7 +14772,7 @@ func (x *RecentEmojiWeightsAction) String() string {
 func (*RecentEmojiWeightsAction) ProtoMessage() {}
 
 func (x *RecentEmojiWeightsAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[114]
+	mi := &file_binary_proto_def_proto_msgTypes[118]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14315,7 +14785,7 @@ func (x *RecentEmojiWeightsAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RecentEmojiWeightsAction.ProtoReflect.Descriptor instead.
 func (*RecentEmojiWeightsAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{114}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{118}
 }
 
 func (x *RecentEmojiWeightsAction) GetWeights() []*RecentEmojiWeight {
@@ -14340,7 +14810,7 @@ type QuickReplyAction struct {
 func (x *QuickReplyAction) Reset() {
 	*x = QuickReplyAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[115]
+		mi := &file_binary_proto_def_proto_msgTypes[119]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14353,7 +14823,7 @@ func (x *QuickReplyAction) String() string {
 func (*QuickReplyAction) ProtoMessage() {}
 
 func (x *QuickReplyAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[115]
+	mi := &file_binary_proto_def_proto_msgTypes[119]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14366,7 +14836,7 @@ func (x *QuickReplyAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use QuickReplyAction.ProtoReflect.Descriptor instead.
 func (*QuickReplyAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{115}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{119}
 }
 
 func (x *QuickReplyAction) GetShortcut() string {
@@ -14415,7 +14885,7 @@ type PushNameSetting struct {
 func (x *PushNameSetting) Reset() {
 	*x = PushNameSetting{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[116]
+		mi := &file_binary_proto_def_proto_msgTypes[120]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14428,7 +14898,7 @@ func (x *PushNameSetting) String() string {
 func (*PushNameSetting) ProtoMessage() {}
 
 func (x *PushNameSetting) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[116]
+	mi := &file_binary_proto_def_proto_msgTypes[120]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14441,7 +14911,7 @@ func (x *PushNameSetting) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PushNameSetting.ProtoReflect.Descriptor instead.
 func (*PushNameSetting) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{116}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{120}
 }
 
 func (x *PushNameSetting) GetName() string {
@@ -14462,7 +14932,7 @@ type PrimaryVersionAction struct {
 func (x *PrimaryVersionAction) Reset() {
 	*x = PrimaryVersionAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[117]
+		mi := &file_binary_proto_def_proto_msgTypes[121]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14475,7 +14945,7 @@ func (x *PrimaryVersionAction) String() string {
 func (*PrimaryVersionAction) ProtoMessage() {}
 
 func (x *PrimaryVersionAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[117]
+	mi := &file_binary_proto_def_proto_msgTypes[121]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14488,7 +14958,7 @@ func (x *PrimaryVersionAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PrimaryVersionAction.ProtoReflect.Descriptor instead.
 func (*PrimaryVersionAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{117}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{121}
 }
 
 func (x *PrimaryVersionAction) GetVersion() string {
@@ -14509,7 +14979,7 @@ type PrimaryFeature struct {
 func (x *PrimaryFeature) Reset() {
 	*x = PrimaryFeature{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[118]
+		mi := &file_binary_proto_def_proto_msgTypes[122]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14522,7 +14992,7 @@ func (x *PrimaryFeature) String() string {
 func (*PrimaryFeature) ProtoMessage() {}
 
 func (x *PrimaryFeature) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[118]
+	mi := &file_binary_proto_def_proto_msgTypes[122]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14535,7 +15005,7 @@ func (x *PrimaryFeature) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PrimaryFeature.ProtoReflect.Descriptor instead.
 func (*PrimaryFeature) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{118}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{122}
 }
 
 func (x *PrimaryFeature) GetFlags() []string {
@@ -14556,7 +15026,7 @@ type PnForLidChatAction struct {
 func (x *PnForLidChatAction) Reset() {
 	*x = PnForLidChatAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[119]
+		mi := &file_binary_proto_def_proto_msgTypes[123]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14569,7 +15039,7 @@ func (x *PnForLidChatAction) String() string {
 func (*PnForLidChatAction) ProtoMessage() {}
 
 func (x *PnForLidChatAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[119]
+	mi := &file_binary_proto_def_proto_msgTypes[123]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14582,7 +15052,7 @@ func (x *PnForLidChatAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PnForLidChatAction.ProtoReflect.Descriptor instead.
 func (*PnForLidChatAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{119}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{123}
 }
 
 func (x *PnForLidChatAction) GetPnJid() string {
@@ -14603,7 +15073,7 @@ type PinAction struct {
 func (x *PinAction) Reset() {
 	*x = PinAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[120]
+		mi := &file_binary_proto_def_proto_msgTypes[124]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14616,7 +15086,7 @@ func (x *PinAction) String() string {
 func (*PinAction) ProtoMessage() {}
 
 func (x *PinAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[120]
+	mi := &file_binary_proto_def_proto_msgTypes[124]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14629,7 +15099,7 @@ func (x *PinAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PinAction.ProtoReflect.Descriptor instead.
 func (*PinAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{120}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{124}
 }
 
 func (x *PinAction) GetPinned() bool {
@@ -14650,7 +15120,7 @@ type NuxAction struct {
 func (x *NuxAction) Reset() {
 	*x = NuxAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[121]
+		mi := &file_binary_proto_def_proto_msgTypes[125]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14663,7 +15133,7 @@ func (x *NuxAction) String() string {
 func (*NuxAction) ProtoMessage() {}
 
 func (x *NuxAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[121]
+	mi := &file_binary_proto_def_proto_msgTypes[125]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14676,7 +15146,7 @@ func (x *NuxAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use NuxAction.ProtoReflect.Descriptor instead.
 func (*NuxAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{121}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{125}
 }
 
 func (x *NuxAction) GetAcknowledged() bool {
@@ -14699,7 +15169,7 @@ type MuteAction struct {
 func (x *MuteAction) Reset() {
 	*x = MuteAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[122]
+		mi := &file_binary_proto_def_proto_msgTypes[126]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14712,7 +15182,7 @@ func (x *MuteAction) String() string {
 func (*MuteAction) ProtoMessage() {}
 
 func (x *MuteAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[122]
+	mi := &file_binary_proto_def_proto_msgTypes[126]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14725,7 +15195,7 @@ func (x *MuteAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MuteAction.ProtoReflect.Descriptor instead.
 func (*MuteAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{122}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{126}
 }
 
 func (x *MuteAction) GetMuted() bool {
@@ -14761,7 +15231,7 @@ type MarkChatAsReadAction struct {
 func (x *MarkChatAsReadAction) Reset() {
 	*x = MarkChatAsReadAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[123]
+		mi := &file_binary_proto_def_proto_msgTypes[127]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14774,7 +15244,7 @@ func (x *MarkChatAsReadAction) String() string {
 func (*MarkChatAsReadAction) ProtoMessage() {}
 
 func (x *MarkChatAsReadAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[123]
+	mi := &file_binary_proto_def_proto_msgTypes[127]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14787,7 +15257,7 @@ func (x *MarkChatAsReadAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MarkChatAsReadAction.ProtoReflect.Descriptor instead.
 func (*MarkChatAsReadAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{123}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{127}
 }
 
 func (x *MarkChatAsReadAction) GetRead() bool {
@@ -14815,7 +15285,7 @@ type LocaleSetting struct {
 func (x *LocaleSetting) Reset() {
 	*x = LocaleSetting{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[124]
+		mi := &file_binary_proto_def_proto_msgTypes[128]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14828,7 +15298,7 @@ func (x *LocaleSetting) String() string {
 func (*LocaleSetting) ProtoMessage() {}
 
 func (x *LocaleSetting) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[124]
+	mi := &file_binary_proto_def_proto_msgTypes[128]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14841,7 +15311,7 @@ func (x *LocaleSetting) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LocaleSetting.ProtoReflect.Descriptor instead.
 func (*LocaleSetting) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{124}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{128}
 }
 
 func (x *LocaleSetting) GetLocale() string {
@@ -14865,7 +15335,7 @@ type LabelEditAction struct {
 func (x *LabelEditAction) Reset() {
 	*x = LabelEditAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[125]
+		mi := &file_binary_proto_def_proto_msgTypes[129]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14878,7 +15348,7 @@ func (x *LabelEditAction) String() string {
 func (*LabelEditAction) ProtoMessage() {}
 
 func (x *LabelEditAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[125]
+	mi := &file_binary_proto_def_proto_msgTypes[129]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14891,7 +15361,7 @@ func (x *LabelEditAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LabelEditAction.ProtoReflect.Descriptor instead.
 func (*LabelEditAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{125}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{129}
 }
 
 func (x *LabelEditAction) GetName() string {
@@ -14933,7 +15403,7 @@ type LabelAssociationAction struct {
 func (x *LabelAssociationAction) Reset() {
 	*x = LabelAssociationAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[126]
+		mi := &file_binary_proto_def_proto_msgTypes[130]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14946,7 +15416,7 @@ func (x *LabelAssociationAction) String() string {
 func (*LabelAssociationAction) ProtoMessage() {}
 
 func (x *LabelAssociationAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[126]
+	mi := &file_binary_proto_def_proto_msgTypes[130]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -14959,7 +15429,7 @@ func (x *LabelAssociationAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LabelAssociationAction.ProtoReflect.Descriptor instead.
 func (*LabelAssociationAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{126}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{130}
 }
 
 func (x *LabelAssociationAction) GetLabeled() bool {
@@ -14980,7 +15450,7 @@ type KeyExpiration struct {
 func (x *KeyExpiration) Reset() {
 	*x = KeyExpiration{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[127]
+		mi := &file_binary_proto_def_proto_msgTypes[131]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -14993,7 +15463,7 @@ func (x *KeyExpiration) String() string {
 func (*KeyExpiration) ProtoMessage() {}
 
 func (x *KeyExpiration) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[127]
+	mi := &file_binary_proto_def_proto_msgTypes[131]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15006,7 +15476,7 @@ func (x *KeyExpiration) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use KeyExpiration.ProtoReflect.Descriptor instead.
 func (*KeyExpiration) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{127}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{131}
 }
 
 func (x *KeyExpiration) GetExpiredKeyEpoch() int32 {
@@ -15028,7 +15498,7 @@ type DeleteMessageForMeAction struct {
 func (x *DeleteMessageForMeAction) Reset() {
 	*x = DeleteMessageForMeAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[128]
+		mi := &file_binary_proto_def_proto_msgTypes[132]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15041,7 +15511,7 @@ func (x *DeleteMessageForMeAction) String() string {
 func (*DeleteMessageForMeAction) ProtoMessage() {}
 
 func (x *DeleteMessageForMeAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[128]
+	mi := &file_binary_proto_def_proto_msgTypes[132]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15054,7 +15524,7 @@ func (x *DeleteMessageForMeAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteMessageForMeAction.ProtoReflect.Descriptor instead.
 func (*DeleteMessageForMeAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{128}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{132}
 }
 
 func (x *DeleteMessageForMeAction) GetDeleteMedia() bool {
@@ -15082,7 +15552,7 @@ type DeleteChatAction struct {
 func (x *DeleteChatAction) Reset() {
 	*x = DeleteChatAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[129]
+		mi := &file_binary_proto_def_proto_msgTypes[133]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15095,7 +15565,7 @@ func (x *DeleteChatAction) String() string {
 func (*DeleteChatAction) ProtoMessage() {}
 
 func (x *DeleteChatAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[129]
+	mi := &file_binary_proto_def_proto_msgTypes[133]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15108,7 +15578,7 @@ func (x *DeleteChatAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteChatAction.ProtoReflect.Descriptor instead.
 func (*DeleteChatAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{129}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{133}
 }
 
 func (x *DeleteChatAction) GetMessageRange() *SyncActionMessageRange {
@@ -15131,7 +15601,7 @@ type ContactAction struct {
 func (x *ContactAction) Reset() {
 	*x = ContactAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[130]
+		mi := &file_binary_proto_def_proto_msgTypes[134]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15144,7 +15614,7 @@ func (x *ContactAction) String() string {
 func (*ContactAction) ProtoMessage() {}
 
 func (x *ContactAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[130]
+	mi := &file_binary_proto_def_proto_msgTypes[134]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15157,7 +15627,7 @@ func (x *ContactAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ContactAction.ProtoReflect.Descriptor instead.
 func (*ContactAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{130}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{134}
 }
 
 func (x *ContactAction) GetFullName() string {
@@ -15192,7 +15662,7 @@ type ClearChatAction struct {
 func (x *ClearChatAction) Reset() {
 	*x = ClearChatAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[131]
+		mi := &file_binary_proto_def_proto_msgTypes[135]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15205,7 +15675,7 @@ func (x *ClearChatAction) String() string {
 func (*ClearChatAction) ProtoMessage() {}
 
 func (x *ClearChatAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[131]
+	mi := &file_binary_proto_def_proto_msgTypes[135]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15218,7 +15688,7 @@ func (x *ClearChatAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ClearChatAction.ProtoReflect.Descriptor instead.
 func (*ClearChatAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{131}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{135}
 }
 
 func (x *ClearChatAction) GetMessageRange() *SyncActionMessageRange {
@@ -15239,7 +15709,7 @@ type ChatAssignmentOpenedStatusAction struct {
 func (x *ChatAssignmentOpenedStatusAction) Reset() {
 	*x = ChatAssignmentOpenedStatusAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[132]
+		mi := &file_binary_proto_def_proto_msgTypes[136]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15252,7 +15722,7 @@ func (x *ChatAssignmentOpenedStatusAction) String() string {
 func (*ChatAssignmentOpenedStatusAction) ProtoMessage() {}
 
 func (x *ChatAssignmentOpenedStatusAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[132]
+	mi := &file_binary_proto_def_proto_msgTypes[136]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15265,7 +15735,7 @@ func (x *ChatAssignmentOpenedStatusAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatAssignmentOpenedStatusAction.ProtoReflect.Descriptor instead.
 func (*ChatAssignmentOpenedStatusAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{132}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{136}
 }
 
 func (x *ChatAssignmentOpenedStatusAction) GetChatOpened() bool {
@@ -15286,7 +15756,7 @@ type ChatAssignmentAction struct {
 func (x *ChatAssignmentAction) Reset() {
 	*x = ChatAssignmentAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[133]
+		mi := &file_binary_proto_def_proto_msgTypes[137]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15299,7 +15769,7 @@ func (x *ChatAssignmentAction) String() string {
 func (*ChatAssignmentAction) ProtoMessage() {}
 
 func (x *ChatAssignmentAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[133]
+	mi := &file_binary_proto_def_proto_msgTypes[137]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15312,7 +15782,7 @@ func (x *ChatAssignmentAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatAssignmentAction.ProtoReflect.Descriptor instead.
 func (*ChatAssignmentAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{133}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{137}
 }
 
 func (x *ChatAssignmentAction) GetDeviceAgentID() string {
@@ -15334,7 +15804,7 @@ type ArchiveChatAction struct {
 func (x *ArchiveChatAction) Reset() {
 	*x = ArchiveChatAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[134]
+		mi := &file_binary_proto_def_proto_msgTypes[138]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15347,7 +15817,7 @@ func (x *ArchiveChatAction) String() string {
 func (*ArchiveChatAction) ProtoMessage() {}
 
 func (x *ArchiveChatAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[134]
+	mi := &file_binary_proto_def_proto_msgTypes[138]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15360,7 +15830,7 @@ func (x *ArchiveChatAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ArchiveChatAction.ProtoReflect.Descriptor instead.
 func (*ArchiveChatAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{134}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{138}
 }
 
 func (x *ArchiveChatAction) GetArchived() bool {
@@ -15388,7 +15858,7 @@ type AndroidUnsupportedActions struct {
 func (x *AndroidUnsupportedActions) Reset() {
 	*x = AndroidUnsupportedActions{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[135]
+		mi := &file_binary_proto_def_proto_msgTypes[139]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15401,7 +15871,7 @@ func (x *AndroidUnsupportedActions) String() string {
 func (*AndroidUnsupportedActions) ProtoMessage() {}
 
 func (x *AndroidUnsupportedActions) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[135]
+	mi := &file_binary_proto_def_proto_msgTypes[139]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15414,7 +15884,7 @@ func (x *AndroidUnsupportedActions) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AndroidUnsupportedActions.ProtoReflect.Descriptor instead.
 func (*AndroidUnsupportedActions) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{135}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{139}
 }
 
 func (x *AndroidUnsupportedActions) GetAllowed() bool {
@@ -15437,7 +15907,7 @@ type AgentAction struct {
 func (x *AgentAction) Reset() {
 	*x = AgentAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[136]
+		mi := &file_binary_proto_def_proto_msgTypes[140]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15450,7 +15920,7 @@ func (x *AgentAction) String() string {
 func (*AgentAction) ProtoMessage() {}
 
 func (x *AgentAction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[136]
+	mi := &file_binary_proto_def_proto_msgTypes[140]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15463,7 +15933,7 @@ func (x *AgentAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AgentAction.ProtoReflect.Descriptor instead.
 func (*AgentAction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{136}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{140}
 }
 
 func (x *AgentAction) GetName() string {
@@ -15501,7 +15971,7 @@ type SyncActionData struct {
 func (x *SyncActionData) Reset() {
 	*x = SyncActionData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[137]
+		mi := &file_binary_proto_def_proto_msgTypes[141]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15514,7 +15984,7 @@ func (x *SyncActionData) String() string {
 func (*SyncActionData) ProtoMessage() {}
 
 func (x *SyncActionData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[137]
+	mi := &file_binary_proto_def_proto_msgTypes[141]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15527,7 +15997,7 @@ func (x *SyncActionData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SyncActionData.ProtoReflect.Descriptor instead.
 func (*SyncActionData) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{137}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{141}
 }
 
 func (x *SyncActionData) GetIndex() []byte {
@@ -15570,7 +16040,7 @@ type RecentEmojiWeight struct {
 func (x *RecentEmojiWeight) Reset() {
 	*x = RecentEmojiWeight{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[138]
+		mi := &file_binary_proto_def_proto_msgTypes[142]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15583,7 +16053,7 @@ func (x *RecentEmojiWeight) String() string {
 func (*RecentEmojiWeight) ProtoMessage() {}
 
 func (x *RecentEmojiWeight) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[138]
+	mi := &file_binary_proto_def_proto_msgTypes[142]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15596,7 +16066,7 @@ func (x *RecentEmojiWeight) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RecentEmojiWeight.ProtoReflect.Descriptor instead.
 func (*RecentEmojiWeight) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{138}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{142}
 }
 
 func (x *RecentEmojiWeight) GetEmoji() string {
@@ -15626,7 +16096,7 @@ type VerifiedNameCertificate struct {
 func (x *VerifiedNameCertificate) Reset() {
 	*x = VerifiedNameCertificate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[139]
+		mi := &file_binary_proto_def_proto_msgTypes[143]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15639,7 +16109,7 @@ func (x *VerifiedNameCertificate) String() string {
 func (*VerifiedNameCertificate) ProtoMessage() {}
 
 func (x *VerifiedNameCertificate) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[139]
+	mi := &file_binary_proto_def_proto_msgTypes[143]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15652,7 +16122,7 @@ func (x *VerifiedNameCertificate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VerifiedNameCertificate.ProtoReflect.Descriptor instead.
 func (*VerifiedNameCertificate) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{139}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{143}
 }
 
 func (x *VerifiedNameCertificate) GetDetails() []byte {
@@ -15689,7 +16159,7 @@ type LocalizedName struct {
 func (x *LocalizedName) Reset() {
 	*x = LocalizedName{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[140]
+		mi := &file_binary_proto_def_proto_msgTypes[144]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15702,7 +16172,7 @@ func (x *LocalizedName) String() string {
 func (*LocalizedName) ProtoMessage() {}
 
 func (x *LocalizedName) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[140]
+	mi := &file_binary_proto_def_proto_msgTypes[144]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15715,7 +16185,7 @@ func (x *LocalizedName) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LocalizedName.ProtoReflect.Descriptor instead.
 func (*LocalizedName) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{140}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{144}
 }
 
 func (x *LocalizedName) GetLg() string {
@@ -15757,7 +16227,7 @@ type BizIdentityInfo struct {
 func (x *BizIdentityInfo) Reset() {
 	*x = BizIdentityInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[141]
+		mi := &file_binary_proto_def_proto_msgTypes[145]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15770,7 +16240,7 @@ func (x *BizIdentityInfo) String() string {
 func (*BizIdentityInfo) ProtoMessage() {}
 
 func (x *BizIdentityInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[141]
+	mi := &file_binary_proto_def_proto_msgTypes[145]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15783,7 +16253,7 @@ func (x *BizIdentityInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BizIdentityInfo.ProtoReflect.Descriptor instead.
 func (*BizIdentityInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{141}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{145}
 }
 
 func (x *BizIdentityInfo) GetVlevel() BizIdentityInfo_VerifiedLevelValue {
@@ -15854,7 +16324,7 @@ type BizAccountPayload struct {
 func (x *BizAccountPayload) Reset() {
 	*x = BizAccountPayload{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[142]
+		mi := &file_binary_proto_def_proto_msgTypes[146]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15867,7 +16337,7 @@ func (x *BizAccountPayload) String() string {
 func (*BizAccountPayload) ProtoMessage() {}
 
 func (x *BizAccountPayload) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[142]
+	mi := &file_binary_proto_def_proto_msgTypes[146]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15880,7 +16350,7 @@ func (x *BizAccountPayload) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BizAccountPayload.ProtoReflect.Descriptor instead.
 func (*BizAccountPayload) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{142}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{146}
 }
 
 func (x *BizAccountPayload) GetVnameCert() *VerifiedNameCertificate {
@@ -15912,7 +16382,7 @@ type BizAccountLinkInfo struct {
 func (x *BizAccountLinkInfo) Reset() {
 	*x = BizAccountLinkInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[143]
+		mi := &file_binary_proto_def_proto_msgTypes[147]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -15925,7 +16395,7 @@ func (x *BizAccountLinkInfo) String() string {
 func (*BizAccountLinkInfo) ProtoMessage() {}
 
 func (x *BizAccountLinkInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[143]
+	mi := &file_binary_proto_def_proto_msgTypes[147]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -15938,7 +16408,7 @@ func (x *BizAccountLinkInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BizAccountLinkInfo.ProtoReflect.Descriptor instead.
 func (*BizAccountLinkInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{143}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{147}
 }
 
 func (x *BizAccountLinkInfo) GetWhatsappBizAcctFbid() uint64 {
@@ -15989,7 +16459,7 @@ type HandshakeMessage struct {
 func (x *HandshakeMessage) Reset() {
 	*x = HandshakeMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[144]
+		mi := &file_binary_proto_def_proto_msgTypes[148]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16002,7 +16472,7 @@ func (x *HandshakeMessage) String() string {
 func (*HandshakeMessage) ProtoMessage() {}
 
 func (x *HandshakeMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[144]
+	mi := &file_binary_proto_def_proto_msgTypes[148]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16015,7 +16485,7 @@ func (x *HandshakeMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HandshakeMessage.ProtoReflect.Descriptor instead.
 func (*HandshakeMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{144}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{148}
 }
 
 func (x *HandshakeMessage) GetClientHello() *HandshakeClientHello {
@@ -16052,7 +16522,7 @@ type HandshakeServerHello struct {
 func (x *HandshakeServerHello) Reset() {
 	*x = HandshakeServerHello{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[145]
+		mi := &file_binary_proto_def_proto_msgTypes[149]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16065,7 +16535,7 @@ func (x *HandshakeServerHello) String() string {
 func (*HandshakeServerHello) ProtoMessage() {}
 
 func (x *HandshakeServerHello) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[145]
+	mi := &file_binary_proto_def_proto_msgTypes[149]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16078,7 +16548,7 @@ func (x *HandshakeServerHello) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HandshakeServerHello.ProtoReflect.Descriptor instead.
 func (*HandshakeServerHello) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{145}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{149}
 }
 
 func (x *HandshakeServerHello) GetEphemeral() []byte {
@@ -16115,7 +16585,7 @@ type HandshakeClientHello struct {
 func (x *HandshakeClientHello) Reset() {
 	*x = HandshakeClientHello{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[146]
+		mi := &file_binary_proto_def_proto_msgTypes[150]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16128,7 +16598,7 @@ func (x *HandshakeClientHello) String() string {
 func (*HandshakeClientHello) ProtoMessage() {}
 
 func (x *HandshakeClientHello) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[146]
+	mi := &file_binary_proto_def_proto_msgTypes[150]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16141,7 +16611,7 @@ func (x *HandshakeClientHello) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HandshakeClientHello.ProtoReflect.Descriptor instead.
 func (*HandshakeClientHello) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{146}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{150}
 }
 
 func (x *HandshakeClientHello) GetEphemeral() []byte {
@@ -16177,7 +16647,7 @@ type HandshakeClientFinish struct {
 func (x *HandshakeClientFinish) Reset() {
 	*x = HandshakeClientFinish{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[147]
+		mi := &file_binary_proto_def_proto_msgTypes[151]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16190,7 +16660,7 @@ func (x *HandshakeClientFinish) String() string {
 func (*HandshakeClientFinish) ProtoMessage() {}
 
 func (x *HandshakeClientFinish) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[147]
+	mi := &file_binary_proto_def_proto_msgTypes[151]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16203,7 +16673,7 @@ func (x *HandshakeClientFinish) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HandshakeClientFinish.ProtoReflect.Descriptor instead.
 func (*HandshakeClientFinish) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{147}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{151}
 }
 
 func (x *HandshakeClientFinish) GetStatic() []byte {
@@ -16249,7 +16719,6 @@ type ClientPayload struct {
 	FbDeviceId          []byte                                       `protobuf:"bytes,32,opt,name=fbDeviceId" json:"fbDeviceId,omitempty"`
 	Pull                *bool                                        `protobuf:"varint,33,opt,name=pull" json:"pull,omitempty"`
 	PaddingBytes        []byte                                       `protobuf:"bytes,34,opt,name=paddingBytes" json:"paddingBytes,omitempty"`
-	BizMarketSegment    *ClientPayload_BizMarketSegment              `protobuf:"varint,35,opt,name=bizMarketSegment,enum=proto.ClientPayload_BizMarketSegment" json:"bizMarketSegment,omitempty"`
 	YearClass           *int32                                       `protobuf:"varint,36,opt,name=yearClass" json:"yearClass,omitempty"`
 	MemClass            *int32                                       `protobuf:"varint,37,opt,name=memClass" json:"memClass,omitempty"`
 }
@@ -16257,7 +16726,7 @@ type ClientPayload struct {
 func (x *ClientPayload) Reset() {
 	*x = ClientPayload{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[148]
+		mi := &file_binary_proto_def_proto_msgTypes[152]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16270,7 +16739,7 @@ func (x *ClientPayload) String() string {
 func (*ClientPayload) ProtoMessage() {}
 
 func (x *ClientPayload) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[148]
+	mi := &file_binary_proto_def_proto_msgTypes[152]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16283,7 +16752,7 @@ func (x *ClientPayload) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ClientPayload.ProtoReflect.Descriptor instead.
 func (*ClientPayload) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152}
 }
 
 func (x *ClientPayload) GetUsername() uint64 {
@@ -16454,13 +16923,6 @@ func (x *ClientPayload) GetPaddingBytes() []byte {
 	return nil
 }
 
-func (x *ClientPayload) GetBizMarketSegment() ClientPayload_BizMarketSegment {
-	if x != nil && x.BizMarketSegment != nil {
-		return *x.BizMarketSegment
-	}
-	return ClientPayload_DEFAULT
-}
-
 func (x *ClientPayload) GetYearClass() int32 {
 	if x != nil && x.YearClass != nil {
 		return *x.YearClass
@@ -16489,7 +16951,7 @@ type WebNotificationsInfo struct {
 func (x *WebNotificationsInfo) Reset() {
 	*x = WebNotificationsInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[149]
+		mi := &file_binary_proto_def_proto_msgTypes[153]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16502,7 +16964,7 @@ func (x *WebNotificationsInfo) String() string {
 func (*WebNotificationsInfo) ProtoMessage() {}
 
 func (x *WebNotificationsInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[149]
+	mi := &file_binary_proto_def_proto_msgTypes[153]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16515,7 +16977,7 @@ func (x *WebNotificationsInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WebNotificationsInfo.ProtoReflect.Descriptor instead.
 func (*WebNotificationsInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{149}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{153}
 }
 
 func (x *WebNotificationsInfo) GetTimestamp() uint64 {
@@ -16599,7 +17061,7 @@ type WebMessageInfo struct {
 func (x *WebMessageInfo) Reset() {
 	*x = WebMessageInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[150]
+		mi := &file_binary_proto_def_proto_msgTypes[154]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16612,7 +17074,7 @@ func (x *WebMessageInfo) String() string {
 func (*WebMessageInfo) ProtoMessage() {}
 
 func (x *WebMessageInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[150]
+	mi := &file_binary_proto_def_proto_msgTypes[154]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -16625,7 +17087,7 @@ func (x *WebMessageInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WebMessageInfo.ProtoReflect.Descriptor instead.
 func (*WebMessageInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{150}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{154}
 }
 
 func (x *WebMessageInfo) GetKey() *MessageKey {
@@ -16984,7 +17446,7 @@ type WebFeatures struct {
 func (x *WebFeatures) Reset() {
 	*x = WebFeatures{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[151]
+		mi := &file_binary_proto_def_proto_msgTypes[155]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -16997,7 +17459,7 @@ func (x *WebFeatures) String() string {
 func (*WebFeatures) ProtoMessage() {}
 
 func (x *WebFeatures) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[151]
+	mi := &file_binary_proto_def_proto_msgTypes[155]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17010,7 +17472,7 @@ func (x *WebFeatures) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WebFeatures.ProtoReflect.Descriptor instead.
 func (*WebFeatures) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{151}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{155}
 }
 
 func (x *WebFeatures) GetLabelsDisplay() WebFeatures_Flag {
@@ -17344,7 +17806,7 @@ type UserReceipt struct {
 func (x *UserReceipt) Reset() {
 	*x = UserReceipt{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[152]
+		mi := &file_binary_proto_def_proto_msgTypes[156]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17357,7 +17819,7 @@ func (x *UserReceipt) String() string {
 func (*UserReceipt) ProtoMessage() {}
 
 func (x *UserReceipt) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[152]
+	mi := &file_binary_proto_def_proto_msgTypes[156]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17370,7 +17832,7 @@ func (x *UserReceipt) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserReceipt.ProtoReflect.Descriptor instead.
 func (*UserReceipt) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{152}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{156}
 }
 
 func (x *UserReceipt) GetUserJid() string {
@@ -17427,7 +17889,7 @@ type StatusPSA struct {
 func (x *StatusPSA) Reset() {
 	*x = StatusPSA{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[153]
+		mi := &file_binary_proto_def_proto_msgTypes[157]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17440,7 +17902,7 @@ func (x *StatusPSA) String() string {
 func (*StatusPSA) ProtoMessage() {}
 
 func (x *StatusPSA) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[153]
+	mi := &file_binary_proto_def_proto_msgTypes[157]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17453,7 +17915,7 @@ func (x *StatusPSA) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StatusPSA.ProtoReflect.Descriptor instead.
 func (*StatusPSA) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{153}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{157}
 }
 
 func (x *StatusPSA) GetCampaignId() uint64 {
@@ -17485,7 +17947,7 @@ type Reaction struct {
 func (x *Reaction) Reset() {
 	*x = Reaction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[154]
+		mi := &file_binary_proto_def_proto_msgTypes[158]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17498,7 +17960,7 @@ func (x *Reaction) String() string {
 func (*Reaction) ProtoMessage() {}
 
 func (x *Reaction) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[154]
+	mi := &file_binary_proto_def_proto_msgTypes[158]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17511,7 +17973,7 @@ func (x *Reaction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Reaction.ProtoReflect.Descriptor instead.
 func (*Reaction) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{154}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{158}
 }
 
 func (x *Reaction) GetKey() *MessageKey {
@@ -17558,12 +18020,13 @@ type PollUpdate struct {
 	Vote                 *PollVoteMessage `protobuf:"bytes,2,opt,name=vote" json:"vote,omitempty"`
 	SenderTimestampMs    *int64           `protobuf:"varint,3,opt,name=senderTimestampMs" json:"senderTimestampMs,omitempty"`
 	ServerTimestampMs    *int64           `protobuf:"varint,4,opt,name=serverTimestampMs" json:"serverTimestampMs,omitempty"`
+	Unread               *bool            `protobuf:"varint,5,opt,name=unread" json:"unread,omitempty"`
 }
 
 func (x *PollUpdate) Reset() {
 	*x = PollUpdate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[155]
+		mi := &file_binary_proto_def_proto_msgTypes[159]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17576,7 +18039,7 @@ func (x *PollUpdate) String() string {
 func (*PollUpdate) ProtoMessage() {}
 
 func (x *PollUpdate) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[155]
+	mi := &file_binary_proto_def_proto_msgTypes[159]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17589,7 +18052,7 @@ func (x *PollUpdate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PollUpdate.ProtoReflect.Descriptor instead.
 func (*PollUpdate) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{155}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{159}
 }
 
 func (x *PollUpdate) GetPollUpdateMessageKey() *MessageKey {
@@ -17620,6 +18083,13 @@ func (x *PollUpdate) GetServerTimestampMs() int64 {
 	return 0
 }
 
+func (x *PollUpdate) GetUnread() bool {
+	if x != nil && x.Unread != nil {
+		return *x.Unread
+	}
+	return false
+}
+
 type PollAdditionalMetadata struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -17631,7 +18101,7 @@ type PollAdditionalMetadata struct {
 func (x *PollAdditionalMetadata) Reset() {
 	*x = PollAdditionalMetadata{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[156]
+		mi := &file_binary_proto_def_proto_msgTypes[160]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17644,7 +18114,7 @@ func (x *PollAdditionalMetadata) String() string {
 func (*PollAdditionalMetadata) ProtoMessage() {}
 
 func (x *PollAdditionalMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[156]
+	mi := &file_binary_proto_def_proto_msgTypes[160]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17657,7 +18127,7 @@ func (x *PollAdditionalMetadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PollAdditionalMetadata.ProtoReflect.Descriptor instead.
 func (*PollAdditionalMetadata) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{156}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{160}
 }
 
 func (x *PollAdditionalMetadata) GetPollInvalidated() bool {
@@ -17680,7 +18150,7 @@ type PhotoChange struct {
 func (x *PhotoChange) Reset() {
 	*x = PhotoChange{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[157]
+		mi := &file_binary_proto_def_proto_msgTypes[161]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17693,7 +18163,7 @@ func (x *PhotoChange) String() string {
 func (*PhotoChange) ProtoMessage() {}
 
 func (x *PhotoChange) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[157]
+	mi := &file_binary_proto_def_proto_msgTypes[161]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17706,7 +18176,7 @@ func (x *PhotoChange) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PhotoChange.ProtoReflect.Descriptor instead.
 func (*PhotoChange) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{157}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{161}
 }
 
 func (x *PhotoChange) GetOldPhoto() []byte {
@@ -17753,7 +18223,7 @@ type PaymentInfo struct {
 func (x *PaymentInfo) Reset() {
 	*x = PaymentInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[158]
+		mi := &file_binary_proto_def_proto_msgTypes[162]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17766,7 +18236,7 @@ func (x *PaymentInfo) String() string {
 func (*PaymentInfo) ProtoMessage() {}
 
 func (x *PaymentInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[158]
+	mi := &file_binary_proto_def_proto_msgTypes[162]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17779,7 +18249,7 @@ func (x *PaymentInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PaymentInfo.ProtoReflect.Descriptor instead.
 func (*PaymentInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{158}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{162}
 }
 
 func (x *PaymentInfo) GetCurrencyDeprecated() PaymentInfo_Currency {
@@ -17887,7 +18357,7 @@ type NotificationMessageInfo struct {
 func (x *NotificationMessageInfo) Reset() {
 	*x = NotificationMessageInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[159]
+		mi := &file_binary_proto_def_proto_msgTypes[163]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17900,7 +18370,7 @@ func (x *NotificationMessageInfo) String() string {
 func (*NotificationMessageInfo) ProtoMessage() {}
 
 func (x *NotificationMessageInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[159]
+	mi := &file_binary_proto_def_proto_msgTypes[163]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17913,7 +18383,7 @@ func (x *NotificationMessageInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use NotificationMessageInfo.ProtoReflect.Descriptor instead.
 func (*NotificationMessageInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{159}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{163}
 }
 
 func (x *NotificationMessageInfo) GetKey() *MessageKey {
@@ -17955,7 +18425,7 @@ type MediaData struct {
 func (x *MediaData) Reset() {
 	*x = MediaData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[160]
+		mi := &file_binary_proto_def_proto_msgTypes[164]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -17968,7 +18438,7 @@ func (x *MediaData) String() string {
 func (*MediaData) ProtoMessage() {}
 
 func (x *MediaData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[160]
+	mi := &file_binary_proto_def_proto_msgTypes[164]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -17981,7 +18451,7 @@ func (x *MediaData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MediaData.ProtoReflect.Descriptor instead.
 func (*MediaData) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{160}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{164}
 }
 
 func (x *MediaData) GetLocalPath() string {
@@ -18007,7 +18477,7 @@ type KeepInChat struct {
 func (x *KeepInChat) Reset() {
 	*x = KeepInChat{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[161]
+		mi := &file_binary_proto_def_proto_msgTypes[165]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18020,7 +18490,7 @@ func (x *KeepInChat) String() string {
 func (*KeepInChat) ProtoMessage() {}
 
 func (x *KeepInChat) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[161]
+	mi := &file_binary_proto_def_proto_msgTypes[165]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18033,7 +18503,7 @@ func (x *KeepInChat) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use KeepInChat.ProtoReflect.Descriptor instead.
 func (*KeepInChat) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{161}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{165}
 }
 
 func (x *KeepInChat) GetKeepType() KeepType {
@@ -18090,7 +18560,7 @@ type NoiseCertificate struct {
 func (x *NoiseCertificate) Reset() {
 	*x = NoiseCertificate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[162]
+		mi := &file_binary_proto_def_proto_msgTypes[166]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18103,7 +18573,7 @@ func (x *NoiseCertificate) String() string {
 func (*NoiseCertificate) ProtoMessage() {}
 
 func (x *NoiseCertificate) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[162]
+	mi := &file_binary_proto_def_proto_msgTypes[166]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18116,7 +18586,7 @@ func (x *NoiseCertificate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use NoiseCertificate.ProtoReflect.Descriptor instead.
 func (*NoiseCertificate) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{162}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{166}
 }
 
 func (x *NoiseCertificate) GetDetails() []byte {
@@ -18145,7 +18615,7 @@ type CertChain struct {
 func (x *CertChain) Reset() {
 	*x = CertChain{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[163]
+		mi := &file_binary_proto_def_proto_msgTypes[167]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18158,7 +18628,7 @@ func (x *CertChain) String() string {
 func (*CertChain) ProtoMessage() {}
 
 func (x *CertChain) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[163]
+	mi := &file_binary_proto_def_proto_msgTypes[167]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18171,7 +18641,7 @@ func (x *CertChain) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CertChain.ProtoReflect.Descriptor instead.
 func (*CertChain) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{163}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{167}
 }
 
 func (x *CertChain) GetLeaf() *CertChain_NoiseCertificate {
@@ -18201,7 +18671,7 @@ type DeviceProps_HistorySyncConfig struct {
 func (x *DeviceProps_HistorySyncConfig) Reset() {
 	*x = DeviceProps_HistorySyncConfig{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[164]
+		mi := &file_binary_proto_def_proto_msgTypes[168]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18214,7 +18684,7 @@ func (x *DeviceProps_HistorySyncConfig) String() string {
 func (*DeviceProps_HistorySyncConfig) ProtoMessage() {}
 
 func (x *DeviceProps_HistorySyncConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[164]
+	mi := &file_binary_proto_def_proto_msgTypes[168]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18266,7 +18736,7 @@ type DeviceProps_AppVersion struct {
 func (x *DeviceProps_AppVersion) Reset() {
 	*x = DeviceProps_AppVersion{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[165]
+		mi := &file_binary_proto_def_proto_msgTypes[169]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18279,7 +18749,7 @@ func (x *DeviceProps_AppVersion) String() string {
 func (*DeviceProps_AppVersion) ProtoMessage() {}
 
 func (x *DeviceProps_AppVersion) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[165]
+	mi := &file_binary_proto_def_proto_msgTypes[169]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18330,165 +18800,6 @@ func (x *DeviceProps_AppVersion) GetQuinary() uint32 {
 	return 0
 }
 
-type PeerDataOperationRequestResponseMessage_PeerDataOperationResult struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	MediaUploadResult   *MediaRetryNotification_ResultType                                                   `protobuf:"varint,1,opt,name=mediaUploadResult,enum=proto.MediaRetryNotification_ResultType" json:"mediaUploadResult,omitempty"`
-	StickerMessage      *StickerMessage                                                                      `protobuf:"bytes,2,opt,name=stickerMessage" json:"stickerMessage,omitempty"`
-	LinkPreviewResponse *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse `protobuf:"bytes,3,opt,name=linkPreviewResponse" json:"linkPreviewResponse,omitempty"`
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) Reset() {
-	*x = PeerDataOperationRequestResponseMessage_PeerDataOperationResult{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[166]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult) ProtoMessage() {}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[166]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeerDataOperationRequestResponseMessage_PeerDataOperationResult.ProtoReflect.Descriptor instead.
-func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{6, 0}
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) GetMediaUploadResult() MediaRetryNotification_ResultType {
-	if x != nil && x.MediaUploadResult != nil {
-		return *x.MediaUploadResult
-	}
-	return MediaRetryNotification_GENERAL_ERROR
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) GetStickerMessage() *StickerMessage {
-	if x != nil {
-		return x.StickerMessage
-	}
-	return nil
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) GetLinkPreviewResponse() *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse {
-	if x != nil {
-		return x.LinkPreviewResponse
-	}
-	return nil
-}
-
-type PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Url          *string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
-	Title        *string `protobuf:"bytes,2,opt,name=title" json:"title,omitempty"`
-	Description  *string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
-	ThumbData    []byte  `protobuf:"bytes,4,opt,name=thumbData" json:"thumbData,omitempty"`
-	CanonicalUrl *string `protobuf:"bytes,5,opt,name=canonicalUrl" json:"canonicalUrl,omitempty"`
-	MatchText    *string `protobuf:"bytes,6,opt,name=matchText" json:"matchText,omitempty"`
-	PreviewType  *string `protobuf:"bytes,7,opt,name=previewType" json:"previewType,omitempty"`
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) Reset() {
-	*x = PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[167]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) ProtoMessage() {
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[167]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse.ProtoReflect.Descriptor instead.
-func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{6, 0, 0}
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetUrl() string {
-	if x != nil && x.Url != nil {
-		return *x.Url
-	}
-	return ""
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetTitle() string {
-	if x != nil && x.Title != nil {
-		return *x.Title
-	}
-	return ""
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetDescription() string {
-	if x != nil && x.Description != nil {
-		return *x.Description
-	}
-	return ""
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetThumbData() []byte {
-	if x != nil {
-		return x.ThumbData
-	}
-	return nil
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetCanonicalUrl() string {
-	if x != nil && x.CanonicalUrl != nil {
-		return *x.CanonicalUrl
-	}
-	return ""
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetMatchText() string {
-	if x != nil && x.MatchText != nil {
-		return *x.MatchText
-	}
-	return ""
-}
-
-func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetPreviewType() string {
-	if x != nil && x.PreviewType != nil {
-		return *x.PreviewType
-	}
-	return ""
-}
-
 type PeerDataOperationRequestMessage_RequestUrlPreview struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -18500,7 +18811,7 @@ type PeerDataOperationRequestMessage_RequestUrlPreview struct {
 func (x *PeerDataOperationRequestMessage_RequestUrlPreview) Reset() {
 	*x = PeerDataOperationRequestMessage_RequestUrlPreview{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[168]
+		mi := &file_binary_proto_def_proto_msgTypes[170]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18513,7 +18824,7 @@ func (x *PeerDataOperationRequestMessage_RequestUrlPreview) String() string {
 func (*PeerDataOperationRequestMessage_RequestUrlPreview) ProtoMessage() {}
 
 func (x *PeerDataOperationRequestMessage_RequestUrlPreview) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[168]
+	mi := &file_binary_proto_def_proto_msgTypes[170]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18526,7 +18837,7 @@ func (x *PeerDataOperationRequestMessage_RequestUrlPreview) ProtoReflect() proto
 
 // Deprecated: Use PeerDataOperationRequestMessage_RequestUrlPreview.ProtoReflect.Descriptor instead.
 func (*PeerDataOperationRequestMessage_RequestUrlPreview) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{7, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{6, 0}
 }
 
 func (x *PeerDataOperationRequestMessage_RequestUrlPreview) GetUrl() string {
@@ -18547,7 +18858,7 @@ type PeerDataOperationRequestMessage_RequestStickerReupload struct {
 func (x *PeerDataOperationRequestMessage_RequestStickerReupload) Reset() {
 	*x = PeerDataOperationRequestMessage_RequestStickerReupload{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[169]
+		mi := &file_binary_proto_def_proto_msgTypes[171]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18560,7 +18871,7 @@ func (x *PeerDataOperationRequestMessage_RequestStickerReupload) String() string
 func (*PeerDataOperationRequestMessage_RequestStickerReupload) ProtoMessage() {}
 
 func (x *PeerDataOperationRequestMessage_RequestStickerReupload) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[169]
+	mi := &file_binary_proto_def_proto_msgTypes[171]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18573,7 +18884,7 @@ func (x *PeerDataOperationRequestMessage_RequestStickerReupload) ProtoReflect()
 
 // Deprecated: Use PeerDataOperationRequestMessage_RequestStickerReupload.ProtoReflect.Descriptor instead.
 func (*PeerDataOperationRequestMessage_RequestStickerReupload) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{7, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{6, 1}
 }
 
 func (x *PeerDataOperationRequestMessage_RequestStickerReupload) GetFileSha256() string {
@@ -18583,6 +18894,85 @@ func (x *PeerDataOperationRequestMessage_RequestStickerReupload) GetFileSha256()
 	return ""
 }
 
+type PeerDataOperationRequestMessage_HistorySyncOnDemandRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ChatJid              *string `protobuf:"bytes,1,opt,name=chatJid" json:"chatJid,omitempty"`
+	OldestMsgId          *string `protobuf:"bytes,2,opt,name=oldestMsgId" json:"oldestMsgId,omitempty"`
+	OldestMsgFromMe      *bool   `protobuf:"varint,3,opt,name=oldestMsgFromMe" json:"oldestMsgFromMe,omitempty"`
+	OnDemandMsgCount     *int32  `protobuf:"varint,4,opt,name=onDemandMsgCount" json:"onDemandMsgCount,omitempty"`
+	OldestMsgTimestampMs *int64  `protobuf:"varint,5,opt,name=oldestMsgTimestampMs" json:"oldestMsgTimestampMs,omitempty"`
+}
+
+func (x *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest) Reset() {
+	*x = PeerDataOperationRequestMessage_HistorySyncOnDemandRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[172]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeerDataOperationRequestMessage_HistorySyncOnDemandRequest) ProtoMessage() {}
+
+func (x *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[172]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeerDataOperationRequestMessage_HistorySyncOnDemandRequest.ProtoReflect.Descriptor instead.
+func (*PeerDataOperationRequestMessage_HistorySyncOnDemandRequest) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{6, 2}
+}
+
+func (x *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest) GetChatJid() string {
+	if x != nil && x.ChatJid != nil {
+		return *x.ChatJid
+	}
+	return ""
+}
+
+func (x *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest) GetOldestMsgId() string {
+	if x != nil && x.OldestMsgId != nil {
+		return *x.OldestMsgId
+	}
+	return ""
+}
+
+func (x *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest) GetOldestMsgFromMe() bool {
+	if x != nil && x.OldestMsgFromMe != nil {
+		return *x.OldestMsgFromMe
+	}
+	return false
+}
+
+func (x *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest) GetOnDemandMsgCount() int32 {
+	if x != nil && x.OnDemandMsgCount != nil {
+		return *x.OnDemandMsgCount
+	}
+	return 0
+}
+
+func (x *PeerDataOperationRequestMessage_HistorySyncOnDemandRequest) GetOldestMsgTimestampMs() int64 {
+	if x != nil && x.OldestMsgTimestampMs != nil {
+		return *x.OldestMsgTimestampMs
+	}
+	return 0
+}
+
 type ListResponseMessage_SingleSelectReply struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -18594,7 +18984,7 @@ type ListResponseMessage_SingleSelectReply struct {
 func (x *ListResponseMessage_SingleSelectReply) Reset() {
 	*x = ListResponseMessage_SingleSelectReply{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[170]
+		mi := &file_binary_proto_def_proto_msgTypes[173]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18607,7 +18997,7 @@ func (x *ListResponseMessage_SingleSelectReply) String() string {
 func (*ListResponseMessage_SingleSelectReply) ProtoMessage() {}
 
 func (x *ListResponseMessage_SingleSelectReply) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[170]
+	mi := &file_binary_proto_def_proto_msgTypes[173]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18620,7 +19010,7 @@ func (x *ListResponseMessage_SingleSelectReply) ProtoReflect() protoreflect.Mess
 
 // Deprecated: Use ListResponseMessage_SingleSelectReply.ProtoReflect.Descriptor instead.
 func (*ListResponseMessage_SingleSelectReply) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{11, 0}
 }
 
 func (x *ListResponseMessage_SingleSelectReply) GetSelectedRowId() string {
@@ -18642,7 +19032,7 @@ type ListMessage_Section struct {
 func (x *ListMessage_Section) Reset() {
 	*x = ListMessage_Section{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[171]
+		mi := &file_binary_proto_def_proto_msgTypes[174]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18655,7 +19045,7 @@ func (x *ListMessage_Section) String() string {
 func (*ListMessage_Section) ProtoMessage() {}
 
 func (x *ListMessage_Section) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[171]
+	mi := &file_binary_proto_def_proto_msgTypes[174]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18668,7 +19058,7 @@ func (x *ListMessage_Section) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListMessage_Section.ProtoReflect.Descriptor instead.
 func (*ListMessage_Section) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{13, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 0}
 }
 
 func (x *ListMessage_Section) GetTitle() string {
@@ -18698,7 +19088,7 @@ type ListMessage_Row struct {
 func (x *ListMessage_Row) Reset() {
 	*x = ListMessage_Row{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[172]
+		mi := &file_binary_proto_def_proto_msgTypes[175]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18711,7 +19101,7 @@ func (x *ListMessage_Row) String() string {
 func (*ListMessage_Row) ProtoMessage() {}
 
 func (x *ListMessage_Row) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[172]
+	mi := &file_binary_proto_def_proto_msgTypes[175]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18724,7 +19114,7 @@ func (x *ListMessage_Row) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListMessage_Row.ProtoReflect.Descriptor instead.
 func (*ListMessage_Row) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{13, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 1}
 }
 
 func (x *ListMessage_Row) GetTitle() string {
@@ -18759,7 +19149,7 @@ type ListMessage_Product struct {
 func (x *ListMessage_Product) Reset() {
 	*x = ListMessage_Product{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[173]
+		mi := &file_binary_proto_def_proto_msgTypes[176]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18772,7 +19162,7 @@ func (x *ListMessage_Product) String() string {
 func (*ListMessage_Product) ProtoMessage() {}
 
 func (x *ListMessage_Product) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[173]
+	mi := &file_binary_proto_def_proto_msgTypes[176]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18785,7 +19175,7 @@ func (x *ListMessage_Product) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListMessage_Product.ProtoReflect.Descriptor instead.
 func (*ListMessage_Product) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{13, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 2}
 }
 
 func (x *ListMessage_Product) GetProductId() string {
@@ -18807,7 +19197,7 @@ type ListMessage_ProductSection struct {
 func (x *ListMessage_ProductSection) Reset() {
 	*x = ListMessage_ProductSection{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[174]
+		mi := &file_binary_proto_def_proto_msgTypes[177]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18820,7 +19210,7 @@ func (x *ListMessage_ProductSection) String() string {
 func (*ListMessage_ProductSection) ProtoMessage() {}
 
 func (x *ListMessage_ProductSection) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[174]
+	mi := &file_binary_proto_def_proto_msgTypes[177]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18833,7 +19223,7 @@ func (x *ListMessage_ProductSection) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListMessage_ProductSection.ProtoReflect.Descriptor instead.
 func (*ListMessage_ProductSection) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{13, 3}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 3}
 }
 
 func (x *ListMessage_ProductSection) GetTitle() string {
@@ -18863,7 +19253,7 @@ type ListMessage_ProductListInfo struct {
 func (x *ListMessage_ProductListInfo) Reset() {
 	*x = ListMessage_ProductListInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[175]
+		mi := &file_binary_proto_def_proto_msgTypes[178]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18876,7 +19266,7 @@ func (x *ListMessage_ProductListInfo) String() string {
 func (*ListMessage_ProductListInfo) ProtoMessage() {}
 
 func (x *ListMessage_ProductListInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[175]
+	mi := &file_binary_proto_def_proto_msgTypes[178]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18889,7 +19279,7 @@ func (x *ListMessage_ProductListInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListMessage_ProductListInfo.ProtoReflect.Descriptor instead.
 func (*ListMessage_ProductListInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{13, 4}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 4}
 }
 
 func (x *ListMessage_ProductListInfo) GetProductSections() []*ListMessage_ProductSection {
@@ -18925,7 +19315,7 @@ type ListMessage_ProductListHeaderImage struct {
 func (x *ListMessage_ProductListHeaderImage) Reset() {
 	*x = ListMessage_ProductListHeaderImage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[176]
+		mi := &file_binary_proto_def_proto_msgTypes[179]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18938,7 +19328,7 @@ func (x *ListMessage_ProductListHeaderImage) String() string {
 func (*ListMessage_ProductListHeaderImage) ProtoMessage() {}
 
 func (x *ListMessage_ProductListHeaderImage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[176]
+	mi := &file_binary_proto_def_proto_msgTypes[179]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -18951,7 +19341,7 @@ func (x *ListMessage_ProductListHeaderImage) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use ListMessage_ProductListHeaderImage.ProtoReflect.Descriptor instead.
 func (*ListMessage_ProductListHeaderImage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{13, 5}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{12, 5}
 }
 
 func (x *ListMessage_ProductListHeaderImage) GetProductId() string {
@@ -18981,7 +19371,7 @@ type InteractiveResponseMessage_NativeFlowResponseMessage struct {
 func (x *InteractiveResponseMessage_NativeFlowResponseMessage) Reset() {
 	*x = InteractiveResponseMessage_NativeFlowResponseMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[177]
+		mi := &file_binary_proto_def_proto_msgTypes[180]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -18994,7 +19384,7 @@ func (x *InteractiveResponseMessage_NativeFlowResponseMessage) String() string {
 func (*InteractiveResponseMessage_NativeFlowResponseMessage) ProtoMessage() {}
 
 func (x *InteractiveResponseMessage_NativeFlowResponseMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[177]
+	mi := &file_binary_proto_def_proto_msgTypes[180]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19007,7 +19397,7 @@ func (x *InteractiveResponseMessage_NativeFlowResponseMessage) ProtoReflect() pr
 
 // Deprecated: Use InteractiveResponseMessage_NativeFlowResponseMessage.ProtoReflect.Descriptor instead.
 func (*InteractiveResponseMessage_NativeFlowResponseMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{15, 0}
 }
 
 func (x *InteractiveResponseMessage_NativeFlowResponseMessage) GetName() string {
@@ -19042,7 +19432,7 @@ type InteractiveResponseMessage_Body struct {
 func (x *InteractiveResponseMessage_Body) Reset() {
 	*x = InteractiveResponseMessage_Body{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[178]
+		mi := &file_binary_proto_def_proto_msgTypes[181]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19055,7 +19445,7 @@ func (x *InteractiveResponseMessage_Body) String() string {
 func (*InteractiveResponseMessage_Body) ProtoMessage() {}
 
 func (x *InteractiveResponseMessage_Body) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[178]
+	mi := &file_binary_proto_def_proto_msgTypes[181]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19068,7 +19458,7 @@ func (x *InteractiveResponseMessage_Body) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InteractiveResponseMessage_Body.ProtoReflect.Descriptor instead.
 func (*InteractiveResponseMessage_Body) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{15, 1}
 }
 
 func (x *InteractiveResponseMessage_Body) GetText() string {
@@ -19091,7 +19481,7 @@ type InteractiveMessage_ShopMessage struct {
 func (x *InteractiveMessage_ShopMessage) Reset() {
 	*x = InteractiveMessage_ShopMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[179]
+		mi := &file_binary_proto_def_proto_msgTypes[182]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19104,7 +19494,7 @@ func (x *InteractiveMessage_ShopMessage) String() string {
 func (*InteractiveMessage_ShopMessage) ProtoMessage() {}
 
 func (x *InteractiveMessage_ShopMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[179]
+	mi := &file_binary_proto_def_proto_msgTypes[182]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19117,7 +19507,7 @@ func (x *InteractiveMessage_ShopMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InteractiveMessage_ShopMessage.ProtoReflect.Descriptor instead.
 func (*InteractiveMessage_ShopMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{17, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 0}
 }
 
 func (x *InteractiveMessage_ShopMessage) GetId() string {
@@ -19154,7 +19544,7 @@ type InteractiveMessage_NativeFlowMessage struct {
 func (x *InteractiveMessage_NativeFlowMessage) Reset() {
 	*x = InteractiveMessage_NativeFlowMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[180]
+		mi := &file_binary_proto_def_proto_msgTypes[183]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19167,7 +19557,7 @@ func (x *InteractiveMessage_NativeFlowMessage) String() string {
 func (*InteractiveMessage_NativeFlowMessage) ProtoMessage() {}
 
 func (x *InteractiveMessage_NativeFlowMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[180]
+	mi := &file_binary_proto_def_proto_msgTypes[183]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19180,7 +19570,7 @@ func (x *InteractiveMessage_NativeFlowMessage) ProtoReflect() protoreflect.Messa
 
 // Deprecated: Use InteractiveMessage_NativeFlowMessage.ProtoReflect.Descriptor instead.
 func (*InteractiveMessage_NativeFlowMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{17, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 1}
 }
 
 func (x *InteractiveMessage_NativeFlowMessage) GetButtons() []*InteractiveMessage_NativeFlowMessage_NativeFlowButton {
@@ -19224,7 +19614,7 @@ type InteractiveMessage_Header struct {
 func (x *InteractiveMessage_Header) Reset() {
 	*x = InteractiveMessage_Header{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[181]
+		mi := &file_binary_proto_def_proto_msgTypes[184]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19237,7 +19627,7 @@ func (x *InteractiveMessage_Header) String() string {
 func (*InteractiveMessage_Header) ProtoMessage() {}
 
 func (x *InteractiveMessage_Header) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[181]
+	mi := &file_binary_proto_def_proto_msgTypes[184]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19250,7 +19640,7 @@ func (x *InteractiveMessage_Header) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InteractiveMessage_Header.ProtoReflect.Descriptor instead.
 func (*InteractiveMessage_Header) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{17, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 2}
 }
 
 func (x *InteractiveMessage_Header) GetTitle() string {
@@ -19348,7 +19738,7 @@ type InteractiveMessage_Footer struct {
 func (x *InteractiveMessage_Footer) Reset() {
 	*x = InteractiveMessage_Footer{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[182]
+		mi := &file_binary_proto_def_proto_msgTypes[185]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19361,7 +19751,7 @@ func (x *InteractiveMessage_Footer) String() string {
 func (*InteractiveMessage_Footer) ProtoMessage() {}
 
 func (x *InteractiveMessage_Footer) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[182]
+	mi := &file_binary_proto_def_proto_msgTypes[185]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19374,7 +19764,7 @@ func (x *InteractiveMessage_Footer) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InteractiveMessage_Footer.ProtoReflect.Descriptor instead.
 func (*InteractiveMessage_Footer) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{17, 3}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 3}
 }
 
 func (x *InteractiveMessage_Footer) GetText() string {
@@ -19397,7 +19787,7 @@ type InteractiveMessage_CollectionMessage struct {
 func (x *InteractiveMessage_CollectionMessage) Reset() {
 	*x = InteractiveMessage_CollectionMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[183]
+		mi := &file_binary_proto_def_proto_msgTypes[186]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19410,7 +19800,7 @@ func (x *InteractiveMessage_CollectionMessage) String() string {
 func (*InteractiveMessage_CollectionMessage) ProtoMessage() {}
 
 func (x *InteractiveMessage_CollectionMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[183]
+	mi := &file_binary_proto_def_proto_msgTypes[186]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19423,7 +19813,7 @@ func (x *InteractiveMessage_CollectionMessage) ProtoReflect() protoreflect.Messa
 
 // Deprecated: Use InteractiveMessage_CollectionMessage.ProtoReflect.Descriptor instead.
 func (*InteractiveMessage_CollectionMessage) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{17, 4}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 4}
 }
 
 func (x *InteractiveMessage_CollectionMessage) GetBizJid() string {
@@ -19458,7 +19848,7 @@ type InteractiveMessage_Body struct {
 func (x *InteractiveMessage_Body) Reset() {
 	*x = InteractiveMessage_Body{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[184]
+		mi := &file_binary_proto_def_proto_msgTypes[187]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19471,7 +19861,7 @@ func (x *InteractiveMessage_Body) String() string {
 func (*InteractiveMessage_Body) ProtoMessage() {}
 
 func (x *InteractiveMessage_Body) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[184]
+	mi := &file_binary_proto_def_proto_msgTypes[187]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19484,7 +19874,7 @@ func (x *InteractiveMessage_Body) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InteractiveMessage_Body.ProtoReflect.Descriptor instead.
 func (*InteractiveMessage_Body) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{17, 5}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 5}
 }
 
 func (x *InteractiveMessage_Body) GetText() string {
@@ -19506,7 +19896,7 @@ type InteractiveMessage_NativeFlowMessage_NativeFlowButton struct {
 func (x *InteractiveMessage_NativeFlowMessage_NativeFlowButton) Reset() {
 	*x = InteractiveMessage_NativeFlowMessage_NativeFlowButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[185]
+		mi := &file_binary_proto_def_proto_msgTypes[188]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19519,7 +19909,7 @@ func (x *InteractiveMessage_NativeFlowMessage_NativeFlowButton) String() string
 func (*InteractiveMessage_NativeFlowMessage_NativeFlowButton) ProtoMessage() {}
 
 func (x *InteractiveMessage_NativeFlowMessage_NativeFlowButton) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[185]
+	mi := &file_binary_proto_def_proto_msgTypes[188]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19532,7 +19922,7 @@ func (x *InteractiveMessage_NativeFlowMessage_NativeFlowButton) ProtoReflect() p
 
 // Deprecated: Use InteractiveMessage_NativeFlowMessage_NativeFlowButton.ProtoReflect.Descriptor instead.
 func (*InteractiveMessage_NativeFlowMessage_NativeFlowButton) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{17, 1, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{16, 1, 0}
 }
 
 func (x *InteractiveMessage_NativeFlowMessage_NativeFlowButton) GetName() string {
@@ -19565,7 +19955,7 @@ type HighlyStructuredMessage_HSMLocalizableParameter struct {
 func (x *HighlyStructuredMessage_HSMLocalizableParameter) Reset() {
 	*x = HighlyStructuredMessage_HSMLocalizableParameter{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[186]
+		mi := &file_binary_proto_def_proto_msgTypes[189]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19578,7 +19968,7 @@ func (x *HighlyStructuredMessage_HSMLocalizableParameter) String() string {
 func (*HighlyStructuredMessage_HSMLocalizableParameter) ProtoMessage() {}
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[186]
+	mi := &file_binary_proto_def_proto_msgTypes[189]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19591,7 +19981,7 @@ func (x *HighlyStructuredMessage_HSMLocalizableParameter) ProtoReflect() protore
 
 // Deprecated: Use HighlyStructuredMessage_HSMLocalizableParameter.ProtoReflect.Descriptor instead.
 func (*HighlyStructuredMessage_HSMLocalizableParameter) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{21, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{20, 0}
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter) GetDefault() string {
@@ -19655,7 +20045,7 @@ type HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime struct {
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime) Reset() {
 	*x = HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[187]
+		mi := &file_binary_proto_def_proto_msgTypes[190]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19668,7 +20058,7 @@ func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime) String() s
 func (*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime) ProtoMessage() {}
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[187]
+	mi := &file_binary_proto_def_proto_msgTypes[190]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19681,7 +20071,7 @@ func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime) ProtoRefle
 
 // Deprecated: Use HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime.ProtoReflect.Descriptor instead.
 func (*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{21, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{20, 0, 0}
 }
 
 func (m *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime) GetDatetimeOneof() isHighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_DatetimeOneof {
@@ -19735,7 +20125,7 @@ type HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency struct {
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency) Reset() {
 	*x = HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[188]
+		mi := &file_binary_proto_def_proto_msgTypes[191]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19748,7 +20138,7 @@ func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency) String() s
 func (*HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency) ProtoMessage() {}
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[188]
+	mi := &file_binary_proto_def_proto_msgTypes[191]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19761,7 +20151,7 @@ func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency) ProtoRefle
 
 // Deprecated: Use HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency.ProtoReflect.Descriptor instead.
 func (*HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{21, 0, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{20, 0, 1}
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency) GetCurrencyCode() string {
@@ -19789,7 +20179,7 @@ type HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnix
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch) Reset() {
 	*x = HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[189]
+		mi := &file_binary_proto_def_proto_msgTypes[192]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19803,7 +20193,7 @@ func (*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUn
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[189]
+	mi := &file_binary_proto_def_proto_msgTypes[192]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19816,7 +20206,7 @@ func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTime
 
 // Deprecated: Use HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch.ProtoReflect.Descriptor instead.
 func (*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{21, 0, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{20, 0, 0, 0}
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch) GetTimestamp() int64 {
@@ -19843,7 +20233,7 @@ type HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComp
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent) Reset() {
 	*x = HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[190]
+		mi := &file_binary_proto_def_proto_msgTypes[193]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19857,7 +20247,7 @@ func (*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeCo
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[190]
+	mi := &file_binary_proto_def_proto_msgTypes[193]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19870,7 +20260,7 @@ func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTime
 
 // Deprecated: Use HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent.ProtoReflect.Descriptor instead.
 func (*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{21, 0, 0, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{20, 0, 0, 1}
 }
 
 func (x *HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent) GetDayOfWeek() HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_DayOfWeekType {
@@ -19936,7 +20326,7 @@ type ButtonsMessage_Button struct {
 func (x *ButtonsMessage_Button) Reset() {
 	*x = ButtonsMessage_Button{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[191]
+		mi := &file_binary_proto_def_proto_msgTypes[194]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -19949,7 +20339,7 @@ func (x *ButtonsMessage_Button) String() string {
 func (*ButtonsMessage_Button) ProtoMessage() {}
 
 func (x *ButtonsMessage_Button) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[191]
+	mi := &file_binary_proto_def_proto_msgTypes[194]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -19962,7 +20352,7 @@ func (x *ButtonsMessage_Button) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ButtonsMessage_Button.ProtoReflect.Descriptor instead.
 func (*ButtonsMessage_Button) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{35, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{34, 0}
 }
 
 func (x *ButtonsMessage_Button) GetButtonId() string {
@@ -20005,7 +20395,7 @@ type ButtonsMessage_Button_NativeFlowInfo struct {
 func (x *ButtonsMessage_Button_NativeFlowInfo) Reset() {
 	*x = ButtonsMessage_Button_NativeFlowInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[192]
+		mi := &file_binary_proto_def_proto_msgTypes[195]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20018,7 +20408,7 @@ func (x *ButtonsMessage_Button_NativeFlowInfo) String() string {
 func (*ButtonsMessage_Button_NativeFlowInfo) ProtoMessage() {}
 
 func (x *ButtonsMessage_Button_NativeFlowInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[192]
+	mi := &file_binary_proto_def_proto_msgTypes[195]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20031,7 +20421,7 @@ func (x *ButtonsMessage_Button_NativeFlowInfo) ProtoReflect() protoreflect.Messa
 
 // Deprecated: Use ButtonsMessage_Button_NativeFlowInfo.ProtoReflect.Descriptor instead.
 func (*ButtonsMessage_Button_NativeFlowInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{35, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{34, 0, 0}
 }
 
 func (x *ButtonsMessage_Button_NativeFlowInfo) GetName() string {
@@ -20059,7 +20449,7 @@ type ButtonsMessage_Button_ButtonText struct {
 func (x *ButtonsMessage_Button_ButtonText) Reset() {
 	*x = ButtonsMessage_Button_ButtonText{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[193]
+		mi := &file_binary_proto_def_proto_msgTypes[196]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20072,7 +20462,7 @@ func (x *ButtonsMessage_Button_ButtonText) String() string {
 func (*ButtonsMessage_Button_ButtonText) ProtoMessage() {}
 
 func (x *ButtonsMessage_Button_ButtonText) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[193]
+	mi := &file_binary_proto_def_proto_msgTypes[196]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20085,7 +20475,7 @@ func (x *ButtonsMessage_Button_ButtonText) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ButtonsMessage_Button_ButtonText.ProtoReflect.Descriptor instead.
 func (*ButtonsMessage_Button_ButtonText) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{35, 0, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{34, 0, 1}
 }
 
 func (x *ButtonsMessage_Button_ButtonText) GetDisplayText() string {
@@ -20107,7 +20497,7 @@ type HydratedTemplateButton_HydratedURLButton struct {
 func (x *HydratedTemplateButton_HydratedURLButton) Reset() {
 	*x = HydratedTemplateButton_HydratedURLButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[194]
+		mi := &file_binary_proto_def_proto_msgTypes[197]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20120,7 +20510,7 @@ func (x *HydratedTemplateButton_HydratedURLButton) String() string {
 func (*HydratedTemplateButton_HydratedURLButton) ProtoMessage() {}
 
 func (x *HydratedTemplateButton_HydratedURLButton) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[194]
+	mi := &file_binary_proto_def_proto_msgTypes[197]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20133,7 +20523,7 @@ func (x *HydratedTemplateButton_HydratedURLButton) ProtoReflect() protoreflect.M
 
 // Deprecated: Use HydratedTemplateButton_HydratedURLButton.ProtoReflect.Descriptor instead.
 func (*HydratedTemplateButton_HydratedURLButton) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{46, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{45, 0}
 }
 
 func (x *HydratedTemplateButton_HydratedURLButton) GetDisplayText() string {
@@ -20162,7 +20552,7 @@ type HydratedTemplateButton_HydratedQuickReplyButton struct {
 func (x *HydratedTemplateButton_HydratedQuickReplyButton) Reset() {
 	*x = HydratedTemplateButton_HydratedQuickReplyButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[195]
+		mi := &file_binary_proto_def_proto_msgTypes[198]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20175,7 +20565,7 @@ func (x *HydratedTemplateButton_HydratedQuickReplyButton) String() string {
 func (*HydratedTemplateButton_HydratedQuickReplyButton) ProtoMessage() {}
 
 func (x *HydratedTemplateButton_HydratedQuickReplyButton) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[195]
+	mi := &file_binary_proto_def_proto_msgTypes[198]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20188,7 +20578,7 @@ func (x *HydratedTemplateButton_HydratedQuickReplyButton) ProtoReflect() protore
 
 // Deprecated: Use HydratedTemplateButton_HydratedQuickReplyButton.ProtoReflect.Descriptor instead.
 func (*HydratedTemplateButton_HydratedQuickReplyButton) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{46, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{45, 1}
 }
 
 func (x *HydratedTemplateButton_HydratedQuickReplyButton) GetDisplayText() string {
@@ -20217,7 +20607,7 @@ type HydratedTemplateButton_HydratedCallButton struct {
 func (x *HydratedTemplateButton_HydratedCallButton) Reset() {
 	*x = HydratedTemplateButton_HydratedCallButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[196]
+		mi := &file_binary_proto_def_proto_msgTypes[199]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20230,7 +20620,7 @@ func (x *HydratedTemplateButton_HydratedCallButton) String() string {
 func (*HydratedTemplateButton_HydratedCallButton) ProtoMessage() {}
 
 func (x *HydratedTemplateButton_HydratedCallButton) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[196]
+	mi := &file_binary_proto_def_proto_msgTypes[199]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20243,7 +20633,7 @@ func (x *HydratedTemplateButton_HydratedCallButton) ProtoReflect() protoreflect.
 
 // Deprecated: Use HydratedTemplateButton_HydratedCallButton.ProtoReflect.Descriptor instead.
 func (*HydratedTemplateButton_HydratedCallButton) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{46, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{45, 2}
 }
 
 func (x *HydratedTemplateButton_HydratedCallButton) GetDisplayText() string {
@@ -20260,6 +20650,61 @@ func (x *HydratedTemplateButton_HydratedCallButton) GetPhoneNumber() string {
 	return ""
 }
 
+type ContextInfo_UTMInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UtmSource   *string `protobuf:"bytes,1,opt,name=utmSource" json:"utmSource,omitempty"`
+	UtmCampaign *string `protobuf:"bytes,2,opt,name=utmCampaign" json:"utmCampaign,omitempty"`
+}
+
+func (x *ContextInfo_UTMInfo) Reset() {
+	*x = ContextInfo_UTMInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[200]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ContextInfo_UTMInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ContextInfo_UTMInfo) ProtoMessage() {}
+
+func (x *ContextInfo_UTMInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[200]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ContextInfo_UTMInfo.ProtoReflect.Descriptor instead.
+func (*ContextInfo_UTMInfo) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{49, 0}
+}
+
+func (x *ContextInfo_UTMInfo) GetUtmSource() string {
+	if x != nil && x.UtmSource != nil {
+		return *x.UtmSource
+	}
+	return ""
+}
+
+func (x *ContextInfo_UTMInfo) GetUtmCampaign() string {
+	if x != nil && x.UtmCampaign != nil {
+		return *x.UtmCampaign
+	}
+	return ""
+}
+
 type ContextInfo_ExternalAdReplyInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -20283,7 +20728,7 @@ type ContextInfo_ExternalAdReplyInfo struct {
 func (x *ContextInfo_ExternalAdReplyInfo) Reset() {
 	*x = ContextInfo_ExternalAdReplyInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[197]
+		mi := &file_binary_proto_def_proto_msgTypes[201]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20296,7 +20741,7 @@ func (x *ContextInfo_ExternalAdReplyInfo) String() string {
 func (*ContextInfo_ExternalAdReplyInfo) ProtoMessage() {}
 
 func (x *ContextInfo_ExternalAdReplyInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[197]
+	mi := &file_binary_proto_def_proto_msgTypes[201]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20309,7 +20754,7 @@ func (x *ContextInfo_ExternalAdReplyInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ContextInfo_ExternalAdReplyInfo.ProtoReflect.Descriptor instead.
 func (*ContextInfo_ExternalAdReplyInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{49, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{49, 1}
 }
 
 func (x *ContextInfo_ExternalAdReplyInfo) GetTitle() string {
@@ -20417,7 +20862,7 @@ type ContextInfo_AdReplyInfo struct {
 func (x *ContextInfo_AdReplyInfo) Reset() {
 	*x = ContextInfo_AdReplyInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[198]
+		mi := &file_binary_proto_def_proto_msgTypes[202]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20430,7 +20875,7 @@ func (x *ContextInfo_AdReplyInfo) String() string {
 func (*ContextInfo_AdReplyInfo) ProtoMessage() {}
 
 func (x *ContextInfo_AdReplyInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[198]
+	mi := &file_binary_proto_def_proto_msgTypes[202]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20443,7 +20888,7 @@ func (x *ContextInfo_AdReplyInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ContextInfo_AdReplyInfo.ProtoReflect.Descriptor instead.
 func (*ContextInfo_AdReplyInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{49, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{49, 2}
 }
 
 func (x *ContextInfo_AdReplyInfo) GetAdvertiserName() string {
@@ -20486,7 +20931,7 @@ type TemplateButton_URLButton struct {
 func (x *TemplateButton_URLButton) Reset() {
 	*x = TemplateButton_URLButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[199]
+		mi := &file_binary_proto_def_proto_msgTypes[203]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20499,7 +20944,7 @@ func (x *TemplateButton_URLButton) String() string {
 func (*TemplateButton_URLButton) ProtoMessage() {}
 
 func (x *TemplateButton_URLButton) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[199]
+	mi := &file_binary_proto_def_proto_msgTypes[203]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20541,7 +20986,7 @@ type TemplateButton_QuickReplyButton struct {
 func (x *TemplateButton_QuickReplyButton) Reset() {
 	*x = TemplateButton_QuickReplyButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[200]
+		mi := &file_binary_proto_def_proto_msgTypes[204]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20554,7 +20999,7 @@ func (x *TemplateButton_QuickReplyButton) String() string {
 func (*TemplateButton_QuickReplyButton) ProtoMessage() {}
 
 func (x *TemplateButton_QuickReplyButton) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[200]
+	mi := &file_binary_proto_def_proto_msgTypes[204]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20596,7 +21041,7 @@ type TemplateButton_CallButton struct {
 func (x *TemplateButton_CallButton) Reset() {
 	*x = TemplateButton_CallButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[201]
+		mi := &file_binary_proto_def_proto_msgTypes[205]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20609,7 +21054,7 @@ func (x *TemplateButton_CallButton) String() string {
 func (*TemplateButton_CallButton) ProtoMessage() {}
 
 func (x *TemplateButton_CallButton) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[201]
+	mi := &file_binary_proto_def_proto_msgTypes[205]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20654,7 +21099,7 @@ type PaymentBackground_MediaData struct {
 func (x *PaymentBackground_MediaData) Reset() {
 	*x = PaymentBackground_MediaData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[202]
+		mi := &file_binary_proto_def_proto_msgTypes[206]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20667,7 +21112,7 @@ func (x *PaymentBackground_MediaData) String() string {
 func (*PaymentBackground_MediaData) ProtoMessage() {}
 
 func (x *PaymentBackground_MediaData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[202]
+	mi := &file_binary_proto_def_proto_msgTypes[206]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20740,7 +21185,7 @@ type TemplateMessage_HydratedFourRowTemplate struct {
 func (x *TemplateMessage_HydratedFourRowTemplate) Reset() {
 	*x = TemplateMessage_HydratedFourRowTemplate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[203]
+		mi := &file_binary_proto_def_proto_msgTypes[207]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20753,7 +21198,7 @@ func (x *TemplateMessage_HydratedFourRowTemplate) String() string {
 func (*TemplateMessage_HydratedFourRowTemplate) ProtoMessage() {}
 
 func (x *TemplateMessage_HydratedFourRowTemplate) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[203]
+	mi := &file_binary_proto_def_proto_msgTypes[207]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -20899,7 +21344,7 @@ type TemplateMessage_FourRowTemplate struct {
 func (x *TemplateMessage_FourRowTemplate) Reset() {
 	*x = TemplateMessage_FourRowTemplate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[204]
+		mi := &file_binary_proto_def_proto_msgTypes[208]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -20912,7 +21357,7 @@ func (x *TemplateMessage_FourRowTemplate) String() string {
 func (*TemplateMessage_FourRowTemplate) ProtoMessage() {}
 
 func (x *TemplateMessage_FourRowTemplate) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[204]
+	mi := &file_binary_proto_def_proto_msgTypes[208]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21047,7 +21492,7 @@ type ProductMessage_ProductSnapshot struct {
 func (x *ProductMessage_ProductSnapshot) Reset() {
 	*x = ProductMessage_ProductSnapshot{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[205]
+		mi := &file_binary_proto_def_proto_msgTypes[209]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21060,7 +21505,7 @@ func (x *ProductMessage_ProductSnapshot) String() string {
 func (*ProductMessage_ProductSnapshot) ProtoMessage() {}
 
 func (x *ProductMessage_ProductSnapshot) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[205]
+	mi := &file_binary_proto_def_proto_msgTypes[209]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21073,7 +21518,7 @@ func (x *ProductMessage_ProductSnapshot) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProductMessage_ProductSnapshot.ProtoReflect.Descriptor instead.
 func (*ProductMessage_ProductSnapshot) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{68, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{70, 0}
 }
 
 func (x *ProductMessage_ProductSnapshot) GetProductImage() *ImageMessage {
@@ -21166,7 +21611,7 @@ type ProductMessage_CatalogSnapshot struct {
 func (x *ProductMessage_CatalogSnapshot) Reset() {
 	*x = ProductMessage_CatalogSnapshot{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[206]
+		mi := &file_binary_proto_def_proto_msgTypes[210]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21179,7 +21624,7 @@ func (x *ProductMessage_CatalogSnapshot) String() string {
 func (*ProductMessage_CatalogSnapshot) ProtoMessage() {}
 
 func (x *ProductMessage_CatalogSnapshot) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[206]
+	mi := &file_binary_proto_def_proto_msgTypes[210]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21192,7 +21637,7 @@ func (x *ProductMessage_CatalogSnapshot) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ProductMessage_CatalogSnapshot.ProtoReflect.Descriptor instead.
 func (*ProductMessage_CatalogSnapshot) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{68, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{70, 1}
 }
 
 func (x *ProductMessage_CatalogSnapshot) GetCatalogImage() *ImageMessage {
@@ -21227,7 +21672,7 @@ type PollCreationMessage_Option struct {
 func (x *PollCreationMessage_Option) Reset() {
 	*x = PollCreationMessage_Option{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[207]
+		mi := &file_binary_proto_def_proto_msgTypes[211]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21240,7 +21685,7 @@ func (x *PollCreationMessage_Option) String() string {
 func (*PollCreationMessage_Option) ProtoMessage() {}
 
 func (x *PollCreationMessage_Option) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[207]
+	mi := &file_binary_proto_def_proto_msgTypes[211]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21253,7 +21698,7 @@ func (x *PollCreationMessage_Option) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PollCreationMessage_Option.ProtoReflect.Descriptor instead.
 func (*PollCreationMessage_Option) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{73, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{75, 0}
 }
 
 func (x *PollCreationMessage_Option) GetOptionName() string {
@@ -21263,6 +21708,165 @@ func (x *PollCreationMessage_Option) GetOptionName() string {
 	return ""
 }
 
+type PeerDataOperationRequestResponseMessage_PeerDataOperationResult struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	MediaUploadResult   *MediaRetryNotification_ResultType                                                   `protobuf:"varint,1,opt,name=mediaUploadResult,enum=proto.MediaRetryNotification_ResultType" json:"mediaUploadResult,omitempty"`
+	StickerMessage      *StickerMessage                                                                      `protobuf:"bytes,2,opt,name=stickerMessage" json:"stickerMessage,omitempty"`
+	LinkPreviewResponse *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse `protobuf:"bytes,3,opt,name=linkPreviewResponse" json:"linkPreviewResponse,omitempty"`
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) Reset() {
+	*x = PeerDataOperationRequestResponseMessage_PeerDataOperationResult{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[212]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult) ProtoMessage() {}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[212]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeerDataOperationRequestResponseMessage_PeerDataOperationResult.ProtoReflect.Descriptor instead.
+func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{77, 0}
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) GetMediaUploadResult() MediaRetryNotification_ResultType {
+	if x != nil && x.MediaUploadResult != nil {
+		return *x.MediaUploadResult
+	}
+	return MediaRetryNotification_GENERAL_ERROR
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) GetStickerMessage() *StickerMessage {
+	if x != nil {
+		return x.StickerMessage
+	}
+	return nil
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult) GetLinkPreviewResponse() *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse {
+	if x != nil {
+		return x.LinkPreviewResponse
+	}
+	return nil
+}
+
+type PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Url          *string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+	Title        *string `protobuf:"bytes,2,opt,name=title" json:"title,omitempty"`
+	Description  *string `protobuf:"bytes,3,opt,name=description" json:"description,omitempty"`
+	ThumbData    []byte  `protobuf:"bytes,4,opt,name=thumbData" json:"thumbData,omitempty"`
+	CanonicalUrl *string `protobuf:"bytes,5,opt,name=canonicalUrl" json:"canonicalUrl,omitempty"`
+	MatchText    *string `protobuf:"bytes,6,opt,name=matchText" json:"matchText,omitempty"`
+	PreviewType  *string `protobuf:"bytes,7,opt,name=previewType" json:"previewType,omitempty"`
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) Reset() {
+	*x = PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_binary_proto_def_proto_msgTypes[213]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) ProtoMessage() {
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_binary_proto_def_proto_msgTypes[213]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse.ProtoReflect.Descriptor instead.
+func (*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) Descriptor() ([]byte, []int) {
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{77, 0, 0}
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetUrl() string {
+	if x != nil && x.Url != nil {
+		return *x.Url
+	}
+	return ""
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetTitle() string {
+	if x != nil && x.Title != nil {
+		return *x.Title
+	}
+	return ""
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetDescription() string {
+	if x != nil && x.Description != nil {
+		return *x.Description
+	}
+	return ""
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetThumbData() []byte {
+	if x != nil {
+		return x.ThumbData
+	}
+	return nil
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetCanonicalUrl() string {
+	if x != nil && x.CanonicalUrl != nil {
+		return *x.CanonicalUrl
+	}
+	return ""
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetMatchText() string {
+	if x != nil && x.MatchText != nil {
+		return *x.MatchText
+	}
+	return ""
+}
+
+func (x *PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse) GetPreviewType() string {
+	if x != nil && x.PreviewType != nil {
+		return *x.PreviewType
+	}
+	return ""
+}
+
 type MsgOpaqueData_PollOption struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -21274,7 +21878,7 @@ type MsgOpaqueData_PollOption struct {
 func (x *MsgOpaqueData_PollOption) Reset() {
 	*x = MsgOpaqueData_PollOption{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[208]
+		mi := &file_binary_proto_def_proto_msgTypes[214]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21287,7 +21891,7 @@ func (x *MsgOpaqueData_PollOption) String() string {
 func (*MsgOpaqueData_PollOption) ProtoMessage() {}
 
 func (x *MsgOpaqueData_PollOption) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[208]
+	mi := &file_binary_proto_def_proto_msgTypes[214]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21300,7 +21904,7 @@ func (x *MsgOpaqueData_PollOption) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MsgOpaqueData_PollOption.ProtoReflect.Descriptor instead.
 func (*MsgOpaqueData_PollOption) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{88, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{92, 0}
 }
 
 func (x *MsgOpaqueData_PollOption) GetName() string {
@@ -21325,7 +21929,7 @@ type VerifiedNameCertificate_Details struct {
 func (x *VerifiedNameCertificate_Details) Reset() {
 	*x = VerifiedNameCertificate_Details{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[209]
+		mi := &file_binary_proto_def_proto_msgTypes[215]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21338,7 +21942,7 @@ func (x *VerifiedNameCertificate_Details) String() string {
 func (*VerifiedNameCertificate_Details) ProtoMessage() {}
 
 func (x *VerifiedNameCertificate_Details) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[209]
+	mi := &file_binary_proto_def_proto_msgTypes[215]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21351,7 +21955,7 @@ func (x *VerifiedNameCertificate_Details) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VerifiedNameCertificate_Details.ProtoReflect.Descriptor instead.
 func (*VerifiedNameCertificate_Details) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{139, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{143, 0}
 }
 
 func (x *VerifiedNameCertificate_Details) GetSerial() uint64 {
@@ -21403,7 +22007,7 @@ type ClientPayload_WebInfo struct {
 func (x *ClientPayload_WebInfo) Reset() {
 	*x = ClientPayload_WebInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[210]
+		mi := &file_binary_proto_def_proto_msgTypes[216]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21416,7 +22020,7 @@ func (x *ClientPayload_WebInfo) String() string {
 func (*ClientPayload_WebInfo) ProtoMessage() {}
 
 func (x *ClientPayload_WebInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[210]
+	mi := &file_binary_proto_def_proto_msgTypes[216]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21429,7 +22033,7 @@ func (x *ClientPayload_WebInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ClientPayload_WebInfo.ProtoReflect.Descriptor instead.
 func (*ClientPayload_WebInfo) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 0}
 }
 
 func (x *ClientPayload_WebInfo) GetRefToken() string {
@@ -21483,7 +22087,7 @@ type ClientPayload_UserAgent struct {
 func (x *ClientPayload_UserAgent) Reset() {
 	*x = ClientPayload_UserAgent{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[211]
+		mi := &file_binary_proto_def_proto_msgTypes[217]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21496,7 +22100,7 @@ func (x *ClientPayload_UserAgent) String() string {
 func (*ClientPayload_UserAgent) ProtoMessage() {}
 
 func (x *ClientPayload_UserAgent) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[211]
+	mi := &file_binary_proto_def_proto_msgTypes[217]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21509,7 +22113,7 @@ func (x *ClientPayload_UserAgent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ClientPayload_UserAgent.ProtoReflect.Descriptor instead.
 func (*ClientPayload_UserAgent) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 1}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 1}
 }
 
 func (x *ClientPayload_UserAgent) GetPlatform() ClientPayload_UserAgent_Platform {
@@ -21621,7 +22225,7 @@ type ClientPayload_DevicePairingRegistrationData struct {
 func (x *ClientPayload_DevicePairingRegistrationData) Reset() {
 	*x = ClientPayload_DevicePairingRegistrationData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[212]
+		mi := &file_binary_proto_def_proto_msgTypes[218]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21634,7 +22238,7 @@ func (x *ClientPayload_DevicePairingRegistrationData) String() string {
 func (*ClientPayload_DevicePairingRegistrationData) ProtoMessage() {}
 
 func (x *ClientPayload_DevicePairingRegistrationData) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[212]
+	mi := &file_binary_proto_def_proto_msgTypes[218]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21647,7 +22251,7 @@ func (x *ClientPayload_DevicePairingRegistrationData) ProtoReflect() protoreflec
 
 // Deprecated: Use ClientPayload_DevicePairingRegistrationData.ProtoReflect.Descriptor instead.
 func (*ClientPayload_DevicePairingRegistrationData) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 2}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 2}
 }
 
 func (x *ClientPayload_DevicePairingRegistrationData) GetERegid() []byte {
@@ -21718,7 +22322,7 @@ type ClientPayload_DNSSource struct {
 func (x *ClientPayload_DNSSource) Reset() {
 	*x = ClientPayload_DNSSource{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[213]
+		mi := &file_binary_proto_def_proto_msgTypes[219]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21731,7 +22335,7 @@ func (x *ClientPayload_DNSSource) String() string {
 func (*ClientPayload_DNSSource) ProtoMessage() {}
 
 func (x *ClientPayload_DNSSource) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[213]
+	mi := &file_binary_proto_def_proto_msgTypes[219]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21744,7 +22348,7 @@ func (x *ClientPayload_DNSSource) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ClientPayload_DNSSource.ProtoReflect.Descriptor instead.
 func (*ClientPayload_DNSSource) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 3}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 3}
 }
 
 func (x *ClientPayload_DNSSource) GetDnsMethod() ClientPayload_DNSSource_DNSResolutionMethod {
@@ -21782,7 +22386,7 @@ type ClientPayload_WebInfo_WebdPayload struct {
 func (x *ClientPayload_WebInfo_WebdPayload) Reset() {
 	*x = ClientPayload_WebInfo_WebdPayload{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[214]
+		mi := &file_binary_proto_def_proto_msgTypes[220]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21795,7 +22399,7 @@ func (x *ClientPayload_WebInfo_WebdPayload) String() string {
 func (*ClientPayload_WebInfo_WebdPayload) ProtoMessage() {}
 
 func (x *ClientPayload_WebInfo_WebdPayload) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[214]
+	mi := &file_binary_proto_def_proto_msgTypes[220]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21808,7 +22412,7 @@ func (x *ClientPayload_WebInfo_WebdPayload) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use ClientPayload_WebInfo_WebdPayload.ProtoReflect.Descriptor instead.
 func (*ClientPayload_WebInfo_WebdPayload) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 0, 0}
 }
 
 func (x *ClientPayload_WebInfo_WebdPayload) GetUsesParticipantInKey() bool {
@@ -21903,7 +22507,7 @@ type ClientPayload_UserAgent_AppVersion struct {
 func (x *ClientPayload_UserAgent_AppVersion) Reset() {
 	*x = ClientPayload_UserAgent_AppVersion{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[215]
+		mi := &file_binary_proto_def_proto_msgTypes[221]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21916,7 +22520,7 @@ func (x *ClientPayload_UserAgent_AppVersion) String() string {
 func (*ClientPayload_UserAgent_AppVersion) ProtoMessage() {}
 
 func (x *ClientPayload_UserAgent_AppVersion) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[215]
+	mi := &file_binary_proto_def_proto_msgTypes[221]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -21929,7 +22533,7 @@ func (x *ClientPayload_UserAgent_AppVersion) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use ClientPayload_UserAgent_AppVersion.ProtoReflect.Descriptor instead.
 func (*ClientPayload_UserAgent_AppVersion) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{148, 1, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{152, 1, 0}
 }
 
 func (x *ClientPayload_UserAgent_AppVersion) GetPrimary() uint32 {
@@ -21982,7 +22586,7 @@ type NoiseCertificate_Details struct {
 func (x *NoiseCertificate_Details) Reset() {
 	*x = NoiseCertificate_Details{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[216]
+		mi := &file_binary_proto_def_proto_msgTypes[222]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -21995,7 +22599,7 @@ func (x *NoiseCertificate_Details) String() string {
 func (*NoiseCertificate_Details) ProtoMessage() {}
 
 func (x *NoiseCertificate_Details) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[216]
+	mi := &file_binary_proto_def_proto_msgTypes[222]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22008,7 +22612,7 @@ func (x *NoiseCertificate_Details) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use NoiseCertificate_Details.ProtoReflect.Descriptor instead.
 func (*NoiseCertificate_Details) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{162, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{166, 0}
 }
 
 func (x *NoiseCertificate_Details) GetSerial() uint32 {
@@ -22058,7 +22662,7 @@ type CertChain_NoiseCertificate struct {
 func (x *CertChain_NoiseCertificate) Reset() {
 	*x = CertChain_NoiseCertificate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[217]
+		mi := &file_binary_proto_def_proto_msgTypes[223]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -22071,7 +22675,7 @@ func (x *CertChain_NoiseCertificate) String() string {
 func (*CertChain_NoiseCertificate) ProtoMessage() {}
 
 func (x *CertChain_NoiseCertificate) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[217]
+	mi := &file_binary_proto_def_proto_msgTypes[223]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22084,7 +22688,7 @@ func (x *CertChain_NoiseCertificate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CertChain_NoiseCertificate.ProtoReflect.Descriptor instead.
 func (*CertChain_NoiseCertificate) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{163, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{167, 0}
 }
 
 func (x *CertChain_NoiseCertificate) GetDetails() []byte {
@@ -22116,7 +22720,7 @@ type CertChain_NoiseCertificate_Details struct {
 func (x *CertChain_NoiseCertificate_Details) Reset() {
 	*x = CertChain_NoiseCertificate_Details{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_binary_proto_def_proto_msgTypes[218]
+		mi := &file_binary_proto_def_proto_msgTypes[224]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -22129,7 +22733,7 @@ func (x *CertChain_NoiseCertificate_Details) String() string {
 func (*CertChain_NoiseCertificate_Details) ProtoMessage() {}
 
 func (x *CertChain_NoiseCertificate_Details) ProtoReflect() protoreflect.Message {
-	mi := &file_binary_proto_def_proto_msgTypes[218]
+	mi := &file_binary_proto_def_proto_msgTypes[224]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -22142,7 +22746,7 @@ func (x *CertChain_NoiseCertificate_Details) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use CertChain_NoiseCertificate_Details.ProtoReflect.Descriptor instead.
 func (*CertChain_NoiseCertificate_Details) Descriptor() ([]byte, []int) {
-	return file_binary_proto_def_proto_rawDescGZIP(), []int{163, 0, 0}
+	return file_binary_proto_def_proto_rawDescGZIP(), []int{167, 0, 0}
 }
 
 func (x *CertChain_NoiseCertificate_Details) GetSerial() uint32 {
@@ -22197,11 +22801,11 @@ func file_binary_proto_def_proto_rawDescGZIP() []byte {
 	return file_binary_proto_def_proto_rawDescData
 }
 
-var file_binary_proto_def_proto_enumTypes = make([]protoimpl.EnumInfo, 54)
-var file_binary_proto_def_proto_msgTypes = make([]protoimpl.MessageInfo, 219)
+var file_binary_proto_def_proto_enumTypes = make([]protoimpl.EnumInfo, 56)
+var file_binary_proto_def_proto_msgTypes = make([]protoimpl.MessageInfo, 225)
 var file_binary_proto_def_proto_goTypes = []interface{}{
-	(PeerDataOperationRequestType)(0),            // 0: proto.PeerDataOperationRequestType
-	(KeepType)(0),                                // 1: proto.KeepType
+	(KeepType)(0),                                // 0: proto.KeepType
+	(PeerDataOperationRequestType)(0),            // 1: proto.PeerDataOperationRequestType
 	(MediaVisibility)(0),                         // 2: proto.MediaVisibility
 	(DeviceProps_PlatformType)(0),                // 3: proto.DeviceProps.PlatformType
 	(PaymentInviteMessage_ServiceType)(0),        // 4: proto.PaymentInviteMessage.ServiceType
@@ -22214,675 +22818,696 @@ var file_binary_proto_def_proto_goTypes = []interface{}{
 	(HistorySyncNotification_HistorySyncType)(0), // 11: proto.HistorySyncNotification.HistorySyncType
 	(HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_DayOfWeekType)(0), // 12: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.DayOfWeekType
 	(HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent_CalendarType)(0),  // 13: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.CalendarType
-	(GroupInviteMessage_GroupType)(0),                // 14: proto.GroupInviteMessage.GroupType
-	(ExtendedTextMessage_PreviewType)(0),             // 15: proto.ExtendedTextMessage.PreviewType
-	(ExtendedTextMessage_InviteLinkGroupType)(0),     // 16: proto.ExtendedTextMessage.InviteLinkGroupType
-	(ExtendedTextMessage_FontType)(0),                // 17: proto.ExtendedTextMessage.FontType
-	(ButtonsResponseMessage_Type)(0),                 // 18: proto.ButtonsResponseMessage.Type
-	(ButtonsMessage_HeaderType)(0),                   // 19: proto.ButtonsMessage.HeaderType
-	(ButtonsMessage_Button_Type)(0),                  // 20: proto.ButtonsMessage.Button.Type
-	(DisappearingMode_Initiator)(0),                  // 21: proto.DisappearingMode.Initiator
-	(ContextInfo_ExternalAdReplyInfo_MediaType)(0),   // 22: proto.ContextInfo.ExternalAdReplyInfo.MediaType
-	(ContextInfo_AdReplyInfo_MediaType)(0),           // 23: proto.ContextInfo.AdReplyInfo.MediaType
-	(PaymentBackground_Type)(0),                      // 24: proto.PaymentBackground.Type
-	(VideoMessage_Attribution)(0),                    // 25: proto.VideoMessage.Attribution
-	(ProtocolMessage_Type)(0),                        // 26: proto.ProtocolMessage.Type
-	(PastParticipant_LeaveReason)(0),                 // 27: proto.PastParticipant.LeaveReason
-	(HistorySync_HistorySyncType)(0),                 // 28: proto.HistorySync.HistorySyncType
-	(GroupParticipant_Rank)(0),                       // 29: proto.GroupParticipant.Rank
-	(Conversation_EndOfHistoryTransferType)(0),       // 30: proto.Conversation.EndOfHistoryTransferType
-	(MediaRetryNotification_ResultType)(0),           // 31: proto.MediaRetryNotification.ResultType
-	(SyncdMutation_SyncdOperation)(0),                // 32: proto.SyncdMutation.SyncdOperation
-	(BizIdentityInfo_VerifiedLevelValue)(0),          // 33: proto.BizIdentityInfo.VerifiedLevelValue
-	(BizIdentityInfo_HostStorageType)(0),             // 34: proto.BizIdentityInfo.HostStorageType
-	(BizIdentityInfo_ActualActorsType)(0),            // 35: proto.BizIdentityInfo.ActualActorsType
-	(BizAccountLinkInfo_HostStorageType)(0),          // 36: proto.BizAccountLinkInfo.HostStorageType
-	(BizAccountLinkInfo_AccountType)(0),              // 37: proto.BizAccountLinkInfo.AccountType
-	(ClientPayload_Product)(0),                       // 38: proto.ClientPayload.Product
-	(ClientPayload_IOSAppExtension)(0),               // 39: proto.ClientPayload.IOSAppExtension
-	(ClientPayload_ConnectType)(0),                   // 40: proto.ClientPayload.ConnectType
-	(ClientPayload_ConnectReason)(0),                 // 41: proto.ClientPayload.ConnectReason
-	(ClientPayload_BizMarketSegment)(0),              // 42: proto.ClientPayload.BizMarketSegment
-	(ClientPayload_WebInfo_WebSubPlatform)(0),        // 43: proto.ClientPayload.WebInfo.WebSubPlatform
-	(ClientPayload_UserAgent_ReleaseChannel)(0),      // 44: proto.ClientPayload.UserAgent.ReleaseChannel
-	(ClientPayload_UserAgent_Platform)(0),            // 45: proto.ClientPayload.UserAgent.Platform
-	(ClientPayload_DNSSource_DNSResolutionMethod)(0), // 46: proto.ClientPayload.DNSSource.DNSResolutionMethod
-	(WebMessageInfo_StubType)(0),                     // 47: proto.WebMessageInfo.StubType
-	(WebMessageInfo_Status)(0),                       // 48: proto.WebMessageInfo.Status
-	(WebMessageInfo_BizPrivacyStatus)(0),             // 49: proto.WebMessageInfo.BizPrivacyStatus
-	(WebFeatures_Flag)(0),                            // 50: proto.WebFeatures.Flag
-	(PaymentInfo_TxnStatus)(0),                       // 51: proto.PaymentInfo.TxnStatus
-	(PaymentInfo_Status)(0),                          // 52: proto.PaymentInfo.Status
-	(PaymentInfo_Currency)(0),                        // 53: proto.PaymentInfo.Currency
-	(*ADVSignedKeyIndexList)(nil),                    // 54: proto.ADVSignedKeyIndexList
-	(*ADVSignedDeviceIdentity)(nil),                  // 55: proto.ADVSignedDeviceIdentity
-	(*ADVSignedDeviceIdentityHMAC)(nil),              // 56: proto.ADVSignedDeviceIdentityHMAC
-	(*ADVKeyIndexList)(nil),                          // 57: proto.ADVKeyIndexList
-	(*ADVDeviceIdentity)(nil),                        // 58: proto.ADVDeviceIdentity
-	(*DeviceProps)(nil),                              // 59: proto.DeviceProps
-	(*PeerDataOperationRequestResponseMessage)(nil),  // 60: proto.PeerDataOperationRequestResponseMessage
-	(*PeerDataOperationRequestMessage)(nil),          // 61: proto.PeerDataOperationRequestMessage
-	(*PaymentInviteMessage)(nil),                     // 62: proto.PaymentInviteMessage
-	(*OrderMessage)(nil),                             // 63: proto.OrderMessage
-	(*LocationMessage)(nil),                          // 64: proto.LocationMessage
-	(*LiveLocationMessage)(nil),                      // 65: proto.LiveLocationMessage
-	(*ListResponseMessage)(nil),                      // 66: proto.ListResponseMessage
-	(*ListMessage)(nil),                              // 67: proto.ListMessage
-	(*KeepInChatMessage)(nil),                        // 68: proto.KeepInChatMessage
-	(*InvoiceMessage)(nil),                           // 69: proto.InvoiceMessage
-	(*InteractiveResponseMessage)(nil),               // 70: proto.InteractiveResponseMessage
-	(*InteractiveMessage)(nil),                       // 71: proto.InteractiveMessage
-	(*InitialSecurityNotificationSettingSync)(nil),   // 72: proto.InitialSecurityNotificationSettingSync
-	(*ImageMessage)(nil),                             // 73: proto.ImageMessage
-	(*HistorySyncNotification)(nil),                  // 74: proto.HistorySyncNotification
-	(*HighlyStructuredMessage)(nil),                  // 75: proto.HighlyStructuredMessage
-	(*GroupInviteMessage)(nil),                       // 76: proto.GroupInviteMessage
-	(*FutureProofMessage)(nil),                       // 77: proto.FutureProofMessage
-	(*ExtendedTextMessage)(nil),                      // 78: proto.ExtendedTextMessage
-	(*EncReactionMessage)(nil),                       // 79: proto.EncReactionMessage
-	(*DocumentMessage)(nil),                          // 80: proto.DocumentMessage
-	(*DeviceSentMessage)(nil),                        // 81: proto.DeviceSentMessage
-	(*DeclinePaymentRequestMessage)(nil),             // 82: proto.DeclinePaymentRequestMessage
-	(*ContactsArrayMessage)(nil),                     // 83: proto.ContactsArrayMessage
-	(*ContactMessage)(nil),                           // 84: proto.ContactMessage
-	(*Chat)(nil),                                     // 85: proto.Chat
-	(*CancelPaymentRequestMessage)(nil),              // 86: proto.CancelPaymentRequestMessage
-	(*Call)(nil),                                     // 87: proto.Call
-	(*ButtonsResponseMessage)(nil),                   // 88: proto.ButtonsResponseMessage
-	(*ButtonsMessage)(nil),                           // 89: proto.ButtonsMessage
-	(*AudioMessage)(nil),                             // 90: proto.AudioMessage
-	(*AppStateSyncKey)(nil),                          // 91: proto.AppStateSyncKey
-	(*AppStateSyncKeyShare)(nil),                     // 92: proto.AppStateSyncKeyShare
-	(*AppStateSyncKeyRequest)(nil),                   // 93: proto.AppStateSyncKeyRequest
-	(*AppStateSyncKeyId)(nil),                        // 94: proto.AppStateSyncKeyId
-	(*AppStateSyncKeyFingerprint)(nil),               // 95: proto.AppStateSyncKeyFingerprint
-	(*AppStateSyncKeyData)(nil),                      // 96: proto.AppStateSyncKeyData
-	(*AppStateFatalExceptionNotification)(nil),       // 97: proto.AppStateFatalExceptionNotification
-	(*Location)(nil),                                 // 98: proto.Location
-	(*InteractiveAnnotation)(nil),                    // 99: proto.InteractiveAnnotation
-	(*HydratedTemplateButton)(nil),                   // 100: proto.HydratedTemplateButton
-	(*DisappearingMode)(nil),                         // 101: proto.DisappearingMode
-	(*DeviceListMetadata)(nil),                       // 102: proto.DeviceListMetadata
-	(*ContextInfo)(nil),                              // 103: proto.ContextInfo
-	(*ActionLink)(nil),                               // 104: proto.ActionLink
-	(*TemplateButton)(nil),                           // 105: proto.TemplateButton
-	(*Point)(nil),                                    // 106: proto.Point
-	(*PaymentBackground)(nil),                        // 107: proto.PaymentBackground
-	(*Money)(nil),                                    // 108: proto.Money
-	(*Message)(nil),                                  // 109: proto.Message
-	(*MessageContextInfo)(nil),                       // 110: proto.MessageContextInfo
-	(*VideoMessage)(nil),                             // 111: proto.VideoMessage
-	(*TemplateMessage)(nil),                          // 112: proto.TemplateMessage
-	(*TemplateButtonReplyMessage)(nil),               // 113: proto.TemplateButtonReplyMessage
-	(*StickerSyncRMRMessage)(nil),                    // 114: proto.StickerSyncRMRMessage
-	(*StickerMessage)(nil),                           // 115: proto.StickerMessage
-	(*SenderKeyDistributionMessage)(nil),             // 116: proto.SenderKeyDistributionMessage
-	(*SendPaymentMessage)(nil),                       // 117: proto.SendPaymentMessage
-	(*RequestPhoneNumberMessage)(nil),                // 118: proto.RequestPhoneNumberMessage
-	(*RequestPaymentMessage)(nil),                    // 119: proto.RequestPaymentMessage
-	(*ReactionMessage)(nil),                          // 120: proto.ReactionMessage
-	(*ProtocolMessage)(nil),                          // 121: proto.ProtocolMessage
-	(*ProductMessage)(nil),                           // 122: proto.ProductMessage
-	(*PollVoteMessage)(nil),                          // 123: proto.PollVoteMessage
-	(*PollUpdateMessage)(nil),                        // 124: proto.PollUpdateMessage
-	(*PollUpdateMessageMetadata)(nil),                // 125: proto.PollUpdateMessageMetadata
-	(*PollEncValue)(nil),                             // 126: proto.PollEncValue
-	(*PollCreationMessage)(nil),                      // 127: proto.PollCreationMessage
-	(*EphemeralSetting)(nil),                         // 128: proto.EphemeralSetting
-	(*WallpaperSettings)(nil),                        // 129: proto.WallpaperSettings
-	(*StickerMetadata)(nil),                          // 130: proto.StickerMetadata
-	(*Pushname)(nil),                                 // 131: proto.Pushname
-	(*PastParticipants)(nil),                         // 132: proto.PastParticipants
-	(*PastParticipant)(nil),                          // 133: proto.PastParticipant
-	(*HistorySync)(nil),                              // 134: proto.HistorySync
-	(*HistorySyncMsg)(nil),                           // 135: proto.HistorySyncMsg
-	(*GroupParticipant)(nil),                         // 136: proto.GroupParticipant
-	(*GlobalSettings)(nil),                           // 137: proto.GlobalSettings
-	(*Conversation)(nil),                             // 138: proto.Conversation
-	(*AvatarUserSettings)(nil),                       // 139: proto.AvatarUserSettings
-	(*AutoDownloadSettings)(nil),                     // 140: proto.AutoDownloadSettings
-	(*MsgRowOpaqueData)(nil),                         // 141: proto.MsgRowOpaqueData
-	(*MsgOpaqueData)(nil),                            // 142: proto.MsgOpaqueData
-	(*ServerErrorReceipt)(nil),                       // 143: proto.ServerErrorReceipt
-	(*MediaRetryNotification)(nil),                   // 144: proto.MediaRetryNotification
-	(*MessageKey)(nil),                               // 145: proto.MessageKey
-	(*SyncdVersion)(nil),                             // 146: proto.SyncdVersion
-	(*SyncdValue)(nil),                               // 147: proto.SyncdValue
-	(*SyncdSnapshot)(nil),                            // 148: proto.SyncdSnapshot
-	(*SyncdRecord)(nil),                              // 149: proto.SyncdRecord
-	(*SyncdPatch)(nil),                               // 150: proto.SyncdPatch
-	(*SyncdMutations)(nil),                           // 151: proto.SyncdMutations
-	(*SyncdMutation)(nil),                            // 152: proto.SyncdMutation
-	(*SyncdIndex)(nil),                               // 153: proto.SyncdIndex
-	(*KeyId)(nil),                                    // 154: proto.KeyId
-	(*ExternalBlobReference)(nil),                    // 155: proto.ExternalBlobReference
-	(*ExitCode)(nil),                                 // 156: proto.ExitCode
-	(*SyncActionValue)(nil),                          // 157: proto.SyncActionValue
-	(*UserStatusMuteAction)(nil),                     // 158: proto.UserStatusMuteAction
-	(*UnarchiveChatsSetting)(nil),                    // 159: proto.UnarchiveChatsSetting
-	(*TimeFormatAction)(nil),                         // 160: proto.TimeFormatAction
-	(*SyncActionMessage)(nil),                        // 161: proto.SyncActionMessage
-	(*SyncActionMessageRange)(nil),                   // 162: proto.SyncActionMessageRange
-	(*SubscriptionAction)(nil),                       // 163: proto.SubscriptionAction
-	(*StickerAction)(nil),                            // 164: proto.StickerAction
-	(*StarAction)(nil),                               // 165: proto.StarAction
-	(*SecurityNotificationSetting)(nil),              // 166: proto.SecurityNotificationSetting
-	(*RemoveRecentStickerAction)(nil),                // 167: proto.RemoveRecentStickerAction
-	(*RecentEmojiWeightsAction)(nil),                 // 168: proto.RecentEmojiWeightsAction
-	(*QuickReplyAction)(nil),                         // 169: proto.QuickReplyAction
-	(*PushNameSetting)(nil),                          // 170: proto.PushNameSetting
-	(*PrimaryVersionAction)(nil),                     // 171: proto.PrimaryVersionAction
-	(*PrimaryFeature)(nil),                           // 172: proto.PrimaryFeature
-	(*PnForLidChatAction)(nil),                       // 173: proto.PnForLidChatAction
-	(*PinAction)(nil),                                // 174: proto.PinAction
-	(*NuxAction)(nil),                                // 175: proto.NuxAction
-	(*MuteAction)(nil),                               // 176: proto.MuteAction
-	(*MarkChatAsReadAction)(nil),                     // 177: proto.MarkChatAsReadAction
-	(*LocaleSetting)(nil),                            // 178: proto.LocaleSetting
-	(*LabelEditAction)(nil),                          // 179: proto.LabelEditAction
-	(*LabelAssociationAction)(nil),                   // 180: proto.LabelAssociationAction
-	(*KeyExpiration)(nil),                            // 181: proto.KeyExpiration
-	(*DeleteMessageForMeAction)(nil),                 // 182: proto.DeleteMessageForMeAction
-	(*DeleteChatAction)(nil),                         // 183: proto.DeleteChatAction
-	(*ContactAction)(nil),                            // 184: proto.ContactAction
-	(*ClearChatAction)(nil),                          // 185: proto.ClearChatAction
-	(*ChatAssignmentOpenedStatusAction)(nil),         // 186: proto.ChatAssignmentOpenedStatusAction
-	(*ChatAssignmentAction)(nil),                     // 187: proto.ChatAssignmentAction
-	(*ArchiveChatAction)(nil),                        // 188: proto.ArchiveChatAction
-	(*AndroidUnsupportedActions)(nil),                // 189: proto.AndroidUnsupportedActions
-	(*AgentAction)(nil),                              // 190: proto.AgentAction
-	(*SyncActionData)(nil),                           // 191: proto.SyncActionData
-	(*RecentEmojiWeight)(nil),                        // 192: proto.RecentEmojiWeight
-	(*VerifiedNameCertificate)(nil),                  // 193: proto.VerifiedNameCertificate
-	(*LocalizedName)(nil),                            // 194: proto.LocalizedName
-	(*BizIdentityInfo)(nil),                          // 195: proto.BizIdentityInfo
-	(*BizAccountPayload)(nil),                        // 196: proto.BizAccountPayload
-	(*BizAccountLinkInfo)(nil),                       // 197: proto.BizAccountLinkInfo
-	(*HandshakeMessage)(nil),                         // 198: proto.HandshakeMessage
-	(*HandshakeServerHello)(nil),                     // 199: proto.HandshakeServerHello
-	(*HandshakeClientHello)(nil),                     // 200: proto.HandshakeClientHello
-	(*HandshakeClientFinish)(nil),                    // 201: proto.HandshakeClientFinish
-	(*ClientPayload)(nil),                            // 202: proto.ClientPayload
-	(*WebNotificationsInfo)(nil),                     // 203: proto.WebNotificationsInfo
-	(*WebMessageInfo)(nil),                           // 204: proto.WebMessageInfo
-	(*WebFeatures)(nil),                              // 205: proto.WebFeatures
-	(*UserReceipt)(nil),                              // 206: proto.UserReceipt
-	(*StatusPSA)(nil),                                // 207: proto.StatusPSA
-	(*Reaction)(nil),                                 // 208: proto.Reaction
-	(*PollUpdate)(nil),                               // 209: proto.PollUpdate
-	(*PollAdditionalMetadata)(nil),                   // 210: proto.PollAdditionalMetadata
-	(*PhotoChange)(nil),                              // 211: proto.PhotoChange
-	(*PaymentInfo)(nil),                              // 212: proto.PaymentInfo
-	(*NotificationMessageInfo)(nil),                  // 213: proto.NotificationMessageInfo
-	(*MediaData)(nil),                                // 214: proto.MediaData
-	(*KeepInChat)(nil),                               // 215: proto.KeepInChat
-	(*NoiseCertificate)(nil),                         // 216: proto.NoiseCertificate
-	(*CertChain)(nil),                                // 217: proto.CertChain
-	(*DeviceProps_HistorySyncConfig)(nil),            // 218: proto.DeviceProps.HistorySyncConfig
-	(*DeviceProps_AppVersion)(nil),                   // 219: proto.DeviceProps.AppVersion
-	(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult)(nil),                     // 220: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult
-	(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse)(nil), // 221: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.LinkPreviewResponse
-	(*PeerDataOperationRequestMessage_RequestUrlPreview)(nil),                                   // 222: proto.PeerDataOperationRequestMessage.RequestUrlPreview
-	(*PeerDataOperationRequestMessage_RequestStickerReupload)(nil),                              // 223: proto.PeerDataOperationRequestMessage.RequestStickerReupload
-	(*ListResponseMessage_SingleSelectReply)(nil),                                               // 224: proto.ListResponseMessage.SingleSelectReply
-	(*ListMessage_Section)(nil),                                                                 // 225: proto.ListMessage.Section
-	(*ListMessage_Row)(nil),                                                                     // 226: proto.ListMessage.Row
-	(*ListMessage_Product)(nil),                                                                 // 227: proto.ListMessage.Product
-	(*ListMessage_ProductSection)(nil),                                                          // 228: proto.ListMessage.ProductSection
-	(*ListMessage_ProductListInfo)(nil),                                                         // 229: proto.ListMessage.ProductListInfo
-	(*ListMessage_ProductListHeaderImage)(nil),                                                  // 230: proto.ListMessage.ProductListHeaderImage
-	(*InteractiveResponseMessage_NativeFlowResponseMessage)(nil),                                // 231: proto.InteractiveResponseMessage.NativeFlowResponseMessage
-	(*InteractiveResponseMessage_Body)(nil),                                                     // 232: proto.InteractiveResponseMessage.Body
-	(*InteractiveMessage_ShopMessage)(nil),                                                      // 233: proto.InteractiveMessage.ShopMessage
-	(*InteractiveMessage_NativeFlowMessage)(nil),                                                // 234: proto.InteractiveMessage.NativeFlowMessage
-	(*InteractiveMessage_Header)(nil),                                                           // 235: proto.InteractiveMessage.Header
-	(*InteractiveMessage_Footer)(nil),                                                           // 236: proto.InteractiveMessage.Footer
-	(*InteractiveMessage_CollectionMessage)(nil),                                                // 237: proto.InteractiveMessage.CollectionMessage
-	(*InteractiveMessage_Body)(nil),                                                             // 238: proto.InteractiveMessage.Body
-	(*InteractiveMessage_NativeFlowMessage_NativeFlowButton)(nil),                               // 239: proto.InteractiveMessage.NativeFlowMessage.NativeFlowButton
-	(*HighlyStructuredMessage_HSMLocalizableParameter)(nil),                                     // 240: proto.HighlyStructuredMessage.HSMLocalizableParameter
-	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime)(nil),                         // 241: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime
-	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency)(nil),                         // 242: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMCurrency
-	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch)(nil),    // 243: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeUnixEpoch
-	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent)(nil),    // 244: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent
-	(*ButtonsMessage_Button)(nil),                                                               // 245: proto.ButtonsMessage.Button
-	(*ButtonsMessage_Button_NativeFlowInfo)(nil),                                                // 246: proto.ButtonsMessage.Button.NativeFlowInfo
-	(*ButtonsMessage_Button_ButtonText)(nil),                                                    // 247: proto.ButtonsMessage.Button.ButtonText
-	(*HydratedTemplateButton_HydratedURLButton)(nil),                                            // 248: proto.HydratedTemplateButton.HydratedURLButton
-	(*HydratedTemplateButton_HydratedQuickReplyButton)(nil),                                     // 249: proto.HydratedTemplateButton.HydratedQuickReplyButton
-	(*HydratedTemplateButton_HydratedCallButton)(nil),                                           // 250: proto.HydratedTemplateButton.HydratedCallButton
-	(*ContextInfo_ExternalAdReplyInfo)(nil),                                                     // 251: proto.ContextInfo.ExternalAdReplyInfo
-	(*ContextInfo_AdReplyInfo)(nil),                                                             // 252: proto.ContextInfo.AdReplyInfo
-	(*TemplateButton_URLButton)(nil),                                                            // 253: proto.TemplateButton.URLButton
-	(*TemplateButton_QuickReplyButton)(nil),                                                     // 254: proto.TemplateButton.QuickReplyButton
-	(*TemplateButton_CallButton)(nil),                                                           // 255: proto.TemplateButton.CallButton
-	(*PaymentBackground_MediaData)(nil),                                                         // 256: proto.PaymentBackground.MediaData
-	(*TemplateMessage_HydratedFourRowTemplate)(nil),                                             // 257: proto.TemplateMessage.HydratedFourRowTemplate
-	(*TemplateMessage_FourRowTemplate)(nil),                                                     // 258: proto.TemplateMessage.FourRowTemplate
-	(*ProductMessage_ProductSnapshot)(nil),                                                      // 259: proto.ProductMessage.ProductSnapshot
-	(*ProductMessage_CatalogSnapshot)(nil),                                                      // 260: proto.ProductMessage.CatalogSnapshot
-	(*PollCreationMessage_Option)(nil),                                                          // 261: proto.PollCreationMessage.Option
-	(*MsgOpaqueData_PollOption)(nil),                                                            // 262: proto.MsgOpaqueData.PollOption
-	(*VerifiedNameCertificate_Details)(nil),                                                     // 263: proto.VerifiedNameCertificate.Details
-	(*ClientPayload_WebInfo)(nil),                                                               // 264: proto.ClientPayload.WebInfo
-	(*ClientPayload_UserAgent)(nil),                                                             // 265: proto.ClientPayload.UserAgent
-	(*ClientPayload_DevicePairingRegistrationData)(nil),                                         // 266: proto.ClientPayload.DevicePairingRegistrationData
-	(*ClientPayload_DNSSource)(nil),                                                             // 267: proto.ClientPayload.DNSSource
-	(*ClientPayload_WebInfo_WebdPayload)(nil),                                                   // 268: proto.ClientPayload.WebInfo.WebdPayload
-	(*ClientPayload_UserAgent_AppVersion)(nil),                                                  // 269: proto.ClientPayload.UserAgent.AppVersion
-	(*NoiseCertificate_Details)(nil),                                                            // 270: proto.NoiseCertificate.Details
-	(*CertChain_NoiseCertificate)(nil),                                                          // 271: proto.CertChain.NoiseCertificate
-	(*CertChain_NoiseCertificate_Details)(nil),                                                  // 272: proto.CertChain.NoiseCertificate.Details
+	(GroupInviteMessage_GroupType)(0),                              // 14: proto.GroupInviteMessage.GroupType
+	(ExtendedTextMessage_PreviewType)(0),                           // 15: proto.ExtendedTextMessage.PreviewType
+	(ExtendedTextMessage_InviteLinkGroupType)(0),                   // 16: proto.ExtendedTextMessage.InviteLinkGroupType
+	(ExtendedTextMessage_FontType)(0),                              // 17: proto.ExtendedTextMessage.FontType
+	(ButtonsResponseMessage_Type)(0),                               // 18: proto.ButtonsResponseMessage.Type
+	(ButtonsMessage_HeaderType)(0),                                 // 19: proto.ButtonsMessage.HeaderType
+	(ButtonsMessage_Button_Type)(0),                                // 20: proto.ButtonsMessage.Button.Type
+	(DisappearingMode_Initiator)(0),                                // 21: proto.DisappearingMode.Initiator
+	(ContextInfo_ExternalAdReplyInfo_MediaType)(0),                 // 22: proto.ContextInfo.ExternalAdReplyInfo.MediaType
+	(ContextInfo_AdReplyInfo_MediaType)(0),                         // 23: proto.ContextInfo.AdReplyInfo.MediaType
+	(PaymentBackground_Type)(0),                                    // 24: proto.PaymentBackground.Type
+	(VideoMessage_Attribution)(0),                                  // 25: proto.VideoMessage.Attribution
+	(ScheduledCallEditMessage_EditType)(0),                         // 26: proto.ScheduledCallEditMessage.EditType
+	(ScheduledCallCreationMessage_CallType)(0),                     // 27: proto.ScheduledCallCreationMessage.CallType
+	(ProtocolMessage_Type)(0),                                      // 28: proto.ProtocolMessage.Type
+	(PinMessage_PinMessageType)(0),                                 // 29: proto.PinMessage.PinMessageType
+	(PastParticipant_LeaveReason)(0),                               // 30: proto.PastParticipant.LeaveReason
+	(HistorySync_HistorySyncType)(0),                               // 31: proto.HistorySync.HistorySyncType
+	(GroupParticipant_Rank)(0),                                     // 32: proto.GroupParticipant.Rank
+	(Conversation_EndOfHistoryTransferType)(0),                     // 33: proto.Conversation.EndOfHistoryTransferType
+	(MediaRetryNotification_ResultType)(0),                         // 34: proto.MediaRetryNotification.ResultType
+	(SyncdMutation_SyncdOperation)(0),                              // 35: proto.SyncdMutation.SyncdOperation
+	(BizIdentityInfo_VerifiedLevelValue)(0),                        // 36: proto.BizIdentityInfo.VerifiedLevelValue
+	(BizIdentityInfo_HostStorageType)(0),                           // 37: proto.BizIdentityInfo.HostStorageType
+	(BizIdentityInfo_ActualActorsType)(0),                          // 38: proto.BizIdentityInfo.ActualActorsType
+	(BizAccountLinkInfo_HostStorageType)(0),                        // 39: proto.BizAccountLinkInfo.HostStorageType
+	(BizAccountLinkInfo_AccountType)(0),                            // 40: proto.BizAccountLinkInfo.AccountType
+	(ClientPayload_Product)(0),                                     // 41: proto.ClientPayload.Product
+	(ClientPayload_IOSAppExtension)(0),                             // 42: proto.ClientPayload.IOSAppExtension
+	(ClientPayload_ConnectType)(0),                                 // 43: proto.ClientPayload.ConnectType
+	(ClientPayload_ConnectReason)(0),                               // 44: proto.ClientPayload.ConnectReason
+	(ClientPayload_WebInfo_WebSubPlatform)(0),                      // 45: proto.ClientPayload.WebInfo.WebSubPlatform
+	(ClientPayload_UserAgent_ReleaseChannel)(0),                    // 46: proto.ClientPayload.UserAgent.ReleaseChannel
+	(ClientPayload_UserAgent_Platform)(0),                          // 47: proto.ClientPayload.UserAgent.Platform
+	(ClientPayload_DNSSource_DNSResolutionMethod)(0),               // 48: proto.ClientPayload.DNSSource.DNSResolutionMethod
+	(WebMessageInfo_StubType)(0),                                   // 49: proto.WebMessageInfo.StubType
+	(WebMessageInfo_Status)(0),                                     // 50: proto.WebMessageInfo.Status
+	(WebMessageInfo_BizPrivacyStatus)(0),                           // 51: proto.WebMessageInfo.BizPrivacyStatus
+	(WebFeatures_Flag)(0),                                          // 52: proto.WebFeatures.Flag
+	(PaymentInfo_TxnStatus)(0),                                     // 53: proto.PaymentInfo.TxnStatus
+	(PaymentInfo_Status)(0),                                        // 54: proto.PaymentInfo.Status
+	(PaymentInfo_Currency)(0),                                      // 55: proto.PaymentInfo.Currency
+	(*ADVSignedKeyIndexList)(nil),                                  // 56: proto.ADVSignedKeyIndexList
+	(*ADVSignedDeviceIdentity)(nil),                                // 57: proto.ADVSignedDeviceIdentity
+	(*ADVSignedDeviceIdentityHMAC)(nil),                            // 58: proto.ADVSignedDeviceIdentityHMAC
+	(*ADVKeyIndexList)(nil),                                        // 59: proto.ADVKeyIndexList
+	(*ADVDeviceIdentity)(nil),                                      // 60: proto.ADVDeviceIdentity
+	(*DeviceProps)(nil),                                            // 61: proto.DeviceProps
+	(*PeerDataOperationRequestMessage)(nil),                        // 62: proto.PeerDataOperationRequestMessage
+	(*PaymentInviteMessage)(nil),                                   // 63: proto.PaymentInviteMessage
+	(*OrderMessage)(nil),                                           // 64: proto.OrderMessage
+	(*LocationMessage)(nil),                                        // 65: proto.LocationMessage
+	(*LiveLocationMessage)(nil),                                    // 66: proto.LiveLocationMessage
+	(*ListResponseMessage)(nil),                                    // 67: proto.ListResponseMessage
+	(*ListMessage)(nil),                                            // 68: proto.ListMessage
+	(*KeepInChatMessage)(nil),                                      // 69: proto.KeepInChatMessage
+	(*InvoiceMessage)(nil),                                         // 70: proto.InvoiceMessage
+	(*InteractiveResponseMessage)(nil),                             // 71: proto.InteractiveResponseMessage
+	(*InteractiveMessage)(nil),                                     // 72: proto.InteractiveMessage
+	(*InitialSecurityNotificationSettingSync)(nil),                 // 73: proto.InitialSecurityNotificationSettingSync
+	(*ImageMessage)(nil),                                           // 74: proto.ImageMessage
+	(*HistorySyncNotification)(nil),                                // 75: proto.HistorySyncNotification
+	(*HighlyStructuredMessage)(nil),                                // 76: proto.HighlyStructuredMessage
+	(*GroupInviteMessage)(nil),                                     // 77: proto.GroupInviteMessage
+	(*FutureProofMessage)(nil),                                     // 78: proto.FutureProofMessage
+	(*ExtendedTextMessage)(nil),                                    // 79: proto.ExtendedTextMessage
+	(*EncReactionMessage)(nil),                                     // 80: proto.EncReactionMessage
+	(*DocumentMessage)(nil),                                        // 81: proto.DocumentMessage
+	(*DeviceSentMessage)(nil),                                      // 82: proto.DeviceSentMessage
+	(*DeclinePaymentRequestMessage)(nil),                           // 83: proto.DeclinePaymentRequestMessage
+	(*ContactsArrayMessage)(nil),                                   // 84: proto.ContactsArrayMessage
+	(*ContactMessage)(nil),                                         // 85: proto.ContactMessage
+	(*Chat)(nil),                                                   // 86: proto.Chat
+	(*CancelPaymentRequestMessage)(nil),                            // 87: proto.CancelPaymentRequestMessage
+	(*Call)(nil),                                                   // 88: proto.Call
+	(*ButtonsResponseMessage)(nil),                                 // 89: proto.ButtonsResponseMessage
+	(*ButtonsMessage)(nil),                                         // 90: proto.ButtonsMessage
+	(*AudioMessage)(nil),                                           // 91: proto.AudioMessage
+	(*AppStateSyncKey)(nil),                                        // 92: proto.AppStateSyncKey
+	(*AppStateSyncKeyShare)(nil),                                   // 93: proto.AppStateSyncKeyShare
+	(*AppStateSyncKeyRequest)(nil),                                 // 94: proto.AppStateSyncKeyRequest
+	(*AppStateSyncKeyId)(nil),                                      // 95: proto.AppStateSyncKeyId
+	(*AppStateSyncKeyFingerprint)(nil),                             // 96: proto.AppStateSyncKeyFingerprint
+	(*AppStateSyncKeyData)(nil),                                    // 97: proto.AppStateSyncKeyData
+	(*AppStateFatalExceptionNotification)(nil),                     // 98: proto.AppStateFatalExceptionNotification
+	(*Location)(nil),                                               // 99: proto.Location
+	(*InteractiveAnnotation)(nil),                                  // 100: proto.InteractiveAnnotation
+	(*HydratedTemplateButton)(nil),                                 // 101: proto.HydratedTemplateButton
+	(*GroupMention)(nil),                                           // 102: proto.GroupMention
+	(*DisappearingMode)(nil),                                       // 103: proto.DisappearingMode
+	(*DeviceListMetadata)(nil),                                     // 104: proto.DeviceListMetadata
+	(*ContextInfo)(nil),                                            // 105: proto.ContextInfo
+	(*ActionLink)(nil),                                             // 106: proto.ActionLink
+	(*TemplateButton)(nil),                                         // 107: proto.TemplateButton
+	(*Point)(nil),                                                  // 108: proto.Point
+	(*PaymentBackground)(nil),                                      // 109: proto.PaymentBackground
+	(*Money)(nil),                                                  // 110: proto.Money
+	(*Message)(nil),                                                // 111: proto.Message
+	(*MessageContextInfo)(nil),                                     // 112: proto.MessageContextInfo
+	(*VideoMessage)(nil),                                           // 113: proto.VideoMessage
+	(*TemplateMessage)(nil),                                        // 114: proto.TemplateMessage
+	(*TemplateButtonReplyMessage)(nil),                             // 115: proto.TemplateButtonReplyMessage
+	(*StickerSyncRMRMessage)(nil),                                  // 116: proto.StickerSyncRMRMessage
+	(*StickerMessage)(nil),                                         // 117: proto.StickerMessage
+	(*SenderKeyDistributionMessage)(nil),                           // 118: proto.SenderKeyDistributionMessage
+	(*SendPaymentMessage)(nil),                                     // 119: proto.SendPaymentMessage
+	(*ScheduledCallEditMessage)(nil),                               // 120: proto.ScheduledCallEditMessage
+	(*ScheduledCallCreationMessage)(nil),                           // 121: proto.ScheduledCallCreationMessage
+	(*RequestPhoneNumberMessage)(nil),                              // 122: proto.RequestPhoneNumberMessage
+	(*RequestPaymentMessage)(nil),                                  // 123: proto.RequestPaymentMessage
+	(*ReactionMessage)(nil),                                        // 124: proto.ReactionMessage
+	(*ProtocolMessage)(nil),                                        // 125: proto.ProtocolMessage
+	(*ProductMessage)(nil),                                         // 126: proto.ProductMessage
+	(*PollVoteMessage)(nil),                                        // 127: proto.PollVoteMessage
+	(*PollUpdateMessage)(nil),                                      // 128: proto.PollUpdateMessage
+	(*PollUpdateMessageMetadata)(nil),                              // 129: proto.PollUpdateMessageMetadata
+	(*PollEncValue)(nil),                                           // 130: proto.PollEncValue
+	(*PollCreationMessage)(nil),                                    // 131: proto.PollCreationMessage
+	(*PinMessage)(nil),                                             // 132: proto.PinMessage
+	(*PeerDataOperationRequestResponseMessage)(nil),                // 133: proto.PeerDataOperationRequestResponseMessage
+	(*EphemeralSetting)(nil),                                       // 134: proto.EphemeralSetting
+	(*WallpaperSettings)(nil),                                      // 135: proto.WallpaperSettings
+	(*StickerMetadata)(nil),                                        // 136: proto.StickerMetadata
+	(*Pushname)(nil),                                               // 137: proto.Pushname
+	(*PastParticipants)(nil),                                       // 138: proto.PastParticipants
+	(*PastParticipant)(nil),                                        // 139: proto.PastParticipant
+	(*HistorySync)(nil),                                            // 140: proto.HistorySync
+	(*HistorySyncMsg)(nil),                                         // 141: proto.HistorySyncMsg
+	(*GroupParticipant)(nil),                                       // 142: proto.GroupParticipant
+	(*GlobalSettings)(nil),                                         // 143: proto.GlobalSettings
+	(*Conversation)(nil),                                           // 144: proto.Conversation
+	(*AvatarUserSettings)(nil),                                     // 145: proto.AvatarUserSettings
+	(*AutoDownloadSettings)(nil),                                   // 146: proto.AutoDownloadSettings
+	(*MsgRowOpaqueData)(nil),                                       // 147: proto.MsgRowOpaqueData
+	(*MsgOpaqueData)(nil),                                          // 148: proto.MsgOpaqueData
+	(*ServerErrorReceipt)(nil),                                     // 149: proto.ServerErrorReceipt
+	(*MediaRetryNotification)(nil),                                 // 150: proto.MediaRetryNotification
+	(*MessageKey)(nil),                                             // 151: proto.MessageKey
+	(*SyncdVersion)(nil),                                           // 152: proto.SyncdVersion
+	(*SyncdValue)(nil),                                             // 153: proto.SyncdValue
+	(*SyncdSnapshot)(nil),                                          // 154: proto.SyncdSnapshot
+	(*SyncdRecord)(nil),                                            // 155: proto.SyncdRecord
+	(*SyncdPatch)(nil),                                             // 156: proto.SyncdPatch
+	(*SyncdMutations)(nil),                                         // 157: proto.SyncdMutations
+	(*SyncdMutation)(nil),                                          // 158: proto.SyncdMutation
+	(*SyncdIndex)(nil),                                             // 159: proto.SyncdIndex
+	(*KeyId)(nil),                                                  // 160: proto.KeyId
+	(*ExternalBlobReference)(nil),                                  // 161: proto.ExternalBlobReference
+	(*ExitCode)(nil),                                               // 162: proto.ExitCode
+	(*SyncActionValue)(nil),                                        // 163: proto.SyncActionValue
+	(*UserStatusMuteAction)(nil),                                   // 164: proto.UserStatusMuteAction
+	(*UnarchiveChatsSetting)(nil),                                  // 165: proto.UnarchiveChatsSetting
+	(*TimeFormatAction)(nil),                                       // 166: proto.TimeFormatAction
+	(*SyncActionMessage)(nil),                                      // 167: proto.SyncActionMessage
+	(*SyncActionMessageRange)(nil),                                 // 168: proto.SyncActionMessageRange
+	(*SubscriptionAction)(nil),                                     // 169: proto.SubscriptionAction
+	(*StickerAction)(nil),                                          // 170: proto.StickerAction
+	(*StarAction)(nil),                                             // 171: proto.StarAction
+	(*SecurityNotificationSetting)(nil),                            // 172: proto.SecurityNotificationSetting
+	(*RemoveRecentStickerAction)(nil),                              // 173: proto.RemoveRecentStickerAction
+	(*RecentEmojiWeightsAction)(nil),                               // 174: proto.RecentEmojiWeightsAction
+	(*QuickReplyAction)(nil),                                       // 175: proto.QuickReplyAction
+	(*PushNameSetting)(nil),                                        // 176: proto.PushNameSetting
+	(*PrimaryVersionAction)(nil),                                   // 177: proto.PrimaryVersionAction
+	(*PrimaryFeature)(nil),                                         // 178: proto.PrimaryFeature
+	(*PnForLidChatAction)(nil),                                     // 179: proto.PnForLidChatAction
+	(*PinAction)(nil),                                              // 180: proto.PinAction
+	(*NuxAction)(nil),                                              // 181: proto.NuxAction
+	(*MuteAction)(nil),                                             // 182: proto.MuteAction
+	(*MarkChatAsReadAction)(nil),                                   // 183: proto.MarkChatAsReadAction
+	(*LocaleSetting)(nil),                                          // 184: proto.LocaleSetting
+	(*LabelEditAction)(nil),                                        // 185: proto.LabelEditAction
+	(*LabelAssociationAction)(nil),                                 // 186: proto.LabelAssociationAction
+	(*KeyExpiration)(nil),                                          // 187: proto.KeyExpiration
+	(*DeleteMessageForMeAction)(nil),                               // 188: proto.DeleteMessageForMeAction
+	(*DeleteChatAction)(nil),                                       // 189: proto.DeleteChatAction
+	(*ContactAction)(nil),                                          // 190: proto.ContactAction
+	(*ClearChatAction)(nil),                                        // 191: proto.ClearChatAction
+	(*ChatAssignmentOpenedStatusAction)(nil),                       // 192: proto.ChatAssignmentOpenedStatusAction
+	(*ChatAssignmentAction)(nil),                                   // 193: proto.ChatAssignmentAction
+	(*ArchiveChatAction)(nil),                                      // 194: proto.ArchiveChatAction
+	(*AndroidUnsupportedActions)(nil),                              // 195: proto.AndroidUnsupportedActions
+	(*AgentAction)(nil),                                            // 196: proto.AgentAction
+	(*SyncActionData)(nil),                                         // 197: proto.SyncActionData
+	(*RecentEmojiWeight)(nil),                                      // 198: proto.RecentEmojiWeight
+	(*VerifiedNameCertificate)(nil),                                // 199: proto.VerifiedNameCertificate
+	(*LocalizedName)(nil),                                          // 200: proto.LocalizedName
+	(*BizIdentityInfo)(nil),                                        // 201: proto.BizIdentityInfo
+	(*BizAccountPayload)(nil),                                      // 202: proto.BizAccountPayload
+	(*BizAccountLinkInfo)(nil),                                     // 203: proto.BizAccountLinkInfo
+	(*HandshakeMessage)(nil),                                       // 204: proto.HandshakeMessage
+	(*HandshakeServerHello)(nil),                                   // 205: proto.HandshakeServerHello
+	(*HandshakeClientHello)(nil),                                   // 206: proto.HandshakeClientHello
+	(*HandshakeClientFinish)(nil),                                  // 207: proto.HandshakeClientFinish
+	(*ClientPayload)(nil),                                          // 208: proto.ClientPayload
+	(*WebNotificationsInfo)(nil),                                   // 209: proto.WebNotificationsInfo
+	(*WebMessageInfo)(nil),                                         // 210: proto.WebMessageInfo
+	(*WebFeatures)(nil),                                            // 211: proto.WebFeatures
+	(*UserReceipt)(nil),                                            // 212: proto.UserReceipt
+	(*StatusPSA)(nil),                                              // 213: proto.StatusPSA
+	(*Reaction)(nil),                                               // 214: proto.Reaction
+	(*PollUpdate)(nil),                                             // 215: proto.PollUpdate
+	(*PollAdditionalMetadata)(nil),                                 // 216: proto.PollAdditionalMetadata
+	(*PhotoChange)(nil),                                            // 217: proto.PhotoChange
+	(*PaymentInfo)(nil),                                            // 218: proto.PaymentInfo
+	(*NotificationMessageInfo)(nil),                                // 219: proto.NotificationMessageInfo
+	(*MediaData)(nil),                                              // 220: proto.MediaData
+	(*KeepInChat)(nil),                                             // 221: proto.KeepInChat
+	(*NoiseCertificate)(nil),                                       // 222: proto.NoiseCertificate
+	(*CertChain)(nil),                                              // 223: proto.CertChain
+	(*DeviceProps_HistorySyncConfig)(nil),                          // 224: proto.DeviceProps.HistorySyncConfig
+	(*DeviceProps_AppVersion)(nil),                                 // 225: proto.DeviceProps.AppVersion
+	(*PeerDataOperationRequestMessage_RequestUrlPreview)(nil),      // 226: proto.PeerDataOperationRequestMessage.RequestUrlPreview
+	(*PeerDataOperationRequestMessage_RequestStickerReupload)(nil), // 227: proto.PeerDataOperationRequestMessage.RequestStickerReupload
+	(*PeerDataOperationRequestMessage_HistorySyncOnDemandRequest)(nil),                          // 228: proto.PeerDataOperationRequestMessage.HistorySyncOnDemandRequest
+	(*ListResponseMessage_SingleSelectReply)(nil),                                               // 229: proto.ListResponseMessage.SingleSelectReply
+	(*ListMessage_Section)(nil),                                                                 // 230: proto.ListMessage.Section
+	(*ListMessage_Row)(nil),                                                                     // 231: proto.ListMessage.Row
+	(*ListMessage_Product)(nil),                                                                 // 232: proto.ListMessage.Product
+	(*ListMessage_ProductSection)(nil),                                                          // 233: proto.ListMessage.ProductSection
+	(*ListMessage_ProductListInfo)(nil),                                                         // 234: proto.ListMessage.ProductListInfo
+	(*ListMessage_ProductListHeaderImage)(nil),                                                  // 235: proto.ListMessage.ProductListHeaderImage
+	(*InteractiveResponseMessage_NativeFlowResponseMessage)(nil),                                // 236: proto.InteractiveResponseMessage.NativeFlowResponseMessage
+	(*InteractiveResponseMessage_Body)(nil),                                                     // 237: proto.InteractiveResponseMessage.Body
+	(*InteractiveMessage_ShopMessage)(nil),                                                      // 238: proto.InteractiveMessage.ShopMessage
+	(*InteractiveMessage_NativeFlowMessage)(nil),                                                // 239: proto.InteractiveMessage.NativeFlowMessage
+	(*InteractiveMessage_Header)(nil),                                                           // 240: proto.InteractiveMessage.Header
+	(*InteractiveMessage_Footer)(nil),                                                           // 241: proto.InteractiveMessage.Footer
+	(*InteractiveMessage_CollectionMessage)(nil),                                                // 242: proto.InteractiveMessage.CollectionMessage
+	(*InteractiveMessage_Body)(nil),                                                             // 243: proto.InteractiveMessage.Body
+	(*InteractiveMessage_NativeFlowMessage_NativeFlowButton)(nil),                               // 244: proto.InteractiveMessage.NativeFlowMessage.NativeFlowButton
+	(*HighlyStructuredMessage_HSMLocalizableParameter)(nil),                                     // 245: proto.HighlyStructuredMessage.HSMLocalizableParameter
+	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime)(nil),                         // 246: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime
+	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency)(nil),                         // 247: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMCurrency
+	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch)(nil),    // 248: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeUnixEpoch
+	(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent)(nil),    // 249: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent
+	(*ButtonsMessage_Button)(nil),                                                               // 250: proto.ButtonsMessage.Button
+	(*ButtonsMessage_Button_NativeFlowInfo)(nil),                                                // 251: proto.ButtonsMessage.Button.NativeFlowInfo
+	(*ButtonsMessage_Button_ButtonText)(nil),                                                    // 252: proto.ButtonsMessage.Button.ButtonText
+	(*HydratedTemplateButton_HydratedURLButton)(nil),                                            // 253: proto.HydratedTemplateButton.HydratedURLButton
+	(*HydratedTemplateButton_HydratedQuickReplyButton)(nil),                                     // 254: proto.HydratedTemplateButton.HydratedQuickReplyButton
+	(*HydratedTemplateButton_HydratedCallButton)(nil),                                           // 255: proto.HydratedTemplateButton.HydratedCallButton
+	(*ContextInfo_UTMInfo)(nil),                                                                 // 256: proto.ContextInfo.UTMInfo
+	(*ContextInfo_ExternalAdReplyInfo)(nil),                                                     // 257: proto.ContextInfo.ExternalAdReplyInfo
+	(*ContextInfo_AdReplyInfo)(nil),                                                             // 258: proto.ContextInfo.AdReplyInfo
+	(*TemplateButton_URLButton)(nil),                                                            // 259: proto.TemplateButton.URLButton
+	(*TemplateButton_QuickReplyButton)(nil),                                                     // 260: proto.TemplateButton.QuickReplyButton
+	(*TemplateButton_CallButton)(nil),                                                           // 261: proto.TemplateButton.CallButton
+	(*PaymentBackground_MediaData)(nil),                                                         // 262: proto.PaymentBackground.MediaData
+	(*TemplateMessage_HydratedFourRowTemplate)(nil),                                             // 263: proto.TemplateMessage.HydratedFourRowTemplate
+	(*TemplateMessage_FourRowTemplate)(nil),                                                     // 264: proto.TemplateMessage.FourRowTemplate
+	(*ProductMessage_ProductSnapshot)(nil),                                                      // 265: proto.ProductMessage.ProductSnapshot
+	(*ProductMessage_CatalogSnapshot)(nil),                                                      // 266: proto.ProductMessage.CatalogSnapshot
+	(*PollCreationMessage_Option)(nil),                                                          // 267: proto.PollCreationMessage.Option
+	(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult)(nil),                     // 268: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult
+	(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse)(nil), // 269: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.LinkPreviewResponse
+	(*MsgOpaqueData_PollOption)(nil),                                                            // 270: proto.MsgOpaqueData.PollOption
+	(*VerifiedNameCertificate_Details)(nil),                                                     // 271: proto.VerifiedNameCertificate.Details
+	(*ClientPayload_WebInfo)(nil),                                                               // 272: proto.ClientPayload.WebInfo
+	(*ClientPayload_UserAgent)(nil),                                                             // 273: proto.ClientPayload.UserAgent
+	(*ClientPayload_DevicePairingRegistrationData)(nil),                                         // 274: proto.ClientPayload.DevicePairingRegistrationData
+	(*ClientPayload_DNSSource)(nil),                                                             // 275: proto.ClientPayload.DNSSource
+	(*ClientPayload_WebInfo_WebdPayload)(nil),                                                   // 276: proto.ClientPayload.WebInfo.WebdPayload
+	(*ClientPayload_UserAgent_AppVersion)(nil),                                                  // 277: proto.ClientPayload.UserAgent.AppVersion
+	(*NoiseCertificate_Details)(nil),                                                            // 278: proto.NoiseCertificate.Details
+	(*CertChain_NoiseCertificate)(nil),                                                          // 279: proto.CertChain.NoiseCertificate
+	(*CertChain_NoiseCertificate_Details)(nil),                                                  // 280: proto.CertChain.NoiseCertificate.Details
 }
 var file_binary_proto_def_proto_depIdxs = []int32{
-	219, // 0: proto.DeviceProps.version:type_name -> proto.DeviceProps.AppVersion
+	225, // 0: proto.DeviceProps.version:type_name -> proto.DeviceProps.AppVersion
 	3,   // 1: proto.DeviceProps.platformType:type_name -> proto.DeviceProps.PlatformType
-	218, // 2: proto.DeviceProps.historySyncConfig:type_name -> proto.DeviceProps.HistorySyncConfig
-	0,   // 3: proto.PeerDataOperationRequestResponseMessage.peerDataOperationRequestType:type_name -> proto.PeerDataOperationRequestType
-	220, // 4: proto.PeerDataOperationRequestResponseMessage.peerDataOperationResult:type_name -> proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult
-	0,   // 5: proto.PeerDataOperationRequestMessage.peerDataOperationRequestType:type_name -> proto.PeerDataOperationRequestType
-	223, // 6: proto.PeerDataOperationRequestMessage.requestStickerReupload:type_name -> proto.PeerDataOperationRequestMessage.RequestStickerReupload
-	222, // 7: proto.PeerDataOperationRequestMessage.requestUrlPreview:type_name -> proto.PeerDataOperationRequestMessage.RequestUrlPreview
-	4,   // 8: proto.PaymentInviteMessage.serviceType:type_name -> proto.PaymentInviteMessage.ServiceType
-	6,   // 9: proto.OrderMessage.status:type_name -> proto.OrderMessage.OrderStatus
-	5,   // 10: proto.OrderMessage.surface:type_name -> proto.OrderMessage.OrderSurface
-	103, // 11: proto.OrderMessage.contextInfo:type_name -> proto.ContextInfo
-	103, // 12: proto.LocationMessage.contextInfo:type_name -> proto.ContextInfo
-	103, // 13: proto.LiveLocationMessage.contextInfo:type_name -> proto.ContextInfo
-	7,   // 14: proto.ListResponseMessage.listType:type_name -> proto.ListResponseMessage.ListType
-	224, // 15: proto.ListResponseMessage.singleSelectReply:type_name -> proto.ListResponseMessage.SingleSelectReply
-	103, // 16: proto.ListResponseMessage.contextInfo:type_name -> proto.ContextInfo
-	8,   // 17: proto.ListMessage.listType:type_name -> proto.ListMessage.ListType
-	225, // 18: proto.ListMessage.sections:type_name -> proto.ListMessage.Section
-	229, // 19: proto.ListMessage.productListInfo:type_name -> proto.ListMessage.ProductListInfo
-	103, // 20: proto.ListMessage.contextInfo:type_name -> proto.ContextInfo
-	145, // 21: proto.KeepInChatMessage.key:type_name -> proto.MessageKey
-	1,   // 22: proto.KeepInChatMessage.keepType:type_name -> proto.KeepType
-	9,   // 23: proto.InvoiceMessage.attachmentType:type_name -> proto.InvoiceMessage.AttachmentType
-	232, // 24: proto.InteractiveResponseMessage.body:type_name -> proto.InteractiveResponseMessage.Body
-	103, // 25: proto.InteractiveResponseMessage.contextInfo:type_name -> proto.ContextInfo
-	231, // 26: proto.InteractiveResponseMessage.nativeFlowResponseMessage:type_name -> proto.InteractiveResponseMessage.NativeFlowResponseMessage
-	235, // 27: proto.InteractiveMessage.header:type_name -> proto.InteractiveMessage.Header
-	238, // 28: proto.InteractiveMessage.body:type_name -> proto.InteractiveMessage.Body
-	236, // 29: proto.InteractiveMessage.footer:type_name -> proto.InteractiveMessage.Footer
-	103, // 30: proto.InteractiveMessage.contextInfo:type_name -> proto.ContextInfo
-	233, // 31: proto.InteractiveMessage.shopStorefrontMessage:type_name -> proto.InteractiveMessage.ShopMessage
-	237, // 32: proto.InteractiveMessage.collectionMessage:type_name -> proto.InteractiveMessage.CollectionMessage
-	234, // 33: proto.InteractiveMessage.nativeFlowMessage:type_name -> proto.InteractiveMessage.NativeFlowMessage
-	99,  // 34: proto.ImageMessage.interactiveAnnotations:type_name -> proto.InteractiveAnnotation
-	103, // 35: proto.ImageMessage.contextInfo:type_name -> proto.ContextInfo
-	11,  // 36: proto.HistorySyncNotification.syncType:type_name -> proto.HistorySyncNotification.HistorySyncType
-	240, // 37: proto.HighlyStructuredMessage.localizableParams:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter
-	112, // 38: proto.HighlyStructuredMessage.hydratedHsm:type_name -> proto.TemplateMessage
-	103, // 39: proto.GroupInviteMessage.contextInfo:type_name -> proto.ContextInfo
-	14,  // 40: proto.GroupInviteMessage.groupType:type_name -> proto.GroupInviteMessage.GroupType
-	109, // 41: proto.FutureProofMessage.message:type_name -> proto.Message
-	17,  // 42: proto.ExtendedTextMessage.font:type_name -> proto.ExtendedTextMessage.FontType
-	15,  // 43: proto.ExtendedTextMessage.previewType:type_name -> proto.ExtendedTextMessage.PreviewType
-	103, // 44: proto.ExtendedTextMessage.contextInfo:type_name -> proto.ContextInfo
-	16,  // 45: proto.ExtendedTextMessage.inviteLinkGroupType:type_name -> proto.ExtendedTextMessage.InviteLinkGroupType
-	16,  // 46: proto.ExtendedTextMessage.inviteLinkGroupTypeV2:type_name -> proto.ExtendedTextMessage.InviteLinkGroupType
-	145, // 47: proto.EncReactionMessage.targetMessageKey:type_name -> proto.MessageKey
-	103, // 48: proto.DocumentMessage.contextInfo:type_name -> proto.ContextInfo
-	109, // 49: proto.DeviceSentMessage.message:type_name -> proto.Message
-	145, // 50: proto.DeclinePaymentRequestMessage.key:type_name -> proto.MessageKey
-	84,  // 51: proto.ContactsArrayMessage.contacts:type_name -> proto.ContactMessage
-	103, // 52: proto.ContactsArrayMessage.contextInfo:type_name -> proto.ContextInfo
-	103, // 53: proto.ContactMessage.contextInfo:type_name -> proto.ContextInfo
-	145, // 54: proto.CancelPaymentRequestMessage.key:type_name -> proto.MessageKey
-	103, // 55: proto.ButtonsResponseMessage.contextInfo:type_name -> proto.ContextInfo
-	18,  // 56: proto.ButtonsResponseMessage.type:type_name -> proto.ButtonsResponseMessage.Type
-	103, // 57: proto.ButtonsMessage.contextInfo:type_name -> proto.ContextInfo
-	245, // 58: proto.ButtonsMessage.buttons:type_name -> proto.ButtonsMessage.Button
-	19,  // 59: proto.ButtonsMessage.headerType:type_name -> proto.ButtonsMessage.HeaderType
-	80,  // 60: proto.ButtonsMessage.documentMessage:type_name -> proto.DocumentMessage
-	73,  // 61: proto.ButtonsMessage.imageMessage:type_name -> proto.ImageMessage
-	111, // 62: proto.ButtonsMessage.videoMessage:type_name -> proto.VideoMessage
-	64,  // 63: proto.ButtonsMessage.locationMessage:type_name -> proto.LocationMessage
-	103, // 64: proto.AudioMessage.contextInfo:type_name -> proto.ContextInfo
-	94,  // 65: proto.AppStateSyncKey.keyId:type_name -> proto.AppStateSyncKeyId
-	96,  // 66: proto.AppStateSyncKey.keyData:type_name -> proto.AppStateSyncKeyData
-	91,  // 67: proto.AppStateSyncKeyShare.keys:type_name -> proto.AppStateSyncKey
-	94,  // 68: proto.AppStateSyncKeyRequest.keyIds:type_name -> proto.AppStateSyncKeyId
-	95,  // 69: proto.AppStateSyncKeyData.fingerprint:type_name -> proto.AppStateSyncKeyFingerprint
-	106, // 70: proto.InteractiveAnnotation.polygonVertices:type_name -> proto.Point
-	98,  // 71: proto.InteractiveAnnotation.location:type_name -> proto.Location
-	249, // 72: proto.HydratedTemplateButton.quickReplyButton:type_name -> proto.HydratedTemplateButton.HydratedQuickReplyButton
-	248, // 73: proto.HydratedTemplateButton.urlButton:type_name -> proto.HydratedTemplateButton.HydratedURLButton
-	250, // 74: proto.HydratedTemplateButton.callButton:type_name -> proto.HydratedTemplateButton.HydratedCallButton
-	21,  // 75: proto.DisappearingMode.initiator:type_name -> proto.DisappearingMode.Initiator
-	109, // 76: proto.ContextInfo.quotedMessage:type_name -> proto.Message
-	252, // 77: proto.ContextInfo.quotedAd:type_name -> proto.ContextInfo.AdReplyInfo
-	145, // 78: proto.ContextInfo.placeholderKey:type_name -> proto.MessageKey
-	251, // 79: proto.ContextInfo.externalAdReply:type_name -> proto.ContextInfo.ExternalAdReplyInfo
-	101, // 80: proto.ContextInfo.disappearingMode:type_name -> proto.DisappearingMode
-	104, // 81: proto.ContextInfo.actionLink:type_name -> proto.ActionLink
-	254, // 82: proto.TemplateButton.quickReplyButton:type_name -> proto.TemplateButton.QuickReplyButton
-	253, // 83: proto.TemplateButton.urlButton:type_name -> proto.TemplateButton.URLButton
-	255, // 84: proto.TemplateButton.callButton:type_name -> proto.TemplateButton.CallButton
-	256, // 85: proto.PaymentBackground.mediaData:type_name -> proto.PaymentBackground.MediaData
-	24,  // 86: proto.PaymentBackground.type:type_name -> proto.PaymentBackground.Type
-	116, // 87: proto.Message.senderKeyDistributionMessage:type_name -> proto.SenderKeyDistributionMessage
-	73,  // 88: proto.Message.imageMessage:type_name -> proto.ImageMessage
-	84,  // 89: proto.Message.contactMessage:type_name -> proto.ContactMessage
-	64,  // 90: proto.Message.locationMessage:type_name -> proto.LocationMessage
-	78,  // 91: proto.Message.extendedTextMessage:type_name -> proto.ExtendedTextMessage
-	80,  // 92: proto.Message.documentMessage:type_name -> proto.DocumentMessage
-	90,  // 93: proto.Message.audioMessage:type_name -> proto.AudioMessage
-	111, // 94: proto.Message.videoMessage:type_name -> proto.VideoMessage
-	87,  // 95: proto.Message.call:type_name -> proto.Call
-	85,  // 96: proto.Message.chat:type_name -> proto.Chat
-	121, // 97: proto.Message.protocolMessage:type_name -> proto.ProtocolMessage
-	83,  // 98: proto.Message.contactsArrayMessage:type_name -> proto.ContactsArrayMessage
-	75,  // 99: proto.Message.highlyStructuredMessage:type_name -> proto.HighlyStructuredMessage
-	116, // 100: proto.Message.fastRatchetKeySenderKeyDistributionMessage:type_name -> proto.SenderKeyDistributionMessage
-	117, // 101: proto.Message.sendPaymentMessage:type_name -> proto.SendPaymentMessage
-	65,  // 102: proto.Message.liveLocationMessage:type_name -> proto.LiveLocationMessage
-	119, // 103: proto.Message.requestPaymentMessage:type_name -> proto.RequestPaymentMessage
-	82,  // 104: proto.Message.declinePaymentRequestMessage:type_name -> proto.DeclinePaymentRequestMessage
-	86,  // 105: proto.Message.cancelPaymentRequestMessage:type_name -> proto.CancelPaymentRequestMessage
-	112, // 106: proto.Message.templateMessage:type_name -> proto.TemplateMessage
-	115, // 107: proto.Message.stickerMessage:type_name -> proto.StickerMessage
-	76,  // 108: proto.Message.groupInviteMessage:type_name -> proto.GroupInviteMessage
-	113, // 109: proto.Message.templateButtonReplyMessage:type_name -> proto.TemplateButtonReplyMessage
-	122, // 110: proto.Message.productMessage:type_name -> proto.ProductMessage
-	81,  // 111: proto.Message.deviceSentMessage:type_name -> proto.DeviceSentMessage
-	110, // 112: proto.Message.messageContextInfo:type_name -> proto.MessageContextInfo
-	67,  // 113: proto.Message.listMessage:type_name -> proto.ListMessage
-	77,  // 114: proto.Message.viewOnceMessage:type_name -> proto.FutureProofMessage
-	63,  // 115: proto.Message.orderMessage:type_name -> proto.OrderMessage
-	66,  // 116: proto.Message.listResponseMessage:type_name -> proto.ListResponseMessage
-	77,  // 117: proto.Message.ephemeralMessage:type_name -> proto.FutureProofMessage
-	69,  // 118: proto.Message.invoiceMessage:type_name -> proto.InvoiceMessage
-	89,  // 119: proto.Message.buttonsMessage:type_name -> proto.ButtonsMessage
-	88,  // 120: proto.Message.buttonsResponseMessage:type_name -> proto.ButtonsResponseMessage
-	62,  // 121: proto.Message.paymentInviteMessage:type_name -> proto.PaymentInviteMessage
-	71,  // 122: proto.Message.interactiveMessage:type_name -> proto.InteractiveMessage
-	120, // 123: proto.Message.reactionMessage:type_name -> proto.ReactionMessage
-	114, // 124: proto.Message.stickerSyncRmrMessage:type_name -> proto.StickerSyncRMRMessage
-	70,  // 125: proto.Message.interactiveResponseMessage:type_name -> proto.InteractiveResponseMessage
-	127, // 126: proto.Message.pollCreationMessage:type_name -> proto.PollCreationMessage
-	124, // 127: proto.Message.pollUpdateMessage:type_name -> proto.PollUpdateMessage
-	68,  // 128: proto.Message.keepInChatMessage:type_name -> proto.KeepInChatMessage
-	77,  // 129: proto.Message.documentWithCaptionMessage:type_name -> proto.FutureProofMessage
-	118, // 130: proto.Message.requestPhoneNumberMessage:type_name -> proto.RequestPhoneNumberMessage
-	77,  // 131: proto.Message.viewOnceMessageV2:type_name -> proto.FutureProofMessage
-	79,  // 132: proto.Message.encReactionMessage:type_name -> proto.EncReactionMessage
-	77,  // 133: proto.Message.editedMessage:type_name -> proto.FutureProofMessage
-	77,  // 134: proto.Message.viewOnceMessageV2Extension:type_name -> proto.FutureProofMessage
-	127, // 135: proto.Message.pollCreationMessageV2:type_name -> proto.PollCreationMessage
-	102, // 136: proto.MessageContextInfo.deviceListMetadata:type_name -> proto.DeviceListMetadata
-	99,  // 137: proto.VideoMessage.interactiveAnnotations:type_name -> proto.InteractiveAnnotation
-	103, // 138: proto.VideoMessage.contextInfo:type_name -> proto.ContextInfo
-	25,  // 139: proto.VideoMessage.gifAttribution:type_name -> proto.VideoMessage.Attribution
-	103, // 140: proto.TemplateMessage.contextInfo:type_name -> proto.ContextInfo
-	257, // 141: proto.TemplateMessage.hydratedTemplate:type_name -> proto.TemplateMessage.HydratedFourRowTemplate
-	258, // 142: proto.TemplateMessage.fourRowTemplate:type_name -> proto.TemplateMessage.FourRowTemplate
-	257, // 143: proto.TemplateMessage.hydratedFourRowTemplate:type_name -> proto.TemplateMessage.HydratedFourRowTemplate
-	71,  // 144: proto.TemplateMessage.interactiveMessageTemplate:type_name -> proto.InteractiveMessage
-	103, // 145: proto.TemplateButtonReplyMessage.contextInfo:type_name -> proto.ContextInfo
-	103, // 146: proto.StickerMessage.contextInfo:type_name -> proto.ContextInfo
-	109, // 147: proto.SendPaymentMessage.noteMessage:type_name -> proto.Message
-	145, // 148: proto.SendPaymentMessage.requestMessageKey:type_name -> proto.MessageKey
-	107, // 149: proto.SendPaymentMessage.background:type_name -> proto.PaymentBackground
-	103, // 150: proto.RequestPhoneNumberMessage.contextInfo:type_name -> proto.ContextInfo
-	109, // 151: proto.RequestPaymentMessage.noteMessage:type_name -> proto.Message
-	108, // 152: proto.RequestPaymentMessage.amount:type_name -> proto.Money
-	107, // 153: proto.RequestPaymentMessage.background:type_name -> proto.PaymentBackground
-	145, // 154: proto.ReactionMessage.key:type_name -> proto.MessageKey
-	145, // 155: proto.ProtocolMessage.key:type_name -> proto.MessageKey
-	26,  // 156: proto.ProtocolMessage.type:type_name -> proto.ProtocolMessage.Type
-	74,  // 157: proto.ProtocolMessage.historySyncNotification:type_name -> proto.HistorySyncNotification
-	92,  // 158: proto.ProtocolMessage.appStateSyncKeyShare:type_name -> proto.AppStateSyncKeyShare
-	93,  // 159: proto.ProtocolMessage.appStateSyncKeyRequest:type_name -> proto.AppStateSyncKeyRequest
-	72,  // 160: proto.ProtocolMessage.initialSecurityNotificationSettingSync:type_name -> proto.InitialSecurityNotificationSettingSync
-	97,  // 161: proto.ProtocolMessage.appStateFatalExceptionNotification:type_name -> proto.AppStateFatalExceptionNotification
-	101, // 162: proto.ProtocolMessage.disappearingMode:type_name -> proto.DisappearingMode
-	109, // 163: proto.ProtocolMessage.editedMessage:type_name -> proto.Message
-	61,  // 164: proto.ProtocolMessage.peerDataOperationRequestMessage:type_name -> proto.PeerDataOperationRequestMessage
-	60,  // 165: proto.ProtocolMessage.peerDataOperationRequestResponseMessage:type_name -> proto.PeerDataOperationRequestResponseMessage
-	259, // 166: proto.ProductMessage.product:type_name -> proto.ProductMessage.ProductSnapshot
-	260, // 167: proto.ProductMessage.catalog:type_name -> proto.ProductMessage.CatalogSnapshot
-	103, // 168: proto.ProductMessage.contextInfo:type_name -> proto.ContextInfo
-	145, // 169: proto.PollUpdateMessage.pollCreationMessageKey:type_name -> proto.MessageKey
-	126, // 170: proto.PollUpdateMessage.vote:type_name -> proto.PollEncValue
-	125, // 171: proto.PollUpdateMessage.metadata:type_name -> proto.PollUpdateMessageMetadata
-	261, // 172: proto.PollCreationMessage.options:type_name -> proto.PollCreationMessage.Option
-	103, // 173: proto.PollCreationMessage.contextInfo:type_name -> proto.ContextInfo
-	133, // 174: proto.PastParticipants.pastParticipants:type_name -> proto.PastParticipant
-	27,  // 175: proto.PastParticipant.leaveReason:type_name -> proto.PastParticipant.LeaveReason
-	28,  // 176: proto.HistorySync.syncType:type_name -> proto.HistorySync.HistorySyncType
-	138, // 177: proto.HistorySync.conversations:type_name -> proto.Conversation
-	204, // 178: proto.HistorySync.statusV3Messages:type_name -> proto.WebMessageInfo
-	131, // 179: proto.HistorySync.pushnames:type_name -> proto.Pushname
-	137, // 180: proto.HistorySync.globalSettings:type_name -> proto.GlobalSettings
-	130, // 181: proto.HistorySync.recentStickers:type_name -> proto.StickerMetadata
-	132, // 182: proto.HistorySync.pastParticipants:type_name -> proto.PastParticipants
-	204, // 183: proto.HistorySyncMsg.message:type_name -> proto.WebMessageInfo
-	29,  // 184: proto.GroupParticipant.rank:type_name -> proto.GroupParticipant.Rank
-	129, // 185: proto.GlobalSettings.lightThemeWallpaper:type_name -> proto.WallpaperSettings
-	2,   // 186: proto.GlobalSettings.mediaVisibility:type_name -> proto.MediaVisibility
-	129, // 187: proto.GlobalSettings.darkThemeWallpaper:type_name -> proto.WallpaperSettings
-	140, // 188: proto.GlobalSettings.autoDownloadWiFi:type_name -> proto.AutoDownloadSettings
-	140, // 189: proto.GlobalSettings.autoDownloadCellular:type_name -> proto.AutoDownloadSettings
-	140, // 190: proto.GlobalSettings.autoDownloadRoaming:type_name -> proto.AutoDownloadSettings
-	139, // 191: proto.GlobalSettings.avatarUserSettings:type_name -> proto.AvatarUserSettings
-	135, // 192: proto.Conversation.messages:type_name -> proto.HistorySyncMsg
-	30,  // 193: proto.Conversation.endOfHistoryTransferType:type_name -> proto.Conversation.EndOfHistoryTransferType
-	101, // 194: proto.Conversation.disappearingMode:type_name -> proto.DisappearingMode
-	136, // 195: proto.Conversation.participant:type_name -> proto.GroupParticipant
-	129, // 196: proto.Conversation.wallpaper:type_name -> proto.WallpaperSettings
-	2,   // 197: proto.Conversation.mediaVisibility:type_name -> proto.MediaVisibility
-	142, // 198: proto.MsgRowOpaqueData.currentMsg:type_name -> proto.MsgOpaqueData
-	142, // 199: proto.MsgRowOpaqueData.quotedMsg:type_name -> proto.MsgOpaqueData
-	262, // 200: proto.MsgOpaqueData.pollOptions:type_name -> proto.MsgOpaqueData.PollOption
-	126, // 201: proto.MsgOpaqueData.encPollVote:type_name -> proto.PollEncValue
-	31,  // 202: proto.MediaRetryNotification.result:type_name -> proto.MediaRetryNotification.ResultType
-	146, // 203: proto.SyncdSnapshot.version:type_name -> proto.SyncdVersion
-	149, // 204: proto.SyncdSnapshot.records:type_name -> proto.SyncdRecord
-	154, // 205: proto.SyncdSnapshot.keyId:type_name -> proto.KeyId
-	153, // 206: proto.SyncdRecord.index:type_name -> proto.SyncdIndex
-	147, // 207: proto.SyncdRecord.value:type_name -> proto.SyncdValue
-	154, // 208: proto.SyncdRecord.keyId:type_name -> proto.KeyId
-	146, // 209: proto.SyncdPatch.version:type_name -> proto.SyncdVersion
-	152, // 210: proto.SyncdPatch.mutations:type_name -> proto.SyncdMutation
-	155, // 211: proto.SyncdPatch.externalMutations:type_name -> proto.ExternalBlobReference
-	154, // 212: proto.SyncdPatch.keyId:type_name -> proto.KeyId
-	156, // 213: proto.SyncdPatch.exitCode:type_name -> proto.ExitCode
-	152, // 214: proto.SyncdMutations.mutations:type_name -> proto.SyncdMutation
-	32,  // 215: proto.SyncdMutation.operation:type_name -> proto.SyncdMutation.SyncdOperation
-	149, // 216: proto.SyncdMutation.record:type_name -> proto.SyncdRecord
-	165, // 217: proto.SyncActionValue.starAction:type_name -> proto.StarAction
-	184, // 218: proto.SyncActionValue.contactAction:type_name -> proto.ContactAction
-	176, // 219: proto.SyncActionValue.muteAction:type_name -> proto.MuteAction
-	174, // 220: proto.SyncActionValue.pinAction:type_name -> proto.PinAction
-	166, // 221: proto.SyncActionValue.securityNotificationSetting:type_name -> proto.SecurityNotificationSetting
-	170, // 222: proto.SyncActionValue.pushNameSetting:type_name -> proto.PushNameSetting
-	169, // 223: proto.SyncActionValue.quickReplyAction:type_name -> proto.QuickReplyAction
-	168, // 224: proto.SyncActionValue.recentEmojiWeightsAction:type_name -> proto.RecentEmojiWeightsAction
-	179, // 225: proto.SyncActionValue.labelEditAction:type_name -> proto.LabelEditAction
-	180, // 226: proto.SyncActionValue.labelAssociationAction:type_name -> proto.LabelAssociationAction
-	178, // 227: proto.SyncActionValue.localeSetting:type_name -> proto.LocaleSetting
-	188, // 228: proto.SyncActionValue.archiveChatAction:type_name -> proto.ArchiveChatAction
-	182, // 229: proto.SyncActionValue.deleteMessageForMeAction:type_name -> proto.DeleteMessageForMeAction
-	181, // 230: proto.SyncActionValue.keyExpiration:type_name -> proto.KeyExpiration
-	177, // 231: proto.SyncActionValue.markChatAsReadAction:type_name -> proto.MarkChatAsReadAction
-	185, // 232: proto.SyncActionValue.clearChatAction:type_name -> proto.ClearChatAction
-	183, // 233: proto.SyncActionValue.deleteChatAction:type_name -> proto.DeleteChatAction
-	159, // 234: proto.SyncActionValue.unarchiveChatsSetting:type_name -> proto.UnarchiveChatsSetting
-	172, // 235: proto.SyncActionValue.primaryFeature:type_name -> proto.PrimaryFeature
-	189, // 236: proto.SyncActionValue.androidUnsupportedActions:type_name -> proto.AndroidUnsupportedActions
-	190, // 237: proto.SyncActionValue.agentAction:type_name -> proto.AgentAction
-	163, // 238: proto.SyncActionValue.subscriptionAction:type_name -> proto.SubscriptionAction
-	158, // 239: proto.SyncActionValue.userStatusMuteAction:type_name -> proto.UserStatusMuteAction
-	160, // 240: proto.SyncActionValue.timeFormatAction:type_name -> proto.TimeFormatAction
-	175, // 241: proto.SyncActionValue.nuxAction:type_name -> proto.NuxAction
-	171, // 242: proto.SyncActionValue.primaryVersionAction:type_name -> proto.PrimaryVersionAction
-	164, // 243: proto.SyncActionValue.stickerAction:type_name -> proto.StickerAction
-	167, // 244: proto.SyncActionValue.removeRecentStickerAction:type_name -> proto.RemoveRecentStickerAction
-	187, // 245: proto.SyncActionValue.chatAssignment:type_name -> proto.ChatAssignmentAction
-	186, // 246: proto.SyncActionValue.chatAssignmentOpenedStatus:type_name -> proto.ChatAssignmentOpenedStatusAction
-	173, // 247: proto.SyncActionValue.pnForLidChatAction:type_name -> proto.PnForLidChatAction
-	145, // 248: proto.SyncActionMessage.key:type_name -> proto.MessageKey
-	161, // 249: proto.SyncActionMessageRange.messages:type_name -> proto.SyncActionMessage
-	192, // 250: proto.RecentEmojiWeightsAction.weights:type_name -> proto.RecentEmojiWeight
-	162, // 251: proto.MarkChatAsReadAction.messageRange:type_name -> proto.SyncActionMessageRange
-	162, // 252: proto.DeleteChatAction.messageRange:type_name -> proto.SyncActionMessageRange
-	162, // 253: proto.ClearChatAction.messageRange:type_name -> proto.SyncActionMessageRange
-	162, // 254: proto.ArchiveChatAction.messageRange:type_name -> proto.SyncActionMessageRange
-	157, // 255: proto.SyncActionData.value:type_name -> proto.SyncActionValue
-	33,  // 256: proto.BizIdentityInfo.vlevel:type_name -> proto.BizIdentityInfo.VerifiedLevelValue
-	193, // 257: proto.BizIdentityInfo.vnameCert:type_name -> proto.VerifiedNameCertificate
-	34,  // 258: proto.BizIdentityInfo.hostStorage:type_name -> proto.BizIdentityInfo.HostStorageType
-	35,  // 259: proto.BizIdentityInfo.actualActors:type_name -> proto.BizIdentityInfo.ActualActorsType
-	193, // 260: proto.BizAccountPayload.vnameCert:type_name -> proto.VerifiedNameCertificate
-	36,  // 261: proto.BizAccountLinkInfo.hostStorage:type_name -> proto.BizAccountLinkInfo.HostStorageType
-	37,  // 262: proto.BizAccountLinkInfo.accountType:type_name -> proto.BizAccountLinkInfo.AccountType
-	200, // 263: proto.HandshakeMessage.clientHello:type_name -> proto.HandshakeClientHello
-	199, // 264: proto.HandshakeMessage.serverHello:type_name -> proto.HandshakeServerHello
-	201, // 265: proto.HandshakeMessage.clientFinish:type_name -> proto.HandshakeClientFinish
-	265, // 266: proto.ClientPayload.userAgent:type_name -> proto.ClientPayload.UserAgent
-	264, // 267: proto.ClientPayload.webInfo:type_name -> proto.ClientPayload.WebInfo
-	40,  // 268: proto.ClientPayload.connectType:type_name -> proto.ClientPayload.ConnectType
-	41,  // 269: proto.ClientPayload.connectReason:type_name -> proto.ClientPayload.ConnectReason
-	267, // 270: proto.ClientPayload.dnsSource:type_name -> proto.ClientPayload.DNSSource
-	266, // 271: proto.ClientPayload.devicePairingData:type_name -> proto.ClientPayload.DevicePairingRegistrationData
-	38,  // 272: proto.ClientPayload.product:type_name -> proto.ClientPayload.Product
-	39,  // 273: proto.ClientPayload.iosAppExtension:type_name -> proto.ClientPayload.IOSAppExtension
-	42,  // 274: proto.ClientPayload.bizMarketSegment:type_name -> proto.ClientPayload.BizMarketSegment
-	204, // 275: proto.WebNotificationsInfo.notifyMessages:type_name -> proto.WebMessageInfo
-	145, // 276: proto.WebMessageInfo.key:type_name -> proto.MessageKey
-	109, // 277: proto.WebMessageInfo.message:type_name -> proto.Message
-	48,  // 278: proto.WebMessageInfo.status:type_name -> proto.WebMessageInfo.Status
-	47,  // 279: proto.WebMessageInfo.messageStubType:type_name -> proto.WebMessageInfo.StubType
-	212, // 280: proto.WebMessageInfo.paymentInfo:type_name -> proto.PaymentInfo
-	65,  // 281: proto.WebMessageInfo.finalLiveLocation:type_name -> proto.LiveLocationMessage
-	212, // 282: proto.WebMessageInfo.quotedPaymentInfo:type_name -> proto.PaymentInfo
-	49,  // 283: proto.WebMessageInfo.bizPrivacyStatus:type_name -> proto.WebMessageInfo.BizPrivacyStatus
-	214, // 284: proto.WebMessageInfo.mediaData:type_name -> proto.MediaData
-	211, // 285: proto.WebMessageInfo.photoChange:type_name -> proto.PhotoChange
-	206, // 286: proto.WebMessageInfo.userReceipt:type_name -> proto.UserReceipt
-	208, // 287: proto.WebMessageInfo.reactions:type_name -> proto.Reaction
-	214, // 288: proto.WebMessageInfo.quotedStickerData:type_name -> proto.MediaData
-	207, // 289: proto.WebMessageInfo.statusPsa:type_name -> proto.StatusPSA
-	209, // 290: proto.WebMessageInfo.pollUpdates:type_name -> proto.PollUpdate
-	210, // 291: proto.WebMessageInfo.pollAdditionalMetadata:type_name -> proto.PollAdditionalMetadata
-	215, // 292: proto.WebMessageInfo.keepInChat:type_name -> proto.KeepInChat
-	50,  // 293: proto.WebFeatures.labelsDisplay:type_name -> proto.WebFeatures.Flag
-	50,  // 294: proto.WebFeatures.voipIndividualOutgoing:type_name -> proto.WebFeatures.Flag
-	50,  // 295: proto.WebFeatures.groupsV3:type_name -> proto.WebFeatures.Flag
-	50,  // 296: proto.WebFeatures.groupsV3Create:type_name -> proto.WebFeatures.Flag
-	50,  // 297: proto.WebFeatures.changeNumberV2:type_name -> proto.WebFeatures.Flag
-	50,  // 298: proto.WebFeatures.queryStatusV3Thumbnail:type_name -> proto.WebFeatures.Flag
-	50,  // 299: proto.WebFeatures.liveLocations:type_name -> proto.WebFeatures.Flag
-	50,  // 300: proto.WebFeatures.queryVname:type_name -> proto.WebFeatures.Flag
-	50,  // 301: proto.WebFeatures.voipIndividualIncoming:type_name -> proto.WebFeatures.Flag
-	50,  // 302: proto.WebFeatures.quickRepliesQuery:type_name -> proto.WebFeatures.Flag
-	50,  // 303: proto.WebFeatures.payments:type_name -> proto.WebFeatures.Flag
-	50,  // 304: proto.WebFeatures.stickerPackQuery:type_name -> proto.WebFeatures.Flag
-	50,  // 305: proto.WebFeatures.liveLocationsFinal:type_name -> proto.WebFeatures.Flag
-	50,  // 306: proto.WebFeatures.labelsEdit:type_name -> proto.WebFeatures.Flag
-	50,  // 307: proto.WebFeatures.mediaUpload:type_name -> proto.WebFeatures.Flag
-	50,  // 308: proto.WebFeatures.mediaUploadRichQuickReplies:type_name -> proto.WebFeatures.Flag
-	50,  // 309: proto.WebFeatures.vnameV2:type_name -> proto.WebFeatures.Flag
-	50,  // 310: proto.WebFeatures.videoPlaybackUrl:type_name -> proto.WebFeatures.Flag
-	50,  // 311: proto.WebFeatures.statusRanking:type_name -> proto.WebFeatures.Flag
-	50,  // 312: proto.WebFeatures.voipIndividualVideo:type_name -> proto.WebFeatures.Flag
-	50,  // 313: proto.WebFeatures.thirdPartyStickers:type_name -> proto.WebFeatures.Flag
-	50,  // 314: proto.WebFeatures.frequentlyForwardedSetting:type_name -> proto.WebFeatures.Flag
-	50,  // 315: proto.WebFeatures.groupsV4JoinPermission:type_name -> proto.WebFeatures.Flag
-	50,  // 316: proto.WebFeatures.recentStickers:type_name -> proto.WebFeatures.Flag
-	50,  // 317: proto.WebFeatures.catalog:type_name -> proto.WebFeatures.Flag
-	50,  // 318: proto.WebFeatures.starredStickers:type_name -> proto.WebFeatures.Flag
-	50,  // 319: proto.WebFeatures.voipGroupCall:type_name -> proto.WebFeatures.Flag
-	50,  // 320: proto.WebFeatures.templateMessage:type_name -> proto.WebFeatures.Flag
-	50,  // 321: proto.WebFeatures.templateMessageInteractivity:type_name -> proto.WebFeatures.Flag
-	50,  // 322: proto.WebFeatures.ephemeralMessages:type_name -> proto.WebFeatures.Flag
-	50,  // 323: proto.WebFeatures.e2ENotificationSync:type_name -> proto.WebFeatures.Flag
-	50,  // 324: proto.WebFeatures.recentStickersV2:type_name -> proto.WebFeatures.Flag
-	50,  // 325: proto.WebFeatures.recentStickersV3:type_name -> proto.WebFeatures.Flag
-	50,  // 326: proto.WebFeatures.userNotice:type_name -> proto.WebFeatures.Flag
-	50,  // 327: proto.WebFeatures.support:type_name -> proto.WebFeatures.Flag
-	50,  // 328: proto.WebFeatures.groupUiiCleanup:type_name -> proto.WebFeatures.Flag
-	50,  // 329: proto.WebFeatures.groupDogfoodingInternalOnly:type_name -> proto.WebFeatures.Flag
-	50,  // 330: proto.WebFeatures.settingsSync:type_name -> proto.WebFeatures.Flag
-	50,  // 331: proto.WebFeatures.archiveV2:type_name -> proto.WebFeatures.Flag
-	50,  // 332: proto.WebFeatures.ephemeralAllowGroupMembers:type_name -> proto.WebFeatures.Flag
-	50,  // 333: proto.WebFeatures.ephemeral24HDuration:type_name -> proto.WebFeatures.Flag
-	50,  // 334: proto.WebFeatures.mdForceUpgrade:type_name -> proto.WebFeatures.Flag
-	50,  // 335: proto.WebFeatures.disappearingMode:type_name -> proto.WebFeatures.Flag
-	50,  // 336: proto.WebFeatures.externalMdOptInAvailable:type_name -> proto.WebFeatures.Flag
-	50,  // 337: proto.WebFeatures.noDeleteMessageTimeLimit:type_name -> proto.WebFeatures.Flag
-	145, // 338: proto.Reaction.key:type_name -> proto.MessageKey
-	145, // 339: proto.PollUpdate.pollUpdateMessageKey:type_name -> proto.MessageKey
-	123, // 340: proto.PollUpdate.vote:type_name -> proto.PollVoteMessage
-	53,  // 341: proto.PaymentInfo.currencyDeprecated:type_name -> proto.PaymentInfo.Currency
-	52,  // 342: proto.PaymentInfo.status:type_name -> proto.PaymentInfo.Status
-	145, // 343: proto.PaymentInfo.requestMessageKey:type_name -> proto.MessageKey
-	51,  // 344: proto.PaymentInfo.txnStatus:type_name -> proto.PaymentInfo.TxnStatus
-	108, // 345: proto.PaymentInfo.primaryAmount:type_name -> proto.Money
-	108, // 346: proto.PaymentInfo.exchangeAmount:type_name -> proto.Money
-	145, // 347: proto.NotificationMessageInfo.key:type_name -> proto.MessageKey
-	109, // 348: proto.NotificationMessageInfo.message:type_name -> proto.Message
-	1,   // 349: proto.KeepInChat.keepType:type_name -> proto.KeepType
-	145, // 350: proto.KeepInChat.key:type_name -> proto.MessageKey
-	271, // 351: proto.CertChain.leaf:type_name -> proto.CertChain.NoiseCertificate
-	271, // 352: proto.CertChain.intermediate:type_name -> proto.CertChain.NoiseCertificate
-	31,  // 353: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.mediaUploadResult:type_name -> proto.MediaRetryNotification.ResultType
-	115, // 354: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.stickerMessage:type_name -> proto.StickerMessage
-	221, // 355: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.linkPreviewResponse:type_name -> proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.LinkPreviewResponse
-	226, // 356: proto.ListMessage.Section.rows:type_name -> proto.ListMessage.Row
-	227, // 357: proto.ListMessage.ProductSection.products:type_name -> proto.ListMessage.Product
-	228, // 358: proto.ListMessage.ProductListInfo.productSections:type_name -> proto.ListMessage.ProductSection
-	230, // 359: proto.ListMessage.ProductListInfo.headerImage:type_name -> proto.ListMessage.ProductListHeaderImage
-	10,  // 360: proto.InteractiveMessage.ShopMessage.surface:type_name -> proto.InteractiveMessage.ShopMessage.Surface
-	239, // 361: proto.InteractiveMessage.NativeFlowMessage.buttons:type_name -> proto.InteractiveMessage.NativeFlowMessage.NativeFlowButton
-	80,  // 362: proto.InteractiveMessage.Header.documentMessage:type_name -> proto.DocumentMessage
-	73,  // 363: proto.InteractiveMessage.Header.imageMessage:type_name -> proto.ImageMessage
-	111, // 364: proto.InteractiveMessage.Header.videoMessage:type_name -> proto.VideoMessage
-	242, // 365: proto.HighlyStructuredMessage.HSMLocalizableParameter.currency:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMCurrency
-	241, // 366: proto.HighlyStructuredMessage.HSMLocalizableParameter.dateTime:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime
-	244, // 367: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.component:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent
-	243, // 368: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.unixEpoch:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeUnixEpoch
-	12,  // 369: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.dayOfWeek:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.DayOfWeekType
-	13,  // 370: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.calendar:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.CalendarType
-	247, // 371: proto.ButtonsMessage.Button.buttonText:type_name -> proto.ButtonsMessage.Button.ButtonText
-	20,  // 372: proto.ButtonsMessage.Button.type:type_name -> proto.ButtonsMessage.Button.Type
-	246, // 373: proto.ButtonsMessage.Button.nativeFlowInfo:type_name -> proto.ButtonsMessage.Button.NativeFlowInfo
-	22,  // 374: proto.ContextInfo.ExternalAdReplyInfo.mediaType:type_name -> proto.ContextInfo.ExternalAdReplyInfo.MediaType
-	23,  // 375: proto.ContextInfo.AdReplyInfo.mediaType:type_name -> proto.ContextInfo.AdReplyInfo.MediaType
-	75,  // 376: proto.TemplateButton.URLButton.displayText:type_name -> proto.HighlyStructuredMessage
-	75,  // 377: proto.TemplateButton.URLButton.url:type_name -> proto.HighlyStructuredMessage
-	75,  // 378: proto.TemplateButton.QuickReplyButton.displayText:type_name -> proto.HighlyStructuredMessage
-	75,  // 379: proto.TemplateButton.CallButton.displayText:type_name -> proto.HighlyStructuredMessage
-	75,  // 380: proto.TemplateButton.CallButton.phoneNumber:type_name -> proto.HighlyStructuredMessage
-	100, // 381: proto.TemplateMessage.HydratedFourRowTemplate.hydratedButtons:type_name -> proto.HydratedTemplateButton
-	80,  // 382: proto.TemplateMessage.HydratedFourRowTemplate.documentMessage:type_name -> proto.DocumentMessage
-	73,  // 383: proto.TemplateMessage.HydratedFourRowTemplate.imageMessage:type_name -> proto.ImageMessage
-	111, // 384: proto.TemplateMessage.HydratedFourRowTemplate.videoMessage:type_name -> proto.VideoMessage
-	64,  // 385: proto.TemplateMessage.HydratedFourRowTemplate.locationMessage:type_name -> proto.LocationMessage
-	75,  // 386: proto.TemplateMessage.FourRowTemplate.content:type_name -> proto.HighlyStructuredMessage
-	75,  // 387: proto.TemplateMessage.FourRowTemplate.footer:type_name -> proto.HighlyStructuredMessage
-	105, // 388: proto.TemplateMessage.FourRowTemplate.buttons:type_name -> proto.TemplateButton
-	80,  // 389: proto.TemplateMessage.FourRowTemplate.documentMessage:type_name -> proto.DocumentMessage
-	75,  // 390: proto.TemplateMessage.FourRowTemplate.highlyStructuredMessage:type_name -> proto.HighlyStructuredMessage
-	73,  // 391: proto.TemplateMessage.FourRowTemplate.imageMessage:type_name -> proto.ImageMessage
-	111, // 392: proto.TemplateMessage.FourRowTemplate.videoMessage:type_name -> proto.VideoMessage
-	64,  // 393: proto.TemplateMessage.FourRowTemplate.locationMessage:type_name -> proto.LocationMessage
-	73,  // 394: proto.ProductMessage.ProductSnapshot.productImage:type_name -> proto.ImageMessage
-	73,  // 395: proto.ProductMessage.CatalogSnapshot.catalogImage:type_name -> proto.ImageMessage
-	194, // 396: proto.VerifiedNameCertificate.Details.localizedNames:type_name -> proto.LocalizedName
-	268, // 397: proto.ClientPayload.WebInfo.webdPayload:type_name -> proto.ClientPayload.WebInfo.WebdPayload
-	43,  // 398: proto.ClientPayload.WebInfo.webSubPlatform:type_name -> proto.ClientPayload.WebInfo.WebSubPlatform
-	45,  // 399: proto.ClientPayload.UserAgent.platform:type_name -> proto.ClientPayload.UserAgent.Platform
-	269, // 400: proto.ClientPayload.UserAgent.appVersion:type_name -> proto.ClientPayload.UserAgent.AppVersion
-	44,  // 401: proto.ClientPayload.UserAgent.releaseChannel:type_name -> proto.ClientPayload.UserAgent.ReleaseChannel
-	46,  // 402: proto.ClientPayload.DNSSource.dnsMethod:type_name -> proto.ClientPayload.DNSSource.DNSResolutionMethod
-	403, // [403:403] is the sub-list for method output_type
-	403, // [403:403] is the sub-list for method input_type
-	403, // [403:403] is the sub-list for extension type_name
-	403, // [403:403] is the sub-list for extension extendee
-	0,   // [0:403] is the sub-list for field type_name
+	224, // 2: proto.DeviceProps.historySyncConfig:type_name -> proto.DeviceProps.HistorySyncConfig
+	1,   // 3: proto.PeerDataOperationRequestMessage.peerDataOperationRequestType:type_name -> proto.PeerDataOperationRequestType
+	227, // 4: proto.PeerDataOperationRequestMessage.requestStickerReupload:type_name -> proto.PeerDataOperationRequestMessage.RequestStickerReupload
+	226, // 5: proto.PeerDataOperationRequestMessage.requestUrlPreview:type_name -> proto.PeerDataOperationRequestMessage.RequestUrlPreview
+	228, // 6: proto.PeerDataOperationRequestMessage.historySyncOnDemandRequest:type_name -> proto.PeerDataOperationRequestMessage.HistorySyncOnDemandRequest
+	4,   // 7: proto.PaymentInviteMessage.serviceType:type_name -> proto.PaymentInviteMessage.ServiceType
+	6,   // 8: proto.OrderMessage.status:type_name -> proto.OrderMessage.OrderStatus
+	5,   // 9: proto.OrderMessage.surface:type_name -> proto.OrderMessage.OrderSurface
+	105, // 10: proto.OrderMessage.contextInfo:type_name -> proto.ContextInfo
+	105, // 11: proto.LocationMessage.contextInfo:type_name -> proto.ContextInfo
+	105, // 12: proto.LiveLocationMessage.contextInfo:type_name -> proto.ContextInfo
+	7,   // 13: proto.ListResponseMessage.listType:type_name -> proto.ListResponseMessage.ListType
+	229, // 14: proto.ListResponseMessage.singleSelectReply:type_name -> proto.ListResponseMessage.SingleSelectReply
+	105, // 15: proto.ListResponseMessage.contextInfo:type_name -> proto.ContextInfo
+	8,   // 16: proto.ListMessage.listType:type_name -> proto.ListMessage.ListType
+	230, // 17: proto.ListMessage.sections:type_name -> proto.ListMessage.Section
+	234, // 18: proto.ListMessage.productListInfo:type_name -> proto.ListMessage.ProductListInfo
+	105, // 19: proto.ListMessage.contextInfo:type_name -> proto.ContextInfo
+	151, // 20: proto.KeepInChatMessage.key:type_name -> proto.MessageKey
+	0,   // 21: proto.KeepInChatMessage.keepType:type_name -> proto.KeepType
+	9,   // 22: proto.InvoiceMessage.attachmentType:type_name -> proto.InvoiceMessage.AttachmentType
+	237, // 23: proto.InteractiveResponseMessage.body:type_name -> proto.InteractiveResponseMessage.Body
+	105, // 24: proto.InteractiveResponseMessage.contextInfo:type_name -> proto.ContextInfo
+	236, // 25: proto.InteractiveResponseMessage.nativeFlowResponseMessage:type_name -> proto.InteractiveResponseMessage.NativeFlowResponseMessage
+	240, // 26: proto.InteractiveMessage.header:type_name -> proto.InteractiveMessage.Header
+	243, // 27: proto.InteractiveMessage.body:type_name -> proto.InteractiveMessage.Body
+	241, // 28: proto.InteractiveMessage.footer:type_name -> proto.InteractiveMessage.Footer
+	105, // 29: proto.InteractiveMessage.contextInfo:type_name -> proto.ContextInfo
+	238, // 30: proto.InteractiveMessage.shopStorefrontMessage:type_name -> proto.InteractiveMessage.ShopMessage
+	242, // 31: proto.InteractiveMessage.collectionMessage:type_name -> proto.InteractiveMessage.CollectionMessage
+	239, // 32: proto.InteractiveMessage.nativeFlowMessage:type_name -> proto.InteractiveMessage.NativeFlowMessage
+	100, // 33: proto.ImageMessage.interactiveAnnotations:type_name -> proto.InteractiveAnnotation
+	105, // 34: proto.ImageMessage.contextInfo:type_name -> proto.ContextInfo
+	11,  // 35: proto.HistorySyncNotification.syncType:type_name -> proto.HistorySyncNotification.HistorySyncType
+	245, // 36: proto.HighlyStructuredMessage.localizableParams:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter
+	114, // 37: proto.HighlyStructuredMessage.hydratedHsm:type_name -> proto.TemplateMessage
+	105, // 38: proto.GroupInviteMessage.contextInfo:type_name -> proto.ContextInfo
+	14,  // 39: proto.GroupInviteMessage.groupType:type_name -> proto.GroupInviteMessage.GroupType
+	111, // 40: proto.FutureProofMessage.message:type_name -> proto.Message
+	17,  // 41: proto.ExtendedTextMessage.font:type_name -> proto.ExtendedTextMessage.FontType
+	15,  // 42: proto.ExtendedTextMessage.previewType:type_name -> proto.ExtendedTextMessage.PreviewType
+	105, // 43: proto.ExtendedTextMessage.contextInfo:type_name -> proto.ContextInfo
+	16,  // 44: proto.ExtendedTextMessage.inviteLinkGroupType:type_name -> proto.ExtendedTextMessage.InviteLinkGroupType
+	16,  // 45: proto.ExtendedTextMessage.inviteLinkGroupTypeV2:type_name -> proto.ExtendedTextMessage.InviteLinkGroupType
+	151, // 46: proto.EncReactionMessage.targetMessageKey:type_name -> proto.MessageKey
+	105, // 47: proto.DocumentMessage.contextInfo:type_name -> proto.ContextInfo
+	111, // 48: proto.DeviceSentMessage.message:type_name -> proto.Message
+	151, // 49: proto.DeclinePaymentRequestMessage.key:type_name -> proto.MessageKey
+	85,  // 50: proto.ContactsArrayMessage.contacts:type_name -> proto.ContactMessage
+	105, // 51: proto.ContactsArrayMessage.contextInfo:type_name -> proto.ContextInfo
+	105, // 52: proto.ContactMessage.contextInfo:type_name -> proto.ContextInfo
+	151, // 53: proto.CancelPaymentRequestMessage.key:type_name -> proto.MessageKey
+	105, // 54: proto.ButtonsResponseMessage.contextInfo:type_name -> proto.ContextInfo
+	18,  // 55: proto.ButtonsResponseMessage.type:type_name -> proto.ButtonsResponseMessage.Type
+	105, // 56: proto.ButtonsMessage.contextInfo:type_name -> proto.ContextInfo
+	250, // 57: proto.ButtonsMessage.buttons:type_name -> proto.ButtonsMessage.Button
+	19,  // 58: proto.ButtonsMessage.headerType:type_name -> proto.ButtonsMessage.HeaderType
+	81,  // 59: proto.ButtonsMessage.documentMessage:type_name -> proto.DocumentMessage
+	74,  // 60: proto.ButtonsMessage.imageMessage:type_name -> proto.ImageMessage
+	113, // 61: proto.ButtonsMessage.videoMessage:type_name -> proto.VideoMessage
+	65,  // 62: proto.ButtonsMessage.locationMessage:type_name -> proto.LocationMessage
+	105, // 63: proto.AudioMessage.contextInfo:type_name -> proto.ContextInfo
+	95,  // 64: proto.AppStateSyncKey.keyId:type_name -> proto.AppStateSyncKeyId
+	97,  // 65: proto.AppStateSyncKey.keyData:type_name -> proto.AppStateSyncKeyData
+	92,  // 66: proto.AppStateSyncKeyShare.keys:type_name -> proto.AppStateSyncKey
+	95,  // 67: proto.AppStateSyncKeyRequest.keyIds:type_name -> proto.AppStateSyncKeyId
+	96,  // 68: proto.AppStateSyncKeyData.fingerprint:type_name -> proto.AppStateSyncKeyFingerprint
+	108, // 69: proto.InteractiveAnnotation.polygonVertices:type_name -> proto.Point
+	99,  // 70: proto.InteractiveAnnotation.location:type_name -> proto.Location
+	254, // 71: proto.HydratedTemplateButton.quickReplyButton:type_name -> proto.HydratedTemplateButton.HydratedQuickReplyButton
+	253, // 72: proto.HydratedTemplateButton.urlButton:type_name -> proto.HydratedTemplateButton.HydratedURLButton
+	255, // 73: proto.HydratedTemplateButton.callButton:type_name -> proto.HydratedTemplateButton.HydratedCallButton
+	21,  // 74: proto.DisappearingMode.initiator:type_name -> proto.DisappearingMode.Initiator
+	111, // 75: proto.ContextInfo.quotedMessage:type_name -> proto.Message
+	258, // 76: proto.ContextInfo.quotedAd:type_name -> proto.ContextInfo.AdReplyInfo
+	151, // 77: proto.ContextInfo.placeholderKey:type_name -> proto.MessageKey
+	257, // 78: proto.ContextInfo.externalAdReply:type_name -> proto.ContextInfo.ExternalAdReplyInfo
+	103, // 79: proto.ContextInfo.disappearingMode:type_name -> proto.DisappearingMode
+	106, // 80: proto.ContextInfo.actionLink:type_name -> proto.ActionLink
+	102, // 81: proto.ContextInfo.groupMentions:type_name -> proto.GroupMention
+	256, // 82: proto.ContextInfo.utm:type_name -> proto.ContextInfo.UTMInfo
+	260, // 83: proto.TemplateButton.quickReplyButton:type_name -> proto.TemplateButton.QuickReplyButton
+	259, // 84: proto.TemplateButton.urlButton:type_name -> proto.TemplateButton.URLButton
+	261, // 85: proto.TemplateButton.callButton:type_name -> proto.TemplateButton.CallButton
+	262, // 86: proto.PaymentBackground.mediaData:type_name -> proto.PaymentBackground.MediaData
+	24,  // 87: proto.PaymentBackground.type:type_name -> proto.PaymentBackground.Type
+	118, // 88: proto.Message.senderKeyDistributionMessage:type_name -> proto.SenderKeyDistributionMessage
+	74,  // 89: proto.Message.imageMessage:type_name -> proto.ImageMessage
+	85,  // 90: proto.Message.contactMessage:type_name -> proto.ContactMessage
+	65,  // 91: proto.Message.locationMessage:type_name -> proto.LocationMessage
+	79,  // 92: proto.Message.extendedTextMessage:type_name -> proto.ExtendedTextMessage
+	81,  // 93: proto.Message.documentMessage:type_name -> proto.DocumentMessage
+	91,  // 94: proto.Message.audioMessage:type_name -> proto.AudioMessage
+	113, // 95: proto.Message.videoMessage:type_name -> proto.VideoMessage
+	88,  // 96: proto.Message.call:type_name -> proto.Call
+	86,  // 97: proto.Message.chat:type_name -> proto.Chat
+	125, // 98: proto.Message.protocolMessage:type_name -> proto.ProtocolMessage
+	84,  // 99: proto.Message.contactsArrayMessage:type_name -> proto.ContactsArrayMessage
+	76,  // 100: proto.Message.highlyStructuredMessage:type_name -> proto.HighlyStructuredMessage
+	118, // 101: proto.Message.fastRatchetKeySenderKeyDistributionMessage:type_name -> proto.SenderKeyDistributionMessage
+	119, // 102: proto.Message.sendPaymentMessage:type_name -> proto.SendPaymentMessage
+	66,  // 103: proto.Message.liveLocationMessage:type_name -> proto.LiveLocationMessage
+	123, // 104: proto.Message.requestPaymentMessage:type_name -> proto.RequestPaymentMessage
+	83,  // 105: proto.Message.declinePaymentRequestMessage:type_name -> proto.DeclinePaymentRequestMessage
+	87,  // 106: proto.Message.cancelPaymentRequestMessage:type_name -> proto.CancelPaymentRequestMessage
+	114, // 107: proto.Message.templateMessage:type_name -> proto.TemplateMessage
+	117, // 108: proto.Message.stickerMessage:type_name -> proto.StickerMessage
+	77,  // 109: proto.Message.groupInviteMessage:type_name -> proto.GroupInviteMessage
+	115, // 110: proto.Message.templateButtonReplyMessage:type_name -> proto.TemplateButtonReplyMessage
+	126, // 111: proto.Message.productMessage:type_name -> proto.ProductMessage
+	82,  // 112: proto.Message.deviceSentMessage:type_name -> proto.DeviceSentMessage
+	112, // 113: proto.Message.messageContextInfo:type_name -> proto.MessageContextInfo
+	68,  // 114: proto.Message.listMessage:type_name -> proto.ListMessage
+	78,  // 115: proto.Message.viewOnceMessage:type_name -> proto.FutureProofMessage
+	64,  // 116: proto.Message.orderMessage:type_name -> proto.OrderMessage
+	67,  // 117: proto.Message.listResponseMessage:type_name -> proto.ListResponseMessage
+	78,  // 118: proto.Message.ephemeralMessage:type_name -> proto.FutureProofMessage
+	70,  // 119: proto.Message.invoiceMessage:type_name -> proto.InvoiceMessage
+	90,  // 120: proto.Message.buttonsMessage:type_name -> proto.ButtonsMessage
+	89,  // 121: proto.Message.buttonsResponseMessage:type_name -> proto.ButtonsResponseMessage
+	63,  // 122: proto.Message.paymentInviteMessage:type_name -> proto.PaymentInviteMessage
+	72,  // 123: proto.Message.interactiveMessage:type_name -> proto.InteractiveMessage
+	124, // 124: proto.Message.reactionMessage:type_name -> proto.ReactionMessage
+	116, // 125: proto.Message.stickerSyncRmrMessage:type_name -> proto.StickerSyncRMRMessage
+	71,  // 126: proto.Message.interactiveResponseMessage:type_name -> proto.InteractiveResponseMessage
+	131, // 127: proto.Message.pollCreationMessage:type_name -> proto.PollCreationMessage
+	128, // 128: proto.Message.pollUpdateMessage:type_name -> proto.PollUpdateMessage
+	69,  // 129: proto.Message.keepInChatMessage:type_name -> proto.KeepInChatMessage
+	78,  // 130: proto.Message.documentWithCaptionMessage:type_name -> proto.FutureProofMessage
+	122, // 131: proto.Message.requestPhoneNumberMessage:type_name -> proto.RequestPhoneNumberMessage
+	78,  // 132: proto.Message.viewOnceMessageV2:type_name -> proto.FutureProofMessage
+	80,  // 133: proto.Message.encReactionMessage:type_name -> proto.EncReactionMessage
+	78,  // 134: proto.Message.editedMessage:type_name -> proto.FutureProofMessage
+	78,  // 135: proto.Message.viewOnceMessageV2Extension:type_name -> proto.FutureProofMessage
+	131, // 136: proto.Message.pollCreationMessageV2:type_name -> proto.PollCreationMessage
+	121, // 137: proto.Message.scheduledCallCreationMessage:type_name -> proto.ScheduledCallCreationMessage
+	78,  // 138: proto.Message.groupMentionedMessage:type_name -> proto.FutureProofMessage
+	132, // 139: proto.Message.pinMessage:type_name -> proto.PinMessage
+	131, // 140: proto.Message.pollCreationMessageV3:type_name -> proto.PollCreationMessage
+	120, // 141: proto.Message.scheduledCallEditMessage:type_name -> proto.ScheduledCallEditMessage
+	113, // 142: proto.Message.ptvMessage:type_name -> proto.VideoMessage
+	104, // 143: proto.MessageContextInfo.deviceListMetadata:type_name -> proto.DeviceListMetadata
+	100, // 144: proto.VideoMessage.interactiveAnnotations:type_name -> proto.InteractiveAnnotation
+	105, // 145: proto.VideoMessage.contextInfo:type_name -> proto.ContextInfo
+	25,  // 146: proto.VideoMessage.gifAttribution:type_name -> proto.VideoMessage.Attribution
+	105, // 147: proto.TemplateMessage.contextInfo:type_name -> proto.ContextInfo
+	263, // 148: proto.TemplateMessage.hydratedTemplate:type_name -> proto.TemplateMessage.HydratedFourRowTemplate
+	264, // 149: proto.TemplateMessage.fourRowTemplate:type_name -> proto.TemplateMessage.FourRowTemplate
+	263, // 150: proto.TemplateMessage.hydratedFourRowTemplate:type_name -> proto.TemplateMessage.HydratedFourRowTemplate
+	72,  // 151: proto.TemplateMessage.interactiveMessageTemplate:type_name -> proto.InteractiveMessage
+	105, // 152: proto.TemplateButtonReplyMessage.contextInfo:type_name -> proto.ContextInfo
+	105, // 153: proto.StickerMessage.contextInfo:type_name -> proto.ContextInfo
+	111, // 154: proto.SendPaymentMessage.noteMessage:type_name -> proto.Message
+	151, // 155: proto.SendPaymentMessage.requestMessageKey:type_name -> proto.MessageKey
+	109, // 156: proto.SendPaymentMessage.background:type_name -> proto.PaymentBackground
+	151, // 157: proto.ScheduledCallEditMessage.key:type_name -> proto.MessageKey
+	26,  // 158: proto.ScheduledCallEditMessage.editType:type_name -> proto.ScheduledCallEditMessage.EditType
+	27,  // 159: proto.ScheduledCallCreationMessage.callType:type_name -> proto.ScheduledCallCreationMessage.CallType
+	105, // 160: proto.RequestPhoneNumberMessage.contextInfo:type_name -> proto.ContextInfo
+	111, // 161: proto.RequestPaymentMessage.noteMessage:type_name -> proto.Message
+	110, // 162: proto.RequestPaymentMessage.amount:type_name -> proto.Money
+	109, // 163: proto.RequestPaymentMessage.background:type_name -> proto.PaymentBackground
+	151, // 164: proto.ReactionMessage.key:type_name -> proto.MessageKey
+	151, // 165: proto.ProtocolMessage.key:type_name -> proto.MessageKey
+	28,  // 166: proto.ProtocolMessage.type:type_name -> proto.ProtocolMessage.Type
+	75,  // 167: proto.ProtocolMessage.historySyncNotification:type_name -> proto.HistorySyncNotification
+	93,  // 168: proto.ProtocolMessage.appStateSyncKeyShare:type_name -> proto.AppStateSyncKeyShare
+	94,  // 169: proto.ProtocolMessage.appStateSyncKeyRequest:type_name -> proto.AppStateSyncKeyRequest
+	73,  // 170: proto.ProtocolMessage.initialSecurityNotificationSettingSync:type_name -> proto.InitialSecurityNotificationSettingSync
+	98,  // 171: proto.ProtocolMessage.appStateFatalExceptionNotification:type_name -> proto.AppStateFatalExceptionNotification
+	103, // 172: proto.ProtocolMessage.disappearingMode:type_name -> proto.DisappearingMode
+	111, // 173: proto.ProtocolMessage.editedMessage:type_name -> proto.Message
+	62,  // 174: proto.ProtocolMessage.peerDataOperationRequestMessage:type_name -> proto.PeerDataOperationRequestMessage
+	133, // 175: proto.ProtocolMessage.peerDataOperationRequestResponseMessage:type_name -> proto.PeerDataOperationRequestResponseMessage
+	265, // 176: proto.ProductMessage.product:type_name -> proto.ProductMessage.ProductSnapshot
+	266, // 177: proto.ProductMessage.catalog:type_name -> proto.ProductMessage.CatalogSnapshot
+	105, // 178: proto.ProductMessage.contextInfo:type_name -> proto.ContextInfo
+	151, // 179: proto.PollUpdateMessage.pollCreationMessageKey:type_name -> proto.MessageKey
+	130, // 180: proto.PollUpdateMessage.vote:type_name -> proto.PollEncValue
+	129, // 181: proto.PollUpdateMessage.metadata:type_name -> proto.PollUpdateMessageMetadata
+	267, // 182: proto.PollCreationMessage.options:type_name -> proto.PollCreationMessage.Option
+	105, // 183: proto.PollCreationMessage.contextInfo:type_name -> proto.ContextInfo
+	151, // 184: proto.PinMessage.key:type_name -> proto.MessageKey
+	29,  // 185: proto.PinMessage.pinMessageType:type_name -> proto.PinMessage.PinMessageType
+	1,   // 186: proto.PeerDataOperationRequestResponseMessage.peerDataOperationRequestType:type_name -> proto.PeerDataOperationRequestType
+	268, // 187: proto.PeerDataOperationRequestResponseMessage.peerDataOperationResult:type_name -> proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult
+	139, // 188: proto.PastParticipants.pastParticipants:type_name -> proto.PastParticipant
+	30,  // 189: proto.PastParticipant.leaveReason:type_name -> proto.PastParticipant.LeaveReason
+	31,  // 190: proto.HistorySync.syncType:type_name -> proto.HistorySync.HistorySyncType
+	144, // 191: proto.HistorySync.conversations:type_name -> proto.Conversation
+	210, // 192: proto.HistorySync.statusV3Messages:type_name -> proto.WebMessageInfo
+	137, // 193: proto.HistorySync.pushnames:type_name -> proto.Pushname
+	143, // 194: proto.HistorySync.globalSettings:type_name -> proto.GlobalSettings
+	136, // 195: proto.HistorySync.recentStickers:type_name -> proto.StickerMetadata
+	138, // 196: proto.HistorySync.pastParticipants:type_name -> proto.PastParticipants
+	210, // 197: proto.HistorySyncMsg.message:type_name -> proto.WebMessageInfo
+	32,  // 198: proto.GroupParticipant.rank:type_name -> proto.GroupParticipant.Rank
+	135, // 199: proto.GlobalSettings.lightThemeWallpaper:type_name -> proto.WallpaperSettings
+	2,   // 200: proto.GlobalSettings.mediaVisibility:type_name -> proto.MediaVisibility
+	135, // 201: proto.GlobalSettings.darkThemeWallpaper:type_name -> proto.WallpaperSettings
+	146, // 202: proto.GlobalSettings.autoDownloadWiFi:type_name -> proto.AutoDownloadSettings
+	146, // 203: proto.GlobalSettings.autoDownloadCellular:type_name -> proto.AutoDownloadSettings
+	146, // 204: proto.GlobalSettings.autoDownloadRoaming:type_name -> proto.AutoDownloadSettings
+	145, // 205: proto.GlobalSettings.avatarUserSettings:type_name -> proto.AvatarUserSettings
+	141, // 206: proto.Conversation.messages:type_name -> proto.HistorySyncMsg
+	33,  // 207: proto.Conversation.endOfHistoryTransferType:type_name -> proto.Conversation.EndOfHistoryTransferType
+	103, // 208: proto.Conversation.disappearingMode:type_name -> proto.DisappearingMode
+	142, // 209: proto.Conversation.participant:type_name -> proto.GroupParticipant
+	135, // 210: proto.Conversation.wallpaper:type_name -> proto.WallpaperSettings
+	2,   // 211: proto.Conversation.mediaVisibility:type_name -> proto.MediaVisibility
+	148, // 212: proto.MsgRowOpaqueData.currentMsg:type_name -> proto.MsgOpaqueData
+	148, // 213: proto.MsgRowOpaqueData.quotedMsg:type_name -> proto.MsgOpaqueData
+	270, // 214: proto.MsgOpaqueData.pollOptions:type_name -> proto.MsgOpaqueData.PollOption
+	130, // 215: proto.MsgOpaqueData.encPollVote:type_name -> proto.PollEncValue
+	34,  // 216: proto.MediaRetryNotification.result:type_name -> proto.MediaRetryNotification.ResultType
+	152, // 217: proto.SyncdSnapshot.version:type_name -> proto.SyncdVersion
+	155, // 218: proto.SyncdSnapshot.records:type_name -> proto.SyncdRecord
+	160, // 219: proto.SyncdSnapshot.keyId:type_name -> proto.KeyId
+	159, // 220: proto.SyncdRecord.index:type_name -> proto.SyncdIndex
+	153, // 221: proto.SyncdRecord.value:type_name -> proto.SyncdValue
+	160, // 222: proto.SyncdRecord.keyId:type_name -> proto.KeyId
+	152, // 223: proto.SyncdPatch.version:type_name -> proto.SyncdVersion
+	158, // 224: proto.SyncdPatch.mutations:type_name -> proto.SyncdMutation
+	161, // 225: proto.SyncdPatch.externalMutations:type_name -> proto.ExternalBlobReference
+	160, // 226: proto.SyncdPatch.keyId:type_name -> proto.KeyId
+	162, // 227: proto.SyncdPatch.exitCode:type_name -> proto.ExitCode
+	158, // 228: proto.SyncdMutations.mutations:type_name -> proto.SyncdMutation
+	35,  // 229: proto.SyncdMutation.operation:type_name -> proto.SyncdMutation.SyncdOperation
+	155, // 230: proto.SyncdMutation.record:type_name -> proto.SyncdRecord
+	171, // 231: proto.SyncActionValue.starAction:type_name -> proto.StarAction
+	190, // 232: proto.SyncActionValue.contactAction:type_name -> proto.ContactAction
+	182, // 233: proto.SyncActionValue.muteAction:type_name -> proto.MuteAction
+	180, // 234: proto.SyncActionValue.pinAction:type_name -> proto.PinAction
+	172, // 235: proto.SyncActionValue.securityNotificationSetting:type_name -> proto.SecurityNotificationSetting
+	176, // 236: proto.SyncActionValue.pushNameSetting:type_name -> proto.PushNameSetting
+	175, // 237: proto.SyncActionValue.quickReplyAction:type_name -> proto.QuickReplyAction
+	174, // 238: proto.SyncActionValue.recentEmojiWeightsAction:type_name -> proto.RecentEmojiWeightsAction
+	185, // 239: proto.SyncActionValue.labelEditAction:type_name -> proto.LabelEditAction
+	186, // 240: proto.SyncActionValue.labelAssociationAction:type_name -> proto.LabelAssociationAction
+	184, // 241: proto.SyncActionValue.localeSetting:type_name -> proto.LocaleSetting
+	194, // 242: proto.SyncActionValue.archiveChatAction:type_name -> proto.ArchiveChatAction
+	188, // 243: proto.SyncActionValue.deleteMessageForMeAction:type_name -> proto.DeleteMessageForMeAction
+	187, // 244: proto.SyncActionValue.keyExpiration:type_name -> proto.KeyExpiration
+	183, // 245: proto.SyncActionValue.markChatAsReadAction:type_name -> proto.MarkChatAsReadAction
+	191, // 246: proto.SyncActionValue.clearChatAction:type_name -> proto.ClearChatAction
+	189, // 247: proto.SyncActionValue.deleteChatAction:type_name -> proto.DeleteChatAction
+	165, // 248: proto.SyncActionValue.unarchiveChatsSetting:type_name -> proto.UnarchiveChatsSetting
+	178, // 249: proto.SyncActionValue.primaryFeature:type_name -> proto.PrimaryFeature
+	195, // 250: proto.SyncActionValue.androidUnsupportedActions:type_name -> proto.AndroidUnsupportedActions
+	196, // 251: proto.SyncActionValue.agentAction:type_name -> proto.AgentAction
+	169, // 252: proto.SyncActionValue.subscriptionAction:type_name -> proto.SubscriptionAction
+	164, // 253: proto.SyncActionValue.userStatusMuteAction:type_name -> proto.UserStatusMuteAction
+	166, // 254: proto.SyncActionValue.timeFormatAction:type_name -> proto.TimeFormatAction
+	181, // 255: proto.SyncActionValue.nuxAction:type_name -> proto.NuxAction
+	177, // 256: proto.SyncActionValue.primaryVersionAction:type_name -> proto.PrimaryVersionAction
+	170, // 257: proto.SyncActionValue.stickerAction:type_name -> proto.StickerAction
+	173, // 258: proto.SyncActionValue.removeRecentStickerAction:type_name -> proto.RemoveRecentStickerAction
+	193, // 259: proto.SyncActionValue.chatAssignment:type_name -> proto.ChatAssignmentAction
+	192, // 260: proto.SyncActionValue.chatAssignmentOpenedStatus:type_name -> proto.ChatAssignmentOpenedStatusAction
+	179, // 261: proto.SyncActionValue.pnForLidChatAction:type_name -> proto.PnForLidChatAction
+	151, // 262: proto.SyncActionMessage.key:type_name -> proto.MessageKey
+	167, // 263: proto.SyncActionMessageRange.messages:type_name -> proto.SyncActionMessage
+	198, // 264: proto.RecentEmojiWeightsAction.weights:type_name -> proto.RecentEmojiWeight
+	168, // 265: proto.MarkChatAsReadAction.messageRange:type_name -> proto.SyncActionMessageRange
+	168, // 266: proto.DeleteChatAction.messageRange:type_name -> proto.SyncActionMessageRange
+	168, // 267: proto.ClearChatAction.messageRange:type_name -> proto.SyncActionMessageRange
+	168, // 268: proto.ArchiveChatAction.messageRange:type_name -> proto.SyncActionMessageRange
+	163, // 269: proto.SyncActionData.value:type_name -> proto.SyncActionValue
+	36,  // 270: proto.BizIdentityInfo.vlevel:type_name -> proto.BizIdentityInfo.VerifiedLevelValue
+	199, // 271: proto.BizIdentityInfo.vnameCert:type_name -> proto.VerifiedNameCertificate
+	37,  // 272: proto.BizIdentityInfo.hostStorage:type_name -> proto.BizIdentityInfo.HostStorageType
+	38,  // 273: proto.BizIdentityInfo.actualActors:type_name -> proto.BizIdentityInfo.ActualActorsType
+	199, // 274: proto.BizAccountPayload.vnameCert:type_name -> proto.VerifiedNameCertificate
+	39,  // 275: proto.BizAccountLinkInfo.hostStorage:type_name -> proto.BizAccountLinkInfo.HostStorageType
+	40,  // 276: proto.BizAccountLinkInfo.accountType:type_name -> proto.BizAccountLinkInfo.AccountType
+	206, // 277: proto.HandshakeMessage.clientHello:type_name -> proto.HandshakeClientHello
+	205, // 278: proto.HandshakeMessage.serverHello:type_name -> proto.HandshakeServerHello
+	207, // 279: proto.HandshakeMessage.clientFinish:type_name -> proto.HandshakeClientFinish
+	273, // 280: proto.ClientPayload.userAgent:type_name -> proto.ClientPayload.UserAgent
+	272, // 281: proto.ClientPayload.webInfo:type_name -> proto.ClientPayload.WebInfo
+	43,  // 282: proto.ClientPayload.connectType:type_name -> proto.ClientPayload.ConnectType
+	44,  // 283: proto.ClientPayload.connectReason:type_name -> proto.ClientPayload.ConnectReason
+	275, // 284: proto.ClientPayload.dnsSource:type_name -> proto.ClientPayload.DNSSource
+	274, // 285: proto.ClientPayload.devicePairingData:type_name -> proto.ClientPayload.DevicePairingRegistrationData
+	41,  // 286: proto.ClientPayload.product:type_name -> proto.ClientPayload.Product
+	42,  // 287: proto.ClientPayload.iosAppExtension:type_name -> proto.ClientPayload.IOSAppExtension
+	210, // 288: proto.WebNotificationsInfo.notifyMessages:type_name -> proto.WebMessageInfo
+	151, // 289: proto.WebMessageInfo.key:type_name -> proto.MessageKey
+	111, // 290: proto.WebMessageInfo.message:type_name -> proto.Message
+	50,  // 291: proto.WebMessageInfo.status:type_name -> proto.WebMessageInfo.Status
+	49,  // 292: proto.WebMessageInfo.messageStubType:type_name -> proto.WebMessageInfo.StubType
+	218, // 293: proto.WebMessageInfo.paymentInfo:type_name -> proto.PaymentInfo
+	66,  // 294: proto.WebMessageInfo.finalLiveLocation:type_name -> proto.LiveLocationMessage
+	218, // 295: proto.WebMessageInfo.quotedPaymentInfo:type_name -> proto.PaymentInfo
+	51,  // 296: proto.WebMessageInfo.bizPrivacyStatus:type_name -> proto.WebMessageInfo.BizPrivacyStatus
+	220, // 297: proto.WebMessageInfo.mediaData:type_name -> proto.MediaData
+	217, // 298: proto.WebMessageInfo.photoChange:type_name -> proto.PhotoChange
+	212, // 299: proto.WebMessageInfo.userReceipt:type_name -> proto.UserReceipt
+	214, // 300: proto.WebMessageInfo.reactions:type_name -> proto.Reaction
+	220, // 301: proto.WebMessageInfo.quotedStickerData:type_name -> proto.MediaData
+	213, // 302: proto.WebMessageInfo.statusPsa:type_name -> proto.StatusPSA
+	215, // 303: proto.WebMessageInfo.pollUpdates:type_name -> proto.PollUpdate
+	216, // 304: proto.WebMessageInfo.pollAdditionalMetadata:type_name -> proto.PollAdditionalMetadata
+	221, // 305: proto.WebMessageInfo.keepInChat:type_name -> proto.KeepInChat
+	52,  // 306: proto.WebFeatures.labelsDisplay:type_name -> proto.WebFeatures.Flag
+	52,  // 307: proto.WebFeatures.voipIndividualOutgoing:type_name -> proto.WebFeatures.Flag
+	52,  // 308: proto.WebFeatures.groupsV3:type_name -> proto.WebFeatures.Flag
+	52,  // 309: proto.WebFeatures.groupsV3Create:type_name -> proto.WebFeatures.Flag
+	52,  // 310: proto.WebFeatures.changeNumberV2:type_name -> proto.WebFeatures.Flag
+	52,  // 311: proto.WebFeatures.queryStatusV3Thumbnail:type_name -> proto.WebFeatures.Flag
+	52,  // 312: proto.WebFeatures.liveLocations:type_name -> proto.WebFeatures.Flag
+	52,  // 313: proto.WebFeatures.queryVname:type_name -> proto.WebFeatures.Flag
+	52,  // 314: proto.WebFeatures.voipIndividualIncoming:type_name -> proto.WebFeatures.Flag
+	52,  // 315: proto.WebFeatures.quickRepliesQuery:type_name -> proto.WebFeatures.Flag
+	52,  // 316: proto.WebFeatures.payments:type_name -> proto.WebFeatures.Flag
+	52,  // 317: proto.WebFeatures.stickerPackQuery:type_name -> proto.WebFeatures.Flag
+	52,  // 318: proto.WebFeatures.liveLocationsFinal:type_name -> proto.WebFeatures.Flag
+	52,  // 319: proto.WebFeatures.labelsEdit:type_name -> proto.WebFeatures.Flag
+	52,  // 320: proto.WebFeatures.mediaUpload:type_name -> proto.WebFeatures.Flag
+	52,  // 321: proto.WebFeatures.mediaUploadRichQuickReplies:type_name -> proto.WebFeatures.Flag
+	52,  // 322: proto.WebFeatures.vnameV2:type_name -> proto.WebFeatures.Flag
+	52,  // 323: proto.WebFeatures.videoPlaybackUrl:type_name -> proto.WebFeatures.Flag
+	52,  // 324: proto.WebFeatures.statusRanking:type_name -> proto.WebFeatures.Flag
+	52,  // 325: proto.WebFeatures.voipIndividualVideo:type_name -> proto.WebFeatures.Flag
+	52,  // 326: proto.WebFeatures.thirdPartyStickers:type_name -> proto.WebFeatures.Flag
+	52,  // 327: proto.WebFeatures.frequentlyForwardedSetting:type_name -> proto.WebFeatures.Flag
+	52,  // 328: proto.WebFeatures.groupsV4JoinPermission:type_name -> proto.WebFeatures.Flag
+	52,  // 329: proto.WebFeatures.recentStickers:type_name -> proto.WebFeatures.Flag
+	52,  // 330: proto.WebFeatures.catalog:type_name -> proto.WebFeatures.Flag
+	52,  // 331: proto.WebFeatures.starredStickers:type_name -> proto.WebFeatures.Flag
+	52,  // 332: proto.WebFeatures.voipGroupCall:type_name -> proto.WebFeatures.Flag
+	52,  // 333: proto.WebFeatures.templateMessage:type_name -> proto.WebFeatures.Flag
+	52,  // 334: proto.WebFeatures.templateMessageInteractivity:type_name -> proto.WebFeatures.Flag
+	52,  // 335: proto.WebFeatures.ephemeralMessages:type_name -> proto.WebFeatures.Flag
+	52,  // 336: proto.WebFeatures.e2ENotificationSync:type_name -> proto.WebFeatures.Flag
+	52,  // 337: proto.WebFeatures.recentStickersV2:type_name -> proto.WebFeatures.Flag
+	52,  // 338: proto.WebFeatures.recentStickersV3:type_name -> proto.WebFeatures.Flag
+	52,  // 339: proto.WebFeatures.userNotice:type_name -> proto.WebFeatures.Flag
+	52,  // 340: proto.WebFeatures.support:type_name -> proto.WebFeatures.Flag
+	52,  // 341: proto.WebFeatures.groupUiiCleanup:type_name -> proto.WebFeatures.Flag
+	52,  // 342: proto.WebFeatures.groupDogfoodingInternalOnly:type_name -> proto.WebFeatures.Flag
+	52,  // 343: proto.WebFeatures.settingsSync:type_name -> proto.WebFeatures.Flag
+	52,  // 344: proto.WebFeatures.archiveV2:type_name -> proto.WebFeatures.Flag
+	52,  // 345: proto.WebFeatures.ephemeralAllowGroupMembers:type_name -> proto.WebFeatures.Flag
+	52,  // 346: proto.WebFeatures.ephemeral24HDuration:type_name -> proto.WebFeatures.Flag
+	52,  // 347: proto.WebFeatures.mdForceUpgrade:type_name -> proto.WebFeatures.Flag
+	52,  // 348: proto.WebFeatures.disappearingMode:type_name -> proto.WebFeatures.Flag
+	52,  // 349: proto.WebFeatures.externalMdOptInAvailable:type_name -> proto.WebFeatures.Flag
+	52,  // 350: proto.WebFeatures.noDeleteMessageTimeLimit:type_name -> proto.WebFeatures.Flag
+	151, // 351: proto.Reaction.key:type_name -> proto.MessageKey
+	151, // 352: proto.PollUpdate.pollUpdateMessageKey:type_name -> proto.MessageKey
+	127, // 353: proto.PollUpdate.vote:type_name -> proto.PollVoteMessage
+	55,  // 354: proto.PaymentInfo.currencyDeprecated:type_name -> proto.PaymentInfo.Currency
+	54,  // 355: proto.PaymentInfo.status:type_name -> proto.PaymentInfo.Status
+	151, // 356: proto.PaymentInfo.requestMessageKey:type_name -> proto.MessageKey
+	53,  // 357: proto.PaymentInfo.txnStatus:type_name -> proto.PaymentInfo.TxnStatus
+	110, // 358: proto.PaymentInfo.primaryAmount:type_name -> proto.Money
+	110, // 359: proto.PaymentInfo.exchangeAmount:type_name -> proto.Money
+	151, // 360: proto.NotificationMessageInfo.key:type_name -> proto.MessageKey
+	111, // 361: proto.NotificationMessageInfo.message:type_name -> proto.Message
+	0,   // 362: proto.KeepInChat.keepType:type_name -> proto.KeepType
+	151, // 363: proto.KeepInChat.key:type_name -> proto.MessageKey
+	279, // 364: proto.CertChain.leaf:type_name -> proto.CertChain.NoiseCertificate
+	279, // 365: proto.CertChain.intermediate:type_name -> proto.CertChain.NoiseCertificate
+	231, // 366: proto.ListMessage.Section.rows:type_name -> proto.ListMessage.Row
+	232, // 367: proto.ListMessage.ProductSection.products:type_name -> proto.ListMessage.Product
+	233, // 368: proto.ListMessage.ProductListInfo.productSections:type_name -> proto.ListMessage.ProductSection
+	235, // 369: proto.ListMessage.ProductListInfo.headerImage:type_name -> proto.ListMessage.ProductListHeaderImage
+	10,  // 370: proto.InteractiveMessage.ShopMessage.surface:type_name -> proto.InteractiveMessage.ShopMessage.Surface
+	244, // 371: proto.InteractiveMessage.NativeFlowMessage.buttons:type_name -> proto.InteractiveMessage.NativeFlowMessage.NativeFlowButton
+	81,  // 372: proto.InteractiveMessage.Header.documentMessage:type_name -> proto.DocumentMessage
+	74,  // 373: proto.InteractiveMessage.Header.imageMessage:type_name -> proto.ImageMessage
+	113, // 374: proto.InteractiveMessage.Header.videoMessage:type_name -> proto.VideoMessage
+	247, // 375: proto.HighlyStructuredMessage.HSMLocalizableParameter.currency:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMCurrency
+	246, // 376: proto.HighlyStructuredMessage.HSMLocalizableParameter.dateTime:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime
+	249, // 377: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.component:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent
+	248, // 378: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.unixEpoch:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeUnixEpoch
+	12,  // 379: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.dayOfWeek:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.DayOfWeekType
+	13,  // 380: proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.calendar:type_name -> proto.HighlyStructuredMessage.HSMLocalizableParameter.HSMDateTime.HSMDateTimeComponent.CalendarType
+	252, // 381: proto.ButtonsMessage.Button.buttonText:type_name -> proto.ButtonsMessage.Button.ButtonText
+	20,  // 382: proto.ButtonsMessage.Button.type:type_name -> proto.ButtonsMessage.Button.Type
+	251, // 383: proto.ButtonsMessage.Button.nativeFlowInfo:type_name -> proto.ButtonsMessage.Button.NativeFlowInfo
+	22,  // 384: proto.ContextInfo.ExternalAdReplyInfo.mediaType:type_name -> proto.ContextInfo.ExternalAdReplyInfo.MediaType
+	23,  // 385: proto.ContextInfo.AdReplyInfo.mediaType:type_name -> proto.ContextInfo.AdReplyInfo.MediaType
+	76,  // 386: proto.TemplateButton.URLButton.displayText:type_name -> proto.HighlyStructuredMessage
+	76,  // 387: proto.TemplateButton.URLButton.url:type_name -> proto.HighlyStructuredMessage
+	76,  // 388: proto.TemplateButton.QuickReplyButton.displayText:type_name -> proto.HighlyStructuredMessage
+	76,  // 389: proto.TemplateButton.CallButton.displayText:type_name -> proto.HighlyStructuredMessage
+	76,  // 390: proto.TemplateButton.CallButton.phoneNumber:type_name -> proto.HighlyStructuredMessage
+	101, // 391: proto.TemplateMessage.HydratedFourRowTemplate.hydratedButtons:type_name -> proto.HydratedTemplateButton
+	81,  // 392: proto.TemplateMessage.HydratedFourRowTemplate.documentMessage:type_name -> proto.DocumentMessage
+	74,  // 393: proto.TemplateMessage.HydratedFourRowTemplate.imageMessage:type_name -> proto.ImageMessage
+	113, // 394: proto.TemplateMessage.HydratedFourRowTemplate.videoMessage:type_name -> proto.VideoMessage
+	65,  // 395: proto.TemplateMessage.HydratedFourRowTemplate.locationMessage:type_name -> proto.LocationMessage
+	76,  // 396: proto.TemplateMessage.FourRowTemplate.content:type_name -> proto.HighlyStructuredMessage
+	76,  // 397: proto.TemplateMessage.FourRowTemplate.footer:type_name -> proto.HighlyStructuredMessage
+	107, // 398: proto.TemplateMessage.FourRowTemplate.buttons:type_name -> proto.TemplateButton
+	81,  // 399: proto.TemplateMessage.FourRowTemplate.documentMessage:type_name -> proto.DocumentMessage
+	76,  // 400: proto.TemplateMessage.FourRowTemplate.highlyStructuredMessage:type_name -> proto.HighlyStructuredMessage
+	74,  // 401: proto.TemplateMessage.FourRowTemplate.imageMessage:type_name -> proto.ImageMessage
+	113, // 402: proto.TemplateMessage.FourRowTemplate.videoMessage:type_name -> proto.VideoMessage
+	65,  // 403: proto.TemplateMessage.FourRowTemplate.locationMessage:type_name -> proto.LocationMessage
+	74,  // 404: proto.ProductMessage.ProductSnapshot.productImage:type_name -> proto.ImageMessage
+	74,  // 405: proto.ProductMessage.CatalogSnapshot.catalogImage:type_name -> proto.ImageMessage
+	34,  // 406: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.mediaUploadResult:type_name -> proto.MediaRetryNotification.ResultType
+	117, // 407: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.stickerMessage:type_name -> proto.StickerMessage
+	269, // 408: proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.linkPreviewResponse:type_name -> proto.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.LinkPreviewResponse
+	200, // 409: proto.VerifiedNameCertificate.Details.localizedNames:type_name -> proto.LocalizedName
+	276, // 410: proto.ClientPayload.WebInfo.webdPayload:type_name -> proto.ClientPayload.WebInfo.WebdPayload
+	45,  // 411: proto.ClientPayload.WebInfo.webSubPlatform:type_name -> proto.ClientPayload.WebInfo.WebSubPlatform
+	47,  // 412: proto.ClientPayload.UserAgent.platform:type_name -> proto.ClientPayload.UserAgent.Platform
+	277, // 413: proto.ClientPayload.UserAgent.appVersion:type_name -> proto.ClientPayload.UserAgent.AppVersion
+	46,  // 414: proto.ClientPayload.UserAgent.releaseChannel:type_name -> proto.ClientPayload.UserAgent.ReleaseChannel
+	48,  // 415: proto.ClientPayload.DNSSource.dnsMethod:type_name -> proto.ClientPayload.DNSSource.DNSResolutionMethod
+	416, // [416:416] is the sub-list for method output_type
+	416, // [416:416] is the sub-list for method input_type
+	416, // [416:416] is the sub-list for extension type_name
+	416, // [416:416] is the sub-list for extension extendee
+	0,   // [0:416] is the sub-list for field type_name
 }
 
 func init() { file_binary_proto_def_proto_init() }
@@ -22964,18 +23589,6 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeerDataOperationRequestResponseMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_binary_proto_def_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PeerDataOperationRequestMessage); i {
 			case 0:
 				return &v.state
@@ -22987,7 +23600,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PaymentInviteMessage); i {
 			case 0:
 				return &v.state
@@ -22999,7 +23612,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*OrderMessage); i {
 			case 0:
 				return &v.state
@@ -23011,7 +23624,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LocationMessage); i {
 			case 0:
 				return &v.state
@@ -23023,7 +23636,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LiveLocationMessage); i {
 			case 0:
 				return &v.state
@@ -23035,7 +23648,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ListResponseMessage); i {
 			case 0:
 				return &v.state
@@ -23047,7 +23660,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ListMessage); i {
 			case 0:
 				return &v.state
@@ -23059,7 +23672,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*KeepInChatMessage); i {
 			case 0:
 				return &v.state
@@ -23071,7 +23684,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InvoiceMessage); i {
 			case 0:
 				return &v.state
@@ -23083,7 +23696,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InteractiveResponseMessage); i {
 			case 0:
 				return &v.state
@@ -23095,7 +23708,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InteractiveMessage); i {
 			case 0:
 				return &v.state
@@ -23107,7 +23720,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InitialSecurityNotificationSettingSync); i {
 			case 0:
 				return &v.state
@@ -23119,7 +23732,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ImageMessage); i {
 			case 0:
 				return &v.state
@@ -23131,7 +23744,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HistorySyncNotification); i {
 			case 0:
 				return &v.state
@@ -23143,7 +23756,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HighlyStructuredMessage); i {
 			case 0:
 				return &v.state
@@ -23155,7 +23768,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GroupInviteMessage); i {
 			case 0:
 				return &v.state
@@ -23167,7 +23780,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FutureProofMessage); i {
 			case 0:
 				return &v.state
@@ -23179,7 +23792,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExtendedTextMessage); i {
 			case 0:
 				return &v.state
@@ -23191,7 +23804,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*EncReactionMessage); i {
 			case 0:
 				return &v.state
@@ -23203,7 +23816,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DocumentMessage); i {
 			case 0:
 				return &v.state
@@ -23215,7 +23828,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeviceSentMessage); i {
 			case 0:
 				return &v.state
@@ -23227,7 +23840,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeclinePaymentRequestMessage); i {
 			case 0:
 				return &v.state
@@ -23239,7 +23852,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ContactsArrayMessage); i {
 			case 0:
 				return &v.state
@@ -23251,7 +23864,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ContactMessage); i {
 			case 0:
 				return &v.state
@@ -23263,7 +23876,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Chat); i {
 			case 0:
 				return &v.state
@@ -23275,7 +23888,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CancelPaymentRequestMessage); i {
 			case 0:
 				return &v.state
@@ -23287,7 +23900,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Call); i {
 			case 0:
 				return &v.state
@@ -23299,7 +23912,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ButtonsResponseMessage); i {
 			case 0:
 				return &v.state
@@ -23311,7 +23924,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ButtonsMessage); i {
 			case 0:
 				return &v.state
@@ -23323,7 +23936,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AudioMessage); i {
 			case 0:
 				return &v.state
@@ -23335,7 +23948,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKey); i {
 			case 0:
 				return &v.state
@@ -23347,7 +23960,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKeyShare); i {
 			case 0:
 				return &v.state
@@ -23359,7 +23972,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKeyRequest); i {
 			case 0:
 				return &v.state
@@ -23371,7 +23984,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKeyId); i {
 			case 0:
 				return &v.state
@@ -23383,7 +23996,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKeyFingerprint); i {
 			case 0:
 				return &v.state
@@ -23395,7 +24008,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateSyncKeyData); i {
 			case 0:
 				return &v.state
@@ -23407,7 +24020,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AppStateFatalExceptionNotification); i {
 			case 0:
 				return &v.state
@@ -23419,7 +24032,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Location); i {
 			case 0:
 				return &v.state
@@ -23431,7 +24044,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InteractiveAnnotation); i {
 			case 0:
 				return &v.state
@@ -23443,7 +24056,7 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
-		file_binary_proto_def_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+		file_binary_proto_def_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HydratedTemplateButton); i {
 			case 0:
 				return &v.state
@@ -23455,6 +24068,18 @@ func file_binary_proto_def_proto_init() {
 				return nil
 			}
 		}
+		file_binary_proto_def_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GroupMention); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 		file_binary_proto_def_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DisappearingMode); i {
 			case 0:
@@ -23660,7 +24285,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[64].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RequestPhoneNumberMessage); i {
+			switch v := v.(*ScheduledCallEditMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23672,7 +24297,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RequestPaymentMessage); i {
+			switch v := v.(*ScheduledCallCreationMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23684,7 +24309,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReactionMessage); i {
+			switch v := v.(*RequestPhoneNumberMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23696,7 +24321,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ProtocolMessage); i {
+			switch v := v.(*RequestPaymentMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23708,7 +24333,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ProductMessage); i {
+			switch v := v.(*ReactionMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23720,7 +24345,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PollVoteMessage); i {
+			switch v := v.(*ProtocolMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23732,7 +24357,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PollUpdateMessage); i {
+			switch v := v.(*ProductMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23744,7 +24369,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PollUpdateMessageMetadata); i {
+			switch v := v.(*PollVoteMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23756,7 +24381,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[72].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PollEncValue); i {
+			switch v := v.(*PollUpdateMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23768,7 +24393,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PollCreationMessage); i {
+			switch v := v.(*PollUpdateMessageMetadata); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23780,7 +24405,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EphemeralSetting); i {
+			switch v := v.(*PollEncValue); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23792,7 +24417,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WallpaperSettings); i {
+			switch v := v.(*PollCreationMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23804,7 +24429,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*StickerMetadata); i {
+			switch v := v.(*PinMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23816,7 +24441,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[77].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Pushname); i {
+			switch v := v.(*PeerDataOperationRequestResponseMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23828,7 +24453,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[78].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PastParticipants); i {
+			switch v := v.(*EphemeralSetting); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23840,7 +24465,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[79].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PastParticipant); i {
+			switch v := v.(*WallpaperSettings); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23852,7 +24477,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[80].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HistorySync); i {
+			switch v := v.(*StickerMetadata); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23864,7 +24489,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[81].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HistorySyncMsg); i {
+			switch v := v.(*Pushname); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23876,7 +24501,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[82].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GroupParticipant); i {
+			switch v := v.(*PastParticipants); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23888,7 +24513,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[83].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GlobalSettings); i {
+			switch v := v.(*PastParticipant); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23900,7 +24525,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[84].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Conversation); i {
+			switch v := v.(*HistorySync); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23912,7 +24537,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[85].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AvatarUserSettings); i {
+			switch v := v.(*HistorySyncMsg); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23924,7 +24549,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[86].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AutoDownloadSettings); i {
+			switch v := v.(*GroupParticipant); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23936,7 +24561,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[87].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MsgRowOpaqueData); i {
+			switch v := v.(*GlobalSettings); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23948,7 +24573,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[88].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MsgOpaqueData); i {
+			switch v := v.(*Conversation); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23960,7 +24585,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[89].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServerErrorReceipt); i {
+			switch v := v.(*AvatarUserSettings); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23972,7 +24597,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[90].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MediaRetryNotification); i {
+			switch v := v.(*AutoDownloadSettings); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23984,7 +24609,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[91].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MessageKey); i {
+			switch v := v.(*MsgRowOpaqueData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -23996,7 +24621,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[92].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncdVersion); i {
+			switch v := v.(*MsgOpaqueData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24008,7 +24633,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[93].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncdValue); i {
+			switch v := v.(*ServerErrorReceipt); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24020,7 +24645,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[94].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncdSnapshot); i {
+			switch v := v.(*MediaRetryNotification); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24032,7 +24657,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[95].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncdRecord); i {
+			switch v := v.(*MessageKey); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24044,7 +24669,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[96].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncdPatch); i {
+			switch v := v.(*SyncdVersion); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24056,7 +24681,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[97].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncdMutations); i {
+			switch v := v.(*SyncdValue); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24068,7 +24693,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[98].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncdMutation); i {
+			switch v := v.(*SyncdSnapshot); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24080,7 +24705,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[99].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncdIndex); i {
+			switch v := v.(*SyncdRecord); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24092,7 +24717,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[100].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*KeyId); i {
+			switch v := v.(*SyncdPatch); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24104,7 +24729,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[101].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExternalBlobReference); i {
+			switch v := v.(*SyncdMutations); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24116,7 +24741,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[102].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExitCode); i {
+			switch v := v.(*SyncdMutation); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24128,7 +24753,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[103].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncActionValue); i {
+			switch v := v.(*SyncdIndex); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24140,7 +24765,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[104].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserStatusMuteAction); i {
+			switch v := v.(*KeyId); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24152,7 +24777,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[105].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UnarchiveChatsSetting); i {
+			switch v := v.(*ExternalBlobReference); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24164,7 +24789,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[106].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TimeFormatAction); i {
+			switch v := v.(*ExitCode); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24176,7 +24801,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[107].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncActionMessage); i {
+			switch v := v.(*SyncActionValue); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24188,7 +24813,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[108].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncActionMessageRange); i {
+			switch v := v.(*UserStatusMuteAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24200,7 +24825,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[109].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SubscriptionAction); i {
+			switch v := v.(*UnarchiveChatsSetting); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24212,7 +24837,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[110].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*StickerAction); i {
+			switch v := v.(*TimeFormatAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24224,7 +24849,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[111].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*StarAction); i {
+			switch v := v.(*SyncActionMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24236,7 +24861,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[112].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SecurityNotificationSetting); i {
+			switch v := v.(*SyncActionMessageRange); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24248,7 +24873,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[113].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RemoveRecentStickerAction); i {
+			switch v := v.(*SubscriptionAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24260,7 +24885,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[114].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RecentEmojiWeightsAction); i {
+			switch v := v.(*StickerAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24272,7 +24897,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[115].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*QuickReplyAction); i {
+			switch v := v.(*StarAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24284,7 +24909,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[116].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PushNameSetting); i {
+			switch v := v.(*SecurityNotificationSetting); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24296,7 +24921,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[117].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PrimaryVersionAction); i {
+			switch v := v.(*RemoveRecentStickerAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24308,7 +24933,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[118].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PrimaryFeature); i {
+			switch v := v.(*RecentEmojiWeightsAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24320,7 +24945,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[119].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PnForLidChatAction); i {
+			switch v := v.(*QuickReplyAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24332,7 +24957,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[120].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PinAction); i {
+			switch v := v.(*PushNameSetting); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24344,7 +24969,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[121].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NuxAction); i {
+			switch v := v.(*PrimaryVersionAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24356,7 +24981,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[122].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MuteAction); i {
+			switch v := v.(*PrimaryFeature); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24368,7 +24993,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[123].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MarkChatAsReadAction); i {
+			switch v := v.(*PnForLidChatAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24380,7 +25005,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[124].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LocaleSetting); i {
+			switch v := v.(*PinAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24392,7 +25017,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[125].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LabelEditAction); i {
+			switch v := v.(*NuxAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24404,7 +25029,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[126].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LabelAssociationAction); i {
+			switch v := v.(*MuteAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24416,7 +25041,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[127].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*KeyExpiration); i {
+			switch v := v.(*MarkChatAsReadAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24428,7 +25053,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[128].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteMessageForMeAction); i {
+			switch v := v.(*LocaleSetting); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24440,7 +25065,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[129].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteChatAction); i {
+			switch v := v.(*LabelEditAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24452,7 +25077,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[130].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ContactAction); i {
+			switch v := v.(*LabelAssociationAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24464,7 +25089,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[131].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClearChatAction); i {
+			switch v := v.(*KeyExpiration); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24476,7 +25101,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[132].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ChatAssignmentOpenedStatusAction); i {
+			switch v := v.(*DeleteMessageForMeAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24488,7 +25113,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[133].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ChatAssignmentAction); i {
+			switch v := v.(*DeleteChatAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24500,7 +25125,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[134].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ArchiveChatAction); i {
+			switch v := v.(*ContactAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24512,7 +25137,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[135].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AndroidUnsupportedActions); i {
+			switch v := v.(*ClearChatAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24524,7 +25149,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[136].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AgentAction); i {
+			switch v := v.(*ChatAssignmentOpenedStatusAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24536,7 +25161,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[137].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncActionData); i {
+			switch v := v.(*ChatAssignmentAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24548,7 +25173,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[138].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RecentEmojiWeight); i {
+			switch v := v.(*ArchiveChatAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24560,7 +25185,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[139].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*VerifiedNameCertificate); i {
+			switch v := v.(*AndroidUnsupportedActions); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24572,7 +25197,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[140].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LocalizedName); i {
+			switch v := v.(*AgentAction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24584,7 +25209,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[141].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BizIdentityInfo); i {
+			switch v := v.(*SyncActionData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24596,7 +25221,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[142].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BizAccountPayload); i {
+			switch v := v.(*RecentEmojiWeight); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24608,7 +25233,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[143].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BizAccountLinkInfo); i {
+			switch v := v.(*VerifiedNameCertificate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24620,7 +25245,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[144].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HandshakeMessage); i {
+			switch v := v.(*LocalizedName); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24632,7 +25257,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[145].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HandshakeServerHello); i {
+			switch v := v.(*BizIdentityInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24644,7 +25269,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[146].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HandshakeClientHello); i {
+			switch v := v.(*BizAccountPayload); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24656,7 +25281,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[147].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HandshakeClientFinish); i {
+			switch v := v.(*BizAccountLinkInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24668,7 +25293,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[148].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClientPayload); i {
+			switch v := v.(*HandshakeMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24680,7 +25305,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[149].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WebNotificationsInfo); i {
+			switch v := v.(*HandshakeServerHello); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24692,7 +25317,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[150].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WebMessageInfo); i {
+			switch v := v.(*HandshakeClientHello); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24704,7 +25329,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[151].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WebFeatures); i {
+			switch v := v.(*HandshakeClientFinish); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24716,7 +25341,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[152].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserReceipt); i {
+			switch v := v.(*ClientPayload); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24728,7 +25353,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[153].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*StatusPSA); i {
+			switch v := v.(*WebNotificationsInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24740,7 +25365,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[154].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Reaction); i {
+			switch v := v.(*WebMessageInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24752,7 +25377,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[155].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PollUpdate); i {
+			switch v := v.(*WebFeatures); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24764,7 +25389,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[156].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PollAdditionalMetadata); i {
+			switch v := v.(*UserReceipt); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24776,7 +25401,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[157].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PhotoChange); i {
+			switch v := v.(*StatusPSA); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24788,7 +25413,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[158].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PaymentInfo); i {
+			switch v := v.(*Reaction); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24800,7 +25425,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[159].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NotificationMessageInfo); i {
+			switch v := v.(*PollUpdate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24812,7 +25437,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[160].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MediaData); i {
+			switch v := v.(*PollAdditionalMetadata); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24824,7 +25449,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[161].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*KeepInChat); i {
+			switch v := v.(*PhotoChange); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24836,7 +25461,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[162].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NoiseCertificate); i {
+			switch v := v.(*PaymentInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24848,7 +25473,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[163].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CertChain); i {
+			switch v := v.(*NotificationMessageInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24860,7 +25485,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[164].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeviceProps_HistorySyncConfig); i {
+			switch v := v.(*MediaData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24872,7 +25497,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[165].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeviceProps_AppVersion); i {
+			switch v := v.(*KeepInChat); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24884,7 +25509,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[166].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult); i {
+			switch v := v.(*NoiseCertificate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24896,7 +25521,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[167].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse); i {
+			switch v := v.(*CertChain); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24908,7 +25533,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[168].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeerDataOperationRequestMessage_RequestUrlPreview); i {
+			switch v := v.(*DeviceProps_HistorySyncConfig); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24920,7 +25545,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[169].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeerDataOperationRequestMessage_RequestStickerReupload); i {
+			switch v := v.(*DeviceProps_AppVersion); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24932,7 +25557,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[170].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListResponseMessage_SingleSelectReply); i {
+			switch v := v.(*PeerDataOperationRequestMessage_RequestUrlPreview); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24944,7 +25569,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[171].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListMessage_Section); i {
+			switch v := v.(*PeerDataOperationRequestMessage_RequestStickerReupload); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24956,7 +25581,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[172].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListMessage_Row); i {
+			switch v := v.(*PeerDataOperationRequestMessage_HistorySyncOnDemandRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24968,7 +25593,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[173].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListMessage_Product); i {
+			switch v := v.(*ListResponseMessage_SingleSelectReply); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24980,7 +25605,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[174].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListMessage_ProductSection); i {
+			switch v := v.(*ListMessage_Section); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -24992,7 +25617,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[175].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListMessage_ProductListInfo); i {
+			switch v := v.(*ListMessage_Row); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25004,7 +25629,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[176].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListMessage_ProductListHeaderImage); i {
+			switch v := v.(*ListMessage_Product); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25016,7 +25641,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[177].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InteractiveResponseMessage_NativeFlowResponseMessage); i {
+			switch v := v.(*ListMessage_ProductSection); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25028,7 +25653,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[178].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InteractiveResponseMessage_Body); i {
+			switch v := v.(*ListMessage_ProductListInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25040,7 +25665,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[179].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InteractiveMessage_ShopMessage); i {
+			switch v := v.(*ListMessage_ProductListHeaderImage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25052,7 +25677,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[180].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InteractiveMessage_NativeFlowMessage); i {
+			switch v := v.(*InteractiveResponseMessage_NativeFlowResponseMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25064,7 +25689,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[181].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InteractiveMessage_Header); i {
+			switch v := v.(*InteractiveResponseMessage_Body); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25076,7 +25701,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[182].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InteractiveMessage_Footer); i {
+			switch v := v.(*InteractiveMessage_ShopMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25088,7 +25713,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[183].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InteractiveMessage_CollectionMessage); i {
+			switch v := v.(*InteractiveMessage_NativeFlowMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25100,7 +25725,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[184].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InteractiveMessage_Body); i {
+			switch v := v.(*InteractiveMessage_Header); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25112,7 +25737,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[185].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InteractiveMessage_NativeFlowMessage_NativeFlowButton); i {
+			switch v := v.(*InteractiveMessage_Footer); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25124,7 +25749,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[186].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter); i {
+			switch v := v.(*InteractiveMessage_CollectionMessage); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25136,7 +25761,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[187].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime); i {
+			switch v := v.(*InteractiveMessage_Body); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25148,7 +25773,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[188].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency); i {
+			switch v := v.(*InteractiveMessage_NativeFlowMessage_NativeFlowButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25160,7 +25785,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[189].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch); i {
+			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25172,7 +25797,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[190].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent); i {
+			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25184,7 +25809,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[191].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ButtonsMessage_Button); i {
+			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMCurrency); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25196,7 +25821,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[192].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ButtonsMessage_Button_NativeFlowInfo); i {
+			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeUnixEpoch); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25208,7 +25833,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[193].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ButtonsMessage_Button_ButtonText); i {
+			switch v := v.(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_HSMDateTimeComponent); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25220,7 +25845,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[194].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HydratedTemplateButton_HydratedURLButton); i {
+			switch v := v.(*ButtonsMessage_Button); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25232,7 +25857,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[195].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HydratedTemplateButton_HydratedQuickReplyButton); i {
+			switch v := v.(*ButtonsMessage_Button_NativeFlowInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25244,7 +25869,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[196].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HydratedTemplateButton_HydratedCallButton); i {
+			switch v := v.(*ButtonsMessage_Button_ButtonText); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25256,7 +25881,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[197].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ContextInfo_ExternalAdReplyInfo); i {
+			switch v := v.(*HydratedTemplateButton_HydratedURLButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25268,7 +25893,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[198].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ContextInfo_AdReplyInfo); i {
+			switch v := v.(*HydratedTemplateButton_HydratedQuickReplyButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25280,7 +25905,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[199].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TemplateButton_URLButton); i {
+			switch v := v.(*HydratedTemplateButton_HydratedCallButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25292,7 +25917,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[200].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TemplateButton_QuickReplyButton); i {
+			switch v := v.(*ContextInfo_UTMInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25304,7 +25929,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[201].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TemplateButton_CallButton); i {
+			switch v := v.(*ContextInfo_ExternalAdReplyInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25316,7 +25941,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[202].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PaymentBackground_MediaData); i {
+			switch v := v.(*ContextInfo_AdReplyInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25328,7 +25953,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[203].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TemplateMessage_HydratedFourRowTemplate); i {
+			switch v := v.(*TemplateButton_URLButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25340,7 +25965,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[204].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TemplateMessage_FourRowTemplate); i {
+			switch v := v.(*TemplateButton_QuickReplyButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25352,7 +25977,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[205].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ProductMessage_ProductSnapshot); i {
+			switch v := v.(*TemplateButton_CallButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25364,7 +25989,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[206].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ProductMessage_CatalogSnapshot); i {
+			switch v := v.(*PaymentBackground_MediaData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25376,7 +26001,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[207].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PollCreationMessage_Option); i {
+			switch v := v.(*TemplateMessage_HydratedFourRowTemplate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25388,7 +26013,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[208].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MsgOpaqueData_PollOption); i {
+			switch v := v.(*TemplateMessage_FourRowTemplate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25400,7 +26025,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[209].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*VerifiedNameCertificate_Details); i {
+			switch v := v.(*ProductMessage_ProductSnapshot); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25412,7 +26037,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[210].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClientPayload_WebInfo); i {
+			switch v := v.(*ProductMessage_CatalogSnapshot); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25424,7 +26049,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[211].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClientPayload_UserAgent); i {
+			switch v := v.(*PollCreationMessage_Option); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25436,7 +26061,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[212].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClientPayload_DevicePairingRegistrationData); i {
+			switch v := v.(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25448,7 +26073,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[213].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClientPayload_DNSSource); i {
+			switch v := v.(*PeerDataOperationRequestResponseMessage_PeerDataOperationResult_LinkPreviewResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25460,7 +26085,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[214].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClientPayload_WebInfo_WebdPayload); i {
+			switch v := v.(*MsgOpaqueData_PollOption); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25472,7 +26097,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[215].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ClientPayload_UserAgent_AppVersion); i {
+			switch v := v.(*VerifiedNameCertificate_Details); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25484,7 +26109,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[216].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NoiseCertificate_Details); i {
+			switch v := v.(*ClientPayload_WebInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25496,7 +26121,7 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[217].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CertChain_NoiseCertificate); i {
+			switch v := v.(*ClientPayload_UserAgent); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -25508,6 +26133,78 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 		file_binary_proto_def_proto_msgTypes[218].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ClientPayload_DevicePairingRegistrationData); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_binary_proto_def_proto_msgTypes[219].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ClientPayload_DNSSource); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_binary_proto_def_proto_msgTypes[220].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ClientPayload_WebInfo_WebdPayload); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_binary_proto_def_proto_msgTypes[221].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ClientPayload_UserAgent_AppVersion); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_binary_proto_def_proto_msgTypes[222].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*NoiseCertificate_Details); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_binary_proto_def_proto_msgTypes[223].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CertChain_NoiseCertificate); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_binary_proto_def_proto_msgTypes[224].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CertChain_NoiseCertificate_Details); i {
 			case 0:
 				return &v.state
@@ -25520,28 +26217,28 @@ func file_binary_proto_def_proto_init() {
 			}
 		}
 	}
-	file_binary_proto_def_proto_msgTypes[16].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[15].OneofWrappers = []interface{}{
 		(*InteractiveResponseMessage_NativeFlowResponseMessage_)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[17].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[16].OneofWrappers = []interface{}{
 		(*InteractiveMessage_ShopStorefrontMessage)(nil),
 		(*InteractiveMessage_CollectionMessage_)(nil),
 		(*InteractiveMessage_NativeFlowMessage_)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[34].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[33].OneofWrappers = []interface{}{
 		(*ButtonsResponseMessage_SelectedDisplayText)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[35].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[34].OneofWrappers = []interface{}{
 		(*ButtonsMessage_Text)(nil),
 		(*ButtonsMessage_DocumentMessage)(nil),
 		(*ButtonsMessage_ImageMessage)(nil),
 		(*ButtonsMessage_VideoMessage)(nil),
 		(*ButtonsMessage_LocationMessage)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[45].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[44].OneofWrappers = []interface{}{
 		(*InteractiveAnnotation_Location)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[46].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[45].OneofWrappers = []interface{}{
 		(*HydratedTemplateButton_QuickReplyButton)(nil),
 		(*HydratedTemplateButton_UrlButton)(nil),
 		(*HydratedTemplateButton_CallButton)(nil),
@@ -25556,28 +26253,28 @@ func file_binary_proto_def_proto_init() {
 		(*TemplateMessage_HydratedFourRowTemplate_)(nil),
 		(*TemplateMessage_InteractiveMessageTemplate)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[181].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[184].OneofWrappers = []interface{}{
 		(*InteractiveMessage_Header_DocumentMessage)(nil),
 		(*InteractiveMessage_Header_ImageMessage)(nil),
 		(*InteractiveMessage_Header_JpegThumbnail)(nil),
 		(*InteractiveMessage_Header_VideoMessage)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[186].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[189].OneofWrappers = []interface{}{
 		(*HighlyStructuredMessage_HSMLocalizableParameter_Currency)(nil),
 		(*HighlyStructuredMessage_HSMLocalizableParameter_DateTime)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[187].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[190].OneofWrappers = []interface{}{
 		(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_Component)(nil),
 		(*HighlyStructuredMessage_HSMLocalizableParameter_HSMDateTime_UnixEpoch)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[203].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[207].OneofWrappers = []interface{}{
 		(*TemplateMessage_HydratedFourRowTemplate_DocumentMessage)(nil),
 		(*TemplateMessage_HydratedFourRowTemplate_HydratedTitleText)(nil),
 		(*TemplateMessage_HydratedFourRowTemplate_ImageMessage)(nil),
 		(*TemplateMessage_HydratedFourRowTemplate_VideoMessage)(nil),
 		(*TemplateMessage_HydratedFourRowTemplate_LocationMessage)(nil),
 	}
-	file_binary_proto_def_proto_msgTypes[204].OneofWrappers = []interface{}{
+	file_binary_proto_def_proto_msgTypes[208].OneofWrappers = []interface{}{
 		(*TemplateMessage_FourRowTemplate_DocumentMessage)(nil),
 		(*TemplateMessage_FourRowTemplate_HighlyStructuredMessage)(nil),
 		(*TemplateMessage_FourRowTemplate_ImageMessage)(nil),
@@ -25589,8 +26286,8 @@ func file_binary_proto_def_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_binary_proto_def_proto_rawDesc,
-			NumEnums:      54,
-			NumMessages:   219,
+			NumEnums:      56,
+			NumMessages:   225,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/vendor/go.mau.fi/whatsmeow/binary/proto/def.pb.raw b/vendor/go.mau.fi/whatsmeow/binary/proto/def.pb.raw
index 52c9695087fdb88035633b273c40bab25df2e52c..827172ab66190667b0f5a786add8aba20efebab9 100644
GIT binary patch
delta 2075
zcmah~U5pb|6!uQH%k*?<XD<|n%^GS~+?B9ZmO#P-Kht*D9qG)J+je0wvDS9zj@j+h
z?G)H3X$+W%5+hE?CdOwU)I{(mYGPu@h6kfD#utqQMdiU4VgO@eM8P}Vw%dhWe44r6
z`OZ1tx#!H8`MIu3?{=L($)U^i6gSRsCpqUz*QXj@4L(Ir=Tc+3CJO;9K#zNjOBpFS
zk<JJ~+zYEEEkSf8(Ig2t1idXtQe(<!R?nt|-U#icH+d5c;+GNhO`28Pnwd?{mJ510
zVNB=CMPj^AGpe@O6-Gn;5y^S;#6~9y{Eo2|spJ7+oWqc>_x;LJt?Z9QSXG$J+fSKA
z5wWa3(mLWW_^qiTlcQEkN>St*)=mfyL9or(H)Bn!hUj4|o-D#g7I3^71glvj3m3O)
z<%KG}<USmaz}j}$j5*B|<fkiYRrIph9<r>Beg=Q`p?P{?(<g{~4LRoEi)-D+=~^x!
ztE?45cjQhFtar|5*MBq=;koO6`skA$FZUaAhPEHAV+?_Wq$-S0<k4(WB0@Lb03lT;
znxc)yh%6tL+on}+f8$b8NoVv?sSWdP6#0-ol9LZ*h!oS43BlK(>RF=5Bt;Ze&NX0&
zoJN4<a)B86f^E_dwo^a)n?5UDMg6!B_@kzAOfMG<G1R!v_L=U9-}VMI=oy`{Y8BNe
z+on}^UWz_E5P_bOi=}JNJ#Q53X1kVPbf@wS;y&-Cu>Y^FI^GGZ8y?LlRdFcnVN<sz
zTA8tIE83ZXEM?*?;HlZu;^R!5f26PJ5Vy*<aokqQN33Wzqq<Mx()tuw)jZ>V@G&H9
z)n>M{;uZ$3g%k{T<d`|m+MPE`<<`h`K$J`U&U4qo^wy!b0(D%1{%T>;DAuNoVmv=J
z6`wKk?v1EMwVE#(;;x3kfu_Lp1E}PIfv^st&bu;-ZU(QLVz-0x;o>q@X2e?oDrQ^F
zo`#y<rkYgSKsrb`1)+*{UnS$)#J!GM+EL$zp9XPB&2rJSTlGqf3>%lLw}VDj41l*W
z!S>NsxL6}xYaqtWqT$@w&G#_9Z4NzEx)2P#hd^9%yKXk;r{lxP1n>rX&&*bgMmqx|
zL;s^L>iW8T()NrD0MAh8EM8Lw=#EQTTuuro@(Y6gC28;Jzq?7=ch$K`+`(g;WH}oi
z1HQmUsYCIW4#oAAW-aQ@--7IxJ6;Q3+q9<^wxW+L93sQOx478PJ`HWZrXSRVhp-R4
z<GK=;1=M&|60$CEkpr-y`CCX$vTywdBR~%v+ZE{k7XhS9=f~qwWefs~W7Z)&eBY==
z7pJbF^&UTG@9a9~{k!5sgg{^^m3_KmQ)(`yXgO6*r=?LjmzhY(OnVUgF1k-AIVs6{
z<Ng%0S|`LszVC)XNAiizhbMycqW1|8edCn_9(0rb{OS>|xwV7$Y;8LK`emQ<<+;b4
zcg{uWjdK&5xw%K^{)_*3=-Zc0d$=<|H+?baLD#7I)psa>dw`E6vvTgB923HH;A?Le
zedgPbhtVHS=<XHg_MHv%*4^tcm-3?+cLvQ}1ypet?z%B|my?NHdP0lm7XKQaxwC$>
F^*=|SngIX+

delta 435
zcmX@IjOEaDmJQ8JjQyKin8KKtb}&x9!?J@_={g&i`eel(;mPq0tds9|@oyII(r0El
z#mprS73G;M-jy{um+ju<^X!RiN=F&FL;@!BC5vq~<h&`xvWbODeDZ}_@y)6#a~T<{
zCrz&2?5AeO!Ssu3bDthFD`VN@$;M@yt4t1ZGv3>5<8YsGv$@l6*3C^G=NOr~1U3hG
z{b1Sr&;K0<(<Ir=?;<AgZ4S)b$iI1VRV3eLx86Wz#)q3{Oh{vb7~D1a7U$%yxq6dR
z=BjPpF*j0+X_C@r;S+zDr31MHk}|7&6N|D_OM+9=b5rw5B$O2xHTaBFCoeoBs^o+w
z8HAyHGvApmW~P6fn`fO@XJ)**`Ou|njI2_B8M$O9_nea5eB#PuW>XU`0d#|exVhL}
zT-_W)eL@5nggCfZTwKE<1Q>-lxmZ2@octpMm^QDvv0az(_Vgq+#yi`?*csn)F&A*j
kz(RcbLLtU54lM^R4)4^|g2@l8MW@FLF{(`$5oR<10Q)4HS^xk5

diff --git a/vendor/go.mau.fi/whatsmeow/binary/proto/def.proto b/vendor/go.mau.fi/whatsmeow/binary/proto/def.proto
index b72ab79c..cdfc0c35 100644
--- a/vendor/go.mau.fi/whatsmeow/binary/proto/def.proto
+++ b/vendor/go.mau.fi/whatsmeow/binary/proto/def.proto
@@ -47,6 +47,10 @@ message DeviceProps {
         ALOHA = 11;
         CATALINA = 12;
         TCL_TV = 13;
+        IOS_PHONE = 14;
+        IOS_CATALYST = 15;
+        ANDROID_PHONE = 16;
+        ANDROID_AMBIGUOUS = 17;
     }
     message HistorySyncConfig {
         optional uint32 fullSyncDaysLimit = 1;
@@ -69,33 +73,6 @@ message DeviceProps {
     optional HistorySyncConfig historySyncConfig = 5;
 }
 
-enum PeerDataOperationRequestType {
-    UPLOAD_STICKER = 0;
-    SEND_RECENT_STICKER_BOOTSTRAP = 1;
-    GENERATE_LINK_PREVIEW = 2;
-}
-message PeerDataOperationRequestResponseMessage {
-    message PeerDataOperationResult {
-        message LinkPreviewResponse {
-            optional string url = 1;
-            optional string title = 2;
-            optional string description = 3;
-            optional bytes thumbData = 4;
-            optional string canonicalUrl = 5;
-            optional string matchText = 6;
-            optional string previewType = 7;
-        }
-        
-        optional MediaRetryNotification.ResultType mediaUploadResult = 1;
-        optional StickerMessage stickerMessage = 2;
-        optional LinkPreviewResponse linkPreviewResponse = 3;
-    }
-    
-    optional PeerDataOperationRequestType peerDataOperationRequestType = 1;
-    optional string stanzaId = 2;
-    repeated PeerDataOperationResult peerDataOperationResult = 3;
-}
-
 message PeerDataOperationRequestMessage {
     message RequestUrlPreview {
         optional string url = 1;
@@ -105,9 +82,18 @@ message PeerDataOperationRequestMessage {
         optional string fileSha256 = 1;
     }
     
+    message HistorySyncOnDemandRequest {
+        optional string chatJid = 1;
+        optional string oldestMsgId = 2;
+        optional bool oldestMsgFromMe = 3;
+        optional int32 onDemandMsgCount = 4;
+        optional int64 oldestMsgTimestampMs = 5;
+    }
+    
     optional PeerDataOperationRequestType peerDataOperationRequestType = 1;
     repeated RequestStickerReupload requestStickerReupload = 2;
     repeated RequestUrlPreview requestUrlPreview = 3;
+    optional HistorySyncOnDemandRequest historySyncOnDemandRequest = 4;
 }
 
 message PaymentInviteMessage {
@@ -376,6 +362,7 @@ message HistorySyncNotification {
         RECENT = 3;
         PUSH_NAME = 4;
         NON_BLOCKING_DATA = 5;
+        ON_DEMAND = 6;
     }
     optional bytes fileSha256 = 1;
     optional uint64 fileLength = 2;
@@ -485,6 +472,11 @@ message ExtendedTextMessage {
         BRYNDAN_WRITE = 3;
         BEBASNEUE_REGULAR = 4;
         OSWALD_HEAVY = 5;
+        DAMION_REGULAR = 6;
+        MORNINGBREEZE_REGULAR = 7;
+        CALISTOGA_REGULAR = 8;
+        EXO2_EXTRABOLD = 9;
+        COURIERPRIME_BOLD = 10;
     }
     optional string text = 1;
     optional string matchedText = 2;
@@ -652,6 +644,7 @@ message AudioMessage {
     optional bytes streamingSidecar = 18;
     optional bytes waveform = 19;
     optional fixed32 backgroundArgb = 20;
+    optional bool viewOnce = 21;
 }
 
 message AppStateSyncKey {
@@ -730,6 +723,11 @@ message HydratedTemplateButton {
     }
 }
 
+message GroupMention {
+    optional string groupJid = 1;
+    optional string groupSubject = 2;
+}
+
 message DisappearingMode {
     enum Initiator {
         CHANGED_IN_CHAT = 0;
@@ -749,6 +747,11 @@ message DeviceListMetadata {
 }
 
 message ContextInfo {
+    message UTMInfo {
+        optional string utmSource = 1;
+        optional string utmCampaign = 2;
+    }
+    
     message ExternalAdReplyInfo {
         enum MediaType {
             NONE = 0;
@@ -808,6 +811,8 @@ message ContextInfo {
     optional string trustBannerType = 37;
     optional uint32 trustBannerAction = 38;
     optional bool isSampled = 39;
+    repeated GroupMention groupMentions = 40;
+    optional UTMInfo utm = 41;
 }
 
 message ActionLink {
@@ -928,6 +933,12 @@ message Message {
     optional FutureProofMessage editedMessage = 58;
     optional FutureProofMessage viewOnceMessageV2Extension = 59;
     optional PollCreationMessage pollCreationMessageV2 = 60;
+    optional ScheduledCallCreationMessage scheduledCallCreationMessage = 61;
+    optional FutureProofMessage groupMentionedMessage = 62;
+    optional PinMessage pinMessage = 63;
+    optional PollCreationMessage pollCreationMessageV3 = 64;
+    optional ScheduledCallEditMessage scheduledCallEditMessage = 65;
+    optional VideoMessage ptvMessage = 66;
 }
 
 message MessageContextInfo {
@@ -1050,6 +1061,26 @@ message SendPaymentMessage {
     optional PaymentBackground background = 4;
 }
 
+message ScheduledCallEditMessage {
+    enum EditType {
+        UNKNOWN = 0;
+        CANCEL = 1;
+    }
+    optional MessageKey key = 1;
+    optional EditType editType = 2;
+}
+
+message ScheduledCallCreationMessage {
+    enum CallType {
+        UNKNOWN = 0;
+        VOICE = 1;
+        VIDEO = 2;
+    }
+    optional int64 scheduledTimestampMs = 1;
+    optional CallType callType = 2;
+    optional string title = 3;
+}
+
 message RequestPhoneNumberMessage {
     optional ContextInfo contextInfo = 1;
 }
@@ -1163,6 +1194,45 @@ message PollCreationMessage {
     optional ContextInfo contextInfo = 5;
 }
 
+message PinMessage {
+    enum PinMessageType {
+        UNKNOWN_PIN_MESSAGE_TYPE = 0;
+        PIN_FOR_ALL = 1;
+        UNPIN_FOR_ALL = 2;
+    }
+    optional MessageKey key = 1;
+    optional PinMessageType pinMessageType = 2;
+    optional int64 senderTimestampMs = 3;
+}
+
+enum PeerDataOperationRequestType {
+    UPLOAD_STICKER = 0;
+    SEND_RECENT_STICKER_BOOTSTRAP = 1;
+    GENERATE_LINK_PREVIEW = 2;
+    HISTORY_SYNC_ON_DEMAND = 3;
+}
+message PeerDataOperationRequestResponseMessage {
+    message PeerDataOperationResult {
+        message LinkPreviewResponse {
+            optional string url = 1;
+            optional string title = 2;
+            optional string description = 3;
+            optional bytes thumbData = 4;
+            optional string canonicalUrl = 5;
+            optional string matchText = 6;
+            optional string previewType = 7;
+        }
+        
+        optional MediaRetryNotification.ResultType mediaUploadResult = 1;
+        optional StickerMessage stickerMessage = 2;
+        optional LinkPreviewResponse linkPreviewResponse = 3;
+    }
+    
+    optional PeerDataOperationRequestType peerDataOperationRequestType = 1;
+    optional string stanzaId = 2;
+    repeated PeerDataOperationResult peerDataOperationResult = 3;
+}
+
 message EphemeralSetting {
     optional sfixed32 duration = 1;
     optional sfixed64 timestamp = 2;
@@ -1220,6 +1290,7 @@ message HistorySync {
         RECENT = 3;
         PUSH_NAME = 4;
         NON_BLOCKING_DATA = 5;
+        ON_DEMAND = 6;
     }
     required HistorySyncType syncType = 1;
     repeated Conversation conversations = 2;
@@ -1303,8 +1374,8 @@ message Conversation {
     optional string description = 33;
     optional bool support = 34;
     optional bool isParentGroup = 35;
-    optional bool isDefaultSubgroup = 36;
     optional string parentGroupId = 37;
+    optional bool isDefaultSubgroup = 36;
     optional string displayName = 38;
     optional string pnJid = 39;
     optional bool shareOwnPn = 40;
@@ -1831,6 +1902,7 @@ message ClientPayload {
             WEAROS = 29;
             ARDEVICE = 30;
             VRDEVICE = 31;
+            BLUE_WEB = 32;
         }
         message AppVersion {
             optional uint32 primary = 1;
@@ -1912,11 +1984,6 @@ message ClientPayload {
         NETWORK_SWITCH = 4;
         PING_RECONNECT = 5;
     }
-    enum BizMarketSegment {
-        DEFAULT = 0;
-        DEVX = 1;
-        INBOX = 2;
-    }
     optional uint64 username = 1;
     optional bool passive = 3;
     optional UserAgent userAgent = 5;
@@ -1941,7 +2008,6 @@ message ClientPayload {
     optional bytes fbDeviceId = 32;
     optional bool pull = 33;
     optional bytes paddingBytes = 34;
-    optional BizMarketSegment bizMarketSegment = 35;
     optional int32 yearClass = 36;
     optional int32 memClass = 37;
 }
@@ -2258,6 +2324,7 @@ message PollUpdate {
     optional PollVoteMessage vote = 2;
     optional int64 senderTimestampMs = 3;
     optional int64 serverTimestampMs = 4;
+    optional bool unread = 5;
 }
 
 message PollAdditionalMetadata {
diff --git a/vendor/go.mau.fi/whatsmeow/broadcast.go b/vendor/go.mau.fi/whatsmeow/broadcast.go
index a61ccfb6..d3bbf8e6 100644
--- a/vendor/go.mau.fi/whatsmeow/broadcast.go
+++ b/vendor/go.mau.fi/whatsmeow/broadcast.go
@@ -30,14 +30,19 @@ func (cli *Client) getBroadcastListParticipants(jid types.JID) ([]types.JID, err
 		return nil, ErrNotLoggedIn
 	}
 
-	var hasSelf bool
-	for _, participant := range list {
+	selfIndex := -1
+	for i, participant := range list {
 		if participant.User == ownID.User {
-			hasSelf = true
+			selfIndex = i
 			break
 		}
 	}
-	if !hasSelf {
+	if selfIndex >= 0 {
+		if cli.DontSendSelfBroadcast {
+			list[selfIndex] = list[len(list)-1]
+			list = list[:len(list)-1]
+		}
+	} else if !cli.DontSendSelfBroadcast {
 		list = append(list, ownID)
 	}
 	return list, nil
diff --git a/vendor/go.mau.fi/whatsmeow/client.go b/vendor/go.mau.fi/whatsmeow/client.go
index 3f832c94..86581198 100644
--- a/vendor/go.mau.fi/whatsmeow/client.go
+++ b/vendor/go.mau.fi/whatsmeow/client.go
@@ -123,6 +123,10 @@ type Client struct {
 	// If false, decrypting a message from untrusted devices will fail.
 	AutoTrustIdentity bool
 
+	// Should sending to own devices be skipped when sending broadcasts?
+	// This works around a bug in the WhatsApp android app where it crashes if you send a status message from a linked device.
+	DontSendSelfBroadcast bool
+
 	// Should SubscribePresence return an error if no privacy token is stored for the user?
 	ErrorOnSubscribePresenceWithoutToken bool
 
@@ -186,8 +190,9 @@ func NewClient(deviceStore *store.Device, log waLog.Logger) *Client {
 		GetMessageForRetry:     func(requester, to types.JID, id types.MessageID) *waProto.Message { return nil },
 		appStateKeyRequests:    make(map[string]time.Time),
 
-		EnableAutoReconnect: true,
-		AutoTrustIdentity:   true,
+		EnableAutoReconnect:   true,
+		AutoTrustIdentity:     true,
+		DontSendSelfBroadcast: true,
 	}
 	cli.nodeHandlers = map[string]nodeHandler{
 		"message":      cli.handleEncryptedMessage,
diff --git a/vendor/go.mau.fi/whatsmeow/connectionevents.go b/vendor/go.mau.fi/whatsmeow/connectionevents.go
index 5d0835fa..3a6d9e29 100644
--- a/vendor/go.mau.fi/whatsmeow/connectionevents.go
+++ b/vendor/go.mau.fi/whatsmeow/connectionevents.go
@@ -79,7 +79,10 @@ func (cli *Client) handleIB(node *waBinary.Node) {
 func (cli *Client) handleConnectFailure(node *waBinary.Node) {
 	ag := node.AttrGetter()
 	reason := events.ConnectFailureReason(ag.Int("reason"))
-	cli.expectDisconnect()
+	// Let the auto-reconnect happen for 503s, for all other failures block it
+	if reason != events.ConnectFailureServiceUnavailable {
+		cli.expectDisconnect()
+	}
 	if reason.IsLoggedOut() {
 		cli.Log.Infof("Got %s connect failure, sending LoggedOut event and deleting session", reason)
 		go cli.dispatchEvent(&events.LoggedOut{OnConnect: true, Reason: reason})
@@ -96,6 +99,8 @@ func (cli *Client) handleConnectFailure(node *waBinary.Node) {
 	} else if reason == events.ConnectFailureClientOutdated {
 		cli.Log.Errorf("Client outdated (405) connect failure")
 		go cli.dispatchEvent(&events.ClientOutdated{})
+	} else if reason == events.ConnectFailureServiceUnavailable {
+		cli.Log.Warnf("Got 503 connect failure, assuming automatic reconnect will handle it")
 	} else {
 		cli.Log.Warnf("Unknown connect failure: %s", node.XMLString())
 		go cli.dispatchEvent(&events.ConnectFailure{Reason: reason, Raw: node})
diff --git a/vendor/go.mau.fi/whatsmeow/download.go b/vendor/go.mau.fi/whatsmeow/download.go
index 99fd3648..e9bedd45 100644
--- a/vendor/go.mau.fi/whatsmeow/download.go
+++ b/vendor/go.mau.fi/whatsmeow/download.go
@@ -192,10 +192,10 @@ func (cli *Client) Download(msg DownloadableMessage) ([]byte, error) {
 	var isWebWhatsappNetURL bool
 	if ok {
 		url = urlable.GetUrl()
-		isWebWhatsappNetURL = strings.HasPrefix(urlable.GetUrl(), "https://web.whatsapp.net")
+		isWebWhatsappNetURL = strings.HasPrefix(url, "https://web.whatsapp.net")
 	}
 	if len(url) > 0 && !isWebWhatsappNetURL {
-		return cli.downloadAndDecrypt(urlable.GetUrl(), msg.GetMediaKey(), mediaType, getSize(msg), msg.GetFileEncSha256(), msg.GetFileSha256())
+		return cli.downloadAndDecrypt(url, msg.GetMediaKey(), mediaType, getSize(msg), msg.GetFileEncSha256(), msg.GetFileSha256())
 	} else if len(msg.GetDirectPath()) > 0 {
 		return cli.DownloadMediaWithPath(msg.GetDirectPath(), msg.GetFileEncSha256(), msg.GetFileSha256(), msg.GetMediaKey(), getSize(msg), mediaType, mediaTypeToMMSType[mediaType])
 	} else {
diff --git a/vendor/go.mau.fi/whatsmeow/message.go b/vendor/go.mau.fi/whatsmeow/message.go
index 2c6c2db2..b3ef53b6 100644
--- a/vendor/go.mau.fi/whatsmeow/message.go
+++ b/vendor/go.mau.fi/whatsmeow/message.go
@@ -345,7 +345,7 @@ func (cli *Client) handleAppStateSyncKeyShare(keys *waProto.AppStateSyncKeyShare
 			cli.Log.Errorf("Failed to store app state sync key %X: %v", key.GetKeyId().GetKeyId(), err)
 			continue
 		}
-		cli.Log.Debugf("Received app state sync key %X", key.GetKeyId().GetKeyId())
+		cli.Log.Debugf("Received app state sync key %X (ts: %d)", key.GetKeyId().GetKeyId(), key.GetKeyData().GetTimestamp())
 	}
 	cli.appStateKeyRequestsLock.RUnlock()
 
diff --git a/vendor/go.mau.fi/whatsmeow/store/clientpayload.go b/vendor/go.mau.fi/whatsmeow/store/clientpayload.go
index 08a3d280..9e8b1778 100644
--- a/vendor/go.mau.fi/whatsmeow/store/clientpayload.go
+++ b/vendor/go.mau.fi/whatsmeow/store/clientpayload.go
@@ -74,7 +74,7 @@ func (vc WAVersionContainer) ProtoAppVersion() *waProto.ClientPayload_UserAgent_
 }
 
 // waVersion is the WhatsApp web client version
-var waVersion = WAVersionContainer{2, 2301, 6}
+var waVersion = WAVersionContainer{2, 2310, 5}
 
 // waVersionHash is the md5 hash of a dot-separated waVersion
 var waVersionHash [16]byte
diff --git a/vendor/go.mau.fi/whatsmeow/store/sqlstore/store.go b/vendor/go.mau.fi/whatsmeow/store/sqlstore/store.go
index 8221a4ad..f9f5a287 100644
--- a/vendor/go.mau.fi/whatsmeow/store/sqlstore/store.go
+++ b/vendor/go.mau.fi/whatsmeow/store/sqlstore/store.go
@@ -282,6 +282,7 @@ const (
 		INSERT INTO whatsmeow_app_state_sync_keys (jid, key_id, key_data, timestamp, fingerprint) VALUES ($1, $2, $3, $4, $5)
 		ON CONFLICT (jid, key_id) DO UPDATE
 			SET key_data=excluded.key_data, timestamp=excluded.timestamp, fingerprint=excluded.fingerprint
+			WHERE excluded.timestamp > whatsmeow_app_state_sync_keys.timestamp
 	`
 	getAppStateSyncKeyQuery = `SELECT key_data, timestamp, fingerprint FROM whatsmeow_app_state_sync_keys WHERE jid=$1 AND key_id=$2`
 )
diff --git a/vendor/go.mau.fi/whatsmeow/types/events/events.go b/vendor/go.mau.fi/whatsmeow/types/events/events.go
index dc8e0ada..4ec38d20 100644
--- a/vendor/go.mau.fi/whatsmeow/types/events/events.go
+++ b/vendor/go.mau.fi/whatsmeow/types/events/events.go
@@ -142,6 +142,11 @@ const (
 	ConnectFailureBadUserAgent   ConnectFailureReason = 409
 
 	// 400, 500 and 501 are also existing codes, but the meaning is unknown
+
+	// 503 doesn't seem to be included in the web app JS with the other codes, and it's very rare,
+	// but does happen after a 503 stream error sometimes.
+
+	ConnectFailureServiceUnavailable ConnectFailureReason = 503
 )
 
 var connectFailureReasonMessage = map[ConnectFailureReason]string{
diff --git a/vendor/go.mau.fi/whatsmeow/types/jid.go b/vendor/go.mau.fi/whatsmeow/types/jid.go
index 4f54f03d..c3bd8a56 100644
--- a/vendor/go.mau.fi/whatsmeow/types/jid.go
+++ b/vendor/go.mau.fi/whatsmeow/types/jid.go
@@ -23,6 +23,7 @@ const (
 	GroupServer       = "g.us"
 	LegacyUserServer  = "c.us"
 	BroadcastServer   = "broadcast"
+	HiddenUserServer  = "lid"
 )
 
 // Some JIDs that are contacted often.
diff --git a/vendor/go.mau.fi/whatsmeow/user.go b/vendor/go.mau.fi/whatsmeow/user.go
index dae86406..229dc4b8 100644
--- a/vendor/go.mau.fi/whatsmeow/user.go
+++ b/vendor/go.mau.fi/whatsmeow/user.go
@@ -286,6 +286,7 @@ func (cli *Client) GetProfilePictureInfo(jid types.JID, params *GetProfilePictur
 	attrs := waBinary.Attrs{
 		"query": "url",
 	}
+	var target, to types.JID
 	if params == nil {
 		params = &GetProfilePictureParams{}
 	}
@@ -297,27 +298,36 @@ func (cli *Client) GetProfilePictureInfo(jid types.JID, params *GetProfilePictur
 	if params.ExistingID != "" {
 		attrs["id"] = params.ExistingID
 	}
-	var pictureContent []waBinary.Node
+	var expectWrapped bool
+	var content []waBinary.Node
 	namespace := "w:profile:picture"
 	if params.IsCommunity {
+		target = types.EmptyJID
 		namespace = "w:g2"
-		pictureContent = []waBinary.Node{{
-			Tag: "query_linked",
-			Attrs: waBinary.Attrs{
-				"type": "parent_group",
-				"jid":  jid,
-			},
+		to = jid
+		attrs["parent_group_jid"] = jid
+		expectWrapped = true
+		content = []waBinary.Node{{
+			Tag: "pictures",
+			Content: []waBinary.Node{{
+				Tag:   "picture",
+				Attrs: attrs,
+			}},
+		}}
+	} else {
+		to = types.ServerJID
+		target = jid
+		content = []waBinary.Node{{
+			Tag:   "picture",
+			Attrs: attrs,
 		}}
 	}
 	resp, err := cli.sendIQ(infoQuery{
 		Namespace: namespace,
 		Type:      "get",
-		To:        jid,
-		Content: []waBinary.Node{{
-			Tag:     "picture",
-			Attrs:   attrs,
-			Content: pictureContent,
-		}},
+		To:        to,
+		Target:    target,
+		Content:   content,
 	})
 	if errors.Is(err, ErrIQNotAuthorized) {
 		return nil, wrapIQError(ErrProfilePictureUnauthorized, err)
@@ -326,6 +336,13 @@ func (cli *Client) GetProfilePictureInfo(jid types.JID, params *GetProfilePictur
 	} else if err != nil {
 		return nil, err
 	}
+	if expectWrapped {
+		pics, ok := resp.GetOptionalChildByTag("pictures")
+		if !ok {
+			return nil, &ElementMissingError{Tag: "pictures", In: "response to profile picture query"}
+		}
+		resp = &pics
+	}
 	picture, ok := resp.GetOptionalChildByTag("picture")
 	if !ok {
 		if params.ExistingID != "" {
@@ -335,6 +352,9 @@ func (cli *Client) GetProfilePictureInfo(jid types.JID, params *GetProfilePictur
 	}
 	var info types.ProfilePictureInfo
 	ag := picture.AttrGetter()
+	if ag.OptionalInt("status") == 304 {
+		return nil, nil
+	}
 	info.ID = ag.String("id")
 	info.URL = ag.String("url")
 	info.Type = ag.String("type")
diff --git a/vendor/golang.org/x/crypto/acme/rfc8555.go b/vendor/golang.org/x/crypto/acme/rfc8555.go
index ee24dfde..3152e531 100644
--- a/vendor/golang.org/x/crypto/acme/rfc8555.go
+++ b/vendor/golang.org/x/crypto/acme/rfc8555.go
@@ -117,7 +117,7 @@ func (c *Client) updateRegRFC(ctx context.Context, a *Account) (*Account, error)
 	return responseAccount(res)
 }
 
-// getGegRFC is equivalent to c.GetReg but for CAs implementing RFC 8555.
+// getRegRFC is equivalent to c.GetReg but for CAs implementing RFC 8555.
 // It expects c.Discover to have already been called.
 func (c *Client) getRegRFC(ctx context.Context) (*Account, error) {
 	req := json.RawMessage(`{"onlyReturnExisting": true}`)
diff --git a/vendor/golang.org/x/crypto/bcrypt/bcrypt.go b/vendor/golang.org/x/crypto/bcrypt/bcrypt.go
index addf56b4..5577c0f9 100644
--- a/vendor/golang.org/x/crypto/bcrypt/bcrypt.go
+++ b/vendor/golang.org/x/crypto/bcrypt/bcrypt.go
@@ -82,11 +82,20 @@ type hashed struct {
 	minor byte
 }
 
+// ErrPasswordTooLong is returned when the password passed to
+// GenerateFromPassword is too long (i.e. > 72 bytes).
+var ErrPasswordTooLong = errors.New("bcrypt: password length exceeds 72 bytes")
+
 // GenerateFromPassword returns the bcrypt hash of the password at the given
 // cost. If the cost given is less than MinCost, the cost will be set to
 // DefaultCost, instead. Use CompareHashAndPassword, as defined in this package,
 // to compare the returned hashed password with its cleartext version.
+// GenerateFromPassword does not accept passwords longer than 72 bytes, which
+// is the longest password bcrypt will operate on.
 func GenerateFromPassword(password []byte, cost int) ([]byte, error) {
+	if len(password) > 72 {
+		return nil, ErrPasswordTooLong
+	}
 	p, err := newFromPassword(password, cost)
 	if err != nil {
 		return nil, err
diff --git a/vendor/golang.org/x/crypto/curve25519/internal/field/fe_generic.go b/vendor/golang.org/x/crypto/curve25519/internal/field/fe_generic.go
index 7b5b78cb..2671217d 100644
--- a/vendor/golang.org/x/crypto/curve25519/internal/field/fe_generic.go
+++ b/vendor/golang.org/x/crypto/curve25519/internal/field/fe_generic.go
@@ -245,7 +245,7 @@ func feSquareGeneric(v, a *Element) {
 	v.carryPropagate()
 }
 
-// carryPropagate brings the limbs below 52 bits by applying the reduction
+// carryPropagateGeneric brings the limbs below 52 bits by applying the reduction
 // identity (a * 2²⁵⁵ + b = a * 19 + b) to the l4 carry. TODO inline
 func (v *Element) carryPropagateGeneric() *Element {
 	c0 := v.l0 >> 51
diff --git a/vendor/golang.org/x/crypto/ssh/handshake.go b/vendor/golang.org/x/crypto/ssh/handshake.go
index 2b84c357..07a1843e 100644
--- a/vendor/golang.org/x/crypto/ssh/handshake.go
+++ b/vendor/golang.org/x/crypto/ssh/handshake.go
@@ -58,11 +58,13 @@ type handshakeTransport struct {
 	incoming  chan []byte
 	readError error
 
-	mu             sync.Mutex
-	writeError     error
-	sentInitPacket []byte
-	sentInitMsg    *kexInitMsg
-	pendingPackets [][]byte // Used when a key exchange is in progress.
+	mu               sync.Mutex
+	writeError       error
+	sentInitPacket   []byte
+	sentInitMsg      *kexInitMsg
+	pendingPackets   [][]byte // Used when a key exchange is in progress.
+	writePacketsLeft uint32
+	writeBytesLeft   int64
 
 	// If the read loop wants to schedule a kex, it pings this
 	// channel, and the write loop will send out a kex
@@ -71,7 +73,8 @@ type handshakeTransport struct {
 
 	// If the other side requests or confirms a kex, its kexInit
 	// packet is sent here for the write loop to find it.
-	startKex chan *pendingKex
+	startKex    chan *pendingKex
+	kexLoopDone chan struct{} // closed (with writeError non-nil) when kexLoop exits
 
 	// data for host key checking
 	hostKeyCallback HostKeyCallback
@@ -86,12 +89,10 @@ type handshakeTransport struct {
 	// Algorithms agreed in the last key exchange.
 	algorithms *algorithms
 
+	// Counters exclusively owned by readLoop.
 	readPacketsLeft uint32
 	readBytesLeft   int64
 
-	writePacketsLeft uint32
-	writeBytesLeft   int64
-
 	// The session ID or nil if first kex did not complete yet.
 	sessionID []byte
 }
@@ -108,7 +109,8 @@ func newHandshakeTransport(conn keyingTransport, config *Config, clientVersion,
 		clientVersion: clientVersion,
 		incoming:      make(chan []byte, chanSize),
 		requestKex:    make(chan struct{}, 1),
-		startKex:      make(chan *pendingKex, 1),
+		startKex:      make(chan *pendingKex),
+		kexLoopDone:   make(chan struct{}),
 
 		config: config,
 	}
@@ -340,16 +342,17 @@ write:
 		t.mu.Unlock()
 	}
 
-	// drain startKex channel. We don't service t.requestKex
-	// because nobody does blocking sends there.
-	go func() {
-		for init := range t.startKex {
-			init.done <- t.writeError
-		}
-	}()
-
 	// Unblock reader.
 	t.conn.Close()
+
+	// drain startKex channel. We don't service t.requestKex
+	// because nobody does blocking sends there.
+	for request := range t.startKex {
+		request.done <- t.getWriteError()
+	}
+
+	// Mark that the loop is done so that Close can return.
+	close(t.kexLoopDone)
 }
 
 // The protocol uses uint32 for packet counters, so we can't let them
@@ -545,7 +548,16 @@ func (t *handshakeTransport) writePacket(p []byte) error {
 }
 
 func (t *handshakeTransport) Close() error {
-	return t.conn.Close()
+	// Close the connection. This should cause the readLoop goroutine to wake up
+	// and close t.startKex, which will shut down kexLoop if running.
+	err := t.conn.Close()
+
+	// Wait for the kexLoop goroutine to complete.
+	// At that point we know that the readLoop goroutine is complete too,
+	// because kexLoop itself waits for readLoop to close the startKex channel.
+	<-t.kexLoopDone
+
+	return err
 }
 
 func (t *handshakeTransport) enterKeyExchange(otherInitPacket []byte) error {
diff --git a/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go b/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go
deleted file mode 100644
index 37dc0cfd..00000000
--- a/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ctxhttp provides helper functions for performing context-aware HTTP requests.
-package ctxhttp // import "golang.org/x/net/context/ctxhttp"
-
-import (
-	"context"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-)
-
-// Do sends an HTTP request with the provided http.Client and returns
-// an HTTP response.
-//
-// If the client is nil, http.DefaultClient is used.
-//
-// The provided ctx must be non-nil. If it is canceled or times out,
-// ctx.Err() will be returned.
-func Do(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) {
-	if client == nil {
-		client = http.DefaultClient
-	}
-	resp, err := client.Do(req.WithContext(ctx))
-	// If we got an error, and the context has been canceled,
-	// the context's error is probably more useful.
-	if err != nil {
-		select {
-		case <-ctx.Done():
-			err = ctx.Err()
-		default:
-		}
-	}
-	return resp, err
-}
-
-// Get issues a GET request via the Do function.
-func Get(ctx context.Context, client *http.Client, url string) (*http.Response, error) {
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, err
-	}
-	return Do(ctx, client, req)
-}
-
-// Head issues a HEAD request via the Do function.
-func Head(ctx context.Context, client *http.Client, url string) (*http.Response, error) {
-	req, err := http.NewRequest("HEAD", url, nil)
-	if err != nil {
-		return nil, err
-	}
-	return Do(ctx, client, req)
-}
-
-// Post issues a POST request via the Do function.
-func Post(ctx context.Context, client *http.Client, url string, bodyType string, body io.Reader) (*http.Response, error) {
-	req, err := http.NewRequest("POST", url, body)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", bodyType)
-	return Do(ctx, client, req)
-}
-
-// PostForm issues a POST request via the Do function.
-func PostForm(ctx context.Context, client *http.Client, url string, data url.Values) (*http.Response, error) {
-	return Post(ctx, client, url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
-}
diff --git a/vendor/golang.org/x/net/html/doc.go b/vendor/golang.org/x/net/html/doc.go
index 822ed42a..7a96eae3 100644
--- a/vendor/golang.org/x/net/html/doc.go
+++ b/vendor/golang.org/x/net/html/doc.go
@@ -92,6 +92,21 @@ example, to process each anchor node in depth-first order:
 The relevant specifications include:
 https://html.spec.whatwg.org/multipage/syntax.html and
 https://html.spec.whatwg.org/multipage/syntax.html#tokenization
+
+# Security Considerations
+
+Care should be taken when parsing and interpreting HTML, whether full documents
+or fragments, within the framework of the HTML specification, especially with
+regard to untrusted inputs.
+
+This package provides both a tokenizer and a parser. Only the parser constructs
+a DOM according to the HTML specification, resolving malformed and misplaced
+tags where appropriate. The tokenizer simply tokenizes the HTML presented to it,
+and as such does not resolve issues that may exist in the processed HTML,
+producing a literal interpretation of the input.
+
+If your use case requires semantically well-formed HTML, as defined by the
+WHATWG specifiction, the parser should be used rather than the tokenizer.
 */
 package html // import "golang.org/x/net/html"
 
diff --git a/vendor/golang.org/x/net/html/escape.go b/vendor/golang.org/x/net/html/escape.go
index d8561396..04c6bec2 100644
--- a/vendor/golang.org/x/net/html/escape.go
+++ b/vendor/golang.org/x/net/html/escape.go
@@ -193,6 +193,87 @@ func lower(b []byte) []byte {
 	return b
 }
 
+// escapeComment is like func escape but escapes its input bytes less often.
+// Per https://github.com/golang/go/issues/58246 some HTML comments are (1)
+// meaningful and (2) contain angle brackets that we'd like to avoid escaping
+// unless we have to.
+//
+// "We have to" includes the '&' byte, since that introduces other escapes.
+//
+// It also includes those bytes (not including EOF) that would otherwise end
+// the comment. Per the summary table at the bottom of comment_test.go, this is
+// the '>' byte that, per above, we'd like to avoid escaping unless we have to.
+//
+// Studying the summary table (and T actions in its '>' column) closely, we
+// only need to escape in states 43, 44, 49, 51 and 52. State 43 is at the
+// start of the comment data. State 52 is after a '!'. The other three states
+// are after a '-'.
+//
+// Our algorithm is thus to escape every '&' and to escape '>' if and only if:
+//   - The '>' is after a '!' or '-' (in the unescaped data) or
+//   - The '>' is at the start of the comment data (after the opening "<!--").
+func escapeComment(w writer, s string) error {
+	// When modifying this function, consider manually increasing the
+	// maxSuffixLen constant in func TestComments, from 6 to e.g. 9 or more.
+	// That increase should only be temporary, not committed, as it
+	// exponentially affects the test running time.
+
+	if len(s) == 0 {
+		return nil
+	}
+
+	// Loop:
+	//   - Grow j such that s[i:j] does not need escaping.
+	//   - If s[j] does need escaping, output s[i:j] and an escaped s[j],
+	//     resetting i and j to point past that s[j] byte.
+	i := 0
+	for j := 0; j < len(s); j++ {
+		escaped := ""
+		switch s[j] {
+		case '&':
+			escaped = "&amp;"
+
+		case '>':
+			if j > 0 {
+				if prev := s[j-1]; (prev != '!') && (prev != '-') {
+					continue
+				}
+			}
+			escaped = "&gt;"
+
+		default:
+			continue
+		}
+
+		if i < j {
+			if _, err := w.WriteString(s[i:j]); err != nil {
+				return err
+			}
+		}
+		if _, err := w.WriteString(escaped); err != nil {
+			return err
+		}
+		i = j + 1
+	}
+
+	if i < len(s) {
+		if _, err := w.WriteString(s[i:]); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// escapeCommentString is to EscapeString as escapeComment is to escape.
+func escapeCommentString(s string) string {
+	if strings.IndexAny(s, "&>") == -1 {
+		return s
+	}
+	var buf bytes.Buffer
+	escapeComment(&buf, s)
+	return buf.String()
+}
+
 const escapedChars = "&'<>\"\r"
 
 func escape(w writer, s string) error {
diff --git a/vendor/golang.org/x/net/html/render.go b/vendor/golang.org/x/net/html/render.go
index 497e1320..8b280319 100644
--- a/vendor/golang.org/x/net/html/render.go
+++ b/vendor/golang.org/x/net/html/render.go
@@ -85,7 +85,7 @@ func render1(w writer, n *Node) error {
 		if _, err := w.WriteString("<!--"); err != nil {
 			return err
 		}
-		if err := escape(w, n.Data); err != nil {
+		if err := escapeComment(w, n.Data); err != nil {
 			return err
 		}
 		if _, err := w.WriteString("-->"); err != nil {
diff --git a/vendor/golang.org/x/net/html/token.go b/vendor/golang.org/x/net/html/token.go
index 50f7c6aa..5c2a1f4e 100644
--- a/vendor/golang.org/x/net/html/token.go
+++ b/vendor/golang.org/x/net/html/token.go
@@ -110,7 +110,7 @@ func (t Token) String() string {
 	case SelfClosingTagToken:
 		return "<" + t.tagString() + "/>"
 	case CommentToken:
-		return "<!--" + EscapeString(t.Data) + "-->"
+		return "<!--" + escapeCommentString(t.Data) + "-->"
 	case DoctypeToken:
 		return "<!DOCTYPE " + EscapeString(t.Data) + ">"
 	}
@@ -598,10 +598,10 @@ scriptDataDoubleEscapeEnd:
 // readComment reads the next comment token starting with "<!--". The opening
 // "<!--" has already been consumed.
 func (z *Tokenizer) readComment() {
-	// When modifying this function, consider manually increasing the suffixLen
-	// constant in func TestComments, from 6 to e.g. 9 or more. That increase
-	// should only be temporary, not committed, as it exponentially affects the
-	// test running time.
+	// When modifying this function, consider manually increasing the
+	// maxSuffixLen constant in func TestComments, from 6 to e.g. 9 or more.
+	// That increase should only be temporary, not committed, as it
+	// exponentially affects the test running time.
 
 	z.data.start = z.raw.end
 	defer func() {
diff --git a/vendor/golang.org/x/oauth2/internal/token.go b/vendor/golang.org/x/oauth2/internal/token.go
index 355c3869..b4723fca 100644
--- a/vendor/golang.org/x/oauth2/internal/token.go
+++ b/vendor/golang.org/x/oauth2/internal/token.go
@@ -19,8 +19,6 @@ import (
 	"strings"
 	"sync"
 	"time"
-
-	"golang.org/x/net/context/ctxhttp"
 )
 
 // Token represents the credentials used to authorize
@@ -229,7 +227,7 @@ func RetrieveToken(ctx context.Context, clientID, clientSecret, tokenURL string,
 }
 
 func doTokenRoundTrip(ctx context.Context, req *http.Request) (*Token, error) {
-	r, err := ctxhttp.Do(ctx, ContextClient(ctx), req)
+	r, err := ContextClient(ctx).Do(req.WithContext(ctx))
 	if err != nil {
 		return nil, err
 	}
diff --git a/vendor/golang.org/x/sys/cpu/hwcap_linux.go b/vendor/golang.org/x/sys/cpu/hwcap_linux.go
index f3baa379..1d9d91f3 100644
--- a/vendor/golang.org/x/sys/cpu/hwcap_linux.go
+++ b/vendor/golang.org/x/sys/cpu/hwcap_linux.go
@@ -24,6 +24,21 @@ var hwCap uint
 var hwCap2 uint
 
 func readHWCAP() error {
+	// For Go 1.21+, get auxv from the Go runtime.
+	if a := getAuxv(); len(a) > 0 {
+		for len(a) >= 2 {
+			tag, val := a[0], uint(a[1])
+			a = a[2:]
+			switch tag {
+			case _AT_HWCAP:
+				hwCap = val
+			case _AT_HWCAP2:
+				hwCap2 = val
+			}
+		}
+		return nil
+	}
+
 	buf, err := ioutil.ReadFile(procAuxv)
 	if err != nil {
 		// e.g. on android /proc/self/auxv is not accessible, so silently
diff --git a/vendor/golang.org/x/sys/cpu/runtime_auxv.go b/vendor/golang.org/x/sys/cpu/runtime_auxv.go
new file mode 100644
index 00000000..5f92ac9a
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/runtime_auxv.go
@@ -0,0 +1,16 @@
+// Copyright 2023 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cpu
+
+// getAuxvFn is non-nil on Go 1.21+ (via runtime_auxv_go121.go init)
+// on platforms that use auxv.
+var getAuxvFn func() []uintptr
+
+func getAuxv() []uintptr {
+	if getAuxvFn == nil {
+		return nil
+	}
+	return getAuxvFn()
+}
diff --git a/vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go b/vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go
new file mode 100644
index 00000000..b975ea2a
--- /dev/null
+++ b/vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go
@@ -0,0 +1,19 @@
+// Copyright 2023 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build go1.21
+// +build go1.21
+
+package cpu
+
+import (
+	_ "unsafe" // for linkname
+)
+
+//go:linkname runtime_getAuxv runtime.getAuxv
+func runtime_getAuxv() []uintptr
+
+func init() {
+	getAuxvFn = runtime_getAuxv
+}
diff --git a/vendor/golang.org/x/sys/execabs/execabs.go b/vendor/golang.org/x/sys/execabs/execabs.go
index b981cfbb..3bf40fdf 100644
--- a/vendor/golang.org/x/sys/execabs/execabs.go
+++ b/vendor/golang.org/x/sys/execabs/execabs.go
@@ -63,7 +63,7 @@ func LookPath(file string) (string, error) {
 }
 
 func fixCmd(name string, cmd *exec.Cmd) {
-	if filepath.Base(name) == name && !filepath.IsAbs(cmd.Path) {
+	if filepath.Base(name) == name && !filepath.IsAbs(cmd.Path) && !isGo119ErrFieldSet(cmd) {
 		// exec.Command was called with a bare binary name and
 		// exec.LookPath returned a path which is not absolute.
 		// Set cmd.lookPathErr and clear cmd.Path so that it
diff --git a/vendor/golang.org/x/sys/execabs/execabs_go118.go b/vendor/golang.org/x/sys/execabs/execabs_go118.go
index 6ab5f508..2000064a 100644
--- a/vendor/golang.org/x/sys/execabs/execabs_go118.go
+++ b/vendor/golang.org/x/sys/execabs/execabs_go118.go
@@ -7,6 +7,12 @@
 
 package execabs
 
+import "os/exec"
+
 func isGo119ErrDot(err error) bool {
 	return false
 }
+
+func isGo119ErrFieldSet(cmd *exec.Cmd) bool {
+	return false
+}
diff --git a/vendor/golang.org/x/sys/execabs/execabs_go119.go b/vendor/golang.org/x/sys/execabs/execabs_go119.go
index 46c5b525..f364b341 100644
--- a/vendor/golang.org/x/sys/execabs/execabs_go119.go
+++ b/vendor/golang.org/x/sys/execabs/execabs_go119.go
@@ -15,3 +15,7 @@ import (
 func isGo119ErrDot(err error) bool {
 	return errors.Is(err, exec.ErrDot)
 }
+
+func isGo119ErrFieldSet(cmd *exec.Cmd) bool {
+	return cmd.Err != nil
+}
diff --git a/vendor/golang.org/x/sys/unix/ioctl.go b/vendor/golang.org/x/sys/unix/ioctl.go
index 1c51b0ec..7ce8dd40 100644
--- a/vendor/golang.org/x/sys/unix/ioctl.go
+++ b/vendor/golang.org/x/sys/unix/ioctl.go
@@ -8,7 +8,6 @@
 package unix
 
 import (
-	"runtime"
 	"unsafe"
 )
 
@@ -27,7 +26,7 @@ func IoctlSetInt(fd int, req uint, value int) error {
 // passing the integer value directly.
 func IoctlSetPointerInt(fd int, req uint, value int) error {
 	v := int32(value)
-	return ioctl(fd, req, uintptr(unsafe.Pointer(&v)))
+	return ioctlPtr(fd, req, unsafe.Pointer(&v))
 }
 
 // IoctlSetWinsize performs an ioctl on fd with a *Winsize argument.
@@ -36,9 +35,7 @@ func IoctlSetPointerInt(fd int, req uint, value int) error {
 func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
 	// TODO: if we get the chance, remove the req parameter and
 	// hardcode TIOCSWINSZ.
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(value)))
-	runtime.KeepAlive(value)
-	return err
+	return ioctlPtr(fd, req, unsafe.Pointer(value))
 }
 
 // IoctlSetTermios performs an ioctl on fd with a *Termios.
@@ -46,9 +43,7 @@ func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
 // The req value will usually be TCSETA or TIOCSETA.
 func IoctlSetTermios(fd int, req uint, value *Termios) error {
 	// TODO: if we get the chance, remove the req parameter.
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(value)))
-	runtime.KeepAlive(value)
-	return err
+	return ioctlPtr(fd, req, unsafe.Pointer(value))
 }
 
 // IoctlGetInt performs an ioctl operation which gets an integer value
@@ -58,18 +53,18 @@ func IoctlSetTermios(fd int, req uint, value *Termios) error {
 // for those, IoctlRetInt should be used instead of this function.
 func IoctlGetInt(fd int, req uint) (int, error) {
 	var value int
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
 	return value, err
 }
 
 func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
 	var value Winsize
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
 	return &value, err
 }
 
 func IoctlGetTermios(fd int, req uint) (*Termios, error) {
 	var value Termios
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
 	return &value, err
 }
diff --git a/vendor/golang.org/x/sys/unix/ioctl_zos.go b/vendor/golang.org/x/sys/unix/ioctl_zos.go
index 5384e7d9..6532f09a 100644
--- a/vendor/golang.org/x/sys/unix/ioctl_zos.go
+++ b/vendor/golang.org/x/sys/unix/ioctl_zos.go
@@ -27,9 +27,7 @@ func IoctlSetInt(fd int, req uint, value int) error {
 func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
 	// TODO: if we get the chance, remove the req parameter and
 	// hardcode TIOCSWINSZ.
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(value)))
-	runtime.KeepAlive(value)
-	return err
+	return ioctlPtr(fd, req, unsafe.Pointer(value))
 }
 
 // IoctlSetTermios performs an ioctl on fd with a *Termios.
@@ -51,13 +49,13 @@ func IoctlSetTermios(fd int, req uint, value *Termios) error {
 // for those, IoctlRetInt should be used instead of this function.
 func IoctlGetInt(fd int, req uint) (int, error) {
 	var value int
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
 	return value, err
 }
 
 func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
 	var value Winsize
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
 	return &value, err
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ptrace_darwin.go b/vendor/golang.org/x/sys/unix/ptrace_darwin.go
index 463c3eff..39dba6ca 100644
--- a/vendor/golang.org/x/sys/unix/ptrace_darwin.go
+++ b/vendor/golang.org/x/sys/unix/ptrace_darwin.go
@@ -7,6 +7,12 @@
 
 package unix
 
+import "unsafe"
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) error {
 	return ptrace1(request, pid, addr, data)
 }
+
+func ptracePtr(request int, pid int, addr uintptr, data unsafe.Pointer) error {
+	return ptrace1Ptr(request, pid, addr, data)
+}
diff --git a/vendor/golang.org/x/sys/unix/ptrace_ios.go b/vendor/golang.org/x/sys/unix/ptrace_ios.go
index ed0509a0..9ea66330 100644
--- a/vendor/golang.org/x/sys/unix/ptrace_ios.go
+++ b/vendor/golang.org/x/sys/unix/ptrace_ios.go
@@ -7,6 +7,12 @@
 
 package unix
 
+import "unsafe"
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	return ENOTSUP
 }
+
+func ptracePtr(request int, pid int, addr uintptr, data unsafe.Pointer) (err error) {
+	return ENOTSUP
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_aix.go b/vendor/golang.org/x/sys/unix/syscall_aix.go
index 2db1b51e..d9f5544c 100644
--- a/vendor/golang.org/x/sys/unix/syscall_aix.go
+++ b/vendor/golang.org/x/sys/unix/syscall_aix.go
@@ -292,9 +292,7 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 				break
 			}
 		}
-
-		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
+		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
 		return sa, nil
 
 	case AF_INET:
@@ -411,6 +409,7 @@ func (w WaitStatus) CoreDump() bool { return w&0x80 == 0x80 }
 func (w WaitStatus) TrapCause() int { return -1 }
 
 //sys	ioctl(fd int, req uint, arg uintptr) (err error)
+//sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = ioctl
 
 // fcntl must never be called with cmd=F_DUP2FD because it doesn't work on AIX
 // There is no way to create a custom fcntl and to keep //sys fcntl easily,
diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go
index eda42671..7705c327 100644
--- a/vendor/golang.org/x/sys/unix/syscall_bsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_bsd.go
@@ -245,8 +245,7 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 				break
 			}
 		}
-		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
+		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
 		return sa, nil
 
 	case AF_INET:
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go
index 192b071b..7064d6eb 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go
@@ -14,7 +14,6 @@ package unix
 
 import (
 	"fmt"
-	"runtime"
 	"syscall"
 	"unsafe"
 )
@@ -376,11 +375,10 @@ func Flistxattr(fd int, dest []byte) (sz int, err error) {
 func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(signum), 1) }
 
 //sys	ioctl(fd int, req uint, arg uintptr) (err error)
+//sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
 func IoctlCtlInfo(fd int, ctlInfo *CtlInfo) error {
-	err := ioctl(fd, CTLIOCGINFO, uintptr(unsafe.Pointer(ctlInfo)))
-	runtime.KeepAlive(ctlInfo)
-	return err
+	return ioctlPtr(fd, CTLIOCGINFO, unsafe.Pointer(ctlInfo))
 }
 
 // IfreqMTU is struct ifreq used to get or set a network device's MTU.
@@ -394,16 +392,14 @@ type IfreqMTU struct {
 func IoctlGetIfreqMTU(fd int, ifname string) (*IfreqMTU, error) {
 	var ifreq IfreqMTU
 	copy(ifreq.Name[:], ifname)
-	err := ioctl(fd, SIOCGIFMTU, uintptr(unsafe.Pointer(&ifreq)))
+	err := ioctlPtr(fd, SIOCGIFMTU, unsafe.Pointer(&ifreq))
 	return &ifreq, err
 }
 
 // IoctlSetIfreqMTU performs the SIOCSIFMTU ioctl operation on fd to set the MTU
 // of the network device specified by ifreq.Name.
 func IoctlSetIfreqMTU(fd int, ifreq *IfreqMTU) error {
-	err := ioctl(fd, SIOCSIFMTU, uintptr(unsafe.Pointer(ifreq)))
-	runtime.KeepAlive(ifreq)
-	return err
+	return ioctlPtr(fd, SIOCSIFMTU, unsafe.Pointer(ifreq))
 }
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
index b37310ce..9fa87980 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
@@ -47,5 +47,6 @@ func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr,
 //sys	getfsstat(buf unsafe.Pointer, size uintptr, flags int) (n int, err error) = SYS_GETFSSTAT64
 //sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
 //sys	ptrace1(request int, pid int, addr uintptr, data uintptr) (err error) = SYS_ptrace
+//sys	ptrace1Ptr(request int, pid int, addr unsafe.Pointer, data uintptr) (err error) = SYS_ptrace
 //sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
 //sys	Statfs(path string, stat *Statfs_t) (err error) = SYS_STATFS64
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
index d51ec996..f17b8c52 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
@@ -47,5 +47,6 @@ func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr,
 //sys	getfsstat(buf unsafe.Pointer, size uintptr, flags int) (n int, err error) = SYS_GETFSSTAT
 //sys	Lstat(path string, stat *Stat_t) (err error)
 //sys	ptrace1(request int, pid int, addr uintptr, data uintptr) (err error) = SYS_ptrace
+//sys	ptrace1Ptr(request int, pid int, addr unsafe.Pointer, data uintptr) (err error) = SYS_ptrace
 //sys	Stat(path string, stat *Stat_t) (err error)
 //sys	Statfs(path string, stat *Statfs_t) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
index a41111a7..221efc26 100644
--- a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
+++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
@@ -172,6 +172,7 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 }
 
 //sys	ioctl(fd int, req uint, arg uintptr) (err error)
+//sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
index d50b9dc2..5bdde03e 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
@@ -161,7 +161,8 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	return
 }
 
-//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+//sys	ioctl(fd int, req uint, arg uintptr) (err error) = SYS_IOCTL
+//sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
 
@@ -253,6 +254,7 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 //sys	ptrace(request int, pid int, addr uintptr, data int) (err error)
+//sys	ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) = SYS_PTRACE
 
 func PtraceAttach(pid int) (err error) {
 	return ptrace(PT_ATTACH, pid, 0, 0)
@@ -267,19 +269,36 @@ func PtraceDetach(pid int) (err error) {
 }
 
 func PtraceGetFpRegs(pid int, fpregsout *FpReg) (err error) {
-	return ptrace(PT_GETFPREGS, pid, uintptr(unsafe.Pointer(fpregsout)), 0)
+	return ptracePtr(PT_GETFPREGS, pid, unsafe.Pointer(fpregsout), 0)
 }
 
 func PtraceGetRegs(pid int, regsout *Reg) (err error) {
-	return ptrace(PT_GETREGS, pid, uintptr(unsafe.Pointer(regsout)), 0)
+	return ptracePtr(PT_GETREGS, pid, unsafe.Pointer(regsout), 0)
+}
+
+func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
+	ioDesc := PtraceIoDesc{
+		Op:   int32(req),
+		Offs: offs,
+	}
+	if countin > 0 {
+		_ = out[:countin] // check bounds
+		ioDesc.Addr = &out[0]
+	} else if out != nil {
+		ioDesc.Addr = (*byte)(unsafe.Pointer(&_zero))
+	}
+	ioDesc.SetLen(countin)
+
+	err = ptracePtr(PT_IO, pid, unsafe.Pointer(&ioDesc), 0)
+	return int(ioDesc.Len), err
 }
 
 func PtraceLwpEvents(pid int, enable int) (err error) {
 	return ptrace(PT_LWP_EVENTS, pid, 0, enable)
 }
 
-func PtraceLwpInfo(pid int, info uintptr) (err error) {
-	return ptrace(PT_LWPINFO, pid, info, int(unsafe.Sizeof(PtraceLwpInfoStruct{})))
+func PtraceLwpInfo(pid int, info *PtraceLwpInfoStruct) (err error) {
+	return ptracePtr(PT_LWPINFO, pid, unsafe.Pointer(info), int(unsafe.Sizeof(*info)))
 }
 
 func PtracePeekData(pid int, addr uintptr, out []byte) (count int, err error) {
@@ -299,13 +318,25 @@ func PtracePokeText(pid int, addr uintptr, data []byte) (count int, err error) {
 }
 
 func PtraceSetRegs(pid int, regs *Reg) (err error) {
-	return ptrace(PT_SETREGS, pid, uintptr(unsafe.Pointer(regs)), 0)
+	return ptracePtr(PT_SETREGS, pid, unsafe.Pointer(regs), 0)
 }
 
 func PtraceSingleStep(pid int) (err error) {
 	return ptrace(PT_STEP, pid, 1, 0)
 }
 
+func Dup3(oldfd, newfd, flags int) error {
+	if oldfd == newfd || flags&^O_CLOEXEC != 0 {
+		return EINVAL
+	}
+	how := F_DUP2FD
+	if flags&O_CLOEXEC != 0 {
+		how = F_DUP2FD_CLOEXEC
+	}
+	_, err := fcntl(oldfd, how, newfd)
+	return err
+}
+
 /*
  * Exposed directly
  */
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
index 6a91d471..b8da5100 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
@@ -42,6 +42,10 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 	cmsg.Len = uint32(length)
 }
 
+func (d *PtraceIoDesc) SetLen(length int) {
+	d.Len = uint32(length)
+}
+
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	var writtenOut uint64 = 0
 	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
@@ -57,16 +61,5 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
 func PtraceGetFsBase(pid int, fsbase *int64) (err error) {
-	return ptrace(PT_GETFSBASE, pid, uintptr(unsafe.Pointer(fsbase)), 0)
-}
-
-func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
-	ioDesc := PtraceIoDesc{
-		Op:   int32(req),
-		Offs: offs,
-		Addr: uintptr(unsafe.Pointer(&out[0])), // TODO(#58351): this is not safe.
-		Len:  uint32(countin),
-	}
-	err = ptrace(PT_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
-	return int(ioDesc.Len), err
+	return ptracePtr(PT_GETFSBASE, pid, unsafe.Pointer(fsbase), 0)
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
index 48110a0a..47155c48 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
@@ -42,6 +42,10 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 	cmsg.Len = uint32(length)
 }
 
+func (d *PtraceIoDesc) SetLen(length int) {
+	d.Len = uint64(length)
+}
+
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	var writtenOut uint64 = 0
 	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
@@ -57,16 +61,5 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
 func PtraceGetFsBase(pid int, fsbase *int64) (err error) {
-	return ptrace(PT_GETFSBASE, pid, uintptr(unsafe.Pointer(fsbase)), 0)
-}
-
-func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
-	ioDesc := PtraceIoDesc{
-		Op:   int32(req),
-		Offs: offs,
-		Addr: uintptr(unsafe.Pointer(&out[0])), // TODO(#58351): this is not safe.
-		Len:  uint64(countin),
-	}
-	err = ptrace(PT_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
-	return int(ioDesc.Len), err
+	return ptracePtr(PT_GETFSBASE, pid, unsafe.Pointer(fsbase), 0)
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
index 52f1d4b7..08932093 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
@@ -42,6 +42,10 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 	cmsg.Len = uint32(length)
 }
 
+func (d *PtraceIoDesc) SetLen(length int) {
+	d.Len = uint32(length)
+}
+
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	var writtenOut uint64 = 0
 	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr((*offset)>>32), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0)
@@ -55,14 +59,3 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
-	ioDesc := PtraceIoDesc{
-		Op:   int32(req),
-		Offs: offs,
-		Addr: uintptr(unsafe.Pointer(&out[0])), // TODO(#58351): this is not safe.
-		Len:  uint32(countin),
-	}
-	err = ptrace(PT_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
-	return int(ioDesc.Len), err
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
index 5537ee4f..d151a0d0 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
@@ -42,6 +42,10 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 	cmsg.Len = uint32(length)
 }
 
+func (d *PtraceIoDesc) SetLen(length int) {
+	d.Len = uint64(length)
+}
+
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	var writtenOut uint64 = 0
 	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
@@ -55,14 +59,3 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
-	ioDesc := PtraceIoDesc{
-		Op:   int32(req),
-		Offs: offs,
-		Addr: uintptr(unsafe.Pointer(&out[0])), // TODO(#58351): this is not safe.
-		Len:  uint64(countin),
-	}
-	err = ptrace(PT_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
-	return int(ioDesc.Len), err
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
index 164abd5d..d5cd64b3 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
@@ -42,6 +42,10 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 	cmsg.Len = uint32(length)
 }
 
+func (d *PtraceIoDesc) SetLen(length int) {
+	d.Len = uint64(length)
+}
+
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	var writtenOut uint64 = 0
 	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
@@ -55,14 +59,3 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
-
-func PtraceIO(req int, pid int, offs uintptr, out []byte, countin int) (count int, err error) {
-	ioDesc := PtraceIoDesc{
-		Op:   int32(req),
-		Offs: offs,
-		Addr: uintptr(unsafe.Pointer(&out[0])), // TODO(#58351): this is not safe.
-		Len:  uint64(countin),
-	}
-	err = ptrace(PT_IO, pid, uintptr(unsafe.Pointer(&ioDesc)), 0)
-	return int(ioDesc.Len), err
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_hurd.go b/vendor/golang.org/x/sys/unix/syscall_hurd.go
index 4ffb6480..381fd467 100644
--- a/vendor/golang.org/x/sys/unix/syscall_hurd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_hurd.go
@@ -20,3 +20,11 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 	}
 	return
 }
+
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	r0, er := C.ioctl(C.int(fd), C.ulong(req), C.uintptr_t(uintptr(arg)))
+	if r0 == -1 && er != nil {
+		err = er
+	}
+	return
+}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
index 5443dddd..97353315 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -1015,8 +1015,7 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		for n < len(pp.Path) && pp.Path[n] != 0 {
 			n++
 		}
-		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
+		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
 		return sa, nil
 
 	case AF_INET:
@@ -1365,6 +1364,10 @@ func SetsockoptTCPRepairOpt(fd, level, opt int, o []TCPRepairOpt) (err error) {
 	return setsockopt(fd, level, opt, unsafe.Pointer(&o[0]), uintptr(SizeofTCPRepairOpt*len(o)))
 }
 
+func SetsockoptTCPMD5Sig(fd, level, opt int, s *TCPMD5Sig) error {
+	return setsockopt(fd, level, opt, unsafe.Pointer(s), unsafe.Sizeof(*s))
+}
+
 // Keyctl Commands (http://man7.org/linux/man-pages/man2/keyctl.2.html)
 
 // KeyctlInt calls keyctl commands in which each argument is an int.
@@ -1579,6 +1582,7 @@ func BindToDevice(fd int, device string) (err error) {
 }
 
 //sys	ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
+//sys	ptracePtr(request int, pid int, addr uintptr, data unsafe.Pointer) (err error) = SYS_PTRACE
 
 func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err error) {
 	// The peek requests are machine-size oriented, so we wrap it
@@ -1596,7 +1600,7 @@ func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err erro
 	// boundary.
 	n := 0
 	if addr%SizeofPtr != 0 {
-		err = ptrace(req, pid, addr-addr%SizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
+		err = ptracePtr(req, pid, addr-addr%SizeofPtr, unsafe.Pointer(&buf[0]))
 		if err != nil {
 			return 0, err
 		}
@@ -1608,7 +1612,7 @@ func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err erro
 	for len(out) > 0 {
 		// We use an internal buffer to guarantee alignment.
 		// It's not documented if this is necessary, but we're paranoid.
-		err = ptrace(req, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
+		err = ptracePtr(req, pid, addr+uintptr(n), unsafe.Pointer(&buf[0]))
 		if err != nil {
 			return n, err
 		}
@@ -1640,7 +1644,7 @@ func ptracePoke(pokeReq int, peekReq int, pid int, addr uintptr, data []byte) (c
 	n := 0
 	if addr%SizeofPtr != 0 {
 		var buf [SizeofPtr]byte
-		err = ptrace(peekReq, pid, addr-addr%SizeofPtr, uintptr(unsafe.Pointer(&buf[0])))
+		err = ptracePtr(peekReq, pid, addr-addr%SizeofPtr, unsafe.Pointer(&buf[0]))
 		if err != nil {
 			return 0, err
 		}
@@ -1667,7 +1671,7 @@ func ptracePoke(pokeReq int, peekReq int, pid int, addr uintptr, data []byte) (c
 	// Trailing edge.
 	if len(data) > 0 {
 		var buf [SizeofPtr]byte
-		err = ptrace(peekReq, pid, addr+uintptr(n), uintptr(unsafe.Pointer(&buf[0])))
+		err = ptracePtr(peekReq, pid, addr+uintptr(n), unsafe.Pointer(&buf[0]))
 		if err != nil {
 			return n, err
 		}
@@ -1696,11 +1700,11 @@ func PtracePokeUser(pid int, addr uintptr, data []byte) (count int, err error) {
 }
 
 func PtraceGetRegs(pid int, regsout *PtraceRegs) (err error) {
-	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
 }
 
 func PtraceSetRegs(pid int, regs *PtraceRegs) (err error) {
-	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
 }
 
 func PtraceSetOptions(pid int, options int) (err error) {
@@ -1709,7 +1713,7 @@ func PtraceSetOptions(pid int, options int) (err error) {
 
 func PtraceGetEventMsg(pid int) (msg uint, err error) {
 	var data _C_long
-	err = ptrace(PTRACE_GETEVENTMSG, pid, 0, uintptr(unsafe.Pointer(&data)))
+	err = ptracePtr(PTRACE_GETEVENTMSG, pid, 0, unsafe.Pointer(&data))
 	msg = uint(data)
 	return
 }
@@ -2154,6 +2158,14 @@ func isGroupMember(gid int) bool {
 	return false
 }
 
+func isCapDacOverrideSet() bool {
+	hdr := CapUserHeader{Version: LINUX_CAPABILITY_VERSION_3}
+	data := [2]CapUserData{}
+	err := Capget(&hdr, &data[0])
+
+	return err == nil && data[0].Effective&(1<<CAP_DAC_OVERRIDE) != 0
+}
+
 //sys	faccessat(dirfd int, path string, mode uint32) (err error)
 //sys	Faccessat2(dirfd int, path string, mode uint32, flags int) (err error)
 
@@ -2189,6 +2201,12 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 	var uid int
 	if flags&AT_EACCESS != 0 {
 		uid = Geteuid()
+		if uid != 0 && isCapDacOverrideSet() {
+			// If CAP_DAC_OVERRIDE is set, file access check is
+			// done by the kernel in the same way as for root
+			// (see generic_permission() in the Linux sources).
+			uid = 0
+		}
 	} else {
 		uid = Getuid()
 	}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
index 35a3ad75..e66865dc 100644
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
@@ -13,7 +13,6 @@
 package unix
 
 import (
-	"runtime"
 	"syscall"
 	"unsafe"
 )
@@ -178,13 +177,13 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 //sys	ioctl(fd int, req uint, arg uintptr) (err error)
+//sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
 
 func IoctlGetPtmget(fd int, req uint) (*Ptmget, error) {
 	var value Ptmget
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
-	runtime.KeepAlive(value)
+	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
 	return &value, err
 }
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
index 9b67b908..5e9de23a 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
@@ -152,6 +152,7 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 }
 
 //sys	ioctl(fd int, req uint, arg uintptr) (err error)
+//sys	ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
 //sys	sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) = SYS___SYSCTL
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go
index 07ac5610..d3444b64 100644
--- a/vendor/golang.org/x/sys/unix/syscall_solaris.go
+++ b/vendor/golang.org/x/sys/unix/syscall_solaris.go
@@ -408,8 +408,7 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		for n < len(pp.Path) && pp.Path[n] != 0 {
 			n++
 		}
-		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
+		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
 		return sa, nil
 
 	case AF_INET:
@@ -547,21 +546,25 @@ func Minor(dev uint64) uint32 {
  */
 
 //sys	ioctlRet(fd int, req uint, arg uintptr) (ret int, err error) = libc.ioctl
+//sys	ioctlPtrRet(fd int, req uint, arg unsafe.Pointer) (ret int, err error) = libc.ioctl
 
 func ioctl(fd int, req uint, arg uintptr) (err error) {
 	_, err = ioctlRet(fd, req, arg)
 	return err
 }
 
-func IoctlSetTermio(fd int, req uint, value *Termio) error {
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(value)))
-	runtime.KeepAlive(value)
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, err = ioctlPtrRet(fd, req, arg)
 	return err
 }
 
+func IoctlSetTermio(fd int, req uint, value *Termio) error {
+	return ioctlPtr(fd, req, unsafe.Pointer(value))
+}
+
 func IoctlGetTermio(fd int, req uint) (*Termio, error) {
 	var value Termio
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	err := ioctlPtr(fd, req, unsafe.Pointer(&value))
 	return &value, err
 }
 
@@ -1084,7 +1087,7 @@ func IoctlSetIntRetInt(fd int, req uint, arg int) (int, error) {
 func IoctlSetString(fd int, req uint, val string) error {
 	bs := make([]byte, len(val)+1)
 	copy(bs[:len(bs)-1], val)
-	err := ioctl(fd, req, uintptr(unsafe.Pointer(&bs[0])))
+	err := ioctlPtr(fd, req, unsafe.Pointer(&bs[0]))
 	runtime.KeepAlive(&bs[0])
 	return err
 }
@@ -1118,7 +1121,7 @@ func (l *Lifreq) GetLifruUint() uint {
 }
 
 func IoctlLifreq(fd int, req uint, l *Lifreq) error {
-	return ioctl(fd, req, uintptr(unsafe.Pointer(l)))
+	return ioctlPtr(fd, req, unsafe.Pointer(l))
 }
 
 // Strioctl Helpers
@@ -1129,5 +1132,5 @@ func (s *Strioctl) SetInt(i int) {
 }
 
 func IoctlSetStrioctlRetInt(fd int, req uint, s *Strioctl) (int, error) {
-	return ioctlRet(fd, req, uintptr(unsafe.Pointer(s)))
+	return ioctlPtrRet(fd, req, unsafe.Pointer(s))
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go b/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
index 68b2f3e1..b295497a 100644
--- a/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
@@ -139,8 +139,7 @@ func anyToSockaddr(_ int, rsa *RawSockaddrAny) (Sockaddr, error) {
 		for n < int(pp.Len) && pp.Path[n] != 0 {
 			n++
 		}
-		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
+		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
 		return sa, nil
 
 	case AF_INET:
@@ -214,6 +213,7 @@ func (cmsg *Cmsghdr) SetLen(length int) {
 //sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) = SYS_MMAP
 //sys   munmap(addr uintptr, length uintptr) (err error) = SYS_MUNMAP
 //sys   ioctl(fd int, req uint, arg uintptr) (err error) = SYS_IOCTL
+//sys   ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) = SYS_IOCTL
 
 //sys   Access(path string, mode uint32) (err error) = SYS___ACCESS_A
 //sys   Chdir(path string) (err error) = SYS___CHDIR_A
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go
index e174685a..398c37e5 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go
@@ -70,6 +70,7 @@ const (
 	ALG_SET_DRBG_ENTROPY                        = 0x6
 	ALG_SET_IV                                  = 0x2
 	ALG_SET_KEY                                 = 0x1
+	ALG_SET_KEY_BY_KEY_SERIAL                   = 0x7
 	ALG_SET_OP                                  = 0x3
 	ANON_INODE_FS_MAGIC                         = 0x9041934
 	ARPHRD_6LOWPAN                              = 0x339
@@ -774,6 +775,8 @@ const (
 	DEVLINK_GENL_MCGRP_CONFIG_NAME              = "config"
 	DEVLINK_GENL_NAME                           = "devlink"
 	DEVLINK_GENL_VERSION                        = 0x1
+	DEVLINK_PORT_FN_CAP_MIGRATABLE              = 0x2
+	DEVLINK_PORT_FN_CAP_ROCE                    = 0x1
 	DEVLINK_SB_THRESHOLD_TO_ALPHA_MAX           = 0x14
 	DEVLINK_SUPPORTED_FLASH_OVERWRITE_SECTIONS  = 0x3
 	DEVMEM_MAGIC                                = 0x454d444d
@@ -1262,6 +1265,8 @@ const (
 	FSCRYPT_MODE_AES_256_CTS                    = 0x4
 	FSCRYPT_MODE_AES_256_HCTR2                  = 0xa
 	FSCRYPT_MODE_AES_256_XTS                    = 0x1
+	FSCRYPT_MODE_SM4_CTS                        = 0x8
+	FSCRYPT_MODE_SM4_XTS                        = 0x7
 	FSCRYPT_POLICY_FLAGS_PAD_16                 = 0x2
 	FSCRYPT_POLICY_FLAGS_PAD_32                 = 0x3
 	FSCRYPT_POLICY_FLAGS_PAD_4                  = 0x0
@@ -1280,8 +1285,6 @@ const (
 	FS_ENCRYPTION_MODE_AES_256_GCM              = 0x2
 	FS_ENCRYPTION_MODE_AES_256_XTS              = 0x1
 	FS_ENCRYPTION_MODE_INVALID                  = 0x0
-	FS_ENCRYPTION_MODE_SPECK128_256_CTS         = 0x8
-	FS_ENCRYPTION_MODE_SPECK128_256_XTS         = 0x7
 	FS_IOC_ADD_ENCRYPTION_KEY                   = 0xc0506617
 	FS_IOC_GET_ENCRYPTION_KEY_STATUS            = 0xc080661a
 	FS_IOC_GET_ENCRYPTION_POLICY_EX             = 0xc0096616
@@ -1770,6 +1773,7 @@ const (
 	LANDLOCK_ACCESS_FS_REFER                    = 0x2000
 	LANDLOCK_ACCESS_FS_REMOVE_DIR               = 0x10
 	LANDLOCK_ACCESS_FS_REMOVE_FILE              = 0x20
+	LANDLOCK_ACCESS_FS_TRUNCATE                 = 0x4000
 	LANDLOCK_ACCESS_FS_WRITE_FILE               = 0x2
 	LANDLOCK_CREATE_RULESET_VERSION             = 0x1
 	LINUX_REBOOT_CMD_CAD_OFF                    = 0x0
@@ -1809,6 +1813,7 @@ const (
 	LWTUNNEL_IP_OPT_GENEVE_MAX                  = 0x3
 	LWTUNNEL_IP_OPT_VXLAN_MAX                   = 0x1
 	MADV_COLD                                   = 0x14
+	MADV_COLLAPSE                               = 0x19
 	MADV_DODUMP                                 = 0x11
 	MADV_DOFORK                                 = 0xb
 	MADV_DONTDUMP                               = 0x10
@@ -2163,6 +2168,7 @@ const (
 	PACKET_FANOUT_DATA                          = 0x16
 	PACKET_FANOUT_EBPF                          = 0x7
 	PACKET_FANOUT_FLAG_DEFRAG                   = 0x8000
+	PACKET_FANOUT_FLAG_IGNORE_OUTGOING          = 0x4000
 	PACKET_FANOUT_FLAG_ROLLOVER                 = 0x1000
 	PACKET_FANOUT_FLAG_UNIQUEID                 = 0x2000
 	PACKET_FANOUT_HASH                          = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go b/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
index bd001a6e..97f20ca2 100644
--- a/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
+++ b/vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
@@ -15,12 +15,12 @@ type PtraceRegsArm struct {
 
 // PtraceGetRegsArm fetches the registers used by arm binaries.
 func PtraceGetRegsArm(pid int, regsout *PtraceRegsArm) error {
-	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
 }
 
 // PtraceSetRegsArm sets the registers used by arm binaries.
 func PtraceSetRegsArm(pid int, regs *PtraceRegsArm) error {
-	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
 }
 
 // PtraceRegsArm64 is the registers used by arm64 binaries.
@@ -33,10 +33,10 @@ type PtraceRegsArm64 struct {
 
 // PtraceGetRegsArm64 fetches the registers used by arm64 binaries.
 func PtraceGetRegsArm64(pid int, regsout *PtraceRegsArm64) error {
-	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
 }
 
 // PtraceSetRegsArm64 sets the registers used by arm64 binaries.
 func PtraceSetRegsArm64(pid int, regs *PtraceRegsArm64) error {
-	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
 }
diff --git a/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go b/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go
index 6cb6d688..834d2856 100644
--- a/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go
@@ -7,11 +7,11 @@ import "unsafe"
 // PtraceGetRegSetArm64 fetches the registers used by arm64 binaries.
 func PtraceGetRegSetArm64(pid, addr int, regsout *PtraceRegsArm64) error {
 	iovec := Iovec{(*byte)(unsafe.Pointer(regsout)), uint64(unsafe.Sizeof(*regsout))}
-	return ptrace(PTRACE_GETREGSET, pid, uintptr(addr), uintptr(unsafe.Pointer(&iovec)))
+	return ptracePtr(PTRACE_GETREGSET, pid, uintptr(addr), unsafe.Pointer(&iovec))
 }
 
 // PtraceSetRegSetArm64 sets the registers used by arm64 binaries.
 func PtraceSetRegSetArm64(pid, addr int, regs *PtraceRegsArm64) error {
 	iovec := Iovec{(*byte)(unsafe.Pointer(regs)), uint64(unsafe.Sizeof(*regs))}
-	return ptrace(PTRACE_SETREGSET, pid, uintptr(addr), uintptr(unsafe.Pointer(&iovec)))
+	return ptracePtr(PTRACE_SETREGSET, pid, uintptr(addr), unsafe.Pointer(&iovec))
 }
diff --git a/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go b/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
index c34d0639..0b5f7943 100644
--- a/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
+++ b/vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
@@ -21,12 +21,12 @@ type PtraceRegsMips struct {
 
 // PtraceGetRegsMips fetches the registers used by mips binaries.
 func PtraceGetRegsMips(pid int, regsout *PtraceRegsMips) error {
-	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
 }
 
 // PtraceSetRegsMips sets the registers used by mips binaries.
 func PtraceSetRegsMips(pid int, regs *PtraceRegsMips) error {
-	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
 }
 
 // PtraceRegsMips64 is the registers used by mips64 binaries.
@@ -42,10 +42,10 @@ type PtraceRegsMips64 struct {
 
 // PtraceGetRegsMips64 fetches the registers used by mips64 binaries.
 func PtraceGetRegsMips64(pid int, regsout *PtraceRegsMips64) error {
-	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
 }
 
 // PtraceSetRegsMips64 sets the registers used by mips64 binaries.
 func PtraceSetRegsMips64(pid int, regs *PtraceRegsMips64) error {
-	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
 }
diff --git a/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go b/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
index 3ccf0c0c..2807f7e6 100644
--- a/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
+++ b/vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
@@ -21,12 +21,12 @@ type PtraceRegsMipsle struct {
 
 // PtraceGetRegsMipsle fetches the registers used by mipsle binaries.
 func PtraceGetRegsMipsle(pid int, regsout *PtraceRegsMipsle) error {
-	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
 }
 
 // PtraceSetRegsMipsle sets the registers used by mipsle binaries.
 func PtraceSetRegsMipsle(pid int, regs *PtraceRegsMipsle) error {
-	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
 }
 
 // PtraceRegsMips64le is the registers used by mips64le binaries.
@@ -42,10 +42,10 @@ type PtraceRegsMips64le struct {
 
 // PtraceGetRegsMips64le fetches the registers used by mips64le binaries.
 func PtraceGetRegsMips64le(pid int, regsout *PtraceRegsMips64le) error {
-	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
 }
 
 // PtraceSetRegsMips64le sets the registers used by mips64le binaries.
 func PtraceSetRegsMips64le(pid int, regs *PtraceRegsMips64le) error {
-	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
 }
diff --git a/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go b/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
index 7d658570..281ea64e 100644
--- a/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
+++ b/vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
@@ -31,12 +31,12 @@ type PtraceRegs386 struct {
 
 // PtraceGetRegs386 fetches the registers used by 386 binaries.
 func PtraceGetRegs386(pid int, regsout *PtraceRegs386) error {
-	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
 }
 
 // PtraceSetRegs386 sets the registers used by 386 binaries.
 func PtraceSetRegs386(pid int, regs *PtraceRegs386) error {
-	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
 }
 
 // PtraceRegsAmd64 is the registers used by amd64 binaries.
@@ -72,10 +72,10 @@ type PtraceRegsAmd64 struct {
 
 // PtraceGetRegsAmd64 fetches the registers used by amd64 binaries.
 func PtraceGetRegsAmd64(pid int, regsout *PtraceRegsAmd64) error {
-	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+	return ptracePtr(PTRACE_GETREGS, pid, 0, unsafe.Pointer(regsout))
 }
 
 // PtraceSetRegsAmd64 sets the registers used by amd64 binaries.
 func PtraceSetRegsAmd64(pid int, regs *PtraceRegsAmd64) error {
-	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+	return ptracePtr(PTRACE_SETREGS, pid, 0, unsafe.Pointer(regs))
 }
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
index 870215d2..ef9dcd1b 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
@@ -223,6 +223,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	r0, er := C.ioctl(C.int(fd), C.int(req), C.uintptr_t(uintptr(arg)))
+	if r0 == -1 && er != nil {
+		err = er
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func FcntlInt(fd uintptr, cmd int, arg int) (r int, err error) {
 	r0, er := C.fcntl(C.uintptr_t(fd), C.int(cmd), C.uintptr_t(arg))
 	r = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
index a89b0bfa..f86a9459 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
@@ -103,6 +103,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, e1 := callioctl_ptr(fd, int(req), arg)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func FcntlInt(fd uintptr, cmd int, arg int) (r int, err error) {
 	r0, e1 := callfcntl(fd, cmd, uintptr(arg))
 	r = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
index 2caa5adf..d32a84ca 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
@@ -423,6 +423,13 @@ func callioctl(fd int, req int, arg uintptr) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func callioctl_ptr(fd int, req int, arg unsafe.Pointer) (r1 uintptr, e1 Errno) {
+	r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_ioctl)), 3, uintptr(fd), uintptr(req), uintptr(arg), 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func callfcntl(fd uintptr, cmd int, arg uintptr) (r1 uintptr, e1 Errno) {
 	r1, _, e1 = syscall6(uintptr(unsafe.Pointer(&libc_fcntl)), 3, fd, uintptr(cmd), arg, 0, 0, 0)
 	return
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
index 944a714b..d7d8baf8 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
@@ -191,6 +191,14 @@ func callioctl(fd int, req int, arg uintptr) (r1 uintptr, e1 Errno) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func callioctl_ptr(fd int, req int, arg unsafe.Pointer) (r1 uintptr, e1 Errno) {
+	r1 = uintptr(C.ioctl(C.int(fd), C.int(req), C.uintptr_t(uintptr(arg))))
+	e1 = syscall.GetErrno()
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func callfcntl(fd uintptr, cmd int, arg uintptr) (r1 uintptr, e1 Errno) {
 	r1 = uintptr(C.fcntl(C.uintptr_t(fd), C.int(cmd), C.uintptr_t(arg)))
 	e1 = syscall.GetErrno()
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
index c2461c49..a29ffdd5 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
@@ -725,6 +725,14 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 	return
 }
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 var libc_ioctl_trampoline_addr uintptr
 
 //go:cgo_import_dynamic libc_ioctl ioctl "/usr/lib/libSystem.B.dylib"
@@ -2502,6 +2510,14 @@ func ptrace1(request int, pid int, addr uintptr, data uintptr) (err error) {
 	return
 }
 
+func ptrace1Ptr(request int, pid int, addr uintptr, data unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall6(libc_ptrace_trampoline_addr, uintptr(request), uintptr(pid), addr, uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 var libc_ptrace_trampoline_addr uintptr
 
 //go:cgo_import_dynamic libc_ptrace ptrace "/usr/lib/libSystem.B.dylib"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
index 26a0fdc5..2fd4590b 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
@@ -725,6 +725,14 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 	return
 }
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 var libc_ioctl_trampoline_addr uintptr
 
 //go:cgo_import_dynamic libc_ioctl ioctl "/usr/lib/libSystem.B.dylib"
@@ -2502,6 +2510,14 @@ func ptrace1(request int, pid int, addr uintptr, data uintptr) (err error) {
 	return
 }
 
+func ptrace1Ptr(request int, pid int, addr uintptr, data unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall6(libc_ptrace_trampoline_addr, uintptr(request), uintptr(pid), addr, uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 var libc_ptrace_trampoline_addr uintptr
 
 //go:cgo_import_dynamic libc_ptrace ptrace "/usr/lib/libSystem.B.dylib"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
index 54749f9c..3b851347 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
@@ -436,6 +436,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
index 77479d45..11290656 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
@@ -388,6 +388,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -414,6 +424,16 @@ func ptrace(request int, pid int, addr uintptr, data int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
index 2e966d4d..55f5abfe 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
@@ -388,6 +388,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -414,6 +424,16 @@ func ptrace(request int, pid int, addr uintptr, data int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
index d65a7c0f..d39651c2 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
@@ -388,6 +388,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -414,6 +424,16 @@ func ptrace(request int, pid int, addr uintptr, data int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
index 6f0b97c6..ddb74086 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
@@ -388,6 +388,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -414,6 +424,16 @@ func ptrace(request int, pid int, addr uintptr, data int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
index e1c23b52..09a53a61 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
@@ -388,6 +388,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
@@ -414,6 +424,16 @@ func ptrace(request int, pid int, addr uintptr, data int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ptracePtr(request int, pid int, addr unsafe.Pointer, data int) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux.go b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
index 36ea3a55..430cb24d 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
@@ -379,6 +379,16 @@ func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ptracePtr(request int, pid int, addr uintptr, data unsafe.Pointer) (err error) {
+	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func reboot(magic1 uint, magic2 uint, cmd int, arg string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(arg)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
index 79f73899..8e1d9c8f 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
@@ -405,6 +405,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
index fb161f3a..21c69504 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
@@ -405,6 +405,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
index 4c8ac993..298168f9 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
@@ -405,6 +405,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
index 76dd8ec4..68b8bd49 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
@@ -405,6 +405,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
 	var _p0 unsafe.Pointer
 	if len(mib) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
index caeb807b..0b0f910e 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
@@ -527,6 +527,14 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 	return
 }
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 var libc_ioctl_trampoline_addr uintptr
 
 //go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
index a05e5f4f..48ff5de7 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
@@ -527,6 +527,14 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 	return
 }
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 var libc_ioctl_trampoline_addr uintptr
 
 //go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
index b2da8e50..2452a641 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
@@ -527,6 +527,14 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 	return
 }
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 var libc_ioctl_trampoline_addr uintptr
 
 //go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
index 048b2655..5e35600a 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
@@ -527,6 +527,14 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 	return
 }
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 var libc_ioctl_trampoline_addr uintptr
 
 //go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
index 6f33e37e..b04cef1a 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
@@ -527,6 +527,14 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 	return
 }
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 var libc_ioctl_trampoline_addr uintptr
 
 //go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
index 330cf7f7..47a07ee0 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
@@ -527,6 +527,14 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 	return
 }
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 var libc_ioctl_trampoline_addr uintptr
 
 //go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
index 5f24de0d..573378fd 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
@@ -527,6 +527,14 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 	return
 }
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall(libc_ioctl_trampoline_addr, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 var libc_ioctl_trampoline_addr uintptr
 
 //go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
index 78d4a424..4873a1e5 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
@@ -657,6 +657,17 @@ func ioctlRet(fd int, req uint, arg uintptr) (ret int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtrRet(fd int, req uint, arg unsafe.Pointer) (ret int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procioctl)), 3, uintptr(fd), uintptr(req), uintptr(arg), 0, 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procpoll)), 3, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout), 0, 0, 0)
 	n = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go b/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
index f2079457..07bfe2ef 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
@@ -267,6 +267,16 @@ func ioctl(fd int, req uint, arg uintptr) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctlPtr(fd int, req uint, arg unsafe.Pointer) (err error) {
+	_, _, e1 := syscall_syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
index d9c78cdc..29dc4833 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
@@ -362,7 +362,7 @@ type FpExtendedPrecision struct{}
 type PtraceIoDesc struct {
 	Op   int32
 	Offs uintptr
-	Addr uintptr
+	Addr *byte
 	Len  uint32
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
index 26991b16..0a89b289 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
@@ -367,7 +367,7 @@ type FpExtendedPrecision struct{}
 type PtraceIoDesc struct {
 	Op   int32
 	Offs uintptr
-	Addr uintptr
+	Addr *byte
 	Len  uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
index f8324e7e..c8666bb1 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
@@ -350,7 +350,7 @@ type FpExtendedPrecision struct {
 type PtraceIoDesc struct {
 	Op   int32
 	Offs uintptr
-	Addr uintptr
+	Addr *byte
 	Len  uint32
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
index 4220411f..88fb48a8 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
@@ -347,7 +347,7 @@ type FpExtendedPrecision struct{}
 type PtraceIoDesc struct {
 	Op   int32
 	Offs uintptr
-	Addr uintptr
+	Addr *byte
 	Len  uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
index 0660fd45..698dc975 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
@@ -348,7 +348,7 @@ type FpExtendedPrecision struct{}
 type PtraceIoDesc struct {
 	Op   int32
 	Offs uintptr
-	Addr uintptr
+	Addr *byte
 	Len  uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go
index 7d9fc8f1..ca84727c 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go
@@ -456,36 +456,60 @@ type Ucred struct {
 }
 
 type TCPInfo struct {
-	State          uint8
-	Ca_state       uint8
-	Retransmits    uint8
-	Probes         uint8
-	Backoff        uint8
-	Options        uint8
-	Rto            uint32
-	Ato            uint32
-	Snd_mss        uint32
-	Rcv_mss        uint32
-	Unacked        uint32
-	Sacked         uint32
-	Lost           uint32
-	Retrans        uint32
-	Fackets        uint32
-	Last_data_sent uint32
-	Last_ack_sent  uint32
-	Last_data_recv uint32
-	Last_ack_recv  uint32
-	Pmtu           uint32
-	Rcv_ssthresh   uint32
-	Rtt            uint32
-	Rttvar         uint32
-	Snd_ssthresh   uint32
-	Snd_cwnd       uint32
-	Advmss         uint32
-	Reordering     uint32
-	Rcv_rtt        uint32
-	Rcv_space      uint32
-	Total_retrans  uint32
+	State           uint8
+	Ca_state        uint8
+	Retransmits     uint8
+	Probes          uint8
+	Backoff         uint8
+	Options         uint8
+	Rto             uint32
+	Ato             uint32
+	Snd_mss         uint32
+	Rcv_mss         uint32
+	Unacked         uint32
+	Sacked          uint32
+	Lost            uint32
+	Retrans         uint32
+	Fackets         uint32
+	Last_data_sent  uint32
+	Last_ack_sent   uint32
+	Last_data_recv  uint32
+	Last_ack_recv   uint32
+	Pmtu            uint32
+	Rcv_ssthresh    uint32
+	Rtt             uint32
+	Rttvar          uint32
+	Snd_ssthresh    uint32
+	Snd_cwnd        uint32
+	Advmss          uint32
+	Reordering      uint32
+	Rcv_rtt         uint32
+	Rcv_space       uint32
+	Total_retrans   uint32
+	Pacing_rate     uint64
+	Max_pacing_rate uint64
+	Bytes_acked     uint64
+	Bytes_received  uint64
+	Segs_out        uint32
+	Segs_in         uint32
+	Notsent_bytes   uint32
+	Min_rtt         uint32
+	Data_segs_in    uint32
+	Data_segs_out   uint32
+	Delivery_rate   uint64
+	Busy_time       uint64
+	Rwnd_limited    uint64
+	Sndbuf_limited  uint64
+	Delivered       uint32
+	Delivered_ce    uint32
+	Bytes_sent      uint64
+	Bytes_retrans   uint64
+	Dsack_dups      uint32
+	Reord_seen      uint32
+	Rcv_ooopack     uint32
+	Snd_wnd         uint32
+	Rcv_wnd         uint32
+	Rehash          uint32
 }
 
 type CanFilter struct {
@@ -528,7 +552,7 @@ const (
 	SizeofIPv6MTUInfo       = 0x20
 	SizeofICMPv6Filter      = 0x20
 	SizeofUcred             = 0xc
-	SizeofTCPInfo           = 0x68
+	SizeofTCPInfo           = 0xf0
 	SizeofCanFilter         = 0x8
 	SizeofTCPRepairOpt      = 0x8
 )
@@ -1043,6 +1067,7 @@ const (
 	PerfBitCommExec                      = CBitFieldMaskBit24
 	PerfBitUseClockID                    = CBitFieldMaskBit25
 	PerfBitContextSwitch                 = CBitFieldMaskBit26
+	PerfBitWriteBackward                 = CBitFieldMaskBit27
 )
 
 const (
@@ -1239,7 +1264,7 @@ type TCPMD5Sig struct {
 	Flags     uint8
 	Prefixlen uint8
 	Keylen    uint16
-	_         uint32
+	Ifindex   int32
 	Key       [80]uint8
 }
 
@@ -1939,7 +1964,11 @@ const (
 	NFT_MSG_GETOBJ                    = 0x13
 	NFT_MSG_DELOBJ                    = 0x14
 	NFT_MSG_GETOBJ_RESET              = 0x15
-	NFT_MSG_MAX                       = 0x19
+	NFT_MSG_NEWFLOWTABLE              = 0x16
+	NFT_MSG_GETFLOWTABLE              = 0x17
+	NFT_MSG_DELFLOWTABLE              = 0x18
+	NFT_MSG_GETRULE_RESET             = 0x19
+	NFT_MSG_MAX                       = 0x1a
 	NFTA_LIST_UNSPEC                  = 0x0
 	NFTA_LIST_ELEM                    = 0x1
 	NFTA_HOOK_UNSPEC                  = 0x0
@@ -2443,9 +2472,11 @@ const (
 	SOF_TIMESTAMPING_OPT_STATS    = 0x1000
 	SOF_TIMESTAMPING_OPT_PKTINFO  = 0x2000
 	SOF_TIMESTAMPING_OPT_TX_SWHW  = 0x4000
+	SOF_TIMESTAMPING_BIND_PHC     = 0x8000
+	SOF_TIMESTAMPING_OPT_ID_TCP   = 0x10000
 
-	SOF_TIMESTAMPING_LAST = 0x8000
-	SOF_TIMESTAMPING_MASK = 0xffff
+	SOF_TIMESTAMPING_LAST = 0x10000
+	SOF_TIMESTAMPING_MASK = 0x1ffff
 
 	SCM_TSTAMP_SND   = 0x0
 	SCM_TSTAMP_SCHED = 0x1
@@ -3265,7 +3296,7 @@ const (
 	DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES              = 0xae
 	DEVLINK_ATTR_NESTED_DEVLINK                        = 0xaf
 	DEVLINK_ATTR_SELFTESTS                             = 0xb0
-	DEVLINK_ATTR_MAX                                   = 0xb0
+	DEVLINK_ATTR_MAX                                   = 0xb3
 	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_NONE              = 0x0
 	DEVLINK_DPIPE_FIELD_MAPPING_TYPE_IFINDEX           = 0x1
 	DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT               = 0x0
@@ -3281,7 +3312,8 @@ const (
 	DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR                 = 0x1
 	DEVLINK_PORT_FN_ATTR_STATE                         = 0x2
 	DEVLINK_PORT_FN_ATTR_OPSTATE                       = 0x3
-	DEVLINK_PORT_FUNCTION_ATTR_MAX                     = 0x3
+	DEVLINK_PORT_FN_ATTR_CAPS                          = 0x4
+	DEVLINK_PORT_FUNCTION_ATTR_MAX                     = 0x4
 )
 
 type FsverityDigest struct {
@@ -3572,7 +3604,8 @@ const (
 	ETHTOOL_MSG_MODULE_SET                    = 0x23
 	ETHTOOL_MSG_PSE_GET                       = 0x24
 	ETHTOOL_MSG_PSE_SET                       = 0x25
-	ETHTOOL_MSG_USER_MAX                      = 0x25
+	ETHTOOL_MSG_RSS_GET                       = 0x26
+	ETHTOOL_MSG_USER_MAX                      = 0x26
 	ETHTOOL_MSG_KERNEL_NONE                   = 0x0
 	ETHTOOL_MSG_STRSET_GET_REPLY              = 0x1
 	ETHTOOL_MSG_LINKINFO_GET_REPLY            = 0x2
@@ -3611,7 +3644,8 @@ const (
 	ETHTOOL_MSG_MODULE_GET_REPLY              = 0x23
 	ETHTOOL_MSG_MODULE_NTF                    = 0x24
 	ETHTOOL_MSG_PSE_GET_REPLY                 = 0x25
-	ETHTOOL_MSG_KERNEL_MAX                    = 0x25
+	ETHTOOL_MSG_RSS_GET_REPLY                 = 0x26
+	ETHTOOL_MSG_KERNEL_MAX                    = 0x26
 	ETHTOOL_A_HEADER_UNSPEC                   = 0x0
 	ETHTOOL_A_HEADER_DEV_INDEX                = 0x1
 	ETHTOOL_A_HEADER_DEV_NAME                 = 0x2
@@ -3679,7 +3713,8 @@ const (
 	ETHTOOL_A_LINKSTATE_SQI_MAX               = 0x4
 	ETHTOOL_A_LINKSTATE_EXT_STATE             = 0x5
 	ETHTOOL_A_LINKSTATE_EXT_SUBSTATE          = 0x6
-	ETHTOOL_A_LINKSTATE_MAX                   = 0x6
+	ETHTOOL_A_LINKSTATE_EXT_DOWN_CNT          = 0x7
+	ETHTOOL_A_LINKSTATE_MAX                   = 0x7
 	ETHTOOL_A_DEBUG_UNSPEC                    = 0x0
 	ETHTOOL_A_DEBUG_HEADER                    = 0x1
 	ETHTOOL_A_DEBUG_MSGMASK                   = 0x2
@@ -4409,7 +4444,7 @@ const (
 	NL80211_ATTR_MAC_HINT                                   = 0xc8
 	NL80211_ATTR_MAC_MASK                                   = 0xd7
 	NL80211_ATTR_MAX_AP_ASSOC_STA                           = 0xca
-	NL80211_ATTR_MAX                                        = 0x140
+	NL80211_ATTR_MAX                                        = 0x141
 	NL80211_ATTR_MAX_CRIT_PROT_DURATION                     = 0xb4
 	NL80211_ATTR_MAX_CSA_COUNTERS                           = 0xce
 	NL80211_ATTR_MAX_MATCH_SETS                             = 0x85
@@ -4552,6 +4587,7 @@ const (
 	NL80211_ATTR_SUPPORT_MESH_AUTH                          = 0x73
 	NL80211_ATTR_SURVEY_INFO                                = 0x54
 	NL80211_ATTR_SURVEY_RADIO_STATS                         = 0xda
+	NL80211_ATTR_TD_BITMAP                                  = 0x141
 	NL80211_ATTR_TDLS_ACTION                                = 0x88
 	NL80211_ATTR_TDLS_DIALOG_TOKEN                          = 0x89
 	NL80211_ATTR_TDLS_EXTERNAL_SETUP                        = 0x8c
@@ -5752,3 +5788,25 @@ const (
 	AUDIT_NLGRP_NONE    = 0x0
 	AUDIT_NLGRP_READLOG = 0x1
 )
+
+const (
+	TUN_F_CSUM    = 0x1
+	TUN_F_TSO4    = 0x2
+	TUN_F_TSO6    = 0x4
+	TUN_F_TSO_ECN = 0x8
+	TUN_F_UFO     = 0x10
+)
+
+const (
+	VIRTIO_NET_HDR_F_NEEDS_CSUM = 0x1
+	VIRTIO_NET_HDR_F_DATA_VALID = 0x2
+	VIRTIO_NET_HDR_F_RSC_INFO   = 0x4
+)
+
+const (
+	VIRTIO_NET_HDR_GSO_NONE  = 0x0
+	VIRTIO_NET_HDR_GSO_TCPV4 = 0x1
+	VIRTIO_NET_HDR_GSO_UDP   = 0x3
+	VIRTIO_NET_HDR_GSO_TCPV6 = 0x4
+	VIRTIO_NET_HDR_GSO_ECN   = 0x80
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
index 89c516a2..4ecc1495 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
@@ -414,7 +414,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [122]int8
+	Data   [122]byte
 	_      uint32
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
index 62b4fb26..34fddff9 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
@@ -427,7 +427,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [118]int8
+	Data   [118]byte
 	_      uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
index e86b3589..3b14a603 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
@@ -405,7 +405,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [122]uint8
+	Data   [122]byte
 	_      uint32
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
index 6c6be4c9..0517651a 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
@@ -406,7 +406,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [118]int8
+	Data   [118]byte
 	_      uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
index 4982ea35..3b0c5181 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
@@ -407,7 +407,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [118]int8
+	Data   [118]byte
 	_      uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
index 173141a6..fccdf4dd 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
@@ -410,7 +410,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [122]int8
+	Data   [122]byte
 	_      uint32
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
index 93ae4c51..500de8fc 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
@@ -409,7 +409,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [118]int8
+	Data   [118]byte
 	_      uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
index 4e4e510c..d0434cd2 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
@@ -409,7 +409,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [118]int8
+	Data   [118]byte
 	_      uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
index 3f5ba013..84206ba5 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
@@ -410,7 +410,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [122]int8
+	Data   [122]byte
 	_      uint32
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
index 71dfe7cd..ab078cf1 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
@@ -417,7 +417,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [122]uint8
+	Data   [122]byte
 	_      uint32
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
index 3a2b7f0a..42eb2c4c 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
@@ -416,7 +416,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [118]uint8
+	Data   [118]byte
 	_      uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
index a52d6275..31304a4e 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
@@ -416,7 +416,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [118]uint8
+	Data   [118]byte
 	_      uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
index dfc007d8..c311f961 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
@@ -434,7 +434,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [118]uint8
+	Data   [118]byte
 	_      uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
index b53cb910..bba3cefa 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
@@ -429,7 +429,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [118]int8
+	Data   [118]byte
 	_      uint64
 }
 
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
index fe0aa354..ad8a0138 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
@@ -411,7 +411,7 @@ const (
 
 type SockaddrStorage struct {
 	Family uint16
-	_      [118]int8
+	Data   [118]byte
 	_      uint64
 }
 
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go
index 41cb3c01..3723b2c2 100644
--- a/vendor/golang.org/x/sys/windows/syscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/syscall_windows.go
@@ -824,6 +824,9 @@ const socket_error = uintptr(^uint32(0))
 //sys	WSAStartup(verreq uint32, data *WSAData) (sockerr error) = ws2_32.WSAStartup
 //sys	WSACleanup() (err error) [failretval==socket_error] = ws2_32.WSACleanup
 //sys	WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbob uint32, cbbr *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) [failretval==socket_error] = ws2_32.WSAIoctl
+//sys	WSALookupServiceBegin(querySet *WSAQUERYSET, flags uint32, handle *Handle) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceBeginW
+//sys	WSALookupServiceNext(handle Handle, flags uint32, size *int32, querySet *WSAQUERYSET) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceNextW
+//sys	WSALookupServiceEnd(handle Handle) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceEnd
 //sys	socket(af int32, typ int32, protocol int32) (handle Handle, err error) [failretval==InvalidHandle] = ws2_32.socket
 //sys	sendto(s Handle, buf []byte, flags int32, to unsafe.Pointer, tolen int32) (err error) [failretval==socket_error] = ws2_32.sendto
 //sys	recvfrom(s Handle, buf []byte, flags int32, from *RawSockaddrAny, fromlen *int32) (n int32, err error) [failretval==-1] = ws2_32.recvfrom
@@ -1019,8 +1022,7 @@ func (rsa *RawSockaddrAny) Sockaddr() (Sockaddr, error) {
 		for n < len(pp.Path) && pp.Path[n] != 0 {
 			n++
 		}
-		bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n]
-		sa.Name = string(bytes)
+		sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n))
 		return sa, nil
 
 	case AF_INET:
diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go
index 0c4add97..857acf10 100644
--- a/vendor/golang.org/x/sys/windows/types_windows.go
+++ b/vendor/golang.org/x/sys/windows/types_windows.go
@@ -1243,6 +1243,51 @@ const (
 	DnsSectionAdditional = 0x0003
 )
 
+const (
+	// flags of WSALookupService
+	LUP_DEEP                = 0x0001
+	LUP_CONTAINERS          = 0x0002
+	LUP_NOCONTAINERS        = 0x0004
+	LUP_NEAREST             = 0x0008
+	LUP_RETURN_NAME         = 0x0010
+	LUP_RETURN_TYPE         = 0x0020
+	LUP_RETURN_VERSION      = 0x0040
+	LUP_RETURN_COMMENT      = 0x0080
+	LUP_RETURN_ADDR         = 0x0100
+	LUP_RETURN_BLOB         = 0x0200
+	LUP_RETURN_ALIASES      = 0x0400
+	LUP_RETURN_QUERY_STRING = 0x0800
+	LUP_RETURN_ALL          = 0x0FF0
+	LUP_RES_SERVICE         = 0x8000
+
+	LUP_FLUSHCACHE    = 0x1000
+	LUP_FLUSHPREVIOUS = 0x2000
+
+	LUP_NON_AUTHORITATIVE      = 0x4000
+	LUP_SECURE                 = 0x8000
+	LUP_RETURN_PREFERRED_NAMES = 0x10000
+	LUP_DNS_ONLY               = 0x20000
+
+	LUP_ADDRCONFIG           = 0x100000
+	LUP_DUAL_ADDR            = 0x200000
+	LUP_FILESERVER           = 0x400000
+	LUP_DISABLE_IDN_ENCODING = 0x00800000
+	LUP_API_ANSI             = 0x01000000
+
+	LUP_RESOLUTION_HANDLE = 0x80000000
+)
+
+const (
+	// values of WSAQUERYSET's namespace
+	NS_ALL       = 0
+	NS_DNS       = 12
+	NS_NLA       = 15
+	NS_BTH       = 16
+	NS_EMAIL     = 37
+	NS_PNRPNAME  = 38
+	NS_PNRPCLOUD = 39
+)
+
 type DNSSRVData struct {
 	Target   *uint16
 	Priority uint16
@@ -3258,3 +3303,43 @@ const (
 	DWMWA_TEXT_COLOR                     = 36
 	DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37
 )
+
+type WSAQUERYSET struct {
+	Size                uint32
+	ServiceInstanceName *uint16
+	ServiceClassId      *GUID
+	Version             *WSAVersion
+	Comment             *uint16
+	NameSpace           uint32
+	NSProviderId        *GUID
+	Context             *uint16
+	NumberOfProtocols   uint32
+	AfpProtocols        *AFProtocols
+	QueryString         *uint16
+	NumberOfCsAddrs     uint32
+	SaBuffer            *CSAddrInfo
+	OutputFlags         uint32
+	Blob                *BLOB
+}
+
+type WSAVersion struct {
+	Version                 uint32
+	EnumerationOfComparison int32
+}
+
+type AFProtocols struct {
+	AddressFamily int32
+	Protocol      int32
+}
+
+type CSAddrInfo struct {
+	LocalAddr  SocketAddress
+	RemoteAddr SocketAddress
+	SocketType int32
+	Protocol   int32
+}
+
+type BLOB struct {
+	Size     uint32
+	BlobData *byte
+}
diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
index ac60052e..6d2a2685 100644
--- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
@@ -474,6 +474,9 @@ var (
 	procWSAEnumProtocolsW                                    = modws2_32.NewProc("WSAEnumProtocolsW")
 	procWSAGetOverlappedResult                               = modws2_32.NewProc("WSAGetOverlappedResult")
 	procWSAIoctl                                             = modws2_32.NewProc("WSAIoctl")
+	procWSALookupServiceBeginW                               = modws2_32.NewProc("WSALookupServiceBeginW")
+	procWSALookupServiceEnd                                  = modws2_32.NewProc("WSALookupServiceEnd")
+	procWSALookupServiceNextW                                = modws2_32.NewProc("WSALookupServiceNextW")
 	procWSARecv                                              = modws2_32.NewProc("WSARecv")
 	procWSARecvFrom                                          = modws2_32.NewProc("WSARecvFrom")
 	procWSASend                                              = modws2_32.NewProc("WSASend")
@@ -4067,6 +4070,30 @@ func WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbo
 	return
 }
 
+func WSALookupServiceBegin(querySet *WSAQUERYSET, flags uint32, handle *Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procWSALookupServiceBeginW.Addr(), 3, uintptr(unsafe.Pointer(querySet)), uintptr(flags), uintptr(unsafe.Pointer(handle)))
+	if r1 == socket_error {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+func WSALookupServiceEnd(handle Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procWSALookupServiceEnd.Addr(), 1, uintptr(handle), 0, 0)
+	if r1 == socket_error {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+func WSALookupServiceNext(handle Handle, flags uint32, size *int32, querySet *WSAQUERYSET) (err error) {
+	r1, _, e1 := syscall.Syscall6(procWSALookupServiceNextW.Addr(), 4, uintptr(handle), uintptr(flags), uintptr(unsafe.Pointer(size)), uintptr(unsafe.Pointer(querySet)), 0, 0)
+	if r1 == socket_error {
+		err = errnoErr(e1)
+	}
+	return
+}
+
 func WSARecv(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32, overlapped *Overlapped, croutine *byte) (err error) {
 	r1, _, e1 := syscall.Syscall9(procWSARecv.Addr(), 7, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(recvd)), uintptr(unsafe.Pointer(flags)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)), 0, 0)
 	if r1 == socket_error {
diff --git a/vendor/golang.org/x/text/encoding/internal/internal.go b/vendor/golang.org/x/text/encoding/internal/internal.go
index 75a5fd16..413e6fc6 100644
--- a/vendor/golang.org/x/text/encoding/internal/internal.go
+++ b/vendor/golang.org/x/text/encoding/internal/internal.go
@@ -64,7 +64,7 @@ func (e FuncEncoding) NewEncoder() *encoding.Encoder {
 // byte.
 type RepertoireError byte
 
-// Error implements the error interrface.
+// Error implements the error interface.
 func (r RepertoireError) Error() string {
 	return "encoding: rune not supported by encoding."
 }
diff --git a/vendor/golang.org/x/text/unicode/norm/forminfo.go b/vendor/golang.org/x/text/unicode/norm/forminfo.go
index d69ccb4f..487335d1 100644
--- a/vendor/golang.org/x/text/unicode/norm/forminfo.go
+++ b/vendor/golang.org/x/text/unicode/norm/forminfo.go
@@ -13,7 +13,7 @@ import "encoding/binary"
 // a rune to a uint16. The values take two forms.  For v >= 0x8000:
 //   bits
 //   15:    1 (inverse of NFD_QC bit of qcInfo)
-//   13..7: qcInfo (see below). isYesD is always true (no decompostion).
+//   13..7: qcInfo (see below). isYesD is always true (no decomposition).
 //    6..0: ccc (compressed CCC value).
 // For v < 0x8000, the respective rune has a decomposition and v is an index
 // into a byte array of UTF-8 decomposition sequences and additional info and
diff --git a/vendor/golang.org/x/time/rate/rate.go b/vendor/golang.org/x/time/rate/rate.go
index 8f7c29f1..f0e0cf3c 100644
--- a/vendor/golang.org/x/time/rate/rate.go
+++ b/vendor/golang.org/x/time/rate/rate.go
@@ -83,7 +83,7 @@ func (lim *Limiter) Burst() int {
 // TokensAt returns the number of tokens available at time t.
 func (lim *Limiter) TokensAt(t time.Time) float64 {
 	lim.mu.Lock()
-	_, _, tokens := lim.advance(t) // does not mutute lim
+	_, tokens := lim.advance(t) // does not mutate lim
 	lim.mu.Unlock()
 	return tokens
 }
@@ -183,7 +183,7 @@ func (r *Reservation) CancelAt(t time.Time) {
 		return
 	}
 	// advance time to now
-	t, _, tokens := r.lim.advance(t)
+	t, tokens := r.lim.advance(t)
 	// calculate new number of tokens
 	tokens += restoreTokens
 	if burst := float64(r.lim.burst); tokens > burst {
@@ -304,7 +304,7 @@ func (lim *Limiter) SetLimitAt(t time.Time, newLimit Limit) {
 	lim.mu.Lock()
 	defer lim.mu.Unlock()
 
-	t, _, tokens := lim.advance(t)
+	t, tokens := lim.advance(t)
 
 	lim.last = t
 	lim.tokens = tokens
@@ -321,7 +321,7 @@ func (lim *Limiter) SetBurstAt(t time.Time, newBurst int) {
 	lim.mu.Lock()
 	defer lim.mu.Unlock()
 
-	t, _, tokens := lim.advance(t)
+	t, tokens := lim.advance(t)
 
 	lim.last = t
 	lim.tokens = tokens
@@ -356,7 +356,7 @@ func (lim *Limiter) reserveN(t time.Time, n int, maxFutureReserve time.Duration)
 		}
 	}
 
-	t, last, tokens := lim.advance(t)
+	t, tokens := lim.advance(t)
 
 	// Calculate the remaining number of tokens resulting from the request.
 	tokens -= float64(n)
@@ -379,15 +379,11 @@ func (lim *Limiter) reserveN(t time.Time, n int, maxFutureReserve time.Duration)
 	if ok {
 		r.tokens = n
 		r.timeToAct = t.Add(waitDuration)
-	}
 
-	// Update state
-	if ok {
+		// Update state
 		lim.last = t
 		lim.tokens = tokens
 		lim.lastEvent = r.timeToAct
-	} else {
-		lim.last = last
 	}
 
 	return r
@@ -396,7 +392,7 @@ func (lim *Limiter) reserveN(t time.Time, n int, maxFutureReserve time.Duration)
 // advance calculates and returns an updated state for lim resulting from the passage of time.
 // lim is not changed.
 // advance requires that lim.mu is held.
-func (lim *Limiter) advance(t time.Time) (newT time.Time, newLast time.Time, newTokens float64) {
+func (lim *Limiter) advance(t time.Time) (newT time.Time, newTokens float64) {
 	last := lim.last
 	if t.Before(last) {
 		last = t
@@ -409,7 +405,7 @@ func (lim *Limiter) advance(t time.Time) (newT time.Time, newLast time.Time, new
 	if burst := float64(lim.burst); tokens > burst {
 		tokens = burst
 	}
-	return t, last, tokens
+	return t, tokens
 }
 
 // durationFromTokens is a unit conversion function from the number of tokens to the duration
diff --git a/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go b/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
index 2ed25a75..165ede0f 100644
--- a/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
+++ b/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
@@ -27,10 +27,9 @@ import (
 	"go/token"
 	"go/types"
 	"io"
-	"io/ioutil"
 	"os/exec"
 
-	"golang.org/x/tools/go/internal/gcimporter"
+	"golang.org/x/tools/internal/gcimporter"
 )
 
 // Find returns the name of an object (.o) or archive (.a) file
@@ -85,9 +84,26 @@ func NewReader(r io.Reader) (io.Reader, error) {
 	}
 }
 
+// readAll works the same way as io.ReadAll, but avoids allocations and copies
+// by preallocating a byte slice of the necessary size if the size is known up
+// front. This is always possible when the input is an archive. In that case,
+// NewReader will return the known size using an io.LimitedReader.
+func readAll(r io.Reader) ([]byte, error) {
+	if lr, ok := r.(*io.LimitedReader); ok {
+		data := make([]byte, lr.N)
+		_, err := io.ReadFull(lr, data)
+		return data, err
+	}
+	return io.ReadAll(r)
+}
+
 // Read reads export data from in, decodes it, and returns type
 // information for the package.
-// The package name is specified by path.
+//
+// The package path (effectively its linker symbol prefix) is
+// specified by path, since unlike the package name, this information
+// may not be recorded in the export data.
+//
 // File position information is added to fset.
 //
 // Read may inspect and add to the imports map to ensure that references
@@ -98,7 +114,7 @@ func NewReader(r io.Reader) (io.Reader, error) {
 //
 // On return, the state of the reader is undefined.
 func Read(in io.Reader, fset *token.FileSet, imports map[string]*types.Package, path string) (*types.Package, error) {
-	data, err := ioutil.ReadAll(in)
+	data, err := readAll(in)
 	if err != nil {
 		return nil, fmt.Errorf("reading export data for %q: %v", path, err)
 	}
@@ -107,12 +123,6 @@ func Read(in io.Reader, fset *token.FileSet, imports map[string]*types.Package,
 		return nil, fmt.Errorf("can't read export data for %q directly from an archive file (call gcexportdata.NewReader first to extract export data)", path)
 	}
 
-	// The App Engine Go runtime v1.6 uses the old export data format.
-	// TODO(adonovan): delete once v1.7 has been around for a while.
-	if bytes.HasPrefix(data, []byte("package ")) {
-		return gcimporter.ImportData(imports, path, path, bytes.NewReader(data))
-	}
-
 	// The indexed export format starts with an 'i'; the older
 	// binary export format starts with a 'c', 'd', or 'v'
 	// (from "version"). Select appropriate importer.
@@ -161,7 +171,7 @@ func Write(out io.Writer, fset *token.FileSet, pkg *types.Package) error {
 //
 // Experimental: This API is experimental and may change in the future.
 func ReadBundle(in io.Reader, fset *token.FileSet, imports map[string]*types.Package) ([]*types.Package, error) {
-	data, err := ioutil.ReadAll(in)
+	data, err := readAll(in)
 	if err != nil {
 		return nil, fmt.Errorf("reading export bundle: %v", err)
 	}
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go b/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go
deleted file mode 100644
index e96c3960..00000000
--- a/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go
+++ /dev/null
@@ -1,1125 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file is a modified copy of $GOROOT/src/go/internal/gcimporter/gcimporter.go,
-// but it also contains the original source-based importer code for Go1.6.
-// Once we stop supporting 1.6, we can remove that code.
-
-// Package gcimporter provides various functions for reading
-// gc-generated object files that can be used to implement the
-// Importer interface defined by the Go 1.5 standard library package.
-package gcimporter // import "golang.org/x/tools/go/internal/gcimporter"
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"go/build"
-	"go/constant"
-	"go/token"
-	"go/types"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"text/scanner"
-)
-
-const (
-	// Enable debug during development: it adds some additional checks, and
-	// prevents errors from being recovered.
-	debug = false
-
-	// If trace is set, debugging output is printed to std out.
-	trace = false
-)
-
-var pkgExts = [...]string{".a", ".o"}
-
-// FindPkg returns the filename and unique package id for an import
-// path based on package information provided by build.Import (using
-// the build.Default build.Context). A relative srcDir is interpreted
-// relative to the current working directory.
-// If no file was found, an empty filename is returned.
-func FindPkg(path, srcDir string) (filename, id string) {
-	if path == "" {
-		return
-	}
-
-	var noext string
-	switch {
-	default:
-		// "x" -> "$GOPATH/pkg/$GOOS_$GOARCH/x.ext", "x"
-		// Don't require the source files to be present.
-		if abs, err := filepath.Abs(srcDir); err == nil { // see issue 14282
-			srcDir = abs
-		}
-		bp, _ := build.Import(path, srcDir, build.FindOnly|build.AllowBinary)
-		if bp.PkgObj == "" {
-			id = path // make sure we have an id to print in error message
-			return
-		}
-		noext = strings.TrimSuffix(bp.PkgObj, ".a")
-		id = bp.ImportPath
-
-	case build.IsLocalImport(path):
-		// "./x" -> "/this/directory/x.ext", "/this/directory/x"
-		noext = filepath.Join(srcDir, path)
-		id = noext
-
-	case filepath.IsAbs(path):
-		// for completeness only - go/build.Import
-		// does not support absolute imports
-		// "/x" -> "/x.ext", "/x"
-		noext = path
-		id = path
-	}
-
-	if false { // for debugging
-		if path != id {
-			fmt.Printf("%s -> %s\n", path, id)
-		}
-	}
-
-	// try extensions
-	for _, ext := range pkgExts {
-		filename = noext + ext
-		if f, err := os.Stat(filename); err == nil && !f.IsDir() {
-			return
-		}
-	}
-
-	filename = "" // not found
-	return
-}
-
-// ImportData imports a package by reading the gc-generated export data,
-// adds the corresponding package object to the packages map indexed by id,
-// and returns the object.
-//
-// The packages map must contains all packages already imported. The data
-// reader position must be the beginning of the export data section. The
-// filename is only used in error messages.
-//
-// If packages[id] contains the completely imported package, that package
-// can be used directly, and there is no need to call this function (but
-// there is also no harm but for extra time used).
-func ImportData(packages map[string]*types.Package, filename, id string, data io.Reader) (pkg *types.Package, err error) {
-	// support for parser error handling
-	defer func() {
-		switch r := recover().(type) {
-		case nil:
-			// nothing to do
-		case importError:
-			err = r
-		default:
-			panic(r) // internal error
-		}
-	}()
-
-	var p parser
-	p.init(filename, id, data, packages)
-	pkg = p.parseExport()
-
-	return
-}
-
-// Import imports a gc-generated package given its import path and srcDir, adds
-// the corresponding package object to the packages map, and returns the object.
-// The packages map must contain all packages already imported.
-func Import(packages map[string]*types.Package, path, srcDir string, lookup func(path string) (io.ReadCloser, error)) (pkg *types.Package, err error) {
-	var rc io.ReadCloser
-	var filename, id string
-	if lookup != nil {
-		// With custom lookup specified, assume that caller has
-		// converted path to a canonical import path for use in the map.
-		if path == "unsafe" {
-			return types.Unsafe, nil
-		}
-		id = path
-
-		// No need to re-import if the package was imported completely before.
-		if pkg = packages[id]; pkg != nil && pkg.Complete() {
-			return
-		}
-		f, err := lookup(path)
-		if err != nil {
-			return nil, err
-		}
-		rc = f
-	} else {
-		filename, id = FindPkg(path, srcDir)
-		if filename == "" {
-			if path == "unsafe" {
-				return types.Unsafe, nil
-			}
-			return nil, fmt.Errorf("can't find import: %q", id)
-		}
-
-		// no need to re-import if the package was imported completely before
-		if pkg = packages[id]; pkg != nil && pkg.Complete() {
-			return
-		}
-
-		// open file
-		f, err := os.Open(filename)
-		if err != nil {
-			return nil, err
-		}
-		defer func() {
-			if err != nil {
-				// add file name to error
-				err = fmt.Errorf("%s: %v", filename, err)
-			}
-		}()
-		rc = f
-	}
-	defer rc.Close()
-
-	var hdr string
-	var size int64
-	buf := bufio.NewReader(rc)
-	if hdr, size, err = FindExportData(buf); err != nil {
-		return
-	}
-
-	switch hdr {
-	case "$$\n":
-		// Work-around if we don't have a filename; happens only if lookup != nil.
-		// Either way, the filename is only needed for importer error messages, so
-		// this is fine.
-		if filename == "" {
-			filename = path
-		}
-		return ImportData(packages, filename, id, buf)
-
-	case "$$B\n":
-		var data []byte
-		data, err = ioutil.ReadAll(buf)
-		if err != nil {
-			break
-		}
-
-		// TODO(gri): allow clients of go/importer to provide a FileSet.
-		// Or, define a new standard go/types/gcexportdata package.
-		fset := token.NewFileSet()
-
-		// The indexed export format starts with an 'i'; the older
-		// binary export format starts with a 'c', 'd', or 'v'
-		// (from "version"). Select appropriate importer.
-		if len(data) > 0 {
-			switch data[0] {
-			case 'i':
-				_, pkg, err := IImportData(fset, packages, data[1:], id)
-				return pkg, err
-
-			case 'v', 'c', 'd':
-				_, pkg, err := BImportData(fset, packages, data, id)
-				return pkg, err
-
-			case 'u':
-				_, pkg, err := UImportData(fset, packages, data[1:size], id)
-				return pkg, err
-
-			default:
-				l := len(data)
-				if l > 10 {
-					l = 10
-				}
-				return nil, fmt.Errorf("unexpected export data with prefix %q for path %s", string(data[:l]), id)
-			}
-		}
-
-	default:
-		err = fmt.Errorf("unknown export data header: %q", hdr)
-	}
-
-	return
-}
-
-// ----------------------------------------------------------------------------
-// Parser
-
-// TODO(gri) Imported objects don't have position information.
-//           Ideally use the debug table line info; alternatively
-//           create some fake position (or the position of the
-//           import). That way error messages referring to imported
-//           objects can print meaningful information.
-
-// parser parses the exports inside a gc compiler-produced
-// object/archive file and populates its scope with the results.
-type parser struct {
-	scanner    scanner.Scanner
-	tok        rune                      // current token
-	lit        string                    // literal string; only valid for Ident, Int, String tokens
-	id         string                    // package id of imported package
-	sharedPkgs map[string]*types.Package // package id -> package object (across importer)
-	localPkgs  map[string]*types.Package // package id -> package object (just this package)
-}
-
-func (p *parser) init(filename, id string, src io.Reader, packages map[string]*types.Package) {
-	p.scanner.Init(src)
-	p.scanner.Error = func(_ *scanner.Scanner, msg string) { p.error(msg) }
-	p.scanner.Mode = scanner.ScanIdents | scanner.ScanInts | scanner.ScanChars | scanner.ScanStrings | scanner.ScanComments | scanner.SkipComments
-	p.scanner.Whitespace = 1<<'\t' | 1<<' '
-	p.scanner.Filename = filename // for good error messages
-	p.next()
-	p.id = id
-	p.sharedPkgs = packages
-	if debug {
-		// check consistency of packages map
-		for _, pkg := range packages {
-			if pkg.Name() == "" {
-				fmt.Printf("no package name for %s\n", pkg.Path())
-			}
-		}
-	}
-}
-
-func (p *parser) next() {
-	p.tok = p.scanner.Scan()
-	switch p.tok {
-	case scanner.Ident, scanner.Int, scanner.Char, scanner.String, '·':
-		p.lit = p.scanner.TokenText()
-	default:
-		p.lit = ""
-	}
-	if debug {
-		fmt.Printf("%s: %q -> %q\n", scanner.TokenString(p.tok), p.scanner.TokenText(), p.lit)
-	}
-}
-
-func declTypeName(pkg *types.Package, name string) *types.TypeName {
-	scope := pkg.Scope()
-	if obj := scope.Lookup(name); obj != nil {
-		return obj.(*types.TypeName)
-	}
-	obj := types.NewTypeName(token.NoPos, pkg, name, nil)
-	// a named type may be referred to before the underlying type
-	// is known - set it up
-	types.NewNamed(obj, nil, nil)
-	scope.Insert(obj)
-	return obj
-}
-
-// ----------------------------------------------------------------------------
-// Error handling
-
-// Internal errors are boxed as importErrors.
-type importError struct {
-	pos scanner.Position
-	err error
-}
-
-func (e importError) Error() string {
-	return fmt.Sprintf("import error %s (byte offset = %d): %s", e.pos, e.pos.Offset, e.err)
-}
-
-func (p *parser) error(err interface{}) {
-	if s, ok := err.(string); ok {
-		err = errors.New(s)
-	}
-	// panic with a runtime.Error if err is not an error
-	panic(importError{p.scanner.Pos(), err.(error)})
-}
-
-func (p *parser) errorf(format string, args ...interface{}) {
-	p.error(fmt.Sprintf(format, args...))
-}
-
-func (p *parser) expect(tok rune) string {
-	lit := p.lit
-	if p.tok != tok {
-		p.errorf("expected %s, got %s (%s)", scanner.TokenString(tok), scanner.TokenString(p.tok), lit)
-	}
-	p.next()
-	return lit
-}
-
-func (p *parser) expectSpecial(tok string) {
-	sep := 'x' // not white space
-	i := 0
-	for i < len(tok) && p.tok == rune(tok[i]) && sep > ' ' {
-		sep = p.scanner.Peek() // if sep <= ' ', there is white space before the next token
-		p.next()
-		i++
-	}
-	if i < len(tok) {
-		p.errorf("expected %q, got %q", tok, tok[0:i])
-	}
-}
-
-func (p *parser) expectKeyword(keyword string) {
-	lit := p.expect(scanner.Ident)
-	if lit != keyword {
-		p.errorf("expected keyword %s, got %q", keyword, lit)
-	}
-}
-
-// ----------------------------------------------------------------------------
-// Qualified and unqualified names
-
-// parsePackageID parses a PackageId:
-//
-//	PackageId = string_lit .
-func (p *parser) parsePackageID() string {
-	id, err := strconv.Unquote(p.expect(scanner.String))
-	if err != nil {
-		p.error(err)
-	}
-	// id == "" stands for the imported package id
-	// (only known at time of package installation)
-	if id == "" {
-		id = p.id
-	}
-	return id
-}
-
-// parsePackageName parse a PackageName:
-//
-//	PackageName = ident .
-func (p *parser) parsePackageName() string {
-	return p.expect(scanner.Ident)
-}
-
-// parseDotIdent parses a dotIdentifier:
-//
-//	dotIdentifier = ( ident | '·' ) { ident | int | '·' } .
-func (p *parser) parseDotIdent() string {
-	ident := ""
-	if p.tok != scanner.Int {
-		sep := 'x' // not white space
-		for (p.tok == scanner.Ident || p.tok == scanner.Int || p.tok == '·') && sep > ' ' {
-			ident += p.lit
-			sep = p.scanner.Peek() // if sep <= ' ', there is white space before the next token
-			p.next()
-		}
-	}
-	if ident == "" {
-		p.expect(scanner.Ident) // use expect() for error handling
-	}
-	return ident
-}
-
-// parseQualifiedName parses a QualifiedName:
-//
-//	QualifiedName = "@" PackageId "." ( "?" | dotIdentifier ) .
-func (p *parser) parseQualifiedName() (id, name string) {
-	p.expect('@')
-	id = p.parsePackageID()
-	p.expect('.')
-	// Per rev f280b8a485fd (10/2/2013), qualified names may be used for anonymous fields.
-	if p.tok == '?' {
-		p.next()
-	} else {
-		name = p.parseDotIdent()
-	}
-	return
-}
-
-// getPkg returns the package for a given id. If the package is
-// not found, create the package and add it to the p.localPkgs
-// and p.sharedPkgs maps. name is the (expected) name of the
-// package. If name == "", the package name is expected to be
-// set later via an import clause in the export data.
-//
-// id identifies a package, usually by a canonical package path like
-// "encoding/json" but possibly by a non-canonical import path like
-// "./json".
-func (p *parser) getPkg(id, name string) *types.Package {
-	// package unsafe is not in the packages maps - handle explicitly
-	if id == "unsafe" {
-		return types.Unsafe
-	}
-
-	pkg := p.localPkgs[id]
-	if pkg == nil {
-		// first import of id from this package
-		pkg = p.sharedPkgs[id]
-		if pkg == nil {
-			// first import of id by this importer;
-			// add (possibly unnamed) pkg to shared packages
-			pkg = types.NewPackage(id, name)
-			p.sharedPkgs[id] = pkg
-		}
-		// add (possibly unnamed) pkg to local packages
-		if p.localPkgs == nil {
-			p.localPkgs = make(map[string]*types.Package)
-		}
-		p.localPkgs[id] = pkg
-	} else if name != "" {
-		// package exists already and we have an expected package name;
-		// make sure names match or set package name if necessary
-		if pname := pkg.Name(); pname == "" {
-			pkg.SetName(name)
-		} else if pname != name {
-			p.errorf("%s package name mismatch: %s (given) vs %s (expected)", id, pname, name)
-		}
-	}
-	return pkg
-}
-
-// parseExportedName is like parseQualifiedName, but
-// the package id is resolved to an imported *types.Package.
-func (p *parser) parseExportedName() (pkg *types.Package, name string) {
-	id, name := p.parseQualifiedName()
-	pkg = p.getPkg(id, "")
-	return
-}
-
-// ----------------------------------------------------------------------------
-// Types
-
-// parseBasicType parses a BasicType:
-//
-//	BasicType = identifier .
-func (p *parser) parseBasicType() types.Type {
-	id := p.expect(scanner.Ident)
-	obj := types.Universe.Lookup(id)
-	if obj, ok := obj.(*types.TypeName); ok {
-		return obj.Type()
-	}
-	p.errorf("not a basic type: %s", id)
-	return nil
-}
-
-// parseArrayType parses an ArrayType:
-//
-//	ArrayType = "[" int_lit "]" Type .
-func (p *parser) parseArrayType(parent *types.Package) types.Type {
-	// "[" already consumed and lookahead known not to be "]"
-	lit := p.expect(scanner.Int)
-	p.expect(']')
-	elem := p.parseType(parent)
-	n, err := strconv.ParseInt(lit, 10, 64)
-	if err != nil {
-		p.error(err)
-	}
-	return types.NewArray(elem, n)
-}
-
-// parseMapType parses a MapType:
-//
-//	MapType = "map" "[" Type "]" Type .
-func (p *parser) parseMapType(parent *types.Package) types.Type {
-	p.expectKeyword("map")
-	p.expect('[')
-	key := p.parseType(parent)
-	p.expect(']')
-	elem := p.parseType(parent)
-	return types.NewMap(key, elem)
-}
-
-// parseName parses a Name:
-//
-//	Name = identifier | "?" | QualifiedName .
-//
-// For unqualified and anonymous names, the returned package is the parent
-// package unless parent == nil, in which case the returned package is the
-// package being imported. (The parent package is not nil if the name
-// is an unqualified struct field or interface method name belonging to a
-// type declared in another package.)
-//
-// For qualified names, the returned package is nil (and not created if
-// it doesn't exist yet) unless materializePkg is set (which creates an
-// unnamed package with valid package path). In the latter case, a
-// subsequent import clause is expected to provide a name for the package.
-func (p *parser) parseName(parent *types.Package, materializePkg bool) (pkg *types.Package, name string) {
-	pkg = parent
-	if pkg == nil {
-		pkg = p.sharedPkgs[p.id]
-	}
-	switch p.tok {
-	case scanner.Ident:
-		name = p.lit
-		p.next()
-	case '?':
-		// anonymous
-		p.next()
-	case '@':
-		// exported name prefixed with package path
-		pkg = nil
-		var id string
-		id, name = p.parseQualifiedName()
-		if materializePkg {
-			pkg = p.getPkg(id, "")
-		}
-	default:
-		p.error("name expected")
-	}
-	return
-}
-
-func deref(typ types.Type) types.Type {
-	if p, _ := typ.(*types.Pointer); p != nil {
-		return p.Elem()
-	}
-	return typ
-}
-
-// parseField parses a Field:
-//
-//	Field = Name Type [ string_lit ] .
-func (p *parser) parseField(parent *types.Package) (*types.Var, string) {
-	pkg, name := p.parseName(parent, true)
-
-	if name == "_" {
-		// Blank fields should be package-qualified because they
-		// are unexported identifiers, but gc does not qualify them.
-		// Assuming that the ident belongs to the current package
-		// causes types to change during re-exporting, leading
-		// to spurious "can't assign A to B" errors from go/types.
-		// As a workaround, pretend all blank fields belong
-		// to the same unique dummy package.
-		const blankpkg = "<_>"
-		pkg = p.getPkg(blankpkg, blankpkg)
-	}
-
-	typ := p.parseType(parent)
-	anonymous := false
-	if name == "" {
-		// anonymous field - typ must be T or *T and T must be a type name
-		switch typ := deref(typ).(type) {
-		case *types.Basic: // basic types are named types
-			pkg = nil // objects defined in Universe scope have no package
-			name = typ.Name()
-		case *types.Named:
-			name = typ.Obj().Name()
-		default:
-			p.errorf("anonymous field expected")
-		}
-		anonymous = true
-	}
-	tag := ""
-	if p.tok == scanner.String {
-		s := p.expect(scanner.String)
-		var err error
-		tag, err = strconv.Unquote(s)
-		if err != nil {
-			p.errorf("invalid struct tag %s: %s", s, err)
-		}
-	}
-	return types.NewField(token.NoPos, pkg, name, typ, anonymous), tag
-}
-
-// parseStructType parses a StructType:
-//
-//	StructType = "struct" "{" [ FieldList ] "}" .
-//	FieldList  = Field { ";" Field } .
-func (p *parser) parseStructType(parent *types.Package) types.Type {
-	var fields []*types.Var
-	var tags []string
-
-	p.expectKeyword("struct")
-	p.expect('{')
-	for i := 0; p.tok != '}' && p.tok != scanner.EOF; i++ {
-		if i > 0 {
-			p.expect(';')
-		}
-		fld, tag := p.parseField(parent)
-		if tag != "" && tags == nil {
-			tags = make([]string, i)
-		}
-		if tags != nil {
-			tags = append(tags, tag)
-		}
-		fields = append(fields, fld)
-	}
-	p.expect('}')
-
-	return types.NewStruct(fields, tags)
-}
-
-// parseParameter parses a Parameter:
-//
-//	Parameter = ( identifier | "?" ) [ "..." ] Type [ string_lit ] .
-func (p *parser) parseParameter() (par *types.Var, isVariadic bool) {
-	_, name := p.parseName(nil, false)
-	// remove gc-specific parameter numbering
-	if i := strings.Index(name, "·"); i >= 0 {
-		name = name[:i]
-	}
-	if p.tok == '.' {
-		p.expectSpecial("...")
-		isVariadic = true
-	}
-	typ := p.parseType(nil)
-	if isVariadic {
-		typ = types.NewSlice(typ)
-	}
-	// ignore argument tag (e.g. "noescape")
-	if p.tok == scanner.String {
-		p.next()
-	}
-	// TODO(gri) should we provide a package?
-	par = types.NewVar(token.NoPos, nil, name, typ)
-	return
-}
-
-// parseParameters parses a Parameters:
-//
-//	Parameters    = "(" [ ParameterList ] ")" .
-//	ParameterList = { Parameter "," } Parameter .
-func (p *parser) parseParameters() (list []*types.Var, isVariadic bool) {
-	p.expect('(')
-	for p.tok != ')' && p.tok != scanner.EOF {
-		if len(list) > 0 {
-			p.expect(',')
-		}
-		par, variadic := p.parseParameter()
-		list = append(list, par)
-		if variadic {
-			if isVariadic {
-				p.error("... not on final argument")
-			}
-			isVariadic = true
-		}
-	}
-	p.expect(')')
-
-	return
-}
-
-// parseSignature parses a Signature:
-//
-//	Signature = Parameters [ Result ] .
-//	Result    = Type | Parameters .
-func (p *parser) parseSignature(recv *types.Var) *types.Signature {
-	params, isVariadic := p.parseParameters()
-
-	// optional result type
-	var results []*types.Var
-	if p.tok == '(' {
-		var variadic bool
-		results, variadic = p.parseParameters()
-		if variadic {
-			p.error("... not permitted on result type")
-		}
-	}
-
-	return types.NewSignature(recv, types.NewTuple(params...), types.NewTuple(results...), isVariadic)
-}
-
-// parseInterfaceType parses an InterfaceType:
-//
-//	InterfaceType = "interface" "{" [ MethodList ] "}" .
-//	MethodList    = Method { ";" Method } .
-//	Method        = Name Signature .
-//
-// The methods of embedded interfaces are always "inlined"
-// by the compiler and thus embedded interfaces are never
-// visible in the export data.
-func (p *parser) parseInterfaceType(parent *types.Package) types.Type {
-	var methods []*types.Func
-
-	p.expectKeyword("interface")
-	p.expect('{')
-	for i := 0; p.tok != '}' && p.tok != scanner.EOF; i++ {
-		if i > 0 {
-			p.expect(';')
-		}
-		pkg, name := p.parseName(parent, true)
-		sig := p.parseSignature(nil)
-		methods = append(methods, types.NewFunc(token.NoPos, pkg, name, sig))
-	}
-	p.expect('}')
-
-	// Complete requires the type's embedded interfaces to be fully defined,
-	// but we do not define any
-	return newInterface(methods, nil).Complete()
-}
-
-// parseChanType parses a ChanType:
-//
-//	ChanType = ( "chan" [ "<-" ] | "<-" "chan" ) Type .
-func (p *parser) parseChanType(parent *types.Package) types.Type {
-	dir := types.SendRecv
-	if p.tok == scanner.Ident {
-		p.expectKeyword("chan")
-		if p.tok == '<' {
-			p.expectSpecial("<-")
-			dir = types.SendOnly
-		}
-	} else {
-		p.expectSpecial("<-")
-		p.expectKeyword("chan")
-		dir = types.RecvOnly
-	}
-	elem := p.parseType(parent)
-	return types.NewChan(dir, elem)
-}
-
-// parseType parses a Type:
-//
-//	Type =
-//		BasicType | TypeName | ArrayType | SliceType | StructType |
-//		PointerType | FuncType | InterfaceType | MapType | ChanType |
-//		"(" Type ")" .
-//
-//	BasicType   = ident .
-//	TypeName    = ExportedName .
-//	SliceType   = "[" "]" Type .
-//	PointerType = "*" Type .
-//	FuncType    = "func" Signature .
-func (p *parser) parseType(parent *types.Package) types.Type {
-	switch p.tok {
-	case scanner.Ident:
-		switch p.lit {
-		default:
-			return p.parseBasicType()
-		case "struct":
-			return p.parseStructType(parent)
-		case "func":
-			// FuncType
-			p.next()
-			return p.parseSignature(nil)
-		case "interface":
-			return p.parseInterfaceType(parent)
-		case "map":
-			return p.parseMapType(parent)
-		case "chan":
-			return p.parseChanType(parent)
-		}
-	case '@':
-		// TypeName
-		pkg, name := p.parseExportedName()
-		return declTypeName(pkg, name).Type()
-	case '[':
-		p.next() // look ahead
-		if p.tok == ']' {
-			// SliceType
-			p.next()
-			return types.NewSlice(p.parseType(parent))
-		}
-		return p.parseArrayType(parent)
-	case '*':
-		// PointerType
-		p.next()
-		return types.NewPointer(p.parseType(parent))
-	case '<':
-		return p.parseChanType(parent)
-	case '(':
-		// "(" Type ")"
-		p.next()
-		typ := p.parseType(parent)
-		p.expect(')')
-		return typ
-	}
-	p.errorf("expected type, got %s (%q)", scanner.TokenString(p.tok), p.lit)
-	return nil
-}
-
-// ----------------------------------------------------------------------------
-// Declarations
-
-// parseImportDecl parses an ImportDecl:
-//
-//	ImportDecl = "import" PackageName PackageId .
-func (p *parser) parseImportDecl() {
-	p.expectKeyword("import")
-	name := p.parsePackageName()
-	p.getPkg(p.parsePackageID(), name)
-}
-
-// parseInt parses an int_lit:
-//
-//	int_lit = [ "+" | "-" ] { "0" ... "9" } .
-func (p *parser) parseInt() string {
-	s := ""
-	switch p.tok {
-	case '-':
-		s = "-"
-		p.next()
-	case '+':
-		p.next()
-	}
-	return s + p.expect(scanner.Int)
-}
-
-// parseNumber parses a number:
-//
-//	number = int_lit [ "p" int_lit ] .
-func (p *parser) parseNumber() (typ *types.Basic, val constant.Value) {
-	// mantissa
-	mant := constant.MakeFromLiteral(p.parseInt(), token.INT, 0)
-	if mant == nil {
-		panic("invalid mantissa")
-	}
-
-	if p.lit == "p" {
-		// exponent (base 2)
-		p.next()
-		exp, err := strconv.ParseInt(p.parseInt(), 10, 0)
-		if err != nil {
-			p.error(err)
-		}
-		if exp < 0 {
-			denom := constant.MakeInt64(1)
-			denom = constant.Shift(denom, token.SHL, uint(-exp))
-			typ = types.Typ[types.UntypedFloat]
-			val = constant.BinaryOp(mant, token.QUO, denom)
-			return
-		}
-		if exp > 0 {
-			mant = constant.Shift(mant, token.SHL, uint(exp))
-		}
-		typ = types.Typ[types.UntypedFloat]
-		val = mant
-		return
-	}
-
-	typ = types.Typ[types.UntypedInt]
-	val = mant
-	return
-}
-
-// parseConstDecl parses a ConstDecl:
-//
-//	ConstDecl   = "const" ExportedName [ Type ] "=" Literal .
-//	Literal     = bool_lit | int_lit | float_lit | complex_lit | rune_lit | string_lit .
-//	bool_lit    = "true" | "false" .
-//	complex_lit = "(" float_lit "+" float_lit "i" ")" .
-//	rune_lit    = "(" int_lit "+" int_lit ")" .
-//	string_lit  = `"` { unicode_char } `"` .
-func (p *parser) parseConstDecl() {
-	p.expectKeyword("const")
-	pkg, name := p.parseExportedName()
-
-	var typ0 types.Type
-	if p.tok != '=' {
-		// constant types are never structured - no need for parent type
-		typ0 = p.parseType(nil)
-	}
-
-	p.expect('=')
-	var typ types.Type
-	var val constant.Value
-	switch p.tok {
-	case scanner.Ident:
-		// bool_lit
-		if p.lit != "true" && p.lit != "false" {
-			p.error("expected true or false")
-		}
-		typ = types.Typ[types.UntypedBool]
-		val = constant.MakeBool(p.lit == "true")
-		p.next()
-
-	case '-', scanner.Int:
-		// int_lit
-		typ, val = p.parseNumber()
-
-	case '(':
-		// complex_lit or rune_lit
-		p.next()
-		if p.tok == scanner.Char {
-			p.next()
-			p.expect('+')
-			typ = types.Typ[types.UntypedRune]
-			_, val = p.parseNumber()
-			p.expect(')')
-			break
-		}
-		_, re := p.parseNumber()
-		p.expect('+')
-		_, im := p.parseNumber()
-		p.expectKeyword("i")
-		p.expect(')')
-		typ = types.Typ[types.UntypedComplex]
-		val = constant.BinaryOp(re, token.ADD, constant.MakeImag(im))
-
-	case scanner.Char:
-		// rune_lit
-		typ = types.Typ[types.UntypedRune]
-		val = constant.MakeFromLiteral(p.lit, token.CHAR, 0)
-		p.next()
-
-	case scanner.String:
-		// string_lit
-		typ = types.Typ[types.UntypedString]
-		val = constant.MakeFromLiteral(p.lit, token.STRING, 0)
-		p.next()
-
-	default:
-		p.errorf("expected literal got %s", scanner.TokenString(p.tok))
-	}
-
-	if typ0 == nil {
-		typ0 = typ
-	}
-
-	pkg.Scope().Insert(types.NewConst(token.NoPos, pkg, name, typ0, val))
-}
-
-// parseTypeDecl parses a TypeDecl:
-//
-//	TypeDecl = "type" ExportedName Type .
-func (p *parser) parseTypeDecl() {
-	p.expectKeyword("type")
-	pkg, name := p.parseExportedName()
-	obj := declTypeName(pkg, name)
-
-	// The type object may have been imported before and thus already
-	// have a type associated with it. We still need to parse the type
-	// structure, but throw it away if the object already has a type.
-	// This ensures that all imports refer to the same type object for
-	// a given type declaration.
-	typ := p.parseType(pkg)
-
-	if name := obj.Type().(*types.Named); name.Underlying() == nil {
-		name.SetUnderlying(typ)
-	}
-}
-
-// parseVarDecl parses a VarDecl:
-//
-//	VarDecl = "var" ExportedName Type .
-func (p *parser) parseVarDecl() {
-	p.expectKeyword("var")
-	pkg, name := p.parseExportedName()
-	typ := p.parseType(pkg)
-	pkg.Scope().Insert(types.NewVar(token.NoPos, pkg, name, typ))
-}
-
-// parseFunc parses a Func:
-//
-//	Func = Signature [ Body ] .
-//	Body = "{" ... "}" .
-func (p *parser) parseFunc(recv *types.Var) *types.Signature {
-	sig := p.parseSignature(recv)
-	if p.tok == '{' {
-		p.next()
-		for i := 1; i > 0; p.next() {
-			switch p.tok {
-			case '{':
-				i++
-			case '}':
-				i--
-			}
-		}
-	}
-	return sig
-}
-
-// parseMethodDecl parses a MethodDecl:
-//
-//	MethodDecl = "func" Receiver Name Func .
-//	Receiver   = "(" ( identifier | "?" ) [ "*" ] ExportedName ")" .
-func (p *parser) parseMethodDecl() {
-	// "func" already consumed
-	p.expect('(')
-	recv, _ := p.parseParameter() // receiver
-	p.expect(')')
-
-	// determine receiver base type object
-	base := deref(recv.Type()).(*types.Named)
-
-	// parse method name, signature, and possibly inlined body
-	_, name := p.parseName(nil, false)
-	sig := p.parseFunc(recv)
-
-	// methods always belong to the same package as the base type object
-	pkg := base.Obj().Pkg()
-
-	// add method to type unless type was imported before
-	// and method exists already
-	// TODO(gri) This leads to a quadratic algorithm - ok for now because method counts are small.
-	base.AddMethod(types.NewFunc(token.NoPos, pkg, name, sig))
-}
-
-// parseFuncDecl parses a FuncDecl:
-//
-//	FuncDecl = "func" ExportedName Func .
-func (p *parser) parseFuncDecl() {
-	// "func" already consumed
-	pkg, name := p.parseExportedName()
-	typ := p.parseFunc(nil)
-	pkg.Scope().Insert(types.NewFunc(token.NoPos, pkg, name, typ))
-}
-
-// parseDecl parses a Decl:
-//
-//	Decl = [ ImportDecl | ConstDecl | TypeDecl | VarDecl | FuncDecl | MethodDecl ] "\n" .
-func (p *parser) parseDecl() {
-	if p.tok == scanner.Ident {
-		switch p.lit {
-		case "import":
-			p.parseImportDecl()
-		case "const":
-			p.parseConstDecl()
-		case "type":
-			p.parseTypeDecl()
-		case "var":
-			p.parseVarDecl()
-		case "func":
-			p.next() // look ahead
-			if p.tok == '(' {
-				p.parseMethodDecl()
-			} else {
-				p.parseFuncDecl()
-			}
-		}
-	}
-	p.expect('\n')
-}
-
-// ----------------------------------------------------------------------------
-// Export
-
-// parseExport parses an Export:
-//
-//	Export        = "PackageClause { Decl } "$$" .
-//	PackageClause = "package" PackageName [ "safe" ] "\n" .
-func (p *parser) parseExport() *types.Package {
-	p.expectKeyword("package")
-	name := p.parsePackageName()
-	if p.tok == scanner.Ident && p.lit == "safe" {
-		// package was compiled with -u option - ignore
-		p.next()
-	}
-	p.expect('\n')
-
-	pkg := p.getPkg(p.id, name)
-
-	for p.tok != '$' && p.tok != scanner.EOF {
-		p.parseDecl()
-	}
-
-	if ch := p.scanner.Peek(); p.tok != '$' || ch != '$' {
-		// don't call next()/expect() since reading past the
-		// export data may cause scanner errors (e.g. NUL chars)
-		p.errorf("expected '$$', got %s %c", scanner.TokenString(p.tok), ch)
-	}
-
-	if n := p.scanner.ErrorCount; n != 0 {
-		p.errorf("expected no scanner errors, got %d", n)
-	}
-
-	// Record all locally referenced packages as imports.
-	var imports []*types.Package
-	for id, pkg2 := range p.localPkgs {
-		if pkg2.Name() == "" {
-			p.errorf("%s package has no name", id)
-		}
-		if id == p.id {
-			continue // avoid self-edge
-		}
-		imports = append(imports, pkg2)
-	}
-	sort.Sort(byPath(imports))
-	pkg.SetImports(imports)
-
-	// package was imported completely and without errors
-	pkg.MarkComplete()
-
-	return pkg
-}
-
-type byPath []*types.Package
-
-func (a byPath) Len() int           { return len(a) }
-func (a byPath) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a byPath) Less(i, j int) bool { return a[i].Path() < a[j].Path() }
diff --git a/vendor/golang.org/x/tools/go/packages/golist.go b/vendor/golang.org/x/tools/go/packages/golist.go
index de881562..6bb7168d 100644
--- a/vendor/golang.org/x/tools/go/packages/golist.go
+++ b/vendor/golang.org/x/tools/go/packages/golist.go
@@ -60,6 +60,7 @@ func (r *responseDeduper) addAll(dr *driverResponse) {
 	for _, root := range dr.Roots {
 		r.addRoot(root)
 	}
+	r.dr.GoVersion = dr.GoVersion
 }
 
 func (r *responseDeduper) addPackage(p *Package) {
@@ -454,11 +455,14 @@ func (state *golistState) createDriverResponse(words ...string) (*driverResponse
 	if err != nil {
 		return nil, err
 	}
+
 	seen := make(map[string]*jsonPackage)
 	pkgs := make(map[string]*Package)
 	additionalErrors := make(map[string][]Error)
 	// Decode the JSON and convert it to Package form.
-	var response driverResponse
+	response := &driverResponse{
+		GoVersion: goVersion,
+	}
 	for dec := json.NewDecoder(buf); dec.More(); {
 		p := new(jsonPackage)
 		if err := dec.Decode(p); err != nil {
@@ -600,17 +604,12 @@ func (state *golistState) createDriverResponse(words ...string) (*driverResponse
 
 		// Work around https://golang.org/issue/28749:
 		// cmd/go puts assembly, C, and C++ files in CompiledGoFiles.
-		// Filter out any elements of CompiledGoFiles that are also in OtherFiles.
-		// We have to keep this workaround in place until go1.12 is a distant memory.
-		if len(pkg.OtherFiles) > 0 {
-			other := make(map[string]bool, len(pkg.OtherFiles))
-			for _, f := range pkg.OtherFiles {
-				other[f] = true
-			}
-
+		// Remove files from CompiledGoFiles that are non-go files
+		// (or are not files that look like they are from the cache).
+		if len(pkg.CompiledGoFiles) > 0 {
 			out := pkg.CompiledGoFiles[:0]
 			for _, f := range pkg.CompiledGoFiles {
-				if other[f] {
+				if ext := filepath.Ext(f); ext != ".go" && ext != "" { // ext == "" means the file is from the cache, so probably cgo-processed file
 					continue
 				}
 				out = append(out, f)
@@ -730,7 +729,7 @@ func (state *golistState) createDriverResponse(words ...string) (*driverResponse
 	}
 	sort.Slice(response.Packages, func(i, j int) bool { return response.Packages[i].ID < response.Packages[j].ID })
 
-	return &response, nil
+	return response, nil
 }
 
 func (state *golistState) shouldAddFilenameFromError(p *jsonPackage) bool {
@@ -756,6 +755,7 @@ func (state *golistState) shouldAddFilenameFromError(p *jsonPackage) bool {
 	return len(p.Error.ImportStack) == 0 || p.Error.ImportStack[len(p.Error.ImportStack)-1] == p.ImportPath
 }
 
+// getGoVersion returns the effective minor version of the go command.
 func (state *golistState) getGoVersion() (int, error) {
 	state.goVersionOnce.Do(func() {
 		state.goVersion, state.goVersionError = gocommand.GoVersion(state.ctx, state.cfgInvocation(), state.cfg.gocmdRunner)
diff --git a/vendor/golang.org/x/tools/go/packages/packages.go b/vendor/golang.org/x/tools/go/packages/packages.go
index a93dc6ad..0f1505b8 100644
--- a/vendor/golang.org/x/tools/go/packages/packages.go
+++ b/vendor/golang.org/x/tools/go/packages/packages.go
@@ -15,10 +15,12 @@ import (
 	"go/scanner"
 	"go/token"
 	"go/types"
+	"io"
 	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"sync"
 	"time"
@@ -233,6 +235,11 @@ type driverResponse struct {
 	// Imports will be connected and then type and syntax information added in a
 	// later pass (see refine).
 	Packages []*Package
+
+	// GoVersion is the minor version number used by the driver
+	// (e.g. the go command on the PATH) when selecting .go files.
+	// Zero means unknown.
+	GoVersion int
 }
 
 // Load loads and returns the Go packages named by the given patterns.
@@ -256,7 +263,7 @@ func Load(cfg *Config, patterns ...string) ([]*Package, error) {
 		return nil, err
 	}
 	l.sizes = response.Sizes
-	return l.refine(response.Roots, response.Packages...)
+	return l.refine(response)
 }
 
 // defaultDriver is a driver that implements go/packages' fallback behavior.
@@ -297,6 +304,9 @@ type Package struct {
 	// of the package, or while parsing or type-checking its files.
 	Errors []Error
 
+	// TypeErrors contains the subset of errors produced during type checking.
+	TypeErrors []types.Error
+
 	// GoFiles lists the absolute file paths of the package's Go source files.
 	GoFiles []string
 
@@ -532,6 +542,7 @@ type loaderPackage struct {
 	needsrc      bool  // load from source (Mode >= LoadTypes)
 	needtypes    bool  // type information is either requested or depended on
 	initial      bool  // package was matched by a pattern
+	goVersion    int   // minor version number of go command on PATH
 }
 
 // loader holds the working state of a single call to load.
@@ -618,7 +629,8 @@ func newLoader(cfg *Config) *loader {
 
 // refine connects the supplied packages into a graph and then adds type and
 // and syntax information as requested by the LoadMode.
-func (ld *loader) refine(roots []string, list ...*Package) ([]*Package, error) {
+func (ld *loader) refine(response *driverResponse) ([]*Package, error) {
+	roots := response.Roots
 	rootMap := make(map[string]int, len(roots))
 	for i, root := range roots {
 		rootMap[root] = i
@@ -626,7 +638,7 @@ func (ld *loader) refine(roots []string, list ...*Package) ([]*Package, error) {
 	ld.pkgs = make(map[string]*loaderPackage)
 	// first pass, fixup and build the map and roots
 	var initial = make([]*loaderPackage, len(roots))
-	for _, pkg := range list {
+	for _, pkg := range response.Packages {
 		rootIndex := -1
 		if i, found := rootMap[pkg.ID]; found {
 			rootIndex = i
@@ -648,6 +660,7 @@ func (ld *loader) refine(roots []string, list ...*Package) ([]*Package, error) {
 			Package:   pkg,
 			needtypes: needtypes,
 			needsrc:   needsrc,
+			goVersion: response.GoVersion,
 		}
 		ld.pkgs[lpkg.ID] = lpkg
 		if rootIndex >= 0 {
@@ -865,12 +878,19 @@ func (ld *loader) loadPackage(lpkg *loaderPackage) {
 	// never has to create a types.Package for an indirect dependency,
 	// which would then require that such created packages be explicitly
 	// inserted back into the Import graph as a final step after export data loading.
+	// (Hence this return is after the Types assignment.)
 	// The Diamond test exercises this case.
 	if !lpkg.needtypes && !lpkg.needsrc {
 		return
 	}
 	if !lpkg.needsrc {
-		ld.loadFromExportData(lpkg)
+		if err := ld.loadFromExportData(lpkg); err != nil {
+			lpkg.Errors = append(lpkg.Errors, Error{
+				Pos:  "-",
+				Msg:  err.Error(),
+				Kind: UnknownError, // e.g. can't find/open/parse export data
+			})
+		}
 		return // not a source package, don't get syntax trees
 	}
 
@@ -902,6 +922,7 @@ func (ld *loader) loadPackage(lpkg *loaderPackage) {
 
 		case types.Error:
 			// from type checker
+			lpkg.TypeErrors = append(lpkg.TypeErrors, err)
 			errs = append(errs, Error{
 				Pos:  err.Fset.Position(err.Pos).String(),
 				Msg:  err.Msg,
@@ -923,11 +944,41 @@ func (ld *loader) loadPackage(lpkg *loaderPackage) {
 		lpkg.Errors = append(lpkg.Errors, errs...)
 	}
 
+	// If the go command on the PATH is newer than the runtime,
+	// then the go/{scanner,ast,parser,types} packages from the
+	// standard library may be unable to process the files
+	// selected by go list.
+	//
+	// There is currently no way to downgrade the effective
+	// version of the go command (see issue 52078), so we proceed
+	// with the newer go command but, in case of parse or type
+	// errors, we emit an additional diagnostic.
+	//
+	// See:
+	// - golang.org/issue/52078 (flag to set release tags)
+	// - golang.org/issue/50825 (gopls legacy version support)
+	// - golang.org/issue/55883 (go/packages confusing error)
+	//
+	// Should we assert a hard minimum of (currently) go1.16 here?
+	var runtimeVersion int
+	if _, err := fmt.Sscanf(runtime.Version(), "go1.%d", &runtimeVersion); err == nil && runtimeVersion < lpkg.goVersion {
+		defer func() {
+			if len(lpkg.Errors) > 0 {
+				appendError(Error{
+					Pos:  "-",
+					Msg:  fmt.Sprintf("This application uses version go1.%d of the source-processing packages but runs version go1.%d of 'go list'. It may fail to process source files that rely on newer language features. If so, rebuild the application using a newer version of Go.", runtimeVersion, lpkg.goVersion),
+					Kind: UnknownError,
+				})
+			}
+		}()
+	}
+
 	if ld.Config.Mode&NeedTypes != 0 && len(lpkg.CompiledGoFiles) == 0 && lpkg.ExportFile != "" {
 		// The config requested loading sources and types, but sources are missing.
 		// Add an error to the package and fall back to loading from export data.
 		appendError(Error{"-", fmt.Sprintf("sources missing for package %s", lpkg.ID), ParseError})
-		ld.loadFromExportData(lpkg)
+		_ = ld.loadFromExportData(lpkg) // ignore any secondary errors
+
 		return // can't get syntax trees for this package
 	}
 
@@ -981,7 +1032,7 @@ func (ld *loader) loadPackage(lpkg *loaderPackage) {
 	tc := &types.Config{
 		Importer: importer,
 
-		// Type-check bodies of functions only in non-initial packages.
+		// Type-check bodies of functions only in initial packages.
 		// Example: for import graph A->B->C and initial packages {A,C},
 		// we can ignore function bodies in B.
 		IgnoreFuncBodies: ld.Mode&NeedDeps == 0 && !lpkg.initial,
@@ -1151,9 +1202,10 @@ func sameFile(x, y string) bool {
 	return false
 }
 
-// loadFromExportData returns type information for the specified
+// loadFromExportData ensures that type information is present for the specified
 // package, loading it from an export data file on the first request.
-func (ld *loader) loadFromExportData(lpkg *loaderPackage) (*types.Package, error) {
+// On success it sets lpkg.Types to a new Package.
+func (ld *loader) loadFromExportData(lpkg *loaderPackage) error {
 	if lpkg.PkgPath == "" {
 		log.Fatalf("internal error: Package %s has no PkgPath", lpkg)
 	}
@@ -1164,8 +1216,8 @@ func (ld *loader) loadFromExportData(lpkg *loaderPackage) (*types.Package, error
 	// must be sequential. (Finer-grained locking would require
 	// changes to the gcexportdata API.)
 	//
-	// The exportMu lock guards the Package.Pkg field and the
-	// types.Package it points to, for each Package in the graph.
+	// The exportMu lock guards the lpkg.Types field and the
+	// types.Package it points to, for each loaderPackage in the graph.
 	//
 	// Not all accesses to Package.Pkg need to be protected by exportMu:
 	// graph ordering ensures that direct dependencies of source
@@ -1174,18 +1226,18 @@ func (ld *loader) loadFromExportData(lpkg *loaderPackage) (*types.Package, error
 	defer ld.exportMu.Unlock()
 
 	if tpkg := lpkg.Types; tpkg != nil && tpkg.Complete() {
-		return tpkg, nil // cache hit
+		return nil // cache hit
 	}
 
 	lpkg.IllTyped = true // fail safe
 
 	if lpkg.ExportFile == "" {
 		// Errors while building export data will have been printed to stderr.
-		return nil, fmt.Errorf("no export data file")
+		return fmt.Errorf("no export data file")
 	}
 	f, err := os.Open(lpkg.ExportFile)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	defer f.Close()
 
@@ -1197,7 +1249,7 @@ func (ld *loader) loadFromExportData(lpkg *loaderPackage) (*types.Package, error
 	// queries.)
 	r, err := gcexportdata.NewReader(f)
 	if err != nil {
-		return nil, fmt.Errorf("reading %s: %v", lpkg.ExportFile, err)
+		return fmt.Errorf("reading %s: %v", lpkg.ExportFile, err)
 	}
 
 	// Build the view.
@@ -1241,7 +1293,7 @@ func (ld *loader) loadFromExportData(lpkg *loaderPackage) (*types.Package, error
 	// (May modify incomplete packages in view but not create new ones.)
 	tpkg, err := gcexportdata.Read(r, ld.Fset, view, lpkg.PkgPath)
 	if err != nil {
-		return nil, fmt.Errorf("reading %s: %v", lpkg.ExportFile, err)
+		return fmt.Errorf("reading %s: %v", lpkg.ExportFile, err)
 	}
 	if _, ok := view["go.shape"]; ok {
 		// Account for the pseudopackage "go.shape" that gets
@@ -1254,8 +1306,7 @@ func (ld *loader) loadFromExportData(lpkg *loaderPackage) (*types.Package, error
 
 	lpkg.Types = tpkg
 	lpkg.IllTyped = false
-
-	return tpkg, nil
+	return nil
 }
 
 // impliedLoadMode returns loadMode with its dependencies.
@@ -1271,3 +1322,5 @@ func impliedLoadMode(loadMode LoadMode) LoadMode {
 func usesExportData(cfg *Config) bool {
 	return cfg.Mode&NeedExportFile != 0 || cfg.Mode&NeedTypes != 0 && cfg.Mode&NeedDeps == 0
 }
+
+var _ interface{} = io.Discard // assert build toolchain is go1.16 or later
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/bexport.go b/vendor/golang.org/x/tools/internal/gcimporter/bexport.go
similarity index 99%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/bexport.go
rename to vendor/golang.org/x/tools/internal/gcimporter/bexport.go
index 196cb3f9..30582ed6 100644
--- a/vendor/golang.org/x/tools/go/internal/gcimporter/bexport.go
+++ b/vendor/golang.org/x/tools/internal/gcimporter/bexport.go
@@ -12,7 +12,6 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"go/ast"
 	"go/constant"
 	"go/token"
 	"go/types"
@@ -145,7 +144,7 @@ func BExportData(fset *token.FileSet, pkg *types.Package) (b []byte, err error)
 	objcount := 0
 	scope := pkg.Scope()
 	for _, name := range scope.Names() {
-		if !ast.IsExported(name) {
+		if !token.IsExported(name) {
 			continue
 		}
 		if trace {
@@ -482,7 +481,7 @@ func (p *exporter) method(m *types.Func) {
 
 	p.pos(m)
 	p.string(m.Name())
-	if m.Name() != "_" && !ast.IsExported(m.Name()) {
+	if m.Name() != "_" && !token.IsExported(m.Name()) {
 		p.pkg(m.Pkg(), false)
 	}
 
@@ -501,7 +500,7 @@ func (p *exporter) fieldName(f *types.Var) {
 		// 3) field name doesn't match base type name (alias name)
 		bname := basetypeName(f.Type())
 		if name == bname {
-			if ast.IsExported(name) {
+			if token.IsExported(name) {
 				name = "" // 1) we don't need to know the field name or package
 			} else {
 				name = "?" // 2) use unexported name "?" to force package export
@@ -514,7 +513,7 @@ func (p *exporter) fieldName(f *types.Var) {
 	}
 
 	p.string(name)
-	if name != "" && !ast.IsExported(name) {
+	if name != "" && !token.IsExported(name) {
 		p.pkg(f.Pkg(), false)
 	}
 }
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/bimport.go b/vendor/golang.org/x/tools/internal/gcimporter/bimport.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/bimport.go
rename to vendor/golang.org/x/tools/internal/gcimporter/bimport.go
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/exportdata.go b/vendor/golang.org/x/tools/internal/gcimporter/exportdata.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/exportdata.go
rename to vendor/golang.org/x/tools/internal/gcimporter/exportdata.go
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go b/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
new file mode 100644
index 00000000..0372fb3a
--- /dev/null
+++ b/vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
@@ -0,0 +1,265 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// This file is a reduced copy of $GOROOT/src/go/internal/gcimporter/gcimporter.go.
+
+// Package gcimporter provides various functions for reading
+// gc-generated object files that can be used to implement the
+// Importer interface defined by the Go 1.5 standard library package.
+package gcimporter // import "golang.org/x/tools/internal/gcimporter"
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"go/build"
+	"go/token"
+	"go/types"
+	"io"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"sync"
+)
+
+const (
+	// Enable debug during development: it adds some additional checks, and
+	// prevents errors from being recovered.
+	debug = false
+
+	// If trace is set, debugging output is printed to std out.
+	trace = false
+)
+
+var exportMap sync.Map // package dir → func() (string, bool)
+
+// lookupGorootExport returns the location of the export data
+// (normally found in the build cache, but located in GOROOT/pkg
+// in prior Go releases) for the package located in pkgDir.
+//
+// (We use the package's directory instead of its import path
+// mainly to simplify handling of the packages in src/vendor
+// and cmd/vendor.)
+func lookupGorootExport(pkgDir string) (string, bool) {
+	f, ok := exportMap.Load(pkgDir)
+	if !ok {
+		var (
+			listOnce   sync.Once
+			exportPath string
+		)
+		f, _ = exportMap.LoadOrStore(pkgDir, func() (string, bool) {
+			listOnce.Do(func() {
+				cmd := exec.Command("go", "list", "-export", "-f", "{{.Export}}", pkgDir)
+				cmd.Dir = build.Default.GOROOT
+				var output []byte
+				output, err := cmd.Output()
+				if err != nil {
+					return
+				}
+
+				exports := strings.Split(string(bytes.TrimSpace(output)), "\n")
+				if len(exports) != 1 {
+					return
+				}
+
+				exportPath = exports[0]
+			})
+
+			return exportPath, exportPath != ""
+		})
+	}
+
+	return f.(func() (string, bool))()
+}
+
+var pkgExts = [...]string{".a", ".o"}
+
+// FindPkg returns the filename and unique package id for an import
+// path based on package information provided by build.Import (using
+// the build.Default build.Context). A relative srcDir is interpreted
+// relative to the current working directory.
+// If no file was found, an empty filename is returned.
+func FindPkg(path, srcDir string) (filename, id string) {
+	if path == "" {
+		return
+	}
+
+	var noext string
+	switch {
+	default:
+		// "x" -> "$GOPATH/pkg/$GOOS_$GOARCH/x.ext", "x"
+		// Don't require the source files to be present.
+		if abs, err := filepath.Abs(srcDir); err == nil { // see issue 14282
+			srcDir = abs
+		}
+		bp, _ := build.Import(path, srcDir, build.FindOnly|build.AllowBinary)
+		if bp.PkgObj == "" {
+			var ok bool
+			if bp.Goroot && bp.Dir != "" {
+				filename, ok = lookupGorootExport(bp.Dir)
+			}
+			if !ok {
+				id = path // make sure we have an id to print in error message
+				return
+			}
+		} else {
+			noext = strings.TrimSuffix(bp.PkgObj, ".a")
+			id = bp.ImportPath
+		}
+
+	case build.IsLocalImport(path):
+		// "./x" -> "/this/directory/x.ext", "/this/directory/x"
+		noext = filepath.Join(srcDir, path)
+		id = noext
+
+	case filepath.IsAbs(path):
+		// for completeness only - go/build.Import
+		// does not support absolute imports
+		// "/x" -> "/x.ext", "/x"
+		noext = path
+		id = path
+	}
+
+	if false { // for debugging
+		if path != id {
+			fmt.Printf("%s -> %s\n", path, id)
+		}
+	}
+
+	if filename != "" {
+		if f, err := os.Stat(filename); err == nil && !f.IsDir() {
+			return
+		}
+	}
+
+	// try extensions
+	for _, ext := range pkgExts {
+		filename = noext + ext
+		if f, err := os.Stat(filename); err == nil && !f.IsDir() {
+			return
+		}
+	}
+
+	filename = "" // not found
+	return
+}
+
+// Import imports a gc-generated package given its import path and srcDir, adds
+// the corresponding package object to the packages map, and returns the object.
+// The packages map must contain all packages already imported.
+func Import(packages map[string]*types.Package, path, srcDir string, lookup func(path string) (io.ReadCloser, error)) (pkg *types.Package, err error) {
+	var rc io.ReadCloser
+	var filename, id string
+	if lookup != nil {
+		// With custom lookup specified, assume that caller has
+		// converted path to a canonical import path for use in the map.
+		if path == "unsafe" {
+			return types.Unsafe, nil
+		}
+		id = path
+
+		// No need to re-import if the package was imported completely before.
+		if pkg = packages[id]; pkg != nil && pkg.Complete() {
+			return
+		}
+		f, err := lookup(path)
+		if err != nil {
+			return nil, err
+		}
+		rc = f
+	} else {
+		filename, id = FindPkg(path, srcDir)
+		if filename == "" {
+			if path == "unsafe" {
+				return types.Unsafe, nil
+			}
+			return nil, fmt.Errorf("can't find import: %q", id)
+		}
+
+		// no need to re-import if the package was imported completely before
+		if pkg = packages[id]; pkg != nil && pkg.Complete() {
+			return
+		}
+
+		// open file
+		f, err := os.Open(filename)
+		if err != nil {
+			return nil, err
+		}
+		defer func() {
+			if err != nil {
+				// add file name to error
+				err = fmt.Errorf("%s: %v", filename, err)
+			}
+		}()
+		rc = f
+	}
+	defer rc.Close()
+
+	var hdr string
+	var size int64
+	buf := bufio.NewReader(rc)
+	if hdr, size, err = FindExportData(buf); err != nil {
+		return
+	}
+
+	switch hdr {
+	case "$$B\n":
+		var data []byte
+		data, err = ioutil.ReadAll(buf)
+		if err != nil {
+			break
+		}
+
+		// TODO(gri): allow clients of go/importer to provide a FileSet.
+		// Or, define a new standard go/types/gcexportdata package.
+		fset := token.NewFileSet()
+
+		// The indexed export format starts with an 'i'; the older
+		// binary export format starts with a 'c', 'd', or 'v'
+		// (from "version"). Select appropriate importer.
+		if len(data) > 0 {
+			switch data[0] {
+			case 'i':
+				_, pkg, err := IImportData(fset, packages, data[1:], id)
+				return pkg, err
+
+			case 'v', 'c', 'd':
+				_, pkg, err := BImportData(fset, packages, data, id)
+				return pkg, err
+
+			case 'u':
+				_, pkg, err := UImportData(fset, packages, data[1:size], id)
+				return pkg, err
+
+			default:
+				l := len(data)
+				if l > 10 {
+					l = 10
+				}
+				return nil, fmt.Errorf("unexpected export data with prefix %q for path %s", string(data[:l]), id)
+			}
+		}
+
+	default:
+		err = fmt.Errorf("unknown export data header: %q", hdr)
+	}
+
+	return
+}
+
+func deref(typ types.Type) types.Type {
+	if p, _ := typ.(*types.Pointer); p != nil {
+		return p.Elem()
+	}
+	return typ
+}
+
+type byPath []*types.Package
+
+func (a byPath) Len() int           { return len(a) }
+func (a byPath) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a byPath) Less(i, j int) bool { return a[i].Path() < a[j].Path() }
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/iexport.go b/vendor/golang.org/x/tools/internal/gcimporter/iexport.go
similarity index 78%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/iexport.go
rename to vendor/golang.org/x/tools/internal/gcimporter/iexport.go
index 9a4ff329..ba53cdcd 100644
--- a/vendor/golang.org/x/tools/go/internal/gcimporter/iexport.go
+++ b/vendor/golang.org/x/tools/internal/gcimporter/iexport.go
@@ -12,7 +12,6 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"go/ast"
 	"go/constant"
 	"go/token"
 	"go/types"
@@ -23,9 +22,45 @@ import (
 	"strconv"
 	"strings"
 
+	"golang.org/x/tools/internal/tokeninternal"
 	"golang.org/x/tools/internal/typeparams"
 )
 
+// IExportShallow encodes "shallow" export data for the specified package.
+//
+// No promises are made about the encoding other than that it can be
+// decoded by the same version of IIExportShallow. If you plan to save
+// export data in the file system, be sure to include a cryptographic
+// digest of the executable in the key to avoid version skew.
+func IExportShallow(fset *token.FileSet, pkg *types.Package) ([]byte, error) {
+	// In principle this operation can only fail if out.Write fails,
+	// but that's impossible for bytes.Buffer---and as a matter of
+	// fact iexportCommon doesn't even check for I/O errors.
+	// TODO(adonovan): handle I/O errors properly.
+	// TODO(adonovan): use byte slices throughout, avoiding copying.
+	const bundle, shallow = false, true
+	var out bytes.Buffer
+	err := iexportCommon(&out, fset, bundle, shallow, iexportVersion, []*types.Package{pkg})
+	return out.Bytes(), err
+}
+
+// IImportShallow decodes "shallow" types.Package data encoded by IExportShallow
+// in the same executable. This function cannot import data from
+// cmd/compile or gcexportdata.Write.
+func IImportShallow(fset *token.FileSet, imports map[string]*types.Package, data []byte, path string, insert InsertType) (*types.Package, error) {
+	const bundle = false
+	pkgs, err := iimportCommon(fset, imports, data, bundle, path, insert)
+	if err != nil {
+		return nil, err
+	}
+	return pkgs[0], nil
+}
+
+// InsertType is the type of a function that creates a types.TypeName
+// object for a named type and inserts it into the scope of the
+// specified Package.
+type InsertType = func(pkg *types.Package, name string)
+
 // Current bundled export format version. Increase with each format change.
 // 0: initial implementation
 const bundleVersion = 0
@@ -36,15 +71,17 @@ const bundleVersion = 0
 // The package path of the top-level package will not be recorded,
 // so that calls to IImportData can override with a provided package path.
 func IExportData(out io.Writer, fset *token.FileSet, pkg *types.Package) error {
-	return iexportCommon(out, fset, false, iexportVersion, []*types.Package{pkg})
+	const bundle, shallow = false, false
+	return iexportCommon(out, fset, bundle, shallow, iexportVersion, []*types.Package{pkg})
 }
 
 // IExportBundle writes an indexed export bundle for pkgs to out.
 func IExportBundle(out io.Writer, fset *token.FileSet, pkgs []*types.Package) error {
-	return iexportCommon(out, fset, true, iexportVersion, pkgs)
+	const bundle, shallow = true, false
+	return iexportCommon(out, fset, bundle, shallow, iexportVersion, pkgs)
 }
 
-func iexportCommon(out io.Writer, fset *token.FileSet, bundle bool, version int, pkgs []*types.Package) (err error) {
+func iexportCommon(out io.Writer, fset *token.FileSet, bundle, shallow bool, version int, pkgs []*types.Package) (err error) {
 	if !debug {
 		defer func() {
 			if e := recover(); e != nil {
@@ -61,6 +98,7 @@ func iexportCommon(out io.Writer, fset *token.FileSet, bundle bool, version int,
 	p := iexporter{
 		fset:        fset,
 		version:     version,
+		shallow:     shallow,
 		allPkgs:     map[*types.Package]bool{},
 		stringIndex: map[string]uint64{},
 		declIndex:   map[types.Object]uint64{},
@@ -82,7 +120,7 @@ func iexportCommon(out io.Writer, fset *token.FileSet, bundle bool, version int,
 	for _, pkg := range pkgs {
 		scope := pkg.Scope()
 		for _, name := range scope.Names() {
-			if ast.IsExported(name) {
+			if token.IsExported(name) {
 				p.pushDecl(scope.Lookup(name))
 			}
 		}
@@ -101,6 +139,17 @@ func iexportCommon(out io.Writer, fset *token.FileSet, bundle bool, version int,
 		p.doDecl(p.declTodo.popHead())
 	}
 
+	// Produce index of offset of each file record in files.
+	var files intWriter
+	var fileOffset []uint64 // fileOffset[i] is offset in files of file encoded as i
+	if p.shallow {
+		fileOffset = make([]uint64, len(p.fileInfos))
+		for i, info := range p.fileInfos {
+			fileOffset[i] = uint64(files.Len())
+			p.encodeFile(&files, info.file, info.needed)
+		}
+	}
+
 	// Append indices to data0 section.
 	dataLen := uint64(p.data0.Len())
 	w := p.newWriter()
@@ -126,16 +175,75 @@ func iexportCommon(out io.Writer, fset *token.FileSet, bundle bool, version int,
 	}
 	hdr.uint64(uint64(p.version))
 	hdr.uint64(uint64(p.strings.Len()))
+	if p.shallow {
+		hdr.uint64(uint64(files.Len()))
+		hdr.uint64(uint64(len(fileOffset)))
+		for _, offset := range fileOffset {
+			hdr.uint64(offset)
+		}
+	}
 	hdr.uint64(dataLen)
 
 	// Flush output.
 	io.Copy(out, &hdr)
 	io.Copy(out, &p.strings)
+	if p.shallow {
+		io.Copy(out, &files)
+	}
 	io.Copy(out, &p.data0)
 
 	return nil
 }
 
+// encodeFile writes to w a representation of the file sufficient to
+// faithfully restore position information about all needed offsets.
+// Mutates the needed array.
+func (p *iexporter) encodeFile(w *intWriter, file *token.File, needed []uint64) {
+	_ = needed[0] // precondition: needed is non-empty
+
+	w.uint64(p.stringOff(file.Name()))
+
+	size := uint64(file.Size())
+	w.uint64(size)
+
+	// Sort the set of needed offsets. Duplicates are harmless.
+	sort.Slice(needed, func(i, j int) bool { return needed[i] < needed[j] })
+
+	lines := tokeninternal.GetLines(file) // byte offset of each line start
+	w.uint64(uint64(len(lines)))
+
+	// Rather than record the entire array of line start offsets,
+	// we save only a sparse list of (index, offset) pairs for
+	// the start of each line that contains a needed position.
+	var sparse [][2]int // (index, offset) pairs
+outer:
+	for i, lineStart := range lines {
+		lineEnd := size
+		if i < len(lines)-1 {
+			lineEnd = uint64(lines[i+1])
+		}
+		// Does this line contains a needed offset?
+		if needed[0] < lineEnd {
+			sparse = append(sparse, [2]int{i, lineStart})
+			for needed[0] < lineEnd {
+				needed = needed[1:]
+				if len(needed) == 0 {
+					break outer
+				}
+			}
+		}
+	}
+
+	// Delta-encode the columns.
+	w.uint64(uint64(len(sparse)))
+	var prev [2]int
+	for _, pair := range sparse {
+		w.uint64(uint64(pair[0] - prev[0]))
+		w.uint64(uint64(pair[1] - prev[1]))
+		prev = pair
+	}
+}
+
 // writeIndex writes out an object index. mainIndex indicates whether
 // we're writing out the main index, which is also read by
 // non-compiler tools and includes a complete package description
@@ -205,7 +313,8 @@ type iexporter struct {
 	out     *bytes.Buffer
 	version int
 
-	localpkg *types.Package
+	shallow  bool           // don't put types from other packages in the index
+	localpkg *types.Package // (nil in bundle mode)
 
 	// allPkgs tracks all packages that have been referenced by
 	// the export data, so we can ensure to include them in the
@@ -217,6 +326,12 @@ type iexporter struct {
 	strings     intWriter
 	stringIndex map[string]uint64
 
+	// In shallow mode, object positions are encoded as (file, offset).
+	// Each file is recorded as a line-number table.
+	// Only the lines of needed positions are saved faithfully.
+	fileInfo  map[*token.File]uint64 // value is index in fileInfos
+	fileInfos []*filePositions
+
 	data0       intWriter
 	declIndex   map[types.Object]uint64
 	tparamNames map[types.Object]string // typeparam->exported name
@@ -225,6 +340,11 @@ type iexporter struct {
 	indent int // for tracing support
 }
 
+type filePositions struct {
+	file   *token.File
+	needed []uint64 // unordered list of needed file offsets
+}
+
 func (p *iexporter) trace(format string, args ...interface{}) {
 	if !trace {
 		// Call sites should also be guarded, but having this check here allows
@@ -248,6 +368,25 @@ func (p *iexporter) stringOff(s string) uint64 {
 	return off
 }
 
+// fileIndexAndOffset returns the index of the token.File and the byte offset of pos within it.
+func (p *iexporter) fileIndexAndOffset(file *token.File, pos token.Pos) (uint64, uint64) {
+	index, ok := p.fileInfo[file]
+	if !ok {
+		index = uint64(len(p.fileInfo))
+		p.fileInfos = append(p.fileInfos, &filePositions{file: file})
+		if p.fileInfo == nil {
+			p.fileInfo = make(map[*token.File]uint64)
+		}
+		p.fileInfo[file] = index
+	}
+	// Record each needed offset.
+	info := p.fileInfos[index]
+	offset := uint64(file.Offset(pos))
+	info.needed = append(info.needed, offset)
+
+	return index, offset
+}
+
 // pushDecl adds n to the declaration work queue, if not already present.
 func (p *iexporter) pushDecl(obj types.Object) {
 	// Package unsafe is known to the compiler and predeclared.
@@ -256,6 +395,11 @@ func (p *iexporter) pushDecl(obj types.Object) {
 		panic("cannot export package unsafe")
 	}
 
+	// Shallow export data: don't index decls from other packages.
+	if p.shallow && obj.Pkg() != p.localpkg {
+		return
+	}
+
 	if _, ok := p.declIndex[obj]; ok {
 		return
 	}
@@ -303,7 +447,13 @@ func (p *iexporter) doDecl(obj types.Object) {
 	case *types.Func:
 		sig, _ := obj.Type().(*types.Signature)
 		if sig.Recv() != nil {
-			panic(internalErrorf("unexpected method: %v", sig))
+			// We shouldn't see methods in the package scope,
+			// but the type checker may repair "func () F() {}"
+			// to "func (Invalid) F()" and then treat it like "func F()",
+			// so allow that. See golang/go#57729.
+			if sig.Recv().Type() != types.Typ[types.Invalid] {
+				panic(internalErrorf("unexpected method: %v", sig))
+			}
 		}
 
 		// Function.
@@ -415,13 +565,30 @@ func (w *exportWriter) tag(tag byte) {
 }
 
 func (w *exportWriter) pos(pos token.Pos) {
-	if w.p.version >= iexportVersionPosCol {
+	if w.p.shallow {
+		w.posV2(pos)
+	} else if w.p.version >= iexportVersionPosCol {
 		w.posV1(pos)
 	} else {
 		w.posV0(pos)
 	}
 }
 
+// posV2 encoding (used only in shallow mode) records positions as
+// (file, offset), where file is the index in the token.File table
+// (which records the file name and newline offsets) and offset is a
+// byte offset. It effectively ignores //line directives.
+func (w *exportWriter) posV2(pos token.Pos) {
+	if pos == token.NoPos {
+		w.uint64(0)
+		return
+	}
+	file := w.p.fset.File(pos) // fset must be non-nil
+	index, offset := w.p.fileIndexAndOffset(file, pos)
+	w.uint64(1 + index)
+	w.uint64(offset)
+}
+
 func (w *exportWriter) posV1(pos token.Pos) {
 	if w.p.fset == nil {
 		w.int64(0)
@@ -497,7 +664,7 @@ func (w *exportWriter) pkg(pkg *types.Package) {
 	w.string(w.exportPath(pkg))
 }
 
-func (w *exportWriter) qualifiedIdent(obj types.Object) {
+func (w *exportWriter) qualifiedType(obj *types.TypeName) {
 	name := w.p.exportName(obj)
 
 	// Ensure any referenced declarations are written out too.
@@ -556,11 +723,11 @@ func (w *exportWriter) doTyp(t types.Type, pkg *types.Package) {
 			return
 		}
 		w.startType(definedType)
-		w.qualifiedIdent(t.Obj())
+		w.qualifiedType(t.Obj())
 
 	case *typeparams.TypeParam:
 		w.startType(typeParamType)
-		w.qualifiedIdent(t.Obj())
+		w.qualifiedType(t.Obj())
 
 	case *types.Pointer:
 		w.startType(pointerType)
@@ -602,14 +769,17 @@ func (w *exportWriter) doTyp(t types.Type, pkg *types.Package) {
 
 	case *types.Struct:
 		w.startType(structType)
-		w.setPkg(pkg, true)
-
 		n := t.NumFields()
+		if n > 0 {
+			w.setPkg(t.Field(0).Pkg(), true) // qualifying package for field objects
+		} else {
+			w.setPkg(pkg, true)
+		}
 		w.uint64(uint64(n))
 		for i := 0; i < n; i++ {
 			f := t.Field(i)
 			w.pos(f.Pos())
-			w.string(f.Name())
+			w.string(f.Name()) // unexported fields implicitly qualified by prior setPkg
 			w.typ(f.Type(), pkg)
 			w.bool(f.Anonymous())
 			w.string(t.Tag(i)) // note (or tag)
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/iimport.go b/vendor/golang.org/x/tools/internal/gcimporter/iimport.go
similarity index 86%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/iimport.go
rename to vendor/golang.org/x/tools/internal/gcimporter/iimport.go
index 4caa0f55..448f903e 100644
--- a/vendor/golang.org/x/tools/go/internal/gcimporter/iimport.go
+++ b/vendor/golang.org/x/tools/internal/gcimporter/iimport.go
@@ -51,6 +51,8 @@ const (
 	iexportVersionPosCol   = 1
 	iexportVersionGo1_18   = 2
 	iexportVersionGenerics = 2
+
+	iexportVersionCurrent = 2
 )
 
 type ident struct {
@@ -83,7 +85,7 @@ const (
 // If the export data version is not recognized or the format is otherwise
 // compromised, an error is returned.
 func IImportData(fset *token.FileSet, imports map[string]*types.Package, data []byte, path string) (int, *types.Package, error) {
-	pkgs, err := iimportCommon(fset, imports, data, false, path)
+	pkgs, err := iimportCommon(fset, imports, data, false, path, nil)
 	if err != nil {
 		return 0, nil, err
 	}
@@ -92,11 +94,11 @@ func IImportData(fset *token.FileSet, imports map[string]*types.Package, data []
 
 // IImportBundle imports a set of packages from the serialized package bundle.
 func IImportBundle(fset *token.FileSet, imports map[string]*types.Package, data []byte) ([]*types.Package, error) {
-	return iimportCommon(fset, imports, data, true, "")
+	return iimportCommon(fset, imports, data, true, "", nil)
 }
 
-func iimportCommon(fset *token.FileSet, imports map[string]*types.Package, data []byte, bundle bool, path string) (pkgs []*types.Package, err error) {
-	const currentVersion = 1
+func iimportCommon(fset *token.FileSet, imports map[string]*types.Package, data []byte, bundle bool, path string, insert InsertType) (pkgs []*types.Package, err error) {
+	const currentVersion = iexportVersionCurrent
 	version := int64(-1)
 	if !debug {
 		defer func() {
@@ -135,19 +137,34 @@ func iimportCommon(fset *token.FileSet, imports map[string]*types.Package, data
 	}
 
 	sLen := int64(r.uint64())
+	var fLen int64
+	var fileOffset []uint64
+	if insert != nil {
+		// Shallow mode uses a different position encoding.
+		fLen = int64(r.uint64())
+		fileOffset = make([]uint64, r.uint64())
+		for i := range fileOffset {
+			fileOffset[i] = r.uint64()
+		}
+	}
 	dLen := int64(r.uint64())
 
 	whence, _ := r.Seek(0, io.SeekCurrent)
 	stringData := data[whence : whence+sLen]
-	declData := data[whence+sLen : whence+sLen+dLen]
-	r.Seek(sLen+dLen, io.SeekCurrent)
+	fileData := data[whence+sLen : whence+sLen+fLen]
+	declData := data[whence+sLen+fLen : whence+sLen+fLen+dLen]
+	r.Seek(sLen+fLen+dLen, io.SeekCurrent)
 
 	p := iimporter{
 		version: int(version),
 		ipath:   path,
+		insert:  insert,
 
 		stringData:  stringData,
 		stringCache: make(map[uint64]string),
+		fileOffset:  fileOffset,
+		fileData:    fileData,
+		fileCache:   make([]*token.File, len(fileOffset)),
 		pkgCache:    make(map[uint64]*types.Package),
 
 		declData: declData,
@@ -185,11 +202,18 @@ func iimportCommon(fset *token.FileSet, imports map[string]*types.Package, data
 		} else if pkg.Name() != pkgName {
 			errorf("conflicting names %s and %s for package %q", pkg.Name(), pkgName, path)
 		}
+		if i == 0 && !bundle {
+			p.localpkg = pkg
+		}
 
 		p.pkgCache[pkgPathOff] = pkg
 
+		// Read index for package.
 		nameIndex := make(map[string]uint64)
-		for nSyms := r.uint64(); nSyms > 0; nSyms-- {
+		nSyms := r.uint64()
+		// In shallow mode we don't expect an index for other packages.
+		assert(nSyms == 0 || p.localpkg == pkg || p.insert == nil)
+		for ; nSyms > 0; nSyms-- {
 			name := p.stringAt(r.uint64())
 			nameIndex[name] = r.uint64()
 		}
@@ -265,8 +289,14 @@ type iimporter struct {
 	version int
 	ipath   string
 
+	localpkg *types.Package
+	insert   func(pkg *types.Package, name string) // "shallow" mode only
+
 	stringData  []byte
 	stringCache map[uint64]string
+	fileOffset  []uint64 // fileOffset[i] is offset in fileData for info about file encoded as i
+	fileData    []byte
+	fileCache   []*token.File // memoized decoding of file encoded as i
 	pkgCache    map[uint64]*types.Package
 
 	declData    []byte
@@ -308,6 +338,13 @@ func (p *iimporter) doDecl(pkg *types.Package, name string) {
 
 	off, ok := p.pkgIndex[pkg][name]
 	if !ok {
+		// In "shallow" mode, call back to the application to
+		// find the object and insert it into the package scope.
+		if p.insert != nil {
+			assert(pkg != p.localpkg)
+			p.insert(pkg, name) // "can't fail"
+			return
+		}
 		errorf("%v.%v not in index", pkg, name)
 	}
 
@@ -332,6 +369,55 @@ func (p *iimporter) stringAt(off uint64) string {
 	return s
 }
 
+func (p *iimporter) fileAt(index uint64) *token.File {
+	file := p.fileCache[index]
+	if file == nil {
+		off := p.fileOffset[index]
+		file = p.decodeFile(intReader{bytes.NewReader(p.fileData[off:]), p.ipath})
+		p.fileCache[index] = file
+	}
+	return file
+}
+
+func (p *iimporter) decodeFile(rd intReader) *token.File {
+	filename := p.stringAt(rd.uint64())
+	size := int(rd.uint64())
+	file := p.fake.fset.AddFile(filename, -1, size)
+
+	// SetLines requires a nondecreasing sequence.
+	// Because it is common for clients to derive the interval
+	// [start, start+len(name)] from a start position, and we
+	// want to ensure that the end offset is on the same line,
+	// we fill in the gaps of the sparse encoding with values
+	// that strictly increase by the largest possible amount.
+	// This allows us to avoid having to record the actual end
+	// offset of each needed line.
+
+	lines := make([]int, int(rd.uint64()))
+	var index, offset int
+	for i, n := 0, int(rd.uint64()); i < n; i++ {
+		index += int(rd.uint64())
+		offset += int(rd.uint64())
+		lines[index] = offset
+
+		// Ensure monotonicity between points.
+		for j := index - 1; j > 0 && lines[j] == 0; j-- {
+			lines[j] = lines[j+1] - 1
+		}
+	}
+
+	// Ensure monotonicity after last point.
+	for j := len(lines) - 1; j > 0 && lines[j] == 0; j-- {
+		size--
+		lines[j] = size
+	}
+
+	if !file.SetLines(lines) {
+		errorf("SetLines failed: %d", lines) // can't happen
+	}
+	return file
+}
+
 func (p *iimporter) pkgAt(off uint64) *types.Package {
 	if pkg, ok := p.pkgCache[off]; ok {
 		return pkg
@@ -625,6 +711,9 @@ func (r *importReader) qualifiedIdent() (*types.Package, string) {
 }
 
 func (r *importReader) pos() token.Pos {
+	if r.p.insert != nil { // shallow mode
+		return r.posv2()
+	}
 	if r.p.version >= iexportVersionPosCol {
 		r.posv1()
 	} else {
@@ -661,6 +750,15 @@ func (r *importReader) posv1() {
 	}
 }
 
+func (r *importReader) posv2() token.Pos {
+	file := r.uint64()
+	if file == 0 {
+		return token.NoPos
+	}
+	tf := r.p.fileAt(file - 1)
+	return tf.Pos(int(r.uint64()))
+}
+
 func (r *importReader) typ() types.Type {
 	return r.p.typAt(r.uint64(), nil)
 }
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/newInterface10.go b/vendor/golang.org/x/tools/internal/gcimporter/newInterface10.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/newInterface10.go
rename to vendor/golang.org/x/tools/internal/gcimporter/newInterface10.go
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/newInterface11.go b/vendor/golang.org/x/tools/internal/gcimporter/newInterface11.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/newInterface11.go
rename to vendor/golang.org/x/tools/internal/gcimporter/newInterface11.go
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/support_go117.go b/vendor/golang.org/x/tools/internal/gcimporter/support_go117.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/support_go117.go
rename to vendor/golang.org/x/tools/internal/gcimporter/support_go117.go
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/support_go118.go b/vendor/golang.org/x/tools/internal/gcimporter/support_go118.go
similarity index 62%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/support_go118.go
rename to vendor/golang.org/x/tools/internal/gcimporter/support_go118.go
index a9938432..edbe6ea7 100644
--- a/vendor/golang.org/x/tools/go/internal/gcimporter/support_go118.go
+++ b/vendor/golang.org/x/tools/internal/gcimporter/support_go118.go
@@ -21,3 +21,17 @@ func additionalPredeclared() []types.Type {
 		types.Universe.Lookup("any").Type(),
 	}
 }
+
+// See cmd/compile/internal/types.SplitVargenSuffix.
+func splitVargenSuffix(name string) (base, suffix string) {
+	i := len(name)
+	for i > 0 && name[i-1] >= '0' && name[i-1] <= '9' {
+		i--
+	}
+	const dot = "·"
+	if i >= len(dot) && name[i-len(dot):i] == dot {
+		i -= len(dot)
+		return name[:i], name[i:]
+	}
+	return name, ""
+}
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/unified_no.go b/vendor/golang.org/x/tools/internal/gcimporter/unified_no.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/unified_no.go
rename to vendor/golang.org/x/tools/internal/gcimporter/unified_no.go
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/unified_yes.go b/vendor/golang.org/x/tools/internal/gcimporter/unified_yes.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/unified_yes.go
rename to vendor/golang.org/x/tools/internal/gcimporter/unified_yes.go
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/ureader_no.go b/vendor/golang.org/x/tools/internal/gcimporter/ureader_no.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/ureader_no.go
rename to vendor/golang.org/x/tools/internal/gcimporter/ureader_no.go
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/ureader_yes.go b/vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go
similarity index 70%
rename from vendor/golang.org/x/tools/go/internal/gcimporter/ureader_yes.go
rename to vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go
index 3c1a4375..b285a11c 100644
--- a/vendor/golang.org/x/tools/go/internal/gcimporter/ureader_yes.go
+++ b/vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go
@@ -14,7 +14,7 @@ import (
 	"go/types"
 	"strings"
 
-	"golang.org/x/tools/go/internal/pkgbits"
+	"golang.org/x/tools/internal/pkgbits"
 )
 
 // A pkgReader holds the shared state for reading a unified IR package
@@ -36,6 +36,12 @@ type pkgReader struct {
 	// laterFns holds functions that need to be invoked at the end of
 	// import reading.
 	laterFns []func()
+	// laterFors is used in case of 'type A B' to ensure that B is processed before A.
+	laterFors map[types.Type]int
+
+	// ifaces holds a list of constructed Interfaces, which need to have
+	// Complete called after importing is done.
+	ifaces []*types.Interface
 }
 
 // later adds a function to be invoked at the end of import reading.
@@ -63,6 +69,15 @@ func UImportData(fset *token.FileSet, imports map[string]*types.Package, data []
 	return
 }
 
+// laterFor adds a function to be invoked at the end of import reading, and records the type that function is finishing.
+func (pr *pkgReader) laterFor(t types.Type, fn func()) {
+	if pr.laterFors == nil {
+		pr.laterFors = make(map[types.Type]int)
+	}
+	pr.laterFors[t] = len(pr.laterFns)
+	pr.laterFns = append(pr.laterFns, fn)
+}
+
 // readUnifiedPackage reads a package description from the given
 // unified IR export data decoder.
 func readUnifiedPackage(fset *token.FileSet, ctxt *types.Context, imports map[string]*types.Package, input pkgbits.PkgDecoder) *types.Package {
@@ -102,6 +117,10 @@ func readUnifiedPackage(fset *token.FileSet, ctxt *types.Context, imports map[st
 		fn()
 	}
 
+	for _, iface := range pr.ifaces {
+		iface.Complete()
+	}
+
 	pkg.MarkComplete()
 	return pkg
 }
@@ -139,6 +158,17 @@ func (pr *pkgReader) newReader(k pkgbits.RelocKind, idx pkgbits.Index, marker pk
 	}
 }
 
+func (pr *pkgReader) tempReader(k pkgbits.RelocKind, idx pkgbits.Index, marker pkgbits.SyncMarker) *reader {
+	return &reader{
+		Decoder: pr.TempDecoder(k, idx, marker),
+		p:       pr,
+	}
+}
+
+func (pr *pkgReader) retireReader(r *reader) {
+	pr.RetireDecoder(&r.Decoder)
+}
+
 // @@@ Positions
 
 func (r *reader) pos() token.Pos {
@@ -163,26 +193,29 @@ func (pr *pkgReader) posBaseIdx(idx pkgbits.Index) string {
 		return b
 	}
 
-	r := pr.newReader(pkgbits.RelocPosBase, idx, pkgbits.SyncPosBase)
+	var filename string
+	{
+		r := pr.tempReader(pkgbits.RelocPosBase, idx, pkgbits.SyncPosBase)
 
-	// Within types2, position bases have a lot more details (e.g.,
-	// keeping track of where //line directives appeared exactly).
-	//
-	// For go/types, we just track the file name.
+		// Within types2, position bases have a lot more details (e.g.,
+		// keeping track of where //line directives appeared exactly).
+		//
+		// For go/types, we just track the file name.
 
-	filename := r.String()
+		filename = r.String()
 
-	if r.Bool() { // file base
-		// Was: "b = token.NewTrimmedFileBase(filename, true)"
-	} else { // line base
-		pos := r.pos()
-		line := r.Uint()
-		col := r.Uint()
+		if r.Bool() { // file base
+			// Was: "b = token.NewTrimmedFileBase(filename, true)"
+		} else { // line base
+			pos := r.pos()
+			line := r.Uint()
+			col := r.Uint()
 
-		// Was: "b = token.NewLineBase(pos, filename, true, line, col)"
-		_, _, _ = pos, line, col
+			// Was: "b = token.NewLineBase(pos, filename, true, line, col)"
+			_, _, _ = pos, line, col
+		}
+		pr.retireReader(r)
 	}
-
 	b := filename
 	pr.posBases[idx] = b
 	return b
@@ -231,11 +264,35 @@ func (r *reader) doPkg() *types.Package {
 	for i := range imports {
 		imports[i] = r.pkg()
 	}
-	pkg.SetImports(imports)
+	pkg.SetImports(flattenImports(imports))
 
 	return pkg
 }
 
+// flattenImports returns the transitive closure of all imported
+// packages rooted from pkgs.
+func flattenImports(pkgs []*types.Package) []*types.Package {
+	var res []*types.Package
+	seen := make(map[*types.Package]struct{})
+	for _, pkg := range pkgs {
+		if _, ok := seen[pkg]; ok {
+			continue
+		}
+		seen[pkg] = struct{}{}
+		res = append(res, pkg)
+
+		// pkg.Imports() is already flattened.
+		for _, pkg := range pkg.Imports() {
+			if _, ok := seen[pkg]; ok {
+				continue
+			}
+			seen[pkg] = struct{}{}
+			res = append(res, pkg)
+		}
+	}
+	return res
+}
+
 // @@@ Types
 
 func (r *reader) typ() types.Type {
@@ -264,12 +321,15 @@ func (pr *pkgReader) typIdx(info typeInfo, dict *readerDict) types.Type {
 		return typ
 	}
 
-	r := pr.newReader(pkgbits.RelocType, idx, pkgbits.SyncTypeIdx)
-	r.dict = dict
-
-	typ := r.doTyp()
-	assert(typ != nil)
+	var typ types.Type
+	{
+		r := pr.tempReader(pkgbits.RelocType, idx, pkgbits.SyncTypeIdx)
+		r.dict = dict
 
+		typ = r.doTyp()
+		assert(typ != nil)
+		pr.retireReader(r)
+	}
 	// See comment in pkgReader.typIdx explaining how this happens.
 	if prev := *where; prev != nil {
 		return prev
@@ -372,6 +432,16 @@ func (r *reader) interfaceType() *types.Interface {
 	if implicit {
 		iface.MarkImplicit()
 	}
+
+	// We need to call iface.Complete(), but if there are any embedded
+	// defined types, then we may not have set their underlying
+	// interface type yet. So we need to defer calling Complete until
+	// after we've called SetUnderlying everywhere.
+	//
+	// TODO(mdempsky): After CL 424876 lands, it should be safe to call
+	// iface.Complete() immediately.
+	r.p.ifaces = append(r.p.ifaces, iface)
+
 	return iface
 }
 
@@ -425,18 +495,30 @@ func (r *reader) obj() (types.Object, []types.Type) {
 }
 
 func (pr *pkgReader) objIdx(idx pkgbits.Index) (*types.Package, string) {
-	rname := pr.newReader(pkgbits.RelocName, idx, pkgbits.SyncObject1)
 
-	objPkg, objName := rname.qualifiedIdent()
-	assert(objName != "")
+	var objPkg *types.Package
+	var objName string
+	var tag pkgbits.CodeObj
+	{
+		rname := pr.tempReader(pkgbits.RelocName, idx, pkgbits.SyncObject1)
 
-	tag := pkgbits.CodeObj(rname.Code(pkgbits.SyncCodeObj))
+		objPkg, objName = rname.qualifiedIdent()
+		assert(objName != "")
+
+		tag = pkgbits.CodeObj(rname.Code(pkgbits.SyncCodeObj))
+		pr.retireReader(rname)
+	}
 
 	if tag == pkgbits.ObjStub {
 		assert(objPkg == nil || objPkg == types.Unsafe)
 		return objPkg, objName
 	}
 
+	// Ignore local types promoted to global scope (#55110).
+	if _, suffix := splitVargenSuffix(objName); suffix != "" {
+		return objPkg, objName
+	}
+
 	if objPkg.Scope().Lookup(objName) == nil {
 		dict := pr.objDictIdx(idx)
 
@@ -477,15 +559,56 @@ func (pr *pkgReader) objIdx(idx pkgbits.Index) (*types.Package, string) {
 
 			named.SetTypeParams(r.typeParamNames())
 
-			// TODO(mdempsky): Rewrite receiver types to underlying is an
-			// Interface? The go/types importer does this (I think because
-			// unit tests expected that), but cmd/compile doesn't care
-			// about it, so maybe we can avoid worrying about that here.
-			rhs := r.typ()
-			r.p.later(func() {
-				underlying := rhs.Underlying()
+			setUnderlying := func(underlying types.Type) {
+				// If the underlying type is an interface, we need to
+				// duplicate its methods so we can replace the receiver
+				// parameter's type (#49906).
+				if iface, ok := underlying.(*types.Interface); ok && iface.NumExplicitMethods() != 0 {
+					methods := make([]*types.Func, iface.NumExplicitMethods())
+					for i := range methods {
+						fn := iface.ExplicitMethod(i)
+						sig := fn.Type().(*types.Signature)
+
+						recv := types.NewVar(fn.Pos(), fn.Pkg(), "", named)
+						methods[i] = types.NewFunc(fn.Pos(), fn.Pkg(), fn.Name(), types.NewSignature(recv, sig.Params(), sig.Results(), sig.Variadic()))
+					}
+
+					embeds := make([]types.Type, iface.NumEmbeddeds())
+					for i := range embeds {
+						embeds[i] = iface.EmbeddedType(i)
+					}
+
+					newIface := types.NewInterfaceType(methods, embeds)
+					r.p.ifaces = append(r.p.ifaces, newIface)
+					underlying = newIface
+				}
+
 				named.SetUnderlying(underlying)
-			})
+			}
+
+			// Since go.dev/cl/455279, we can assume rhs.Underlying() will
+			// always be non-nil. However, to temporarily support users of
+			// older snapshot releases, we continue to fallback to the old
+			// behavior for now.
+			//
+			// TODO(mdempsky): Remove fallback code and simplify after
+			// allowing time for snapshot users to upgrade.
+			rhs := r.typ()
+			if underlying := rhs.Underlying(); underlying != nil {
+				setUnderlying(underlying)
+			} else {
+				pk := r.p
+				pk.laterFor(named, func() {
+					// First be sure that the rhs is initialized, if it needs to be initialized.
+					delete(pk.laterFors, named) // prevent cycles
+					if i, ok := pk.laterFors[rhs]; ok {
+						f := pk.laterFns[i]
+						pk.laterFns[i] = func() {} // function is running now, so replace it with a no-op
+						f()                        // initialize RHS
+					}
+					setUnderlying(rhs.Underlying())
+				})
+			}
 
 			for i, n := 0, r.Len(); i < n; i++ {
 				named.AddMethod(r.method())
@@ -502,25 +625,28 @@ func (pr *pkgReader) objIdx(idx pkgbits.Index) (*types.Package, string) {
 }
 
 func (pr *pkgReader) objDictIdx(idx pkgbits.Index) *readerDict {
-	r := pr.newReader(pkgbits.RelocObjDict, idx, pkgbits.SyncObject1)
 
 	var dict readerDict
 
-	if implicits := r.Len(); implicits != 0 {
-		errorf("unexpected object with %v implicit type parameter(s)", implicits)
-	}
+	{
+		r := pr.tempReader(pkgbits.RelocObjDict, idx, pkgbits.SyncObject1)
+		if implicits := r.Len(); implicits != 0 {
+			errorf("unexpected object with %v implicit type parameter(s)", implicits)
+		}
 
-	dict.bounds = make([]typeInfo, r.Len())
-	for i := range dict.bounds {
-		dict.bounds[i] = r.typInfo()
-	}
+		dict.bounds = make([]typeInfo, r.Len())
+		for i := range dict.bounds {
+			dict.bounds[i] = r.typInfo()
+		}
 
-	dict.derived = make([]derivedInfo, r.Len())
-	dict.derivedTypes = make([]types.Type, len(dict.derived))
-	for i := range dict.derived {
-		dict.derived[i] = derivedInfo{r.Reloc(pkgbits.RelocType), r.Bool()}
-	}
+		dict.derived = make([]derivedInfo, r.Len())
+		dict.derivedTypes = make([]types.Type, len(dict.derived))
+		for i := range dict.derived {
+			dict.derived[i] = derivedInfo{r.Reloc(pkgbits.RelocType), r.Bool()}
+		}
 
+		pr.retireReader(r)
+	}
 	// function references follow, but reader doesn't need those
 
 	return &dict
diff --git a/vendor/golang.org/x/tools/internal/gocommand/invoke.go b/vendor/golang.org/x/tools/internal/gocommand/invoke.go
index 67256dc3..d5055169 100644
--- a/vendor/golang.org/x/tools/internal/gocommand/invoke.go
+++ b/vendor/golang.org/x/tools/internal/gocommand/invoke.go
@@ -10,8 +10,10 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"regexp"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -232,6 +234,12 @@ func (i *Invocation) run(ctx context.Context, stdout, stderr io.Writer) error {
 	return runCmdContext(ctx, cmd)
 }
 
+// DebugHangingGoCommands may be set by tests to enable additional
+// instrumentation (including panics) for debugging hanging Go commands.
+//
+// See golang/go#54461 for details.
+var DebugHangingGoCommands = false
+
 // runCmdContext is like exec.CommandContext except it sends os.Interrupt
 // before os.Kill.
 func runCmdContext(ctx context.Context, cmd *exec.Cmd) error {
@@ -243,11 +251,24 @@ func runCmdContext(ctx context.Context, cmd *exec.Cmd) error {
 		resChan <- cmd.Wait()
 	}()
 
-	select {
-	case err := <-resChan:
-		return err
-	case <-ctx.Done():
+	// If we're interested in debugging hanging Go commands, stop waiting after a
+	// minute and panic with interesting information.
+	if DebugHangingGoCommands {
+		select {
+		case err := <-resChan:
+			return err
+		case <-time.After(1 * time.Minute):
+			HandleHangingGoCommand(cmd.Process)
+		case <-ctx.Done():
+		}
+	} else {
+		select {
+		case err := <-resChan:
+			return err
+		case <-ctx.Done():
+		}
 	}
+
 	// Cancelled. Interrupt and see if it ends voluntarily.
 	cmd.Process.Signal(os.Interrupt)
 	select {
@@ -255,11 +276,63 @@ func runCmdContext(ctx context.Context, cmd *exec.Cmd) error {
 		return err
 	case <-time.After(time.Second):
 	}
+
 	// Didn't shut down in response to interrupt. Kill it hard.
-	cmd.Process.Kill()
+	// TODO(rfindley): per advice from bcmills@, it may be better to send SIGQUIT
+	// on certain platforms, such as unix.
+	if err := cmd.Process.Kill(); err != nil && DebugHangingGoCommands {
+		// Don't panic here as this reliably fails on windows with EINVAL.
+		log.Printf("error killing the Go command: %v", err)
+	}
+
+	// See above: don't wait indefinitely if we're debugging hanging Go commands.
+	if DebugHangingGoCommands {
+		select {
+		case err := <-resChan:
+			return err
+		case <-time.After(10 * time.Second): // a shorter wait as resChan should return quickly following Kill
+			HandleHangingGoCommand(cmd.Process)
+		}
+	}
 	return <-resChan
 }
 
+func HandleHangingGoCommand(proc *os.Process) {
+	switch runtime.GOOS {
+	case "linux", "darwin", "freebsd", "netbsd":
+		fmt.Fprintln(os.Stderr, `DETECTED A HANGING GO COMMAND
+
+The gopls test runner has detected a hanging go command. In order to debug
+this, the output of ps and lsof/fstat is printed below.
+
+See golang/go#54461 for more details.`)
+
+		fmt.Fprintln(os.Stderr, "\nps axo ppid,pid,command:")
+		fmt.Fprintln(os.Stderr, "-------------------------")
+		psCmd := exec.Command("ps", "axo", "ppid,pid,command")
+		psCmd.Stdout = os.Stderr
+		psCmd.Stderr = os.Stderr
+		if err := psCmd.Run(); err != nil {
+			panic(fmt.Sprintf("running ps: %v", err))
+		}
+
+		listFiles := "lsof"
+		if runtime.GOOS == "freebsd" || runtime.GOOS == "netbsd" {
+			listFiles = "fstat"
+		}
+
+		fmt.Fprintln(os.Stderr, "\n"+listFiles+":")
+		fmt.Fprintln(os.Stderr, "-----")
+		listFilesCmd := exec.Command(listFiles)
+		listFilesCmd.Stdout = os.Stderr
+		listFilesCmd.Stderr = os.Stderr
+		if err := listFilesCmd.Run(); err != nil {
+			panic(fmt.Sprintf("running %s: %v", listFiles, err))
+		}
+	}
+	panic(fmt.Sprintf("detected hanging go command (pid %d): see golang/go#54461 for more details", proc.Pid))
+}
+
 func cmdDebugStr(cmd *exec.Cmd) string {
 	env := make(map[string]string)
 	for _, kv := range cmd.Env {
diff --git a/vendor/golang.org/x/tools/internal/gocommand/version.go b/vendor/golang.org/x/tools/internal/gocommand/version.go
index 71304368..307a76d4 100644
--- a/vendor/golang.org/x/tools/internal/gocommand/version.go
+++ b/vendor/golang.org/x/tools/internal/gocommand/version.go
@@ -7,11 +7,19 @@ package gocommand
 import (
 	"context"
 	"fmt"
+	"regexp"
 	"strings"
 )
 
-// GoVersion checks the go version by running "go list" with modules off.
-// It returns the X in Go 1.X.
+// GoVersion reports the minor version number of the highest release
+// tag built into the go command on the PATH.
+//
+// Note that this may be higher than the version of the go tool used
+// to build this application, and thus the versions of the standard
+// go/{scanner,parser,ast,types} packages that are linked into it.
+// In that case, callers should either downgrade to the version of
+// go used to build the application, or report an error that the
+// application is too old to use the go command on the PATH.
 func GoVersion(ctx context.Context, inv Invocation, r *Runner) (int, error) {
 	inv.Verb = "list"
 	inv.Args = []string{"-e", "-f", `{{context.ReleaseTags}}`, `--`, `unsafe`}
@@ -38,7 +46,7 @@ func GoVersion(ctx context.Context, inv Invocation, r *Runner) (int, error) {
 	if len(stdout) < 3 {
 		return 0, fmt.Errorf("bad ReleaseTags output: %q", stdout)
 	}
-	// Split up "[go1.1 go1.15]"
+	// Split up "[go1.1 go1.15]" and return highest go1.X value.
 	tags := strings.Fields(stdout[1 : len(stdout)-2])
 	for i := len(tags) - 1; i >= 0; i-- {
 		var version int
@@ -49,3 +57,25 @@ func GoVersion(ctx context.Context, inv Invocation, r *Runner) (int, error) {
 	}
 	return 0, fmt.Errorf("no parseable ReleaseTags in %v", tags)
 }
+
+// GoVersionOutput returns the complete output of the go version command.
+func GoVersionOutput(ctx context.Context, inv Invocation, r *Runner) (string, error) {
+	inv.Verb = "version"
+	goVersion, err := r.Run(ctx, inv)
+	if err != nil {
+		return "", err
+	}
+	return goVersion.String(), nil
+}
+
+// ParseGoVersionOutput extracts the Go version string
+// from the output of the "go version" command.
+// Given an unrecognized form, it returns an empty string.
+func ParseGoVersionOutput(data string) string {
+	re := regexp.MustCompile(`^go version (go\S+|devel \S+)`)
+	m := re.FindStringSubmatch(data)
+	if len(m) != 2 {
+		return "" // unrecognized version
+	}
+	return m[1]
+}
diff --git a/vendor/golang.org/x/tools/go/internal/pkgbits/codes.go b/vendor/golang.org/x/tools/internal/pkgbits/codes.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/pkgbits/codes.go
rename to vendor/golang.org/x/tools/internal/pkgbits/codes.go
diff --git a/vendor/golang.org/x/tools/go/internal/pkgbits/decoder.go b/vendor/golang.org/x/tools/internal/pkgbits/decoder.go
similarity index 83%
rename from vendor/golang.org/x/tools/go/internal/pkgbits/decoder.go
rename to vendor/golang.org/x/tools/internal/pkgbits/decoder.go
index 2bc79366..b92e8e6e 100644
--- a/vendor/golang.org/x/tools/go/internal/pkgbits/decoder.go
+++ b/vendor/golang.org/x/tools/internal/pkgbits/decoder.go
@@ -6,9 +6,11 @@ package pkgbits
 
 import (
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"go/constant"
 	"go/token"
+	"io"
 	"math/big"
 	"os"
 	"runtime"
@@ -51,6 +53,8 @@ type PkgDecoder struct {
 	// For example, section K's end positions start at elemEndsEnds[K-1]
 	// (or 0, if K==0) and end at elemEndsEnds[K].
 	elemEndsEnds [numRelocs]uint32
+
+	scratchRelocEnt []RelocEnt
 }
 
 // PkgPath returns the package path for the package
@@ -94,7 +98,7 @@ func NewPkgDecoder(pkgPath, input string) PkgDecoder {
 	pr.elemEnds = make([]uint32, pr.elemEndsEnds[len(pr.elemEndsEnds)-1])
 	assert(binary.Read(r, binary.LittleEndian, pr.elemEnds[:]) == nil)
 
-	pos, err := r.Seek(0, os.SEEK_CUR)
+	pos, err := r.Seek(0, io.SeekCurrent)
 	assert(err == nil)
 
 	pr.elemData = input[pos:]
@@ -164,6 +168,21 @@ func (pr *PkgDecoder) NewDecoder(k RelocKind, idx Index, marker SyncMarker) Deco
 	return r
 }
 
+// TempDecoder returns a Decoder for the given (section, index) pair,
+// and decodes the given SyncMarker from the element bitstream.
+// If possible the Decoder should be RetireDecoder'd when it is no longer
+// needed, this will avoid heap allocations.
+func (pr *PkgDecoder) TempDecoder(k RelocKind, idx Index, marker SyncMarker) Decoder {
+	r := pr.TempDecoderRaw(k, idx)
+	r.Sync(marker)
+	return r
+}
+
+func (pr *PkgDecoder) RetireDecoder(d *Decoder) {
+	pr.scratchRelocEnt = d.Relocs
+	d.Relocs = nil
+}
+
 // NewDecoderRaw returns a Decoder for the given (section, index) pair.
 //
 // Most callers should use NewDecoder instead.
@@ -187,6 +206,30 @@ func (pr *PkgDecoder) NewDecoderRaw(k RelocKind, idx Index) Decoder {
 	return r
 }
 
+func (pr *PkgDecoder) TempDecoderRaw(k RelocKind, idx Index) Decoder {
+	r := Decoder{
+		common: pr,
+		k:      k,
+		Idx:    idx,
+	}
+
+	r.Data.Reset(pr.DataIdx(k, idx))
+	r.Sync(SyncRelocs)
+	l := r.Len()
+	if cap(pr.scratchRelocEnt) >= l {
+		r.Relocs = pr.scratchRelocEnt[:l]
+		pr.scratchRelocEnt = nil
+	} else {
+		r.Relocs = make([]RelocEnt, l)
+	}
+	for i := range r.Relocs {
+		r.Sync(SyncReloc)
+		r.Relocs[i] = RelocEnt{RelocKind(r.Len()), Index(r.Len())}
+	}
+
+	return r
+}
+
 // A Decoder provides methods for decoding an individual element's
 // bitstream data.
 type Decoder struct {
@@ -206,11 +249,39 @@ func (r *Decoder) checkErr(err error) {
 }
 
 func (r *Decoder) rawUvarint() uint64 {
-	x, err := binary.ReadUvarint(&r.Data)
+	x, err := readUvarint(&r.Data)
 	r.checkErr(err)
 	return x
 }
 
+// readUvarint is a type-specialized copy of encoding/binary.ReadUvarint.
+// This avoids the interface conversion and thus has better escape properties,
+// which flows up the stack.
+func readUvarint(r *strings.Reader) (uint64, error) {
+	var x uint64
+	var s uint
+	for i := 0; i < binary.MaxVarintLen64; i++ {
+		b, err := r.ReadByte()
+		if err != nil {
+			if i > 0 && err == io.EOF {
+				err = io.ErrUnexpectedEOF
+			}
+			return x, err
+		}
+		if b < 0x80 {
+			if i == binary.MaxVarintLen64-1 && b > 1 {
+				return x, overflow
+			}
+			return x | uint64(b)<<s, nil
+		}
+		x |= uint64(b&0x7f) << s
+		s += 7
+	}
+	return x, overflow
+}
+
+var overflow = errors.New("pkgbits: readUvarint overflows a 64-bit integer")
+
 func (r *Decoder) rawVarint() int64 {
 	ux := r.rawUvarint()
 
@@ -237,7 +308,7 @@ func (r *Decoder) Sync(mWant SyncMarker) {
 		return
 	}
 
-	pos, _ := r.Data.Seek(0, os.SEEK_CUR) // TODO(mdempsky): io.SeekCurrent after #44505 is resolved
+	pos, _ := r.Data.Seek(0, io.SeekCurrent)
 	mHave := SyncMarker(r.rawUvarint())
 	writerPCs := make([]int, r.rawUvarint())
 	for i := range writerPCs {
@@ -302,7 +373,7 @@ func (r *Decoder) Int64() int64 {
 	return r.rawVarint()
 }
 
-// Int64 decodes and returns a uint64 value from the element bitstream.
+// Uint64 decodes and returns a uint64 value from the element bitstream.
 func (r *Decoder) Uint64() uint64 {
 	r.Sync(SyncUint64)
 	return r.rawUvarint()
@@ -409,8 +480,12 @@ func (r *Decoder) bigFloat() *big.Float {
 // PeekPkgPath returns the package path for the specified package
 // index.
 func (pr *PkgDecoder) PeekPkgPath(idx Index) string {
-	r := pr.NewDecoder(RelocPkg, idx, SyncPkgDef)
-	path := r.String()
+	var path string
+	{
+		r := pr.TempDecoder(RelocPkg, idx, SyncPkgDef)
+		path = r.String()
+		pr.RetireDecoder(&r)
+	}
 	if path == "" {
 		path = pr.pkgPath
 	}
@@ -420,14 +495,23 @@ func (pr *PkgDecoder) PeekPkgPath(idx Index) string {
 // PeekObj returns the package path, object name, and CodeObj for the
 // specified object index.
 func (pr *PkgDecoder) PeekObj(idx Index) (string, string, CodeObj) {
-	r := pr.NewDecoder(RelocName, idx, SyncObject1)
-	r.Sync(SyncSym)
-	r.Sync(SyncPkg)
-	path := pr.PeekPkgPath(r.Reloc(RelocPkg))
-	name := r.String()
+	var ridx Index
+	var name string
+	var rcode int
+	{
+		r := pr.TempDecoder(RelocName, idx, SyncObject1)
+		r.Sync(SyncSym)
+		r.Sync(SyncPkg)
+		ridx = r.Reloc(RelocPkg)
+		name = r.String()
+		rcode = r.Code(SyncCodeObj)
+		pr.RetireDecoder(&r)
+	}
+
+	path := pr.PeekPkgPath(ridx)
 	assert(name != "")
 
-	tag := CodeObj(r.Code(SyncCodeObj))
+	tag := CodeObj(rcode)
 
 	return path, name, tag
 }
diff --git a/vendor/golang.org/x/tools/go/internal/pkgbits/doc.go b/vendor/golang.org/x/tools/internal/pkgbits/doc.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/pkgbits/doc.go
rename to vendor/golang.org/x/tools/internal/pkgbits/doc.go
diff --git a/vendor/golang.org/x/tools/go/internal/pkgbits/encoder.go b/vendor/golang.org/x/tools/internal/pkgbits/encoder.go
similarity index 95%
rename from vendor/golang.org/x/tools/go/internal/pkgbits/encoder.go
rename to vendor/golang.org/x/tools/internal/pkgbits/encoder.go
index c50c838c..6482617a 100644
--- a/vendor/golang.org/x/tools/go/internal/pkgbits/encoder.go
+++ b/vendor/golang.org/x/tools/internal/pkgbits/encoder.go
@@ -147,8 +147,9 @@ func (pw *PkgEncoder) NewEncoderRaw(k RelocKind) Encoder {
 type Encoder struct {
 	p *PkgEncoder
 
-	Relocs []RelocEnt
-	Data   bytes.Buffer // accumulated element bitstream data
+	Relocs   []RelocEnt
+	RelocMap map[RelocEnt]uint32
+	Data     bytes.Buffer // accumulated element bitstream data
 
 	encodingRelocHeader bool
 
@@ -210,15 +211,18 @@ func (w *Encoder) rawVarint(x int64) {
 }
 
 func (w *Encoder) rawReloc(r RelocKind, idx Index) int {
-	// TODO(mdempsky): Use map for lookup; this takes quadratic time.
-	for i, rEnt := range w.Relocs {
-		if rEnt.Kind == r && rEnt.Idx == idx {
-			return i
+	e := RelocEnt{r, idx}
+	if w.RelocMap != nil {
+		if i, ok := w.RelocMap[e]; ok {
+			return int(i)
 		}
+	} else {
+		w.RelocMap = make(map[RelocEnt]uint32)
 	}
 
 	i := len(w.Relocs)
-	w.Relocs = append(w.Relocs, RelocEnt{r, idx})
+	w.RelocMap[e] = uint32(i)
+	w.Relocs = append(w.Relocs, e)
 	return i
 }
 
@@ -289,7 +293,7 @@ func (w *Encoder) Len(x int) { assert(x >= 0); w.Uint64(uint64(x)) }
 // Int encodes and writes an int value into the element bitstream.
 func (w *Encoder) Int(x int) { w.Int64(int64(x)) }
 
-// Len encodes and writes a uint value into the element bitstream.
+// Uint encodes and writes a uint value into the element bitstream.
 func (w *Encoder) Uint(x uint) { w.Uint64(uint64(x)) }
 
 // Reloc encodes and writes a relocation for the given (section,
diff --git a/vendor/golang.org/x/tools/go/internal/pkgbits/flags.go b/vendor/golang.org/x/tools/internal/pkgbits/flags.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/pkgbits/flags.go
rename to vendor/golang.org/x/tools/internal/pkgbits/flags.go
diff --git a/vendor/golang.org/x/tools/go/internal/pkgbits/frames_go1.go b/vendor/golang.org/x/tools/internal/pkgbits/frames_go1.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/pkgbits/frames_go1.go
rename to vendor/golang.org/x/tools/internal/pkgbits/frames_go1.go
diff --git a/vendor/golang.org/x/tools/go/internal/pkgbits/frames_go17.go b/vendor/golang.org/x/tools/internal/pkgbits/frames_go17.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/pkgbits/frames_go17.go
rename to vendor/golang.org/x/tools/internal/pkgbits/frames_go17.go
diff --git a/vendor/golang.org/x/tools/go/internal/pkgbits/reloc.go b/vendor/golang.org/x/tools/internal/pkgbits/reloc.go
similarity index 95%
rename from vendor/golang.org/x/tools/go/internal/pkgbits/reloc.go
rename to vendor/golang.org/x/tools/internal/pkgbits/reloc.go
index 7a8f04ab..fcdfb97c 100644
--- a/vendor/golang.org/x/tools/go/internal/pkgbits/reloc.go
+++ b/vendor/golang.org/x/tools/internal/pkgbits/reloc.go
@@ -5,11 +5,11 @@
 package pkgbits
 
 // A RelocKind indicates a particular section within a unified IR export.
-type RelocKind int
+type RelocKind int32
 
 // An Index represents a bitstream element index within a particular
 // section.
-type Index int
+type Index int32
 
 // A relocEnt (relocation entry) is an entry in an element's local
 // reference table.
diff --git a/vendor/golang.org/x/tools/go/internal/pkgbits/support.go b/vendor/golang.org/x/tools/internal/pkgbits/support.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/pkgbits/support.go
rename to vendor/golang.org/x/tools/internal/pkgbits/support.go
diff --git a/vendor/golang.org/x/tools/go/internal/pkgbits/sync.go b/vendor/golang.org/x/tools/internal/pkgbits/sync.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/pkgbits/sync.go
rename to vendor/golang.org/x/tools/internal/pkgbits/sync.go
diff --git a/vendor/golang.org/x/tools/go/internal/pkgbits/syncmarker_string.go b/vendor/golang.org/x/tools/internal/pkgbits/syncmarker_string.go
similarity index 100%
rename from vendor/golang.org/x/tools/go/internal/pkgbits/syncmarker_string.go
rename to vendor/golang.org/x/tools/internal/pkgbits/syncmarker_string.go
diff --git a/vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go b/vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go
new file mode 100644
index 00000000..a3fb2d4f
--- /dev/null
+++ b/vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go
@@ -0,0 +1,59 @@
+// Copyright 2023 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// package tokeninternal provides access to some internal features of the token
+// package.
+package tokeninternal
+
+import (
+	"go/token"
+	"sync"
+	"unsafe"
+)
+
+// GetLines returns the table of line-start offsets from a token.File.
+func GetLines(file *token.File) []int {
+	// token.File has a Lines method on Go 1.21 and later.
+	if file, ok := (interface{})(file).(interface{ Lines() []int }); ok {
+		return file.Lines()
+	}
+
+	// This declaration must match that of token.File.
+	// This creates a risk of dependency skew.
+	// For now we check that the size of the two
+	// declarations is the same, on the (fragile) assumption
+	// that future changes would add fields.
+	type tokenFile119 struct {
+		_     string
+		_     int
+		_     int
+		mu    sync.Mutex // we're not complete monsters
+		lines []int
+		_     []struct{}
+	}
+	type tokenFile118 struct {
+		_ *token.FileSet // deleted in go1.19
+		tokenFile119
+	}
+
+	type uP = unsafe.Pointer
+	switch unsafe.Sizeof(*file) {
+	case unsafe.Sizeof(tokenFile118{}):
+		var ptr *tokenFile118
+		*(*uP)(uP(&ptr)) = uP(file)
+		ptr.mu.Lock()
+		defer ptr.mu.Unlock()
+		return ptr.lines
+
+	case unsafe.Sizeof(tokenFile119{}):
+		var ptr *tokenFile119
+		*(*uP)(uP(&ptr)) = uP(file)
+		ptr.mu.Lock()
+		defer ptr.mu.Unlock()
+		return ptr.lines
+
+	default:
+		panic("unexpected token.File size")
+	}
+}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go b/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
index d38ee3c2..07484073 100644
--- a/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
+++ b/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
@@ -30,6 +30,12 @@ type ErrorCode int
 // convention that "bad" implies a problem with syntax, and "invalid" implies a
 // problem with types.
 
+const (
+	// InvalidSyntaxTree occurs if an invalid syntax tree is provided
+	// to the type checker. It should never happen.
+	InvalidSyntaxTree ErrorCode = -1
+)
+
 const (
 	_ ErrorCode = iota
 
@@ -153,12 +159,12 @@ const (
 
 	/* decls > var (+ other variable assignment codes) */
 
-	// UntypedNil occurs when the predeclared (untyped) value nil is used to
+	// UntypedNilUse occurs when the predeclared (untyped) value nil is used to
 	// initialize a variable declared without an explicit type.
 	//
 	// Example:
 	//  var x = nil
-	UntypedNil
+	UntypedNilUse
 
 	// WrongAssignCount occurs when the number of values on the right-hand side
 	// of an assignment or or initialization expression does not match the number
@@ -1523,4 +1529,32 @@ const (
 	// Example:
 	//  type T[P any] struct{ *P }
 	MisplacedTypeParam
+
+	// InvalidUnsafeSliceData occurs when unsafe.SliceData is called with
+	// an argument that is not of slice type. It also occurs if it is used
+	// in a package compiled for a language version before go1.20.
+	//
+	// Example:
+	//  import "unsafe"
+	//
+	//  var x int
+	//  var _ = unsafe.SliceData(x)
+	InvalidUnsafeSliceData
+
+	// InvalidUnsafeString occurs when unsafe.String is called with
+	// a length argument that is not of integer type, negative, or
+	// out of bounds. It also occurs if it is used in a package
+	// compiled for a language version before go1.20.
+	//
+	// Example:
+	//  import "unsafe"
+	//
+	//  var b [10]byte
+	//  var _ = unsafe.String(&b[0], -1)
+	InvalidUnsafeString
+
+	// InvalidUnsafeStringData occurs if it is used in a package
+	// compiled for a language version before go1.20.
+	_ // not used anymore
+
 )
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go b/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
index de90e951..15ecf7c5 100644
--- a/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
+++ b/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
@@ -8,6 +8,7 @@ func _() {
 	// An "invalid array index" compiler error signifies that the constant values have changed.
 	// Re-run the stringer command to generate them again.
 	var x [1]struct{}
+	_ = x[InvalidSyntaxTree - -1]
 	_ = x[Test-1]
 	_ = x[BlankPkgName-2]
 	_ = x[MismatchedPkgName-3]
@@ -23,7 +24,7 @@ func _() {
 	_ = x[InvalidConstInit-13]
 	_ = x[InvalidConstVal-14]
 	_ = x[InvalidConstType-15]
-	_ = x[UntypedNil-16]
+	_ = x[UntypedNilUse-16]
 	_ = x[WrongAssignCount-17]
 	_ = x[UnassignableOperand-18]
 	_ = x[NoNewVar-19]
@@ -152,16 +153,27 @@ func _() {
 	_ = x[MisplacedConstraintIface-142]
 	_ = x[InvalidMethodTypeParams-143]
 	_ = x[MisplacedTypeParam-144]
+	_ = x[InvalidUnsafeSliceData-145]
+	_ = x[InvalidUnsafeString-146]
 }
 
-const _ErrorCode_name = "TestBlankPkgNameMismatchedPkgNameInvalidPkgUseBadImportPathBrokenImportImportCRenamedUnusedImportInvalidInitCycleDuplicateDeclInvalidDeclCycleInvalidTypeCycleInvalidConstInitInvalidConstValInvalidConstTypeUntypedNilWrongAssignCountUnassignableOperandNoNewVarMultiValAssignOpInvalidIfaceAssignInvalidChanAssignIncompatibleAssignUnaddressableFieldAssignNotATypeInvalidArrayLenBlankIfaceMethodIncomparableMapKeyInvalidIfaceEmbedInvalidPtrEmbedBadRecvInvalidRecvDuplicateFieldAndMethodDuplicateMethodInvalidBlankInvalidIotaMissingInitBodyInvalidInitSigInvalidInitDeclInvalidMainDeclTooManyValuesNotAnExprTruncatedFloatNumericOverflowUndefinedOpMismatchedTypesDivByZeroNonNumericIncDecUnaddressableOperandInvalidIndirectionNonIndexableOperandInvalidIndexSwappedSliceIndicesNonSliceableOperandInvalidSliceExprInvalidShiftCountInvalidShiftOperandInvalidReceiveInvalidSendDuplicateLitKeyMissingLitKeyInvalidLitIndexOversizeArrayLitMixedStructLitInvalidStructLitMissingLitFieldDuplicateLitFieldUnexportedLitFieldInvalidLitFieldUntypedLitInvalidLitAmbiguousSelectorUndeclaredImportedNameUnexportedNameUndeclaredNameMissingFieldOrMethodBadDotDotDotSyntaxNonVariadicDotDotDotMisplacedDotDotDotInvalidDotDotDotOperandInvalidDotDotDotUncalledBuiltinInvalidAppendInvalidCapInvalidCloseInvalidCopyInvalidComplexInvalidDeleteInvalidImagInvalidLenSwappedMakeArgsInvalidMakeInvalidRealInvalidAssertImpossibleAssertInvalidConversionInvalidUntypedConversionBadOffsetofSyntaxInvalidOffsetofUnusedExprUnusedVarMissingReturnWrongResultCountOutOfScopeResultInvalidCondInvalidPostDeclInvalidChanRangeInvalidIterVarInvalidRangeExprMisplacedBreakMisplacedContinueMisplacedFallthroughDuplicateCaseDuplicateDefaultBadTypeKeywordInvalidTypeSwitchInvalidExprSwitchInvalidSelectCaseUndeclaredLabelDuplicateLabelMisplacedLabelUnusedLabelJumpOverDeclJumpIntoBlockInvalidMethodExprWrongArgCountInvalidCallUnusedResultsInvalidDeferInvalidGoBadDeclRepeatedDeclInvalidUnsafeAddInvalidUnsafeSliceUnsupportedFeatureNotAGenericTypeWrongTypeArgCountCannotInferTypeArgsInvalidTypeArgInvalidInstanceCycleInvalidUnionMisplacedConstraintIfaceInvalidMethodTypeParamsMisplacedTypeParam"
+const (
+	_ErrorCode_name_0 = "InvalidSyntaxTree"
+	_ErrorCode_name_1 = "TestBlankPkgNameMismatchedPkgNameInvalidPkgUseBadImportPathBrokenImportImportCRenamedUnusedImportInvalidInitCycleDuplicateDeclInvalidDeclCycleInvalidTypeCycleInvalidConstInitInvalidConstValInvalidConstTypeUntypedNilUseWrongAssignCountUnassignableOperandNoNewVarMultiValAssignOpInvalidIfaceAssignInvalidChanAssignIncompatibleAssignUnaddressableFieldAssignNotATypeInvalidArrayLenBlankIfaceMethodIncomparableMapKeyInvalidIfaceEmbedInvalidPtrEmbedBadRecvInvalidRecvDuplicateFieldAndMethodDuplicateMethodInvalidBlankInvalidIotaMissingInitBodyInvalidInitSigInvalidInitDeclInvalidMainDeclTooManyValuesNotAnExprTruncatedFloatNumericOverflowUndefinedOpMismatchedTypesDivByZeroNonNumericIncDecUnaddressableOperandInvalidIndirectionNonIndexableOperandInvalidIndexSwappedSliceIndicesNonSliceableOperandInvalidSliceExprInvalidShiftCountInvalidShiftOperandInvalidReceiveInvalidSendDuplicateLitKeyMissingLitKeyInvalidLitIndexOversizeArrayLitMixedStructLitInvalidStructLitMissingLitFieldDuplicateLitFieldUnexportedLitFieldInvalidLitFieldUntypedLitInvalidLitAmbiguousSelectorUndeclaredImportedNameUnexportedNameUndeclaredNameMissingFieldOrMethodBadDotDotDotSyntaxNonVariadicDotDotDotMisplacedDotDotDotInvalidDotDotDotOperandInvalidDotDotDotUncalledBuiltinInvalidAppendInvalidCapInvalidCloseInvalidCopyInvalidComplexInvalidDeleteInvalidImagInvalidLenSwappedMakeArgsInvalidMakeInvalidRealInvalidAssertImpossibleAssertInvalidConversionInvalidUntypedConversionBadOffsetofSyntaxInvalidOffsetofUnusedExprUnusedVarMissingReturnWrongResultCountOutOfScopeResultInvalidCondInvalidPostDeclInvalidChanRangeInvalidIterVarInvalidRangeExprMisplacedBreakMisplacedContinueMisplacedFallthroughDuplicateCaseDuplicateDefaultBadTypeKeywordInvalidTypeSwitchInvalidExprSwitchInvalidSelectCaseUndeclaredLabelDuplicateLabelMisplacedLabelUnusedLabelJumpOverDeclJumpIntoBlockInvalidMethodExprWrongArgCountInvalidCallUnusedResultsInvalidDeferInvalidGoBadDeclRepeatedDeclInvalidUnsafeAddInvalidUnsafeSliceUnsupportedFeatureNotAGenericTypeWrongTypeArgCountCannotInferTypeArgsInvalidTypeArgInvalidInstanceCycleInvalidUnionMisplacedConstraintIfaceInvalidMethodTypeParamsMisplacedTypeParamInvalidUnsafeSliceDataInvalidUnsafeString"
+)
 
-var _ErrorCode_index = [...]uint16{0, 4, 16, 33, 46, 59, 71, 85, 97, 113, 126, 142, 158, 174, 189, 205, 215, 231, 250, 258, 274, 292, 309, 327, 351, 359, 374, 390, 408, 425, 440, 447, 458, 481, 496, 508, 519, 534, 548, 563, 578, 591, 600, 614, 629, 640, 655, 664, 680, 700, 718, 737, 749, 768, 787, 803, 820, 839, 853, 864, 879, 892, 907, 923, 937, 953, 968, 985, 1003, 1018, 1028, 1038, 1055, 1077, 1091, 1105, 1125, 1143, 1163, 1181, 1204, 1220, 1235, 1248, 1258, 1270, 1281, 1295, 1308, 1319, 1329, 1344, 1355, 1366, 1379, 1395, 1412, 1436, 1453, 1468, 1478, 1487, 1500, 1516, 1532, 1543, 1558, 1574, 1588, 1604, 1618, 1635, 1655, 1668, 1684, 1698, 1715, 1732, 1749, 1764, 1778, 1792, 1803, 1815, 1828, 1845, 1858, 1869, 1882, 1894, 1903, 1910, 1922, 1938, 1956, 1974, 1989, 2006, 2025, 2039, 2059, 2071, 2095, 2118, 2136}
+var (
+	_ErrorCode_index_1 = [...]uint16{0, 4, 16, 33, 46, 59, 71, 85, 97, 113, 126, 142, 158, 174, 189, 205, 218, 234, 253, 261, 277, 295, 312, 330, 354, 362, 377, 393, 411, 428, 443, 450, 461, 484, 499, 511, 522, 537, 551, 566, 581, 594, 603, 617, 632, 643, 658, 667, 683, 703, 721, 740, 752, 771, 790, 806, 823, 842, 856, 867, 882, 895, 910, 926, 940, 956, 971, 988, 1006, 1021, 1031, 1041, 1058, 1080, 1094, 1108, 1128, 1146, 1166, 1184, 1207, 1223, 1238, 1251, 1261, 1273, 1284, 1298, 1311, 1322, 1332, 1347, 1358, 1369, 1382, 1398, 1415, 1439, 1456, 1471, 1481, 1490, 1503, 1519, 1535, 1546, 1561, 1577, 1591, 1607, 1621, 1638, 1658, 1671, 1687, 1701, 1718, 1735, 1752, 1767, 1781, 1795, 1806, 1818, 1831, 1848, 1861, 1872, 1885, 1897, 1906, 1913, 1925, 1941, 1959, 1977, 1992, 2009, 2028, 2042, 2062, 2074, 2098, 2121, 2139, 2161, 2180}
+)
 
 func (i ErrorCode) String() string {
-	i -= 1
-	if i < 0 || i >= ErrorCode(len(_ErrorCode_index)-1) {
-		return "ErrorCode(" + strconv.FormatInt(int64(i+1), 10) + ")"
+	switch {
+	case i == -1:
+		return _ErrorCode_name_0
+	case 1 <= i && i <= 146:
+		i -= 1
+		return _ErrorCode_name_1[_ErrorCode_index_1[i]:_ErrorCode_index_1[i+1]]
+	default:
+		return "ErrorCode(" + strconv.FormatInt(int64(i), 10) + ")"
 	}
-	return _ErrorCode_name[_ErrorCode_index[i]:_ErrorCode_index[i+1]]
 }
diff --git a/vendor/google.golang.org/protobuf/encoding/protowire/wire.go b/vendor/google.golang.org/protobuf/encoding/protowire/wire.go
index ce57f57e..f4b4686c 100644
--- a/vendor/google.golang.org/protobuf/encoding/protowire/wire.go
+++ b/vendor/google.golang.org/protobuf/encoding/protowire/wire.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package protowire parses and formats the raw wire encoding.
-// See https://developers.google.com/protocol-buffers/docs/encoding.
+// See https://protobuf.dev/programming-guides/encoding.
 //
 // For marshaling and unmarshaling entire protobuf messages,
 // use the "google.golang.org/protobuf/proto" package instead.
@@ -29,12 +29,8 @@ const (
 )
 
 // IsValid reports whether the field number is semantically valid.
-//
-// Note that while numbers within the reserved range are semantically invalid,
-// they are syntactically valid in the wire format.
-// Implementations may treat records with reserved field numbers as unknown.
 func (n Number) IsValid() bool {
-	return MinValidNumber <= n && n < FirstReservedNumber || LastReservedNumber < n && n <= MaxValidNumber
+	return MinValidNumber <= n && n <= MaxValidNumber
 }
 
 // Type represents the wire type.
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/text/decode.go b/vendor/google.golang.org/protobuf/internal/encoding/text/decode.go
index 427c62d0..87853e78 100644
--- a/vendor/google.golang.org/protobuf/internal/encoding/text/decode.go
+++ b/vendor/google.golang.org/protobuf/internal/encoding/text/decode.go
@@ -412,12 +412,13 @@ func (d *Decoder) parseFieldName() (tok Token, err error) {
 	// Field number. Identify if input is a valid number that is not negative
 	// and is decimal integer within 32-bit range.
 	if num := parseNumber(d.in); num.size > 0 {
+		str := num.string(d.in)
 		if !num.neg && num.kind == numDec {
-			if _, err := strconv.ParseInt(string(d.in[:num.size]), 10, 32); err == nil {
+			if _, err := strconv.ParseInt(str, 10, 32); err == nil {
 				return d.consumeToken(Name, num.size, uint8(FieldNumber)), nil
 			}
 		}
-		return Token{}, d.newSyntaxError("invalid field number: %s", d.in[:num.size])
+		return Token{}, d.newSyntaxError("invalid field number: %s", str)
 	}
 
 	return Token{}, d.newSyntaxError("invalid field name: %s", errId(d.in))
diff --git a/vendor/google.golang.org/protobuf/internal/encoding/text/decode_number.go b/vendor/google.golang.org/protobuf/internal/encoding/text/decode_number.go
index 81a5d8c8..3dc8e978 100644
--- a/vendor/google.golang.org/protobuf/internal/encoding/text/decode_number.go
+++ b/vendor/google.golang.org/protobuf/internal/encoding/text/decode_number.go
@@ -15,17 +15,12 @@ func (d *Decoder) parseNumberValue() (Token, bool) {
 	if num.neg {
 		numAttrs |= isNegative
 	}
-	strSize := num.size
-	last := num.size - 1
-	if num.kind == numFloat && (d.in[last] == 'f' || d.in[last] == 'F') {
-		strSize = last
-	}
 	tok := Token{
 		kind:     Scalar,
 		attrs:    numberValue,
 		pos:      len(d.orig) - len(d.in),
 		raw:      d.in[:num.size],
-		str:      string(d.in[:strSize]),
+		str:      num.string(d.in),
 		numAttrs: numAttrs,
 	}
 	d.consume(num.size)
@@ -46,6 +41,27 @@ type number struct {
 	kind uint8
 	neg  bool
 	size int
+	// if neg, this is the length of whitespace and comments between
+	// the minus sign and the rest fo the number literal
+	sep int
+}
+
+func (num number) string(data []byte) string {
+	strSize := num.size
+	last := num.size - 1
+	if num.kind == numFloat && (data[last] == 'f' || data[last] == 'F') {
+		strSize = last
+	}
+	if num.neg && num.sep > 0 {
+		// strip whitespace/comments between negative sign and the rest
+		strLen := strSize - num.sep
+		str := make([]byte, strLen)
+		str[0] = data[0]
+		copy(str[1:], data[num.sep+1:strSize])
+		return string(str)
+	}
+	return string(data[:strSize])
+
 }
 
 // parseNumber constructs a number object from given input. It allows for the
@@ -67,6 +83,7 @@ func parseNumber(input []byte) number {
 	}
 
 	// Optional -
+	var sep int
 	if s[0] == '-' {
 		neg = true
 		s = s[1:]
@@ -74,12 +91,14 @@ func parseNumber(input []byte) number {
 		if len(s) == 0 {
 			return number{}
 		}
+		// Consume any whitespace or comments between the
+		// negative sign and the rest of the number
+		lenBefore := len(s)
+		s = consume(s, 0)
+		sep = lenBefore - len(s)
+		size += sep
 	}
 
-	// C++ allows for whitespace and comments in between the negative sign and
-	// the rest of the number. This logic currently does not but is consistent
-	// with v1.
-
 	switch {
 	case s[0] == '0':
 		if len(s) > 1 {
@@ -116,7 +135,7 @@ func parseNumber(input []byte) number {
 				if len(s) > 0 && !isDelim(s[0]) {
 					return number{}
 				}
-				return number{kind: kind, neg: neg, size: size}
+				return number{kind: kind, neg: neg, size: size, sep: sep}
 			}
 		}
 		s = s[1:]
@@ -188,5 +207,5 @@ func parseNumber(input []byte) number {
 		return number{}
 	}
 
-	return number{kind: kind, neg: neg, size: size}
+	return number{kind: kind, neg: neg, size: size, sep: sep}
 }
diff --git a/vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go b/vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
index e3cdf1c2..5c0e8f73 100644
--- a/vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
+++ b/vendor/google.golang.org/protobuf/internal/genid/descriptor_gen.go
@@ -50,6 +50,7 @@ const (
 	FileDescriptorProto_Options_field_name          protoreflect.Name = "options"
 	FileDescriptorProto_SourceCodeInfo_field_name   protoreflect.Name = "source_code_info"
 	FileDescriptorProto_Syntax_field_name           protoreflect.Name = "syntax"
+	FileDescriptorProto_Edition_field_name          protoreflect.Name = "edition"
 
 	FileDescriptorProto_Name_field_fullname             protoreflect.FullName = "google.protobuf.FileDescriptorProto.name"
 	FileDescriptorProto_Package_field_fullname          protoreflect.FullName = "google.protobuf.FileDescriptorProto.package"
@@ -63,6 +64,7 @@ const (
 	FileDescriptorProto_Options_field_fullname          protoreflect.FullName = "google.protobuf.FileDescriptorProto.options"
 	FileDescriptorProto_SourceCodeInfo_field_fullname   protoreflect.FullName = "google.protobuf.FileDescriptorProto.source_code_info"
 	FileDescriptorProto_Syntax_field_fullname           protoreflect.FullName = "google.protobuf.FileDescriptorProto.syntax"
+	FileDescriptorProto_Edition_field_fullname          protoreflect.FullName = "google.protobuf.FileDescriptorProto.edition"
 )
 
 // Field numbers for google.protobuf.FileDescriptorProto.
@@ -79,6 +81,7 @@ const (
 	FileDescriptorProto_Options_field_number          protoreflect.FieldNumber = 8
 	FileDescriptorProto_SourceCodeInfo_field_number   protoreflect.FieldNumber = 9
 	FileDescriptorProto_Syntax_field_number           protoreflect.FieldNumber = 12
+	FileDescriptorProto_Edition_field_number          protoreflect.FieldNumber = 13
 )
 
 // Names for google.protobuf.DescriptorProto.
@@ -494,26 +497,29 @@ const (
 
 // Field names for google.protobuf.MessageOptions.
 const (
-	MessageOptions_MessageSetWireFormat_field_name         protoreflect.Name = "message_set_wire_format"
-	MessageOptions_NoStandardDescriptorAccessor_field_name protoreflect.Name = "no_standard_descriptor_accessor"
-	MessageOptions_Deprecated_field_name                   protoreflect.Name = "deprecated"
-	MessageOptions_MapEntry_field_name                     protoreflect.Name = "map_entry"
-	MessageOptions_UninterpretedOption_field_name          protoreflect.Name = "uninterpreted_option"
+	MessageOptions_MessageSetWireFormat_field_name               protoreflect.Name = "message_set_wire_format"
+	MessageOptions_NoStandardDescriptorAccessor_field_name       protoreflect.Name = "no_standard_descriptor_accessor"
+	MessageOptions_Deprecated_field_name                         protoreflect.Name = "deprecated"
+	MessageOptions_MapEntry_field_name                           protoreflect.Name = "map_entry"
+	MessageOptions_DeprecatedLegacyJsonFieldConflicts_field_name protoreflect.Name = "deprecated_legacy_json_field_conflicts"
+	MessageOptions_UninterpretedOption_field_name                protoreflect.Name = "uninterpreted_option"
 
-	MessageOptions_MessageSetWireFormat_field_fullname         protoreflect.FullName = "google.protobuf.MessageOptions.message_set_wire_format"
-	MessageOptions_NoStandardDescriptorAccessor_field_fullname protoreflect.FullName = "google.protobuf.MessageOptions.no_standard_descriptor_accessor"
-	MessageOptions_Deprecated_field_fullname                   protoreflect.FullName = "google.protobuf.MessageOptions.deprecated"
-	MessageOptions_MapEntry_field_fullname                     protoreflect.FullName = "google.protobuf.MessageOptions.map_entry"
-	MessageOptions_UninterpretedOption_field_fullname          protoreflect.FullName = "google.protobuf.MessageOptions.uninterpreted_option"
+	MessageOptions_MessageSetWireFormat_field_fullname               protoreflect.FullName = "google.protobuf.MessageOptions.message_set_wire_format"
+	MessageOptions_NoStandardDescriptorAccessor_field_fullname       protoreflect.FullName = "google.protobuf.MessageOptions.no_standard_descriptor_accessor"
+	MessageOptions_Deprecated_field_fullname                         protoreflect.FullName = "google.protobuf.MessageOptions.deprecated"
+	MessageOptions_MapEntry_field_fullname                           protoreflect.FullName = "google.protobuf.MessageOptions.map_entry"
+	MessageOptions_DeprecatedLegacyJsonFieldConflicts_field_fullname protoreflect.FullName = "google.protobuf.MessageOptions.deprecated_legacy_json_field_conflicts"
+	MessageOptions_UninterpretedOption_field_fullname                protoreflect.FullName = "google.protobuf.MessageOptions.uninterpreted_option"
 )
 
 // Field numbers for google.protobuf.MessageOptions.
 const (
-	MessageOptions_MessageSetWireFormat_field_number         protoreflect.FieldNumber = 1
-	MessageOptions_NoStandardDescriptorAccessor_field_number protoreflect.FieldNumber = 2
-	MessageOptions_Deprecated_field_number                   protoreflect.FieldNumber = 3
-	MessageOptions_MapEntry_field_number                     protoreflect.FieldNumber = 7
-	MessageOptions_UninterpretedOption_field_number          protoreflect.FieldNumber = 999
+	MessageOptions_MessageSetWireFormat_field_number               protoreflect.FieldNumber = 1
+	MessageOptions_NoStandardDescriptorAccessor_field_number       protoreflect.FieldNumber = 2
+	MessageOptions_Deprecated_field_number                         protoreflect.FieldNumber = 3
+	MessageOptions_MapEntry_field_number                           protoreflect.FieldNumber = 7
+	MessageOptions_DeprecatedLegacyJsonFieldConflicts_field_number protoreflect.FieldNumber = 11
+	MessageOptions_UninterpretedOption_field_number                protoreflect.FieldNumber = 999
 )
 
 // Names for google.protobuf.FieldOptions.
@@ -528,16 +534,24 @@ const (
 	FieldOptions_Packed_field_name              protoreflect.Name = "packed"
 	FieldOptions_Jstype_field_name              protoreflect.Name = "jstype"
 	FieldOptions_Lazy_field_name                protoreflect.Name = "lazy"
+	FieldOptions_UnverifiedLazy_field_name      protoreflect.Name = "unverified_lazy"
 	FieldOptions_Deprecated_field_name          protoreflect.Name = "deprecated"
 	FieldOptions_Weak_field_name                protoreflect.Name = "weak"
+	FieldOptions_DebugRedact_field_name         protoreflect.Name = "debug_redact"
+	FieldOptions_Retention_field_name           protoreflect.Name = "retention"
+	FieldOptions_Target_field_name              protoreflect.Name = "target"
 	FieldOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
 
 	FieldOptions_Ctype_field_fullname               protoreflect.FullName = "google.protobuf.FieldOptions.ctype"
 	FieldOptions_Packed_field_fullname              protoreflect.FullName = "google.protobuf.FieldOptions.packed"
 	FieldOptions_Jstype_field_fullname              protoreflect.FullName = "google.protobuf.FieldOptions.jstype"
 	FieldOptions_Lazy_field_fullname                protoreflect.FullName = "google.protobuf.FieldOptions.lazy"
+	FieldOptions_UnverifiedLazy_field_fullname      protoreflect.FullName = "google.protobuf.FieldOptions.unverified_lazy"
 	FieldOptions_Deprecated_field_fullname          protoreflect.FullName = "google.protobuf.FieldOptions.deprecated"
 	FieldOptions_Weak_field_fullname                protoreflect.FullName = "google.protobuf.FieldOptions.weak"
+	FieldOptions_DebugRedact_field_fullname         protoreflect.FullName = "google.protobuf.FieldOptions.debug_redact"
+	FieldOptions_Retention_field_fullname           protoreflect.FullName = "google.protobuf.FieldOptions.retention"
+	FieldOptions_Target_field_fullname              protoreflect.FullName = "google.protobuf.FieldOptions.target"
 	FieldOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.FieldOptions.uninterpreted_option"
 )
 
@@ -547,8 +561,12 @@ const (
 	FieldOptions_Packed_field_number              protoreflect.FieldNumber = 2
 	FieldOptions_Jstype_field_number              protoreflect.FieldNumber = 6
 	FieldOptions_Lazy_field_number                protoreflect.FieldNumber = 5
+	FieldOptions_UnverifiedLazy_field_number      protoreflect.FieldNumber = 15
 	FieldOptions_Deprecated_field_number          protoreflect.FieldNumber = 3
 	FieldOptions_Weak_field_number                protoreflect.FieldNumber = 10
+	FieldOptions_DebugRedact_field_number         protoreflect.FieldNumber = 16
+	FieldOptions_Retention_field_number           protoreflect.FieldNumber = 17
+	FieldOptions_Target_field_number              protoreflect.FieldNumber = 18
 	FieldOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
 )
 
@@ -564,6 +582,18 @@ const (
 	FieldOptions_JSType_enum_name     = "JSType"
 )
 
+// Full and short names for google.protobuf.FieldOptions.OptionRetention.
+const (
+	FieldOptions_OptionRetention_enum_fullname = "google.protobuf.FieldOptions.OptionRetention"
+	FieldOptions_OptionRetention_enum_name     = "OptionRetention"
+)
+
+// Full and short names for google.protobuf.FieldOptions.OptionTargetType.
+const (
+	FieldOptions_OptionTargetType_enum_fullname = "google.protobuf.FieldOptions.OptionTargetType"
+	FieldOptions_OptionTargetType_enum_name     = "OptionTargetType"
+)
+
 // Names for google.protobuf.OneofOptions.
 const (
 	OneofOptions_message_name     protoreflect.Name     = "OneofOptions"
@@ -590,20 +620,23 @@ const (
 
 // Field names for google.protobuf.EnumOptions.
 const (
-	EnumOptions_AllowAlias_field_name          protoreflect.Name = "allow_alias"
-	EnumOptions_Deprecated_field_name          protoreflect.Name = "deprecated"
-	EnumOptions_UninterpretedOption_field_name protoreflect.Name = "uninterpreted_option"
+	EnumOptions_AllowAlias_field_name                         protoreflect.Name = "allow_alias"
+	EnumOptions_Deprecated_field_name                         protoreflect.Name = "deprecated"
+	EnumOptions_DeprecatedLegacyJsonFieldConflicts_field_name protoreflect.Name = "deprecated_legacy_json_field_conflicts"
+	EnumOptions_UninterpretedOption_field_name                protoreflect.Name = "uninterpreted_option"
 
-	EnumOptions_AllowAlias_field_fullname          protoreflect.FullName = "google.protobuf.EnumOptions.allow_alias"
-	EnumOptions_Deprecated_field_fullname          protoreflect.FullName = "google.protobuf.EnumOptions.deprecated"
-	EnumOptions_UninterpretedOption_field_fullname protoreflect.FullName = "google.protobuf.EnumOptions.uninterpreted_option"
+	EnumOptions_AllowAlias_field_fullname                         protoreflect.FullName = "google.protobuf.EnumOptions.allow_alias"
+	EnumOptions_Deprecated_field_fullname                         protoreflect.FullName = "google.protobuf.EnumOptions.deprecated"
+	EnumOptions_DeprecatedLegacyJsonFieldConflicts_field_fullname protoreflect.FullName = "google.protobuf.EnumOptions.deprecated_legacy_json_field_conflicts"
+	EnumOptions_UninterpretedOption_field_fullname                protoreflect.FullName = "google.protobuf.EnumOptions.uninterpreted_option"
 )
 
 // Field numbers for google.protobuf.EnumOptions.
 const (
-	EnumOptions_AllowAlias_field_number          protoreflect.FieldNumber = 2
-	EnumOptions_Deprecated_field_number          protoreflect.FieldNumber = 3
-	EnumOptions_UninterpretedOption_field_number protoreflect.FieldNumber = 999
+	EnumOptions_AllowAlias_field_number                         protoreflect.FieldNumber = 2
+	EnumOptions_Deprecated_field_number                         protoreflect.FieldNumber = 3
+	EnumOptions_DeprecatedLegacyJsonFieldConflicts_field_number protoreflect.FieldNumber = 6
+	EnumOptions_UninterpretedOption_field_number                protoreflect.FieldNumber = 999
 )
 
 // Names for google.protobuf.EnumValueOptions.
@@ -813,11 +846,13 @@ const (
 	GeneratedCodeInfo_Annotation_SourceFile_field_name protoreflect.Name = "source_file"
 	GeneratedCodeInfo_Annotation_Begin_field_name      protoreflect.Name = "begin"
 	GeneratedCodeInfo_Annotation_End_field_name        protoreflect.Name = "end"
+	GeneratedCodeInfo_Annotation_Semantic_field_name   protoreflect.Name = "semantic"
 
 	GeneratedCodeInfo_Annotation_Path_field_fullname       protoreflect.FullName = "google.protobuf.GeneratedCodeInfo.Annotation.path"
 	GeneratedCodeInfo_Annotation_SourceFile_field_fullname protoreflect.FullName = "google.protobuf.GeneratedCodeInfo.Annotation.source_file"
 	GeneratedCodeInfo_Annotation_Begin_field_fullname      protoreflect.FullName = "google.protobuf.GeneratedCodeInfo.Annotation.begin"
 	GeneratedCodeInfo_Annotation_End_field_fullname        protoreflect.FullName = "google.protobuf.GeneratedCodeInfo.Annotation.end"
+	GeneratedCodeInfo_Annotation_Semantic_field_fullname   protoreflect.FullName = "google.protobuf.GeneratedCodeInfo.Annotation.semantic"
 )
 
 // Field numbers for google.protobuf.GeneratedCodeInfo.Annotation.
@@ -826,4 +861,11 @@ const (
 	GeneratedCodeInfo_Annotation_SourceFile_field_number protoreflect.FieldNumber = 2
 	GeneratedCodeInfo_Annotation_Begin_field_number      protoreflect.FieldNumber = 3
 	GeneratedCodeInfo_Annotation_End_field_number        protoreflect.FieldNumber = 4
+	GeneratedCodeInfo_Annotation_Semantic_field_number   protoreflect.FieldNumber = 5
+)
+
+// Full and short names for google.protobuf.GeneratedCodeInfo.Annotation.Semantic.
+const (
+	GeneratedCodeInfo_Annotation_Semantic_enum_fullname = "google.protobuf.GeneratedCodeInfo.Annotation.Semantic"
+	GeneratedCodeInfo_Annotation_Semantic_enum_name     = "Semantic"
 )
diff --git a/vendor/google.golang.org/protobuf/internal/impl/convert.go b/vendor/google.golang.org/protobuf/internal/impl/convert.go
index 11a6128b..185ef2ef 100644
--- a/vendor/google.golang.org/protobuf/internal/impl/convert.go
+++ b/vendor/google.golang.org/protobuf/internal/impl/convert.go
@@ -59,7 +59,6 @@ func NewConverter(t reflect.Type, fd protoreflect.FieldDescriptor) Converter {
 	default:
 		return newSingularConverter(t, fd)
 	}
-	panic(fmt.Sprintf("invalid Go type %v for field %v", t, fd.FullName()))
 }
 
 var (
diff --git a/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe.go b/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe.go
index fea589c4..61a84d34 100644
--- a/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe.go
+++ b/vendor/google.golang.org/protobuf/internal/strs/strings_unsafe.go
@@ -87,7 +87,7 @@ func (sb *Builder) grow(n int) {
 	// Unlike strings.Builder, we do not need to copy over the contents
 	// of the old buffer since our builder provides no API for
 	// retrieving previously created strings.
-	sb.buf = make([]byte, 2*(cap(sb.buf)+n))
+	sb.buf = make([]byte, 0, 2*(cap(sb.buf)+n))
 }
 
 func (sb *Builder) last(n int) string {
diff --git a/vendor/google.golang.org/protobuf/internal/version/version.go b/vendor/google.golang.org/protobuf/internal/version/version.go
index b480c501..f6e0119f 100644
--- a/vendor/google.golang.org/protobuf/internal/version/version.go
+++ b/vendor/google.golang.org/protobuf/internal/version/version.go
@@ -51,8 +51,8 @@ import (
 //  10. Send out the CL for review and submit it.
 const (
 	Major      = 1
-	Minor      = 28
-	Patch      = 1
+	Minor      = 29
+	Patch      = 0
 	PreRelease = ""
 )
 
diff --git a/vendor/google.golang.org/protobuf/proto/doc.go b/vendor/google.golang.org/protobuf/proto/doc.go
index 08d2a46f..ec71e717 100644
--- a/vendor/google.golang.org/protobuf/proto/doc.go
+++ b/vendor/google.golang.org/protobuf/proto/doc.go
@@ -5,16 +5,13 @@
 // Package proto provides functions operating on protocol buffer messages.
 //
 // For documentation on protocol buffers in general, see:
-//
-//	https://developers.google.com/protocol-buffers
+// https://protobuf.dev.
 //
 // For a tutorial on using protocol buffers with Go, see:
-//
-//	https://developers.google.com/protocol-buffers/docs/gotutorial
+// https://protobuf.dev/getting-started/gotutorial.
 //
 // For a guide to generated Go protocol buffer code, see:
-//
-//	https://developers.google.com/protocol-buffers/docs/reference/go-generated
+// https://protobuf.dev/reference/go/go-generated.
 //
 // # Binary serialization
 //
diff --git a/vendor/google.golang.org/protobuf/proto/equal.go b/vendor/google.golang.org/protobuf/proto/equal.go
index 67948dd1..1a0be1b0 100644
--- a/vendor/google.golang.org/protobuf/proto/equal.go
+++ b/vendor/google.golang.org/protobuf/proto/equal.go
@@ -5,30 +5,39 @@
 package proto
 
 import (
-	"bytes"
-	"math"
 	"reflect"
 
-	"google.golang.org/protobuf/encoding/protowire"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
-// Equal reports whether two messages are equal.
-// If two messages marshal to the same bytes under deterministic serialization,
-// then Equal is guaranteed to report true.
+// Equal reports whether two messages are equal,
+// by recursively comparing the fields of the message.
 //
-// Two messages are equal if they belong to the same message descriptor,
-// have the same set of populated known and extension field values,
-// and the same set of unknown fields values. If either of the top-level
-// messages are invalid, then Equal reports true only if both are invalid.
+//   - Bytes fields are equal if they contain identical bytes.
+//     Empty bytes (regardless of nil-ness) are considered equal.
 //
-// Scalar values are compared with the equivalent of the == operator in Go,
-// except bytes values which are compared using bytes.Equal and
-// floating point values which specially treat NaNs as equal.
-// Message values are compared by recursively calling Equal.
-// Lists are equal if each element value is also equal.
-// Maps are equal if they have the same set of keys, where the pair of values
-// for each key is also equal.
+//   - Floating-point fields are equal if they contain the same value.
+//     Unlike the == operator, a NaN is equal to another NaN.
+//
+//   - Other scalar fields are equal if they contain the same value.
+//
+//   - Message fields are equal if they have
+//     the same set of populated known and extension field values, and
+//     the same set of unknown fields values.
+//
+//   - Lists are equal if they are the same length and
+//     each corresponding element is equal.
+//
+//   - Maps are equal if they have the same set of keys and
+//     the corresponding value for each key is equal.
+//
+// An invalid message is not equal to a valid message.
+// An invalid message is only equal to another invalid message of the
+// same type. An invalid message often corresponds to a nil pointer
+// of the concrete message type. For example, (*pb.M)(nil) is not equal
+// to &pb.M{}.
+// If two valid messages marshal to the same bytes under deterministic
+// serialization, then Equal is guaranteed to report true.
 func Equal(x, y Message) bool {
 	if x == nil || y == nil {
 		return x == nil && y == nil
@@ -42,130 +51,7 @@ func Equal(x, y Message) bool {
 	if mx.IsValid() != my.IsValid() {
 		return false
 	}
-	return equalMessage(mx, my)
-}
-
-// equalMessage compares two messages.
-func equalMessage(mx, my protoreflect.Message) bool {
-	if mx.Descriptor() != my.Descriptor() {
-		return false
-	}
-
-	nx := 0
-	equal := true
-	mx.Range(func(fd protoreflect.FieldDescriptor, vx protoreflect.Value) bool {
-		nx++
-		vy := my.Get(fd)
-		equal = my.Has(fd) && equalField(fd, vx, vy)
-		return equal
-	})
-	if !equal {
-		return false
-	}
-	ny := 0
-	my.Range(func(fd protoreflect.FieldDescriptor, vx protoreflect.Value) bool {
-		ny++
-		return true
-	})
-	if nx != ny {
-		return false
-	}
-
-	return equalUnknown(mx.GetUnknown(), my.GetUnknown())
-}
-
-// equalField compares two fields.
-func equalField(fd protoreflect.FieldDescriptor, x, y protoreflect.Value) bool {
-	switch {
-	case fd.IsList():
-		return equalList(fd, x.List(), y.List())
-	case fd.IsMap():
-		return equalMap(fd, x.Map(), y.Map())
-	default:
-		return equalValue(fd, x, y)
-	}
-}
-
-// equalMap compares two maps.
-func equalMap(fd protoreflect.FieldDescriptor, x, y protoreflect.Map) bool {
-	if x.Len() != y.Len() {
-		return false
-	}
-	equal := true
-	x.Range(func(k protoreflect.MapKey, vx protoreflect.Value) bool {
-		vy := y.Get(k)
-		equal = y.Has(k) && equalValue(fd.MapValue(), vx, vy)
-		return equal
-	})
-	return equal
-}
-
-// equalList compares two lists.
-func equalList(fd protoreflect.FieldDescriptor, x, y protoreflect.List) bool {
-	if x.Len() != y.Len() {
-		return false
-	}
-	for i := x.Len() - 1; i >= 0; i-- {
-		if !equalValue(fd, x.Get(i), y.Get(i)) {
-			return false
-		}
-	}
-	return true
-}
-
-// equalValue compares two singular values.
-func equalValue(fd protoreflect.FieldDescriptor, x, y protoreflect.Value) bool {
-	switch fd.Kind() {
-	case protoreflect.BoolKind:
-		return x.Bool() == y.Bool()
-	case protoreflect.EnumKind:
-		return x.Enum() == y.Enum()
-	case protoreflect.Int32Kind, protoreflect.Sint32Kind,
-		protoreflect.Int64Kind, protoreflect.Sint64Kind,
-		protoreflect.Sfixed32Kind, protoreflect.Sfixed64Kind:
-		return x.Int() == y.Int()
-	case protoreflect.Uint32Kind, protoreflect.Uint64Kind,
-		protoreflect.Fixed32Kind, protoreflect.Fixed64Kind:
-		return x.Uint() == y.Uint()
-	case protoreflect.FloatKind, protoreflect.DoubleKind:
-		fx := x.Float()
-		fy := y.Float()
-		if math.IsNaN(fx) || math.IsNaN(fy) {
-			return math.IsNaN(fx) && math.IsNaN(fy)
-		}
-		return fx == fy
-	case protoreflect.StringKind:
-		return x.String() == y.String()
-	case protoreflect.BytesKind:
-		return bytes.Equal(x.Bytes(), y.Bytes())
-	case protoreflect.MessageKind, protoreflect.GroupKind:
-		return equalMessage(x.Message(), y.Message())
-	default:
-		return x.Interface() == y.Interface()
-	}
-}
-
-// equalUnknown compares unknown fields by direct comparison on the raw bytes
-// of each individual field number.
-func equalUnknown(x, y protoreflect.RawFields) bool {
-	if len(x) != len(y) {
-		return false
-	}
-	if bytes.Equal([]byte(x), []byte(y)) {
-		return true
-	}
-
-	mx := make(map[protoreflect.FieldNumber]protoreflect.RawFields)
-	my := make(map[protoreflect.FieldNumber]protoreflect.RawFields)
-	for len(x) > 0 {
-		fnum, _, n := protowire.ConsumeField(x)
-		mx[fnum] = append(mx[fnum], x[:n]...)
-		x = x[n:]
-	}
-	for len(y) > 0 {
-		fnum, _, n := protowire.ConsumeField(y)
-		my[fnum] = append(my[fnum], y[:n]...)
-		y = y[n:]
-	}
-	return reflect.DeepEqual(mx, my)
+	vx := protoreflect.ValueOfMessage(mx)
+	vy := protoreflect.ValueOfMessage(my)
+	return vx.Equal(vy)
 }
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
index b03c1223..54ce326d 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go
@@ -35,6 +35,8 @@ func (p *SourcePath) appendFileDescriptorProto(b []byte) []byte {
 		b = p.appendSingularField(b, "source_code_info", (*SourcePath).appendSourceCodeInfo)
 	case 12:
 		b = p.appendSingularField(b, "syntax", nil)
+	case 13:
+		b = p.appendSingularField(b, "edition", nil)
 	}
 	return b
 }
@@ -236,6 +238,8 @@ func (p *SourcePath) appendMessageOptions(b []byte) []byte {
 		b = p.appendSingularField(b, "deprecated", nil)
 	case 7:
 		b = p.appendSingularField(b, "map_entry", nil)
+	case 11:
+		b = p.appendSingularField(b, "deprecated_legacy_json_field_conflicts", nil)
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	}
@@ -279,6 +283,8 @@ func (p *SourcePath) appendEnumOptions(b []byte) []byte {
 		b = p.appendSingularField(b, "allow_alias", nil)
 	case 3:
 		b = p.appendSingularField(b, "deprecated", nil)
+	case 6:
+		b = p.appendSingularField(b, "deprecated_legacy_json_field_conflicts", nil)
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	}
@@ -345,10 +351,18 @@ func (p *SourcePath) appendFieldOptions(b []byte) []byte {
 		b = p.appendSingularField(b, "jstype", nil)
 	case 5:
 		b = p.appendSingularField(b, "lazy", nil)
+	case 15:
+		b = p.appendSingularField(b, "unverified_lazy", nil)
 	case 3:
 		b = p.appendSingularField(b, "deprecated", nil)
 	case 10:
 		b = p.appendSingularField(b, "weak", nil)
+	case 16:
+		b = p.appendSingularField(b, "debug_redact", nil)
+	case 17:
+		b = p.appendSingularField(b, "retention", nil)
+	case 18:
+		b = p.appendSingularField(b, "target", nil)
 	case 999:
 		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
 	}
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/value.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/value.go
index f3198107..37601b78 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/value.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/value.go
@@ -148,7 +148,7 @@ type Message interface {
 	// be preserved in marshaling or other operations.
 	IsValid() bool
 
-	// ProtoMethods returns optional fast-path implementions of various operations.
+	// ProtoMethods returns optional fast-path implementations of various operations.
 	// This method may return nil.
 	//
 	// The returned methods type is identical to
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_equal.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_equal.go
new file mode 100644
index 00000000..59165254
--- /dev/null
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_equal.go
@@ -0,0 +1,168 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package protoreflect
+
+import (
+	"bytes"
+	"fmt"
+	"math"
+	"reflect"
+
+	"google.golang.org/protobuf/encoding/protowire"
+)
+
+// Equal reports whether v1 and v2 are recursively equal.
+//
+//   - Values of different types are always unequal.
+//
+//   - Bytes values are equal if they contain identical bytes.
+//     Empty bytes (regardless of nil-ness) are considered equal.
+//
+//   - Floating point values are equal if they contain the same value.
+//     Unlike the == operator, a NaN is equal to another NaN.
+//
+//   - Enums are equal if they contain the same number.
+//     Since Value does not contain an enum descriptor,
+//     enum values do not consider the type of the enum.
+//
+//   - Other scalar values are equal if they contain the same value.
+//
+//   - Message values are equal if they belong to the same message descriptor,
+//     have the same set of populated known and extension field values,
+//     and the same set of unknown fields values.
+//
+//   - Lists are equal if they are the same length and
+//     each corresponding element is equal.
+//
+//   - Maps are equal if they have the same set of keys and
+//     the corresponding value for each key is equal.
+func (v1 Value) Equal(v2 Value) bool {
+	return equalValue(v1, v2)
+}
+
+func equalValue(x, y Value) bool {
+	eqType := x.typ == y.typ
+	switch x.typ {
+	case nilType:
+		return eqType
+	case boolType:
+		return eqType && x.Bool() == y.Bool()
+	case int32Type, int64Type:
+		return eqType && x.Int() == y.Int()
+	case uint32Type, uint64Type:
+		return eqType && x.Uint() == y.Uint()
+	case float32Type, float64Type:
+		return eqType && equalFloat(x.Float(), y.Float())
+	case stringType:
+		return eqType && x.String() == y.String()
+	case bytesType:
+		return eqType && bytes.Equal(x.Bytes(), y.Bytes())
+	case enumType:
+		return eqType && x.Enum() == y.Enum()
+	default:
+		switch x := x.Interface().(type) {
+		case Message:
+			y, ok := y.Interface().(Message)
+			return ok && equalMessage(x, y)
+		case List:
+			y, ok := y.Interface().(List)
+			return ok && equalList(x, y)
+		case Map:
+			y, ok := y.Interface().(Map)
+			return ok && equalMap(x, y)
+		default:
+			panic(fmt.Sprintf("unknown type: %T", x))
+		}
+	}
+}
+
+// equalFloat compares two floats, where NaNs are treated as equal.
+func equalFloat(x, y float64) bool {
+	if math.IsNaN(x) || math.IsNaN(y) {
+		return math.IsNaN(x) && math.IsNaN(y)
+	}
+	return x == y
+}
+
+// equalMessage compares two messages.
+func equalMessage(mx, my Message) bool {
+	if mx.Descriptor() != my.Descriptor() {
+		return false
+	}
+
+	nx := 0
+	equal := true
+	mx.Range(func(fd FieldDescriptor, vx Value) bool {
+		nx++
+		vy := my.Get(fd)
+		equal = my.Has(fd) && equalValue(vx, vy)
+		return equal
+	})
+	if !equal {
+		return false
+	}
+	ny := 0
+	my.Range(func(fd FieldDescriptor, vx Value) bool {
+		ny++
+		return true
+	})
+	if nx != ny {
+		return false
+	}
+
+	return equalUnknown(mx.GetUnknown(), my.GetUnknown())
+}
+
+// equalList compares two lists.
+func equalList(x, y List) bool {
+	if x.Len() != y.Len() {
+		return false
+	}
+	for i := x.Len() - 1; i >= 0; i-- {
+		if !equalValue(x.Get(i), y.Get(i)) {
+			return false
+		}
+	}
+	return true
+}
+
+// equalMap compares two maps.
+func equalMap(x, y Map) bool {
+	if x.Len() != y.Len() {
+		return false
+	}
+	equal := true
+	x.Range(func(k MapKey, vx Value) bool {
+		vy := y.Get(k)
+		equal = y.Has(k) && equalValue(vx, vy)
+		return equal
+	})
+	return equal
+}
+
+// equalUnknown compares unknown fields by direct comparison on the raw bytes
+// of each individual field number.
+func equalUnknown(x, y RawFields) bool {
+	if len(x) != len(y) {
+		return false
+	}
+	if bytes.Equal([]byte(x), []byte(y)) {
+		return true
+	}
+
+	mx := make(map[FieldNumber]RawFields)
+	my := make(map[FieldNumber]RawFields)
+	for len(x) > 0 {
+		fnum, _, n := protowire.ConsumeField(x)
+		mx[fnum] = append(mx[fnum], x[:n]...)
+		x = x[n:]
+	}
+	for len(y) > 0 {
+		fnum, _, n := protowire.ConsumeField(y)
+		my[fnum] = append(my[fnum], y[:n]...)
+		y = y[n:]
+	}
+	return reflect.DeepEqual(mx, my)
+}
diff --git a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go
index ca8e28c5..08e5ef73 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoreflect/value_union.go
@@ -54,11 +54,11 @@ import (
 //	// Append a 0 to a "repeated int32" field.
 //	// Since the Value returned by Mutable is guaranteed to alias
 //	// the source message, modifying the Value modifies the message.
-//	message.Mutable(fieldDesc).(List).Append(protoreflect.ValueOfInt32(0))
+//	message.Mutable(fieldDesc).List().Append(protoreflect.ValueOfInt32(0))
 //
 //	// Assign [0] to a "repeated int32" field by creating a new Value,
 //	// modifying it, and assigning it.
-//	list := message.NewField(fieldDesc).(List)
+//	list := message.NewField(fieldDesc).List()
 //	list.Append(protoreflect.ValueOfInt32(0))
 //	message.Set(fieldDesc, list)
 //	// ERROR: Since it is not defined whether Set aliases the source,
diff --git a/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go b/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go
index 58352a69..aeb55977 100644
--- a/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go
+++ b/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go
@@ -46,7 +46,7 @@ var conflictPolicy = "panic" // "panic" | "warn" | "ignore"
 // It is a variable so that the behavior is easily overridden in another file.
 var ignoreConflict = func(d protoreflect.Descriptor, err error) bool {
 	const env = "GOLANG_PROTOBUF_REGISTRATION_CONFLICT"
-	const faq = "https://developers.google.com/protocol-buffers/docs/reference/go/faq#namespace-conflict"
+	const faq = "https://protobuf.dev/reference/go/faq#namespace-conflict"
 	policy := conflictPolicy
 	if v := os.Getenv(env); v != "" {
 		policy = v
diff --git a/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go b/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
index abe4ab51..dac5671d 100644
--- a/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
+++ b/vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go
@@ -406,6 +406,152 @@ func (FieldOptions_JSType) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{12, 1}
 }
 
+// If set to RETENTION_SOURCE, the option will be omitted from the binary.
+// Note: as of January 2023, support for this is in progress and does not yet
+// have an effect (b/264593489).
+type FieldOptions_OptionRetention int32
+
+const (
+	FieldOptions_RETENTION_UNKNOWN FieldOptions_OptionRetention = 0
+	FieldOptions_RETENTION_RUNTIME FieldOptions_OptionRetention = 1
+	FieldOptions_RETENTION_SOURCE  FieldOptions_OptionRetention = 2
+)
+
+// Enum value maps for FieldOptions_OptionRetention.
+var (
+	FieldOptions_OptionRetention_name = map[int32]string{
+		0: "RETENTION_UNKNOWN",
+		1: "RETENTION_RUNTIME",
+		2: "RETENTION_SOURCE",
+	}
+	FieldOptions_OptionRetention_value = map[string]int32{
+		"RETENTION_UNKNOWN": 0,
+		"RETENTION_RUNTIME": 1,
+		"RETENTION_SOURCE":  2,
+	}
+)
+
+func (x FieldOptions_OptionRetention) Enum() *FieldOptions_OptionRetention {
+	p := new(FieldOptions_OptionRetention)
+	*p = x
+	return p
+}
+
+func (x FieldOptions_OptionRetention) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (FieldOptions_OptionRetention) Descriptor() protoreflect.EnumDescriptor {
+	return file_google_protobuf_descriptor_proto_enumTypes[5].Descriptor()
+}
+
+func (FieldOptions_OptionRetention) Type() protoreflect.EnumType {
+	return &file_google_protobuf_descriptor_proto_enumTypes[5]
+}
+
+func (x FieldOptions_OptionRetention) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *FieldOptions_OptionRetention) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = FieldOptions_OptionRetention(num)
+	return nil
+}
+
+// Deprecated: Use FieldOptions_OptionRetention.Descriptor instead.
+func (FieldOptions_OptionRetention) EnumDescriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{12, 2}
+}
+
+// This indicates the types of entities that the field may apply to when used
+// as an option. If it is unset, then the field may be freely used as an
+// option on any kind of entity. Note: as of January 2023, support for this is
+// in progress and does not yet have an effect (b/264593489).
+type FieldOptions_OptionTargetType int32
+
+const (
+	FieldOptions_TARGET_TYPE_UNKNOWN         FieldOptions_OptionTargetType = 0
+	FieldOptions_TARGET_TYPE_FILE            FieldOptions_OptionTargetType = 1
+	FieldOptions_TARGET_TYPE_EXTENSION_RANGE FieldOptions_OptionTargetType = 2
+	FieldOptions_TARGET_TYPE_MESSAGE         FieldOptions_OptionTargetType = 3
+	FieldOptions_TARGET_TYPE_FIELD           FieldOptions_OptionTargetType = 4
+	FieldOptions_TARGET_TYPE_ONEOF           FieldOptions_OptionTargetType = 5
+	FieldOptions_TARGET_TYPE_ENUM            FieldOptions_OptionTargetType = 6
+	FieldOptions_TARGET_TYPE_ENUM_ENTRY      FieldOptions_OptionTargetType = 7
+	FieldOptions_TARGET_TYPE_SERVICE         FieldOptions_OptionTargetType = 8
+	FieldOptions_TARGET_TYPE_METHOD          FieldOptions_OptionTargetType = 9
+)
+
+// Enum value maps for FieldOptions_OptionTargetType.
+var (
+	FieldOptions_OptionTargetType_name = map[int32]string{
+		0: "TARGET_TYPE_UNKNOWN",
+		1: "TARGET_TYPE_FILE",
+		2: "TARGET_TYPE_EXTENSION_RANGE",
+		3: "TARGET_TYPE_MESSAGE",
+		4: "TARGET_TYPE_FIELD",
+		5: "TARGET_TYPE_ONEOF",
+		6: "TARGET_TYPE_ENUM",
+		7: "TARGET_TYPE_ENUM_ENTRY",
+		8: "TARGET_TYPE_SERVICE",
+		9: "TARGET_TYPE_METHOD",
+	}
+	FieldOptions_OptionTargetType_value = map[string]int32{
+		"TARGET_TYPE_UNKNOWN":         0,
+		"TARGET_TYPE_FILE":            1,
+		"TARGET_TYPE_EXTENSION_RANGE": 2,
+		"TARGET_TYPE_MESSAGE":         3,
+		"TARGET_TYPE_FIELD":           4,
+		"TARGET_TYPE_ONEOF":           5,
+		"TARGET_TYPE_ENUM":            6,
+		"TARGET_TYPE_ENUM_ENTRY":      7,
+		"TARGET_TYPE_SERVICE":         8,
+		"TARGET_TYPE_METHOD":          9,
+	}
+)
+
+func (x FieldOptions_OptionTargetType) Enum() *FieldOptions_OptionTargetType {
+	p := new(FieldOptions_OptionTargetType)
+	*p = x
+	return p
+}
+
+func (x FieldOptions_OptionTargetType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (FieldOptions_OptionTargetType) Descriptor() protoreflect.EnumDescriptor {
+	return file_google_protobuf_descriptor_proto_enumTypes[6].Descriptor()
+}
+
+func (FieldOptions_OptionTargetType) Type() protoreflect.EnumType {
+	return &file_google_protobuf_descriptor_proto_enumTypes[6]
+}
+
+func (x FieldOptions_OptionTargetType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *FieldOptions_OptionTargetType) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = FieldOptions_OptionTargetType(num)
+	return nil
+}
+
+// Deprecated: Use FieldOptions_OptionTargetType.Descriptor instead.
+func (FieldOptions_OptionTargetType) EnumDescriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{12, 3}
+}
+
 // Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
 // or neither? HTTP based RPC implementation may choose GET verb for safe
 // methods, and PUT verb for idempotent methods instead of the default POST.
@@ -442,11 +588,11 @@ func (x MethodOptions_IdempotencyLevel) String() string {
 }
 
 func (MethodOptions_IdempotencyLevel) Descriptor() protoreflect.EnumDescriptor {
-	return file_google_protobuf_descriptor_proto_enumTypes[5].Descriptor()
+	return file_google_protobuf_descriptor_proto_enumTypes[7].Descriptor()
 }
 
 func (MethodOptions_IdempotencyLevel) Type() protoreflect.EnumType {
-	return &file_google_protobuf_descriptor_proto_enumTypes[5]
+	return &file_google_protobuf_descriptor_proto_enumTypes[7]
 }
 
 func (x MethodOptions_IdempotencyLevel) Number() protoreflect.EnumNumber {
@@ -468,6 +614,70 @@ func (MethodOptions_IdempotencyLevel) EnumDescriptor() ([]byte, []int) {
 	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{17, 0}
 }
 
+// Represents the identified object's effect on the element in the original
+// .proto file.
+type GeneratedCodeInfo_Annotation_Semantic int32
+
+const (
+	// There is no effect or the effect is indescribable.
+	GeneratedCodeInfo_Annotation_NONE GeneratedCodeInfo_Annotation_Semantic = 0
+	// The element is set or otherwise mutated.
+	GeneratedCodeInfo_Annotation_SET GeneratedCodeInfo_Annotation_Semantic = 1
+	// An alias to the element is returned.
+	GeneratedCodeInfo_Annotation_ALIAS GeneratedCodeInfo_Annotation_Semantic = 2
+)
+
+// Enum value maps for GeneratedCodeInfo_Annotation_Semantic.
+var (
+	GeneratedCodeInfo_Annotation_Semantic_name = map[int32]string{
+		0: "NONE",
+		1: "SET",
+		2: "ALIAS",
+	}
+	GeneratedCodeInfo_Annotation_Semantic_value = map[string]int32{
+		"NONE":  0,
+		"SET":   1,
+		"ALIAS": 2,
+	}
+)
+
+func (x GeneratedCodeInfo_Annotation_Semantic) Enum() *GeneratedCodeInfo_Annotation_Semantic {
+	p := new(GeneratedCodeInfo_Annotation_Semantic)
+	*p = x
+	return p
+}
+
+func (x GeneratedCodeInfo_Annotation_Semantic) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (GeneratedCodeInfo_Annotation_Semantic) Descriptor() protoreflect.EnumDescriptor {
+	return file_google_protobuf_descriptor_proto_enumTypes[8].Descriptor()
+}
+
+func (GeneratedCodeInfo_Annotation_Semantic) Type() protoreflect.EnumType {
+	return &file_google_protobuf_descriptor_proto_enumTypes[8]
+}
+
+func (x GeneratedCodeInfo_Annotation_Semantic) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *GeneratedCodeInfo_Annotation_Semantic) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = GeneratedCodeInfo_Annotation_Semantic(num)
+	return nil
+}
+
+// Deprecated: Use GeneratedCodeInfo_Annotation_Semantic.Descriptor instead.
+func (GeneratedCodeInfo_Annotation_Semantic) EnumDescriptor() ([]byte, []int) {
+	return file_google_protobuf_descriptor_proto_rawDescGZIP(), []int{20, 0, 0}
+}
+
 // The protocol compiler can output a FileDescriptorSet containing the .proto
 // files it parses.
 type FileDescriptorSet struct {
@@ -544,8 +754,12 @@ type FileDescriptorProto struct {
 	// development tools.
 	SourceCodeInfo *SourceCodeInfo `protobuf:"bytes,9,opt,name=source_code_info,json=sourceCodeInfo" json:"source_code_info,omitempty"`
 	// The syntax of the proto file.
-	// The supported values are "proto2" and "proto3".
+	// The supported values are "proto2", "proto3", and "editions".
+	//
+	// If `edition` is present, this value must be "editions".
 	Syntax *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
+	// The edition of the proto file, which is an opaque string.
+	Edition *string `protobuf:"bytes,13,opt,name=edition" json:"edition,omitempty"`
 }
 
 func (x *FileDescriptorProto) Reset() {
@@ -664,6 +878,13 @@ func (x *FileDescriptorProto) GetSyntax() string {
 	return ""
 }
 
+func (x *FileDescriptorProto) GetEdition() string {
+	if x != nil && x.Edition != nil {
+		return *x.Edition
+	}
+	return ""
+}
+
 // Describes a message type.
 type DescriptorProto struct {
 	state         protoimpl.MessageState
@@ -860,7 +1081,6 @@ type FieldDescriptorProto struct {
 	// For booleans, "true" or "false".
 	// For strings, contains the default text contents (not escaped in any way).
 	// For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-	// TODO(kenton):  Base-64 encode?
 	DefaultValue *string `protobuf:"bytes,7,opt,name=default_value,json=defaultValue" json:"default_value,omitempty"`
 	// If set, gives the index of a oneof in the containing type's oneof_decl
 	// list.  This field is a member of that oneof.
@@ -1382,22 +1602,22 @@ type FileOptions struct {
 	// inappropriate because proto packages do not normally start with backwards
 	// domain names.
 	JavaPackage *string `protobuf:"bytes,1,opt,name=java_package,json=javaPackage" json:"java_package,omitempty"`
-	// If set, all the classes from the .proto file are wrapped in a single
-	// outer class with the given name.  This applies to both Proto1
-	// (equivalent to the old "--one_java_file" option) and Proto2 (where
-	// a .proto always translates to a single class, but you may want to
-	// explicitly choose the class name).
+	// Controls the name of the wrapper Java class generated for the .proto file.
+	// That class will always contain the .proto file's getDescriptor() method as
+	// well as any top-level extensions defined in the .proto file.
+	// If java_multiple_files is disabled, then all the other classes from the
+	// .proto file will be nested inside the single wrapper outer class.
 	JavaOuterClassname *string `protobuf:"bytes,8,opt,name=java_outer_classname,json=javaOuterClassname" json:"java_outer_classname,omitempty"`
-	// If set true, then the Java code generator will generate a separate .java
+	// If enabled, then the Java code generator will generate a separate .java
 	// file for each top-level message, enum, and service defined in the .proto
-	// file.  Thus, these types will *not* be nested inside the outer class
-	// named by java_outer_classname.  However, the outer class will still be
+	// file.  Thus, these types will *not* be nested inside the wrapper class
+	// named by java_outer_classname.  However, the wrapper class will still be
 	// generated to contain the file's getDescriptor() method as well as any
 	// top-level extensions defined in the file.
 	JavaMultipleFiles *bool `protobuf:"varint,10,opt,name=java_multiple_files,json=javaMultipleFiles,def=0" json:"java_multiple_files,omitempty"`
 	// This option does nothing.
 	//
-	// Deprecated: Do not use.
+	// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
 	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,json=javaGenerateEqualsAndHash" json:"java_generate_equals_and_hash,omitempty"`
 	// If set true, then the Java2 code generator will generate code that
 	// throws an exception whenever an attempt is made to assign a non-UTF-8
@@ -1531,7 +1751,7 @@ func (x *FileOptions) GetJavaMultipleFiles() bool {
 	return Default_FileOptions_JavaMultipleFiles
 }
 
-// Deprecated: Do not use.
+// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
 func (x *FileOptions) GetJavaGenerateEqualsAndHash() bool {
 	if x != nil && x.JavaGenerateEqualsAndHash != nil {
 		return *x.JavaGenerateEqualsAndHash
@@ -1670,10 +1890,12 @@ type MessageOptions struct {
 	// efficient, has fewer features, and is more complicated.
 	//
 	// The message must be defined exactly as follows:
-	//   message Foo {
-	//     option message_set_wire_format = true;
-	//     extensions 4 to max;
-	//   }
+	//
+	//	message Foo {
+	//	  option message_set_wire_format = true;
+	//	  extensions 4 to max;
+	//	}
+	//
 	// Note that the message cannot have any defined fields; MessageSets only
 	// have extensions.
 	//
@@ -1692,28 +1914,44 @@ type MessageOptions struct {
 	// for the message, or it will be completely ignored; in the very least,
 	// this is a formalization for deprecating messages.
 	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// NOTE: Do not set the option in .proto files. Always use the maps syntax
+	// instead. The option should only be implicitly set by the proto compiler
+	// parser.
+	//
 	// Whether the message is an automatically generated map entry type for the
 	// maps field.
 	//
 	// For maps fields:
-	//     map<KeyType, ValueType> map_field = 1;
+	//
+	//	map<KeyType, ValueType> map_field = 1;
+	//
 	// The parsed descriptor looks like:
-	//     message MapFieldEntry {
-	//         option map_entry = true;
-	//         optional KeyType key = 1;
-	//         optional ValueType value = 2;
-	//     }
-	//     repeated MapFieldEntry map_field = 1;
+	//
+	//	message MapFieldEntry {
+	//	    option map_entry = true;
+	//	    optional KeyType key = 1;
+	//	    optional ValueType value = 2;
+	//	}
+	//	repeated MapFieldEntry map_field = 1;
 	//
 	// Implementations may choose not to generate the map_entry=true message, but
 	// use a native map in the target language to hold the keys and values.
 	// The reflection APIs in such implementations still need to work as
 	// if the field is a repeated message field.
-	//
-	// NOTE: Do not set the option in .proto files. Always use the maps syntax
-	// instead. The option should only be implicitly set by the proto compiler
-	// parser.
 	MapEntry *bool `protobuf:"varint,7,opt,name=map_entry,json=mapEntry" json:"map_entry,omitempty"`
+	// Enable the legacy handling of JSON field name conflicts.  This lowercases
+	// and strips underscored from the fields before comparison in proto3 only.
+	// The new behavior takes `json_name` into account and applies to proto2 as
+	// well.
+	//
+	// This should only be used as a temporary measure against broken builds due
+	// to the change in behavior for JSON field name conflicts.
+	//
+	// TODO(b/261750190) This is legacy behavior we plan to remove once downstream
+	// teams have had time to migrate.
+	//
+	// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
+	DeprecatedLegacyJsonFieldConflicts *bool `protobuf:"varint,11,opt,name=deprecated_legacy_json_field_conflicts,json=deprecatedLegacyJsonFieldConflicts" json:"deprecated_legacy_json_field_conflicts,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
 }
@@ -1785,6 +2023,14 @@ func (x *MessageOptions) GetMapEntry() bool {
 	return false
 }
 
+// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
+func (x *MessageOptions) GetDeprecatedLegacyJsonFieldConflicts() bool {
+	if x != nil && x.DeprecatedLegacyJsonFieldConflicts != nil {
+		return *x.DeprecatedLegacyJsonFieldConflicts
+	}
+	return false
+}
+
 func (x *MessageOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if x != nil {
 		return x.UninterpretedOption
@@ -1838,7 +2084,6 @@ type FieldOptions struct {
 	// call from multiple threads concurrently, while non-const methods continue
 	// to require exclusive access.
 	//
-	//
 	// Note that implementations may choose not to check required fields within
 	// a lazy sub-message.  That is, calling IsInitialized() on the outer message
 	// may return true even if the inner message has missing required fields.
@@ -1849,7 +2094,14 @@ type FieldOptions struct {
 	// implementation must either *always* check its required fields, or *never*
 	// check its required fields, regardless of whether or not the message has
 	// been parsed.
+	//
+	// As of May 2022, lazy verifies the contents of the byte stream during
+	// parsing.  An invalid byte stream will cause the overall parsing to fail.
 	Lazy *bool `protobuf:"varint,5,opt,name=lazy,def=0" json:"lazy,omitempty"`
+	// unverified_lazy does no correctness checks on the byte stream. This should
+	// only be used where lazy with verification is prohibitive for performance
+	// reasons.
+	UnverifiedLazy *bool `protobuf:"varint,15,opt,name=unverified_lazy,json=unverifiedLazy,def=0" json:"unverified_lazy,omitempty"`
 	// Is this field deprecated?
 	// Depending on the target platform, this can emit Deprecated annotations
 	// for accessors, or it will be completely ignored; in the very least, this
@@ -1857,17 +2109,24 @@ type FieldOptions struct {
 	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// For Google-internal migration only. Do not use.
 	Weak *bool `protobuf:"varint,10,opt,name=weak,def=0" json:"weak,omitempty"`
+	// Indicate that the field value should not be printed out when using debug
+	// formats, e.g. when the field contains sensitive credentials.
+	DebugRedact *bool                          `protobuf:"varint,16,opt,name=debug_redact,json=debugRedact,def=0" json:"debug_redact,omitempty"`
+	Retention   *FieldOptions_OptionRetention  `protobuf:"varint,17,opt,name=retention,enum=google.protobuf.FieldOptions_OptionRetention" json:"retention,omitempty"`
+	Target      *FieldOptions_OptionTargetType `protobuf:"varint,18,opt,name=target,enum=google.protobuf.FieldOptions_OptionTargetType" json:"target,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
 }
 
 // Default values for FieldOptions fields.
 const (
-	Default_FieldOptions_Ctype      = FieldOptions_STRING
-	Default_FieldOptions_Jstype     = FieldOptions_JS_NORMAL
-	Default_FieldOptions_Lazy       = bool(false)
-	Default_FieldOptions_Deprecated = bool(false)
-	Default_FieldOptions_Weak       = bool(false)
+	Default_FieldOptions_Ctype          = FieldOptions_STRING
+	Default_FieldOptions_Jstype         = FieldOptions_JS_NORMAL
+	Default_FieldOptions_Lazy           = bool(false)
+	Default_FieldOptions_UnverifiedLazy = bool(false)
+	Default_FieldOptions_Deprecated     = bool(false)
+	Default_FieldOptions_Weak           = bool(false)
+	Default_FieldOptions_DebugRedact    = bool(false)
 )
 
 func (x *FieldOptions) Reset() {
@@ -1930,6 +2189,13 @@ func (x *FieldOptions) GetLazy() bool {
 	return Default_FieldOptions_Lazy
 }
 
+func (x *FieldOptions) GetUnverifiedLazy() bool {
+	if x != nil && x.UnverifiedLazy != nil {
+		return *x.UnverifiedLazy
+	}
+	return Default_FieldOptions_UnverifiedLazy
+}
+
 func (x *FieldOptions) GetDeprecated() bool {
 	if x != nil && x.Deprecated != nil {
 		return *x.Deprecated
@@ -1944,6 +2210,27 @@ func (x *FieldOptions) GetWeak() bool {
 	return Default_FieldOptions_Weak
 }
 
+func (x *FieldOptions) GetDebugRedact() bool {
+	if x != nil && x.DebugRedact != nil {
+		return *x.DebugRedact
+	}
+	return Default_FieldOptions_DebugRedact
+}
+
+func (x *FieldOptions) GetRetention() FieldOptions_OptionRetention {
+	if x != nil && x.Retention != nil {
+		return *x.Retention
+	}
+	return FieldOptions_RETENTION_UNKNOWN
+}
+
+func (x *FieldOptions) GetTarget() FieldOptions_OptionTargetType {
+	if x != nil && x.Target != nil {
+		return *x.Target
+	}
+	return FieldOptions_TARGET_TYPE_UNKNOWN
+}
+
 func (x *FieldOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if x != nil {
 		return x.UninterpretedOption
@@ -2014,6 +2301,15 @@ type EnumOptions struct {
 	// for the enum, or it will be completely ignored; in the very least, this
 	// is a formalization for deprecating enums.
 	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
+	// Enable the legacy handling of JSON field name conflicts.  This lowercases
+	// and strips underscored from the fields before comparison in proto3 only.
+	// The new behavior takes `json_name` into account and applies to proto2 as
+	// well.
+	// TODO(b/261750190) Remove this legacy behavior once downstream teams have
+	// had time to migrate.
+	//
+	// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
+	DeprecatedLegacyJsonFieldConflicts *bool `protobuf:"varint,6,opt,name=deprecated_legacy_json_field_conflicts,json=deprecatedLegacyJsonFieldConflicts" json:"deprecated_legacy_json_field_conflicts,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
 }
@@ -2069,6 +2365,14 @@ func (x *EnumOptions) GetDeprecated() bool {
 	return Default_EnumOptions_Deprecated
 }
 
+// Deprecated: Marked as deprecated in google/protobuf/descriptor.proto.
+func (x *EnumOptions) GetDeprecatedLegacyJsonFieldConflicts() bool {
+	if x != nil && x.DeprecatedLegacyJsonFieldConflicts != nil {
+		return *x.DeprecatedLegacyJsonFieldConflicts
+	}
+	return false
+}
+
 func (x *EnumOptions) GetUninterpretedOption() []*UninterpretedOption {
 	if x != nil {
 		return x.UninterpretedOption
@@ -2399,43 +2703,48 @@ type SourceCodeInfo struct {
 	// tools.
 	//
 	// For example, say we have a file like:
-	//   message Foo {
-	//     optional string foo = 1;
-	//   }
+	//
+	//	message Foo {
+	//	  optional string foo = 1;
+	//	}
+	//
 	// Let's look at just the field definition:
-	//   optional string foo = 1;
-	//   ^       ^^     ^^  ^  ^^^
-	//   a       bc     de  f  ghi
+	//
+	//	optional string foo = 1;
+	//	^       ^^     ^^  ^  ^^^
+	//	a       bc     de  f  ghi
+	//
 	// We have the following locations:
-	//   span   path               represents
-	//   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-	//   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-	//   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-	//   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-	//   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
+	//
+	//	span   path               represents
+	//	[a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
+	//	[a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
+	//	[c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
+	//	[e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
+	//	[g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
 	//
 	// Notes:
-	// - A location may refer to a repeated field itself (i.e. not to any
-	//   particular index within it).  This is used whenever a set of elements are
-	//   logically enclosed in a single code segment.  For example, an entire
-	//   extend block (possibly containing multiple extension definitions) will
-	//   have an outer location whose path refers to the "extensions" repeated
-	//   field without an index.
-	// - Multiple locations may have the same path.  This happens when a single
-	//   logical declaration is spread out across multiple places.  The most
-	//   obvious example is the "extend" block again -- there may be multiple
-	//   extend blocks in the same scope, each of which will have the same path.
-	// - A location's span is not always a subset of its parent's span.  For
-	//   example, the "extendee" of an extension declaration appears at the
-	//   beginning of the "extend" block and is shared by all extensions within
-	//   the block.
-	// - Just because a location's span is a subset of some other location's span
-	//   does not mean that it is a descendant.  For example, a "group" defines
-	//   both a type and a field in a single declaration.  Thus, the locations
-	//   corresponding to the type and field and their components will overlap.
-	// - Code which tries to interpret locations should probably be designed to
-	//   ignore those that it doesn't understand, as more types of locations could
-	//   be recorded in the future.
+	//   - A location may refer to a repeated field itself (i.e. not to any
+	//     particular index within it).  This is used whenever a set of elements are
+	//     logically enclosed in a single code segment.  For example, an entire
+	//     extend block (possibly containing multiple extension definitions) will
+	//     have an outer location whose path refers to the "extensions" repeated
+	//     field without an index.
+	//   - Multiple locations may have the same path.  This happens when a single
+	//     logical declaration is spread out across multiple places.  The most
+	//     obvious example is the "extend" block again -- there may be multiple
+	//     extend blocks in the same scope, each of which will have the same path.
+	//   - A location's span is not always a subset of its parent's span.  For
+	//     example, the "extendee" of an extension declaration appears at the
+	//     beginning of the "extend" block and is shared by all extensions within
+	//     the block.
+	//   - Just because a location's span is a subset of some other location's span
+	//     does not mean that it is a descendant.  For example, a "group" defines
+	//     both a type and a field in a single declaration.  Thus, the locations
+	//     corresponding to the type and field and their components will overlap.
+	//   - Code which tries to interpret locations should probably be designed to
+	//     ignore those that it doesn't understand, as more types of locations could
+	//     be recorded in the future.
 	Location []*SourceCodeInfo_Location `protobuf:"bytes,1,rep,name=location" json:"location,omitempty"`
 }
 
@@ -2715,8 +3024,8 @@ func (x *EnumDescriptorProto_EnumReservedRange) GetEnd() int32 {
 // The name of the uninterpreted option.  Each string represents a segment in
 // a dot-separated name.  is_extension is true iff a segment represents an
 // extension (denoted with parentheses in options specs in .proto files).
-// E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-// "foo.(bar.baz).qux".
+// E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
+// "foo.(bar.baz).moo".
 type UninterpretedOption_NamePart struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2781,23 +3090,34 @@ type SourceCodeInfo_Location struct {
 	// location.
 	//
 	// Each element is a field number or an index.  They form a path from
-	// the root FileDescriptorProto to the place where the definition.  For
-	// example, this path:
-	//   [ 4, 3, 2, 7, 1 ]
+	// the root FileDescriptorProto to the place where the definition occurs.
+	// For example, this path:
+	//
+	//	[ 4, 3, 2, 7, 1 ]
+	//
 	// refers to:
-	//   file.message_type(3)  // 4, 3
-	//       .field(7)         // 2, 7
-	//       .name()           // 1
+	//
+	//	file.message_type(3)  // 4, 3
+	//	    .field(7)         // 2, 7
+	//	    .name()           // 1
+	//
 	// This is because FileDescriptorProto.message_type has field number 4:
-	//   repeated DescriptorProto message_type = 4;
+	//
+	//	repeated DescriptorProto message_type = 4;
+	//
 	// and DescriptorProto.field has field number 2:
-	//   repeated FieldDescriptorProto field = 2;
+	//
+	//	repeated FieldDescriptorProto field = 2;
+	//
 	// and FieldDescriptorProto.name has field number 1:
-	//   optional string name = 1;
+	//
+	//	optional string name = 1;
 	//
 	// Thus, the above path gives the location of a field name.  If we removed
 	// the last element:
-	//   [ 4, 3, 2, 7 ]
+	//
+	//	[ 4, 3, 2, 7 ]
+	//
 	// this path refers to the whole field declaration (from the beginning
 	// of the label to the terminating semicolon).
 	Path []int32 `protobuf:"varint,1,rep,packed,name=path" json:"path,omitempty"`
@@ -2826,34 +3146,34 @@ type SourceCodeInfo_Location struct {
 	//
 	// Examples:
 	//
-	//   optional int32 foo = 1;  // Comment attached to foo.
-	//   // Comment attached to bar.
-	//   optional int32 bar = 2;
+	//	optional int32 foo = 1;  // Comment attached to foo.
+	//	// Comment attached to bar.
+	//	optional int32 bar = 2;
 	//
-	//   optional string baz = 3;
-	//   // Comment attached to baz.
-	//   // Another line attached to baz.
+	//	optional string baz = 3;
+	//	// Comment attached to baz.
+	//	// Another line attached to baz.
 	//
-	//   // Comment attached to qux.
-	//   //
-	//   // Another line attached to qux.
-	//   optional double qux = 4;
+	//	// Comment attached to moo.
+	//	//
+	//	// Another line attached to moo.
+	//	optional double moo = 4;
 	//
-	//   // Detached comment for corge. This is not leading or trailing comments
-	//   // to qux or corge because there are blank lines separating it from
-	//   // both.
+	//	// Detached comment for corge. This is not leading or trailing comments
+	//	// to moo or corge because there are blank lines separating it from
+	//	// both.
 	//
-	//   // Detached comment for corge paragraph 2.
+	//	// Detached comment for corge paragraph 2.
 	//
-	//   optional string corge = 5;
-	//   /* Block comment attached
-	//    * to corge.  Leading asterisks
-	//    * will be removed. */
-	//   /* Block comment attached to
-	//    * grault. */
-	//   optional int32 grault = 6;
+	//	optional string corge = 5;
+	//	/* Block comment attached
+	//	 * to corge.  Leading asterisks
+	//	 * will be removed. */
+	//	/* Block comment attached to
+	//	 * grault. */
+	//	optional int32 grault = 6;
 	//
-	//   // ignored detached comments.
+	//	// ignored detached comments.
 	LeadingComments         *string  `protobuf:"bytes,3,opt,name=leading_comments,json=leadingComments" json:"leading_comments,omitempty"`
 	TrailingComments        *string  `protobuf:"bytes,4,opt,name=trailing_comments,json=trailingComments" json:"trailing_comments,omitempty"`
 	LeadingDetachedComments []string `protobuf:"bytes,6,rep,name=leading_detached_comments,json=leadingDetachedComments" json:"leading_detached_comments,omitempty"`
@@ -2940,9 +3260,10 @@ type GeneratedCodeInfo_Annotation struct {
 	// that relates to the identified object.
 	Begin *int32 `protobuf:"varint,3,opt,name=begin" json:"begin,omitempty"`
 	// Identifies the ending offset in bytes in the generated code that
-	// relates to the identified offset. The end offset should be one past
+	// relates to the identified object. The end offset should be one past
 	// the last relevant byte (so the length of the text = end - begin).
-	End *int32 `protobuf:"varint,4,opt,name=end" json:"end,omitempty"`
+	End      *int32                                 `protobuf:"varint,4,opt,name=end" json:"end,omitempty"`
+	Semantic *GeneratedCodeInfo_Annotation_Semantic `protobuf:"varint,5,opt,name=semantic,enum=google.protobuf.GeneratedCodeInfo_Annotation_Semantic" json:"semantic,omitempty"`
 }
 
 func (x *GeneratedCodeInfo_Annotation) Reset() {
@@ -3005,6 +3326,13 @@ func (x *GeneratedCodeInfo_Annotation) GetEnd() int32 {
 	return 0
 }
 
+func (x *GeneratedCodeInfo_Annotation) GetSemantic() GeneratedCodeInfo_Annotation_Semantic {
+	if x != nil && x.Semantic != nil {
+		return *x.Semantic
+	}
+	return GeneratedCodeInfo_Annotation_NONE
+}
+
 var File_google_protobuf_descriptor_proto protoreflect.FileDescriptor
 
 var file_google_protobuf_descriptor_proto_rawDesc = []byte{
@@ -3016,7 +3344,7 @@ var file_google_protobuf_descriptor_proto_rawDesc = []byte{
 	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x73,
 	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x04, 0x66, 0x69,
-	0x6c, 0x65, 0x22, 0xe4, 0x04, 0x0a, 0x13, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72,
+	0x6c, 0x65, 0x22, 0xfe, 0x04, 0x0a, 0x13, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72,
 	0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
 	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18,
 	0x0a, 0x07, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
@@ -3054,330 +3382,391 @@ var file_google_protobuf_descriptor_proto_rawDesc = []byte{
 	0x75, 0x66, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66,
 	0x6f, 0x52, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66,
 	0x6f, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x22, 0xb9, 0x06, 0x0a, 0x0f, 0x44, 0x65,
+	0x09, 0x52, 0x06, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x64, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x64, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x22, 0xb9, 0x06, 0x0a, 0x0f, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3b, 0x0a, 0x05, 0x66,
+	0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65,
+	0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x43, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69,
+	0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x52, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a,
+	0x0b, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x52, 0x0a, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x41, 0x0a, 0x09, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x08, 0x65, 0x6e, 0x75, 0x6d, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x58, 0x0a, 0x0f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0e, 0x65,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x44, 0x0a,
+	0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x64, 0x65, 0x63, 0x6c, 0x18, 0x08, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x09, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x44,
+	0x65, 0x63, 0x6c, 0x12, 0x39, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x55,
+	0x0a, 0x0e, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65,
+	0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
+	0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64,
+	0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
+	0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65,
+	0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x7a, 0x0a, 0x0e, 0x45, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05,
+	0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61,
+	0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x03, 0x65, 0x6e, 0x64, 0x12, 0x40, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x37, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76,
+	0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a,
+	0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22,
+	0x7c, 0x0a, 0x15, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67,
+	0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75,
+	0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0xc1, 0x06,
+	0x0a, 0x14, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
+	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75,
+	0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62,
+	0x65, 0x72, 0x12, 0x41, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x2b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x52, 0x05,
+	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x3e, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52,
+	0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x79, 0x70, 0x65, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x65, 0x12, 0x23,
+	0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x69, 0x6e, 0x64,
+	0x65, 0x78, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x49,
+	0x6e, 0x64, 0x65, 0x78, 0x12, 0x1b, 0x0a, 0x09, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6a, 0x73, 0x6f, 0x6e, 0x4e, 0x61, 0x6d,
+	0x65, 0x12, 0x37, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x18, 0x11, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x61, 0x6c, 0x22, 0xb6, 0x02, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b,
+	0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x4f, 0x55, 0x42, 0x4c, 0x45, 0x10, 0x01, 0x12, 0x0e, 0x0a,
+	0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x10, 0x02, 0x12, 0x0e, 0x0a,
+	0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x36, 0x34, 0x10, 0x03, 0x12, 0x0f, 0x0a,
+	0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x49, 0x4e, 0x54, 0x36, 0x34, 0x10, 0x04, 0x12, 0x0e,
+	0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10, 0x05, 0x12, 0x10,
+	0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x58, 0x45, 0x44, 0x36, 0x34, 0x10, 0x06,
+	0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x58, 0x45, 0x44, 0x33, 0x32,
+	0x10, 0x07, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x4f, 0x4f, 0x4c, 0x10,
+	0x08, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47,
+	0x10, 0x09, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50,
+	0x10, 0x0a, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41,
+	0x47, 0x45, 0x10, 0x0b, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x42, 0x59, 0x54,
+	0x45, 0x53, 0x10, 0x0c, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x49, 0x4e,
+	0x54, 0x33, 0x32, 0x10, 0x0d, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x4e,
+	0x55, 0x4d, 0x10, 0x0e, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x46, 0x49,
+	0x58, 0x45, 0x44, 0x33, 0x32, 0x10, 0x0f, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x53, 0x46, 0x49, 0x58, 0x45, 0x44, 0x36, 0x34, 0x10, 0x10, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59,
+	0x50, 0x45, 0x5f, 0x53, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10, 0x11, 0x12, 0x0f, 0x0a, 0x0b, 0x54,
+	0x59, 0x50, 0x45, 0x5f, 0x53, 0x49, 0x4e, 0x54, 0x36, 0x34, 0x10, 0x12, 0x22, 0x43, 0x0a, 0x05,
+	0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x5f, 0x4f,
+	0x50, 0x54, 0x49, 0x4f, 0x4e, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x41, 0x42,
+	0x45, 0x4c, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x49, 0x52, 0x45, 0x44, 0x10, 0x02, 0x12, 0x12, 0x0a,
+	0x0e, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x50, 0x45, 0x41, 0x54, 0x45, 0x44, 0x10,
+	0x03, 0x22, 0x63, 0x0a, 0x14, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a,
+	0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xe3, 0x02, 0x0a, 0x13, 0x45, 0x6e, 0x75, 0x6d, 0x44,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x12, 0x3f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x36, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x5d, 0x0a, 0x0e, 0x72,
+	0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x04, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x65,
+	0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0d, 0x72, 0x65, 0x73,
+	0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65,
+	0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x1a,
+	0x3b, 0x0a, 0x11, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52,
+	0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x83, 0x01, 0x0a,
+	0x18, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a,
+	0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e,
+	0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x3b, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x22, 0xa7, 0x01, 0x0a, 0x16, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65,
 	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a,
 	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x3b, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x25, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x43,
-	0x0a, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x0b, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x79,
-	0x70, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x0a, 0x6e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d,
-	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52,
-	0x08, 0x65, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x58, 0x0a, 0x0f, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x05, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61,
-	0x6e, 0x67, 0x65, 0x52, 0x0e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61,
-	0x6e, 0x67, 0x65, 0x12, 0x44, 0x0a, 0x0a, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x64, 0x65, 0x63,
-	0x6c, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x09,
-	0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x44, 0x65, 0x63, 0x6c, 0x12, 0x39, 0x0a, 0x07, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x55, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64,
-	0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52,
-	0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x0d, 0x72, 0x65,
-	0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x72,
-	0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65,
-	0x1a, 0x7a, 0x0a, 0x0e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e,
-	0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x12, 0x40, 0x0a, 0x07, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x37, 0x0a, 0x0d,
-	0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a,
-	0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74,
-	0x61, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x7c, 0x0a, 0x15, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x58,
-	0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74,
-	0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80,
-	0x80, 0x80, 0x02, 0x22, 0xc1, 0x06, 0x0a, 0x14, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x41, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65,
-	0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c,
-	0x61, 0x62, 0x65, 0x6c, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x3e, 0x0a, 0x04, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c,
-	0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x74,
-	0x79, 0x70, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x74, 0x79, 0x70, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x74, 0x65,
-	0x6e, 0x64, 0x65, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x78, 0x74, 0x65,
-	0x6e, 0x64, 0x65, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x6e, 0x65,
-	0x6f, 0x66, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
-	0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1b, 0x0a, 0x09, 0x6a, 0x73,
-	0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6a,
-	0x73, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x12, 0x27, 0x0a, 0x0f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x22, 0xb6, 0x02, 0x0a, 0x04, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x4f, 0x55, 0x42, 0x4c,
-	0x45, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x4c, 0x4f, 0x41,
-	0x54, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x36,
-	0x34, 0x10, 0x03, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x49, 0x4e, 0x54,
-	0x36, 0x34, 0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x54,
-	0x33, 0x32, 0x10, 0x05, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x58,
-	0x45, 0x44, 0x36, 0x34, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46,
-	0x49, 0x58, 0x45, 0x44, 0x33, 0x32, 0x10, 0x07, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x42, 0x4f, 0x4f, 0x4c, 0x10, 0x08, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x09, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50, 0x10, 0x0a, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x10, 0x0b, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x42, 0x59, 0x54, 0x45, 0x53, 0x10, 0x0c, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x55, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10, 0x0d, 0x12, 0x0d, 0x0a, 0x09, 0x54,
-	0x59, 0x50, 0x45, 0x5f, 0x45, 0x4e, 0x55, 0x4d, 0x10, 0x0e, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x53, 0x46, 0x49, 0x58, 0x45, 0x44, 0x33, 0x32, 0x10, 0x0f, 0x12, 0x11, 0x0a,
-	0x0d, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x46, 0x49, 0x58, 0x45, 0x44, 0x36, 0x34, 0x10, 0x10,
-	0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x49, 0x4e, 0x54, 0x33, 0x32, 0x10,
-	0x11, 0x12, 0x0f, 0x0a, 0x0b, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x49, 0x4e, 0x54, 0x36, 0x34,
-	0x10, 0x12, 0x22, 0x43, 0x0a, 0x05, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x0e, 0x4c,
-	0x41, 0x42, 0x45, 0x4c, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x41, 0x4c, 0x10, 0x01, 0x12,
-	0x12, 0x0a, 0x0e, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x51, 0x55, 0x49, 0x52, 0x45,
-	0x44, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x50,
-	0x45, 0x41, 0x54, 0x45, 0x44, 0x10, 0x03, 0x22, 0x63, 0x0a, 0x14, 0x4f, 0x6e, 0x65, 0x6f, 0x66,
-	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xe3, 0x02, 0x0a,
-	0x13, 0x45, 0x6e, 0x75, 0x6d, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x36, 0x0a, 0x07, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75,
-	0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x5d, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x72, 0x61,
-	0x6e, 0x67, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6e, 0x75, 0x6d,
-	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x45, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67,
-	0x65, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65,
-	0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x64, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x3b, 0x0a, 0x11, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x73,
-	0x65, 0x72, 0x76, 0x65, 0x64, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74,
-	0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74,
-	0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65,
-	0x6e, 0x64, 0x22, 0x83, 0x01, 0x0a, 0x18, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x3b, 0x0a, 0x07, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45,
-	0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
-	0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xa7, 0x01, 0x0a, 0x16, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x3e, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f,
-	0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52,
-	0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x39, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x22, 0x89, 0x02, 0x0a, 0x15, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x44, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x1d, 0x0a, 0x0a, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x1f, 0x0a, 0x0b, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x38, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x30, 0x0a, 0x10, 0x63, 0x6c,
-	0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0f, 0x63, 0x6c, 0x69,
-	0x65, 0x6e, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x30, 0x0a, 0x10,
-	0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0f, 0x73,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x22, 0x91,
-	0x09, 0x0a, 0x0b, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x21,
-	0x0a, 0x0c, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6a, 0x61, 0x76, 0x61, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67,
-	0x65, 0x12, 0x30, 0x0a, 0x14, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f,
-	0x63, 0x6c, 0x61, 0x73, 0x73, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x12, 0x6a, 0x61, 0x76, 0x61, 0x4f, 0x75, 0x74, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x13, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x6d, 0x75, 0x6c, 0x74,
-	0x69, 0x70, 0x6c, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08,
-	0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x11, 0x6a, 0x61, 0x76, 0x61, 0x4d, 0x75, 0x6c,
-	0x74, 0x69, 0x70, 0x6c, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x1d, 0x6a, 0x61,
-	0x76, 0x61, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x65, 0x71, 0x75, 0x61,
-	0x6c, 0x73, 0x5f, 0x61, 0x6e, 0x64, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x14, 0x20, 0x01, 0x28,
-	0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x19, 0x6a, 0x61, 0x76, 0x61, 0x47, 0x65, 0x6e, 0x65, 0x72,
-	0x61, 0x74, 0x65, 0x45, 0x71, 0x75, 0x61, 0x6c, 0x73, 0x41, 0x6e, 0x64, 0x48, 0x61, 0x73, 0x68,
-	0x12, 0x3a, 0x0a, 0x16, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f,
-	0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x75, 0x74, 0x66, 0x38, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x08,
-	0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x13, 0x6a, 0x61, 0x76, 0x61, 0x53, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x74, 0x66, 0x38, 0x12, 0x53, 0x0a, 0x0c,
-	0x6f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x29, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x3a, 0x05, 0x53,
-	0x50, 0x45, 0x45, 0x44, 0x52, 0x0b, 0x6f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x46, 0x6f,
-	0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x67, 0x6f, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18,
-	0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x67, 0x6f, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65,
-	0x12, 0x35, 0x0a, 0x13, 0x63, 0x63, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66,
-	0x61, 0x6c, 0x73, 0x65, 0x52, 0x11, 0x63, 0x63, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x39, 0x0a, 0x15, 0x6a, 0x61, 0x76, 0x61, 0x5f,
-	0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
-	0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x13, 0x6a,
-	0x61, 0x76, 0x61, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x12, 0x35, 0x0a, 0x13, 0x70, 0x79, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63,
-	0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x3a,
-	0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x11, 0x70, 0x79, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69,
-	0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x14, 0x70, 0x68, 0x70,
+	0x65, 0x12, 0x3e, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x26, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f,
+	0x64, 0x12, 0x39, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x89, 0x02, 0x0a,
+	0x15, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
+	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x69, 0x6e,
+	0x70, 0x75, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x69, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x75, 0x74,
+	0x70, 0x75, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x38, 0x0a, 0x07, 0x6f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65,
+	0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x30, 0x0a, 0x10, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05,
+	0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x30, 0x0a, 0x10, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08,
+	0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x53,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x22, 0x91, 0x09, 0x0a, 0x0b, 0x46, 0x69, 0x6c,
+	0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x6a, 0x61, 0x76, 0x61,
+	0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
+	0x6a, 0x61, 0x76, 0x61, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x6a,
+	0x61, 0x76, 0x61, 0x5f, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6a, 0x61, 0x76, 0x61, 0x4f,
+	0x75, 0x74, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a,
+	0x13, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x5f, 0x66,
+	0x69, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73,
+	0x65, 0x52, 0x11, 0x6a, 0x61, 0x76, 0x61, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x46,
+	0x69, 0x6c, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x1d, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x67, 0x65, 0x6e,
+	0x65, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x65, 0x71, 0x75, 0x61, 0x6c, 0x73, 0x5f, 0x61, 0x6e, 0x64,
+	0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08, 0x42, 0x02, 0x18, 0x01, 0x52,
+	0x19, 0x6a, 0x61, 0x76, 0x61, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x45, 0x71, 0x75,
+	0x61, 0x6c, 0x73, 0x41, 0x6e, 0x64, 0x48, 0x61, 0x73, 0x68, 0x12, 0x3a, 0x0a, 0x16, 0x6a, 0x61,
+	0x76, 0x61, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f,
+	0x75, 0x74, 0x66, 0x38, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73,
+	0x65, 0x52, 0x13, 0x6a, 0x61, 0x76, 0x61, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x65,
+	0x63, 0x6b, 0x55, 0x74, 0x66, 0x38, 0x12, 0x53, 0x0a, 0x0c, 0x6f, 0x70, 0x74, 0x69, 0x6d, 0x69,
+	0x7a, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x29, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46,
+	0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6d,
+	0x69, 0x7a, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x3a, 0x05, 0x53, 0x50, 0x45, 0x45, 0x44, 0x52, 0x0b,
+	0x6f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x46, 0x6f, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x67,
+	0x6f, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x67, 0x6f, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x35, 0x0a, 0x13, 0x63, 0x63,
 	0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x18, 0x2a, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x12,
-	0x70, 0x68, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64,
-	0x18, 0x17, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64,
-	0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x2e, 0x0a, 0x10, 0x63, 0x63, 0x5f,
-	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x73, 0x18, 0x1f, 0x20,
-	0x01, 0x28, 0x08, 0x3a, 0x04, 0x74, 0x72, 0x75, 0x65, 0x52, 0x0e, 0x63, 0x63, 0x45, 0x6e, 0x61,
-	0x62, 0x6c, 0x65, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x6f, 0x62, 0x6a,
-	0x63, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x24,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6f, 0x62, 0x6a, 0x63, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50,
-	0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x73, 0x68, 0x61, 0x72, 0x70, 0x5f,
-	0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x25, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0f, 0x63, 0x73, 0x68, 0x61, 0x72, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x12, 0x21, 0x0a, 0x0c, 0x73, 0x77, 0x69, 0x66, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78,
-	0x18, 0x27, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x77, 0x69, 0x66, 0x74, 0x50, 0x72, 0x65,
-	0x66, 0x69, 0x78, 0x12, 0x28, 0x0a, 0x10, 0x70, 0x68, 0x70, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73,
-	0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x28, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70,
-	0x68, 0x70, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x23, 0x0a,
-	0x0d, 0x70, 0x68, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x29,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x68, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x12, 0x34, 0x0a, 0x16, 0x70, 0x68, 0x70, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x2c, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x14, 0x70, 0x68, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4e,
-	0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x75, 0x62, 0x79,
-	0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x18, 0x2d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
-	0x72, 0x75, 0x62, 0x79, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x58, 0x0a, 0x14, 0x75,
-	0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3a, 0x0a, 0x0c, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a,
-	0x65, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x50, 0x45, 0x45, 0x44, 0x10, 0x01,
-	0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x53, 0x49, 0x5a, 0x45, 0x10, 0x02, 0x12,
-	0x10, 0x0a, 0x0c, 0x4c, 0x49, 0x54, 0x45, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x10,
-	0x03, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04, 0x08, 0x26,
-	0x10, 0x27, 0x22, 0xd1, 0x02, 0x0a, 0x0e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3c, 0x0a, 0x17, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x5f, 0x73, 0x65, 0x74, 0x5f, 0x77, 0x69, 0x72, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x14, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x57, 0x69, 0x72, 0x65, 0x46, 0x6f, 0x72,
-	0x6d, 0x61, 0x74, 0x12, 0x4c, 0x0a, 0x1f, 0x6e, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61,
-	0x72, 0x64, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x63,
-	0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61,
-	0x6c, 0x73, 0x65, 0x52, 0x1c, 0x6e, 0x6f, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f,
-	0x72, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65,
-	0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x70, 0x5f,
-	0x65, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6d, 0x61, 0x70,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x11,
+	0x63, 0x63, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x73, 0x12, 0x39, 0x0a, 0x15, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69,
+	0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08,
+	0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x13, 0x6a, 0x61, 0x76, 0x61, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x35, 0x0a, 0x13,
+	0x70, 0x79, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x73, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65,
+	0x52, 0x11, 0x70, 0x79, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x14, 0x70, 0x68, 0x70, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72,
+	0x69, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x2a, 0x20, 0x01, 0x28,
+	0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x12, 0x70, 0x68, 0x70, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0a,
+	0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x17, 0x20, 0x01, 0x28, 0x08,
+	0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61,
+	0x74, 0x65, 0x64, 0x12, 0x2e, 0x0a, 0x10, 0x63, 0x63, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
+	0x5f, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x73, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x04, 0x74,
+	0x72, 0x75, 0x65, 0x52, 0x0e, 0x63, 0x63, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x72, 0x65,
+	0x6e, 0x61, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x6f, 0x62, 0x6a, 0x63, 0x5f, 0x63, 0x6c, 0x61, 0x73,
+	0x73, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x24, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f,
+	0x6f, 0x62, 0x6a, 0x63, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12,
+	0x29, 0x0a, 0x10, 0x63, 0x73, 0x68, 0x61, 0x72, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x18, 0x25, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x63, 0x73, 0x68, 0x61, 0x72,
+	0x70, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x77,
+	0x69, 0x66, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x27, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0b, 0x73, 0x77, 0x69, 0x66, 0x74, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x28, 0x0a,
+	0x10, 0x70, 0x68, 0x70, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69,
+	0x78, 0x18, 0x28, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x68, 0x70, 0x43, 0x6c, 0x61, 0x73,
+	0x73, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x23, 0x0a, 0x0d, 0x70, 0x68, 0x70, 0x5f, 0x6e,
+	0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x29, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
+	0x70, 0x68, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x34, 0x0a, 0x16,
+	0x70, 0x68, 0x70, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6e, 0x61, 0x6d,
+	0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x2c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x70, 0x68,
+	0x70, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x75, 0x62, 0x79, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61,
+	0x67, 0x65, 0x18, 0x2d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, 0x75, 0x62, 0x79, 0x50, 0x61,
+	0x63, 0x6b, 0x61, 0x67, 0x65, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72,
 	0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07,
 	0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
 	0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a,
-	0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09,
-	0x4a, 0x04, 0x08, 0x09, 0x10, 0x0a, 0x22, 0xe2, 0x03, 0x0a, 0x0c, 0x46, 0x69, 0x65, 0x6c, 0x64,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x41, 0x0a, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x23, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22,
+	0x3a, 0x0a, 0x0c, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x12,
+	0x09, 0x0a, 0x05, 0x53, 0x50, 0x45, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f,
+	0x44, 0x45, 0x5f, 0x53, 0x49, 0x5a, 0x45, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x4c, 0x49, 0x54,
+	0x45, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x03, 0x2a, 0x09, 0x08, 0xe8, 0x07,
+	0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04, 0x08, 0x26, 0x10, 0x27, 0x22, 0xbb, 0x03, 0x0a,
+	0x0e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
+	0x3c, 0x0a, 0x17, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x77,
+	0x69, 0x72, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
+	0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x14, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x53, 0x65, 0x74, 0x57, 0x69, 0x72, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x4c, 0x0a,
+	0x1f, 0x6e, 0x6f, 0x5f, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x5f, 0x64, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x1c, 0x6e,
+	0x6f, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x25, 0x0a, 0x0a, 0x64,
+	0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x3a,
+	0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74,
+	0x65, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x70, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x56, 0x0a, 0x26, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6c, 0x65,
+	0x67, 0x61, 0x63, 0x79, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f,
+	0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x42,
+	0x02, 0x18, 0x01, 0x52, 0x22, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x4c,
+	0x65, 0x67, 0x61, 0x63, 0x79, 0x4a, 0x73, 0x6f, 0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x43, 0x6f,
+	0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+	0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04, 0x08, 0x04,
+	0x10, 0x05, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x4a, 0x04, 0x08, 0x06, 0x10, 0x07, 0x4a, 0x04,
+	0x08, 0x08, 0x10, 0x09, 0x4a, 0x04, 0x08, 0x09, 0x10, 0x0a, 0x22, 0xb7, 0x08, 0x0a, 0x0c, 0x46,
+	0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x41, 0x0a, 0x05, 0x63,
+	0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x23, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65,
+	0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x43, 0x54, 0x79, 0x70, 0x65, 0x3a,
+	0x06, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16,
+	0x0a, 0x06, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x70, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x12, 0x47, 0x0a, 0x06, 0x6a, 0x73, 0x74, 0x79, 0x70, 0x65,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x43, 0x54, 0x79, 0x70, 0x65, 0x3a, 0x06, 0x53, 0x54, 0x52,
-	0x49, 0x4e, 0x47, 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61,
-	0x63, 0x6b, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x61, 0x63, 0x6b,
-	0x65, 0x64, 0x12, 0x47, 0x0a, 0x06, 0x6a, 0x73, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x4a, 0x53, 0x54, 0x79, 0x70, 0x65, 0x3a, 0x09, 0x4a, 0x53, 0x5f, 0x4e, 0x4f, 0x52,
-	0x4d, 0x41, 0x4c, 0x52, 0x06, 0x6a, 0x73, 0x74, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x04, 0x6c,
-	0x61, 0x7a, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65,
-	0x52, 0x04, 0x6c, 0x61, 0x7a, 0x79, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63,
-	0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73,
-	0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x19, 0x0a,
-	0x04, 0x77, 0x65, 0x61, 0x6b, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c,
-	0x73, 0x65, 0x52, 0x04, 0x77, 0x65, 0x61, 0x6b, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75,
-	0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x22, 0x2f, 0x0a, 0x05, 0x43, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x53,
-	0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x4f, 0x52, 0x44, 0x10,
-	0x01, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x50, 0x49, 0x45, 0x43,
-	0x45, 0x10, 0x02, 0x22, 0x35, 0x0a, 0x06, 0x4a, 0x53, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0d, 0x0a,
-	0x09, 0x4a, 0x53, 0x5f, 0x4e, 0x4f, 0x52, 0x4d, 0x41, 0x4c, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09,
-	0x4a, 0x53, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x4a,
-	0x53, 0x5f, 0x4e, 0x55, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x02, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10,
-	0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x22, 0x73, 0x0a, 0x0c, 0x4f,
-	0x6e, 0x65, 0x6f, 0x66, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4a, 0x53, 0x54, 0x79, 0x70, 0x65, 0x3a, 0x09, 0x4a, 0x53,
+	0x5f, 0x4e, 0x4f, 0x52, 0x4d, 0x41, 0x4c, 0x52, 0x06, 0x6a, 0x73, 0x74, 0x79, 0x70, 0x65, 0x12,
+	0x19, 0x0a, 0x04, 0x6c, 0x61, 0x7a, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66,
+	0x61, 0x6c, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x61, 0x7a, 0x79, 0x12, 0x2e, 0x0a, 0x0f, 0x75, 0x6e,
+	0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x6c, 0x61, 0x7a, 0x79, 0x18, 0x0f, 0x20,
+	0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0e, 0x75, 0x6e, 0x76, 0x65,
+	0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x4c, 0x61, 0x7a, 0x79, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65,
+	0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05,
+	0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65,
+	0x64, 0x12, 0x19, 0x0a, 0x04, 0x77, 0x65, 0x61, 0x6b, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x3a,
+	0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x04, 0x77, 0x65, 0x61, 0x6b, 0x12, 0x28, 0x0a, 0x0c,
+	0x64, 0x65, 0x62, 0x75, 0x67, 0x5f, 0x72, 0x65, 0x64, 0x61, 0x63, 0x74, 0x18, 0x10, 0x20, 0x01,
+	0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0b, 0x64, 0x65, 0x62, 0x75, 0x67,
+	0x52, 0x65, 0x64, 0x61, 0x63, 0x74, 0x12, 0x4b, 0x0a, 0x09, 0x72, 0x65, 0x74, 0x65, 0x6e, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2d, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c,
+	0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x74, 0x65, 0x6e, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x12, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54,
+	0x79, 0x70, 0x65, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x58, 0x0a, 0x14, 0x75,
 	0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74,
 	0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f,
 	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69,
 	0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
 	0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02,
-	0x22, 0xc0, 0x01, 0x0a, 0x0b, 0x45, 0x6e, 0x75, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x41, 0x6c, 0x69, 0x61,
-	0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65,
-	0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75,
-	0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04, 0x08,
-	0x05, 0x10, 0x06, 0x22, 0x9e, 0x01, 0x0a, 0x10, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, 0x0a, 0x05, 0x43, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a,
+	0x0a, 0x06, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x4f,
+	0x52, 0x44, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x50,
+	0x49, 0x45, 0x43, 0x45, 0x10, 0x02, 0x22, 0x35, 0x0a, 0x06, 0x4a, 0x53, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x0d, 0x0a, 0x09, 0x4a, 0x53, 0x5f, 0x4e, 0x4f, 0x52, 0x4d, 0x41, 0x4c, 0x10, 0x00, 0x12,
+	0x0d, 0x0a, 0x09, 0x4a, 0x53, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0d,
+	0x0a, 0x09, 0x4a, 0x53, 0x5f, 0x4e, 0x55, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x02, 0x22, 0x55, 0x0a,
+	0x0f, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x15, 0x0a, 0x11, 0x52, 0x45, 0x54, 0x45, 0x4e, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e,
+	0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x52, 0x45, 0x54, 0x45, 0x4e,
+	0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x01, 0x12, 0x14,
+	0x0a, 0x10, 0x52, 0x45, 0x54, 0x45, 0x4e, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x4f, 0x55, 0x52,
+	0x43, 0x45, 0x10, 0x02, 0x22, 0x8c, 0x02, 0x0a, 0x10, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x54,
+	0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x41, 0x52,
+	0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e,
+	0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50,
+	0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x01, 0x12, 0x1f, 0x0a, 0x1b, 0x54, 0x41, 0x52, 0x47,
+	0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x53, 0x49, 0x4f,
+	0x4e, 0x5f, 0x52, 0x41, 0x4e, 0x47, 0x45, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x41, 0x52,
+	0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45,
+	0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50,
+	0x45, 0x5f, 0x46, 0x49, 0x45, 0x4c, 0x44, 0x10, 0x04, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x41, 0x52,
+	0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4f, 0x4e, 0x45, 0x4f, 0x46, 0x10, 0x05,
+	0x12, 0x14, 0x0a, 0x10, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x45, 0x4e, 0x55, 0x4d, 0x10, 0x06, 0x12, 0x1a, 0x0a, 0x16, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54,
+	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x59,
+	0x10, 0x07, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50,
+	0x45, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x10, 0x08, 0x12, 0x16, 0x0a, 0x12, 0x54,
+	0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f,
+	0x44, 0x10, 0x09, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04,
+	0x08, 0x04, 0x10, 0x05, 0x22, 0x73, 0x0a, 0x0c, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70,
+	0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65,
+	0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09,
+	0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0x98, 0x02, 0x0a, 0x0b, 0x45, 0x6e,
+	0x75, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x6c, 0x6c,
+	0x6f, 0x77, 0x5f, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a,
+	0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65,
+	0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05,
+	0x66, 0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65,
+	0x64, 0x12, 0x56, 0x0a, 0x26, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f,
+	0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x66, 0x69, 0x65, 0x6c,
+	0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x22, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65,
+	0x64, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4a, 0x73, 0x6f, 0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64,
+	0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13,
+	0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x4a, 0x04,
+	0x08, 0x05, 0x10, 0x06, 0x22, 0x9e, 0x01, 0x0a, 0x10, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70,
+	0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66,
+	0x61, 0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64,
+	0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65,
+	0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
+	0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10,
+	0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0x9c, 0x01, 0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
 	0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72,
-	0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61,
+	0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x21, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61,
 	0x6c, 0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12,
 	0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64,
 	0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24,
@@ -3385,97 +3774,95 @@ var file_google_protobuf_descriptor_proto_rawDesc = []byte{
 	0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70,
 	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65,
 	0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80,
-	0x80, 0x80, 0x80, 0x02, 0x22, 0x9c, 0x01, 0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65,
-	0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x21, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c,
-	0x73, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x58,
-	0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x5f,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e,
+	0x80, 0x80, 0x80, 0x02, 0x22, 0xe0, 0x02, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63,
+	0x61, 0x74, 0x65, 0x64, 0x18, 0x21, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73,
+	0x65, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x71, 0x0a,
+	0x11, 0x69, 0x64, 0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x5f, 0x6c, 0x65, 0x76,
+	0x65, 0x6c, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f,
+	0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x49, 0x64, 0x65, 0x6d, 0x70, 0x6f, 0x74,
+	0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x3a, 0x13, 0x49, 0x44, 0x45, 0x4d, 0x50,
+	0x4f, 0x54, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x52, 0x10,
+	0x69, 0x64, 0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c,
+	0x12, 0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65,
+	0x64, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
+	0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x50, 0x0a, 0x10, 0x49, 0x64,
+	0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x17,
+	0x0a, 0x13, 0x49, 0x44, 0x45, 0x4d, 0x50, 0x4f, 0x54, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x55, 0x4e,
+	0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4e, 0x4f, 0x5f, 0x53, 0x49,
+	0x44, 0x45, 0x5f, 0x45, 0x46, 0x46, 0x45, 0x43, 0x54, 0x53, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a,
+	0x49, 0x44, 0x45, 0x4d, 0x50, 0x4f, 0x54, 0x45, 0x4e, 0x54, 0x10, 0x02, 0x2a, 0x09, 0x08, 0xe8,
+	0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0x9a, 0x03, 0x0a, 0x13, 0x55, 0x6e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x41, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e,
 	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
 	0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74,
-	0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80,
-	0x80, 0x80, 0x02, 0x22, 0xe0, 0x02, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61,
-	0x74, 0x65, 0x64, 0x18, 0x21, 0x20, 0x01, 0x28, 0x08, 0x3a, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65,
-	0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x12, 0x71, 0x0a, 0x11,
-	0x69, 0x64, 0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x5f, 0x6c, 0x65, 0x76, 0x65,
-	0x6c, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x49, 0x64, 0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65,
-	0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x3a, 0x13, 0x49, 0x44, 0x45, 0x4d, 0x50, 0x4f,
-	0x54, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x52, 0x10, 0x69,
-	0x64, 0x65, 0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12,
-	0x58, 0x0a, 0x14, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64,
-	0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0xe7, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x55, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x75, 0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65,
-	0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x50, 0x0a, 0x10, 0x49, 0x64, 0x65,
-	0x6d, 0x70, 0x6f, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x17, 0x0a,
-	0x13, 0x49, 0x44, 0x45, 0x4d, 0x50, 0x4f, 0x54, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x4b,
-	0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4e, 0x4f, 0x5f, 0x53, 0x49, 0x44,
-	0x45, 0x5f, 0x45, 0x46, 0x46, 0x45, 0x43, 0x54, 0x53, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x49,
-	0x44, 0x45, 0x4d, 0x50, 0x4f, 0x54, 0x45, 0x4e, 0x54, 0x10, 0x02, 0x2a, 0x09, 0x08, 0xe8, 0x07,
-	0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0x9a, 0x03, 0x0a, 0x13, 0x55, 0x6e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55,
-	0x6e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x65, 0x74, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x50, 0x61, 0x72, 0x74, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x29, 0x0a, 0x10, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x69, 0x64, 0x65,
-	0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, 0x12,
-	0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
-	0x76, 0x65, 0x49, 0x6e, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x6e, 0x65,
-	0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65,
-	0x49, 0x6e, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x6f, 0x75, 0x62,
-	0x6c, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0b,
-	0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x73,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x0c, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x27,
-	0x0a, 0x0f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61,
-	0x74, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0x4a, 0x0a, 0x08, 0x4e, 0x61, 0x6d, 0x65, 0x50,
-	0x61, 0x72, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x74,
-	0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x61, 0x6d, 0x65, 0x50, 0x61, 0x72, 0x74,
-	0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x18, 0x02, 0x20, 0x02, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x22, 0xa7, 0x02, 0x0a, 0x0e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6f,
-	0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x44, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xce, 0x01, 0x0a,
-	0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x04, 0x70, 0x61, 0x74,
-	0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x42, 0x02, 0x10, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74,
-	0x68, 0x12, 0x16, 0x0a, 0x04, 0x73, 0x70, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x42,
-	0x02, 0x10, 0x01, 0x52, 0x04, 0x73, 0x70, 0x61, 0x6e, 0x12, 0x29, 0x0a, 0x10, 0x6c, 0x65, 0x61,
-	0x64, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0f, 0x6c, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6d, 0x6d,
-	0x65, 0x6e, 0x74, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x69, 0x6e, 0x67,
-	0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x10, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74,
-	0x73, 0x12, 0x3a, 0x0a, 0x19, 0x6c, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x65, 0x74,
-	0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x06,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x17, 0x6c, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x74,
-	0x61, 0x63, 0x68, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xd1, 0x01,
-	0x0a, 0x11, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x49,
-	0x6e, 0x66, 0x6f, 0x12, 0x4d, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61,
-	0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x6e, 0x6e, 0x6f,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x1a, 0x6d, 0x0a, 0x0a, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x16, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x42, 0x02,
-	0x10, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x65, 0x67,
-	0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x12,
-	0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e,
-	0x64, 0x42, 0x7e, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x69, 0x6f, 0x6e, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x50, 0x61, 0x72, 0x74, 0x52, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72,
+	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x69, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a,
+	0x12, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, 0x70, 0x6f, 0x73, 0x69, 0x74,
+	0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x6e,
+	0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76,
+	0x65, 0x49, 0x6e, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x6f, 0x75,
+	0x62, 0x6c, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x01, 0x52,
+	0x0b, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0c,
+	0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0c, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12,
+	0x27, 0x0a, 0x0f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x5f, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x1a, 0x4a, 0x0a, 0x08, 0x4e, 0x61, 0x6d, 0x65,
+	0x50, 0x61, 0x72, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x70, 0x61, 0x72,
+	0x74, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x61, 0x6d, 0x65, 0x50, 0x61, 0x72,
+	0x74, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x18, 0x02, 0x20, 0x02, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x45, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x22, 0xa7, 0x02, 0x0a, 0x0e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43,
+	0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x44, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xce, 0x01,
+	0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x04, 0x70, 0x61,
+	0x74, 0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x42, 0x02, 0x10, 0x01, 0x52, 0x04, 0x70, 0x61,
+	0x74, 0x68, 0x12, 0x16, 0x0a, 0x04, 0x73, 0x70, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05,
+	0x42, 0x02, 0x10, 0x01, 0x52, 0x04, 0x73, 0x70, 0x61, 0x6e, 0x12, 0x29, 0x0a, 0x10, 0x6c, 0x65,
+	0x61, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6c, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6d,
+	0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x69, 0x6e,
+	0x67, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x10, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
+	0x74, 0x73, 0x12, 0x3a, 0x0a, 0x19, 0x6c, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x65,
+	0x74, 0x61, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18,
+	0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x17, 0x6c, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x44, 0x65,
+	0x74, 0x61, 0x63, 0x68, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xd0,
+	0x02, 0x0a, 0x11, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65,
+	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x4d, 0x0a, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72,
+	0x61, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x6e, 0x6e,
+	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x1a, 0xeb, 0x01, 0x0a, 0x0a, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05,
+	0x42, 0x02, 0x10, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x62,
+	0x65, 0x67, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x65, 0x67, 0x69,
+	0x6e, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x65, 0x6e, 0x64, 0x12, 0x52, 0x0a, 0x08, 0x73, 0x65, 0x6d, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
+	0x64, 0x43, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x65, 0x6d, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x52, 0x08, 0x73,
+	0x65, 0x6d, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x22, 0x28, 0x0a, 0x08, 0x53, 0x65, 0x6d, 0x61, 0x6e,
+	0x74, 0x69, 0x63, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x07, 0x0a,
+	0x03, 0x53, 0x45, 0x54, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x4c, 0x49, 0x41, 0x53, 0x10,
+	0x02, 0x42, 0x7e, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x10, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
 	0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x48, 0x01, 0x5a, 0x2d, 0x67, 0x6f,
 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f,
@@ -3498,7 +3885,7 @@ func file_google_protobuf_descriptor_proto_rawDescGZIP() []byte {
 	return file_google_protobuf_descriptor_proto_rawDescData
 }
 
-var file_google_protobuf_descriptor_proto_enumTypes = make([]protoimpl.EnumInfo, 6)
+var file_google_protobuf_descriptor_proto_enumTypes = make([]protoimpl.EnumInfo, 9)
 var file_google_protobuf_descriptor_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
 var file_google_protobuf_descriptor_proto_goTypes = []interface{}{
 	(FieldDescriptorProto_Type)(0),                // 0: google.protobuf.FieldDescriptorProto.Type
@@ -3506,84 +3893,90 @@ var file_google_protobuf_descriptor_proto_goTypes = []interface{}{
 	(FileOptions_OptimizeMode)(0),                 // 2: google.protobuf.FileOptions.OptimizeMode
 	(FieldOptions_CType)(0),                       // 3: google.protobuf.FieldOptions.CType
 	(FieldOptions_JSType)(0),                      // 4: google.protobuf.FieldOptions.JSType
-	(MethodOptions_IdempotencyLevel)(0),           // 5: google.protobuf.MethodOptions.IdempotencyLevel
-	(*FileDescriptorSet)(nil),                     // 6: google.protobuf.FileDescriptorSet
-	(*FileDescriptorProto)(nil),                   // 7: google.protobuf.FileDescriptorProto
-	(*DescriptorProto)(nil),                       // 8: google.protobuf.DescriptorProto
-	(*ExtensionRangeOptions)(nil),                 // 9: google.protobuf.ExtensionRangeOptions
-	(*FieldDescriptorProto)(nil),                  // 10: google.protobuf.FieldDescriptorProto
-	(*OneofDescriptorProto)(nil),                  // 11: google.protobuf.OneofDescriptorProto
-	(*EnumDescriptorProto)(nil),                   // 12: google.protobuf.EnumDescriptorProto
-	(*EnumValueDescriptorProto)(nil),              // 13: google.protobuf.EnumValueDescriptorProto
-	(*ServiceDescriptorProto)(nil),                // 14: google.protobuf.ServiceDescriptorProto
-	(*MethodDescriptorProto)(nil),                 // 15: google.protobuf.MethodDescriptorProto
-	(*FileOptions)(nil),                           // 16: google.protobuf.FileOptions
-	(*MessageOptions)(nil),                        // 17: google.protobuf.MessageOptions
-	(*FieldOptions)(nil),                          // 18: google.protobuf.FieldOptions
-	(*OneofOptions)(nil),                          // 19: google.protobuf.OneofOptions
-	(*EnumOptions)(nil),                           // 20: google.protobuf.EnumOptions
-	(*EnumValueOptions)(nil),                      // 21: google.protobuf.EnumValueOptions
-	(*ServiceOptions)(nil),                        // 22: google.protobuf.ServiceOptions
-	(*MethodOptions)(nil),                         // 23: google.protobuf.MethodOptions
-	(*UninterpretedOption)(nil),                   // 24: google.protobuf.UninterpretedOption
-	(*SourceCodeInfo)(nil),                        // 25: google.protobuf.SourceCodeInfo
-	(*GeneratedCodeInfo)(nil),                     // 26: google.protobuf.GeneratedCodeInfo
-	(*DescriptorProto_ExtensionRange)(nil),        // 27: google.protobuf.DescriptorProto.ExtensionRange
-	(*DescriptorProto_ReservedRange)(nil),         // 28: google.protobuf.DescriptorProto.ReservedRange
-	(*EnumDescriptorProto_EnumReservedRange)(nil), // 29: google.protobuf.EnumDescriptorProto.EnumReservedRange
-	(*UninterpretedOption_NamePart)(nil),          // 30: google.protobuf.UninterpretedOption.NamePart
-	(*SourceCodeInfo_Location)(nil),               // 31: google.protobuf.SourceCodeInfo.Location
-	(*GeneratedCodeInfo_Annotation)(nil),          // 32: google.protobuf.GeneratedCodeInfo.Annotation
+	(FieldOptions_OptionRetention)(0),             // 5: google.protobuf.FieldOptions.OptionRetention
+	(FieldOptions_OptionTargetType)(0),            // 6: google.protobuf.FieldOptions.OptionTargetType
+	(MethodOptions_IdempotencyLevel)(0),           // 7: google.protobuf.MethodOptions.IdempotencyLevel
+	(GeneratedCodeInfo_Annotation_Semantic)(0),    // 8: google.protobuf.GeneratedCodeInfo.Annotation.Semantic
+	(*FileDescriptorSet)(nil),                     // 9: google.protobuf.FileDescriptorSet
+	(*FileDescriptorProto)(nil),                   // 10: google.protobuf.FileDescriptorProto
+	(*DescriptorProto)(nil),                       // 11: google.protobuf.DescriptorProto
+	(*ExtensionRangeOptions)(nil),                 // 12: google.protobuf.ExtensionRangeOptions
+	(*FieldDescriptorProto)(nil),                  // 13: google.protobuf.FieldDescriptorProto
+	(*OneofDescriptorProto)(nil),                  // 14: google.protobuf.OneofDescriptorProto
+	(*EnumDescriptorProto)(nil),                   // 15: google.protobuf.EnumDescriptorProto
+	(*EnumValueDescriptorProto)(nil),              // 16: google.protobuf.EnumValueDescriptorProto
+	(*ServiceDescriptorProto)(nil),                // 17: google.protobuf.ServiceDescriptorProto
+	(*MethodDescriptorProto)(nil),                 // 18: google.protobuf.MethodDescriptorProto
+	(*FileOptions)(nil),                           // 19: google.protobuf.FileOptions
+	(*MessageOptions)(nil),                        // 20: google.protobuf.MessageOptions
+	(*FieldOptions)(nil),                          // 21: google.protobuf.FieldOptions
+	(*OneofOptions)(nil),                          // 22: google.protobuf.OneofOptions
+	(*EnumOptions)(nil),                           // 23: google.protobuf.EnumOptions
+	(*EnumValueOptions)(nil),                      // 24: google.protobuf.EnumValueOptions
+	(*ServiceOptions)(nil),                        // 25: google.protobuf.ServiceOptions
+	(*MethodOptions)(nil),                         // 26: google.protobuf.MethodOptions
+	(*UninterpretedOption)(nil),                   // 27: google.protobuf.UninterpretedOption
+	(*SourceCodeInfo)(nil),                        // 28: google.protobuf.SourceCodeInfo
+	(*GeneratedCodeInfo)(nil),                     // 29: google.protobuf.GeneratedCodeInfo
+	(*DescriptorProto_ExtensionRange)(nil),        // 30: google.protobuf.DescriptorProto.ExtensionRange
+	(*DescriptorProto_ReservedRange)(nil),         // 31: google.protobuf.DescriptorProto.ReservedRange
+	(*EnumDescriptorProto_EnumReservedRange)(nil), // 32: google.protobuf.EnumDescriptorProto.EnumReservedRange
+	(*UninterpretedOption_NamePart)(nil),          // 33: google.protobuf.UninterpretedOption.NamePart
+	(*SourceCodeInfo_Location)(nil),               // 34: google.protobuf.SourceCodeInfo.Location
+	(*GeneratedCodeInfo_Annotation)(nil),          // 35: google.protobuf.GeneratedCodeInfo.Annotation
 }
 var file_google_protobuf_descriptor_proto_depIdxs = []int32{
-	7,  // 0: google.protobuf.FileDescriptorSet.file:type_name -> google.protobuf.FileDescriptorProto
-	8,  // 1: google.protobuf.FileDescriptorProto.message_type:type_name -> google.protobuf.DescriptorProto
-	12, // 2: google.protobuf.FileDescriptorProto.enum_type:type_name -> google.protobuf.EnumDescriptorProto
-	14, // 3: google.protobuf.FileDescriptorProto.service:type_name -> google.protobuf.ServiceDescriptorProto
-	10, // 4: google.protobuf.FileDescriptorProto.extension:type_name -> google.protobuf.FieldDescriptorProto
-	16, // 5: google.protobuf.FileDescriptorProto.options:type_name -> google.protobuf.FileOptions
-	25, // 6: google.protobuf.FileDescriptorProto.source_code_info:type_name -> google.protobuf.SourceCodeInfo
-	10, // 7: google.protobuf.DescriptorProto.field:type_name -> google.protobuf.FieldDescriptorProto
-	10, // 8: google.protobuf.DescriptorProto.extension:type_name -> google.protobuf.FieldDescriptorProto
-	8,  // 9: google.protobuf.DescriptorProto.nested_type:type_name -> google.protobuf.DescriptorProto
-	12, // 10: google.protobuf.DescriptorProto.enum_type:type_name -> google.protobuf.EnumDescriptorProto
-	27, // 11: google.protobuf.DescriptorProto.extension_range:type_name -> google.protobuf.DescriptorProto.ExtensionRange
-	11, // 12: google.protobuf.DescriptorProto.oneof_decl:type_name -> google.protobuf.OneofDescriptorProto
-	17, // 13: google.protobuf.DescriptorProto.options:type_name -> google.protobuf.MessageOptions
-	28, // 14: google.protobuf.DescriptorProto.reserved_range:type_name -> google.protobuf.DescriptorProto.ReservedRange
-	24, // 15: google.protobuf.ExtensionRangeOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	10, // 0: google.protobuf.FileDescriptorSet.file:type_name -> google.protobuf.FileDescriptorProto
+	11, // 1: google.protobuf.FileDescriptorProto.message_type:type_name -> google.protobuf.DescriptorProto
+	15, // 2: google.protobuf.FileDescriptorProto.enum_type:type_name -> google.protobuf.EnumDescriptorProto
+	17, // 3: google.protobuf.FileDescriptorProto.service:type_name -> google.protobuf.ServiceDescriptorProto
+	13, // 4: google.protobuf.FileDescriptorProto.extension:type_name -> google.protobuf.FieldDescriptorProto
+	19, // 5: google.protobuf.FileDescriptorProto.options:type_name -> google.protobuf.FileOptions
+	28, // 6: google.protobuf.FileDescriptorProto.source_code_info:type_name -> google.protobuf.SourceCodeInfo
+	13, // 7: google.protobuf.DescriptorProto.field:type_name -> google.protobuf.FieldDescriptorProto
+	13, // 8: google.protobuf.DescriptorProto.extension:type_name -> google.protobuf.FieldDescriptorProto
+	11, // 9: google.protobuf.DescriptorProto.nested_type:type_name -> google.protobuf.DescriptorProto
+	15, // 10: google.protobuf.DescriptorProto.enum_type:type_name -> google.protobuf.EnumDescriptorProto
+	30, // 11: google.protobuf.DescriptorProto.extension_range:type_name -> google.protobuf.DescriptorProto.ExtensionRange
+	14, // 12: google.protobuf.DescriptorProto.oneof_decl:type_name -> google.protobuf.OneofDescriptorProto
+	20, // 13: google.protobuf.DescriptorProto.options:type_name -> google.protobuf.MessageOptions
+	31, // 14: google.protobuf.DescriptorProto.reserved_range:type_name -> google.protobuf.DescriptorProto.ReservedRange
+	27, // 15: google.protobuf.ExtensionRangeOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
 	1,  // 16: google.protobuf.FieldDescriptorProto.label:type_name -> google.protobuf.FieldDescriptorProto.Label
 	0,  // 17: google.protobuf.FieldDescriptorProto.type:type_name -> google.protobuf.FieldDescriptorProto.Type
-	18, // 18: google.protobuf.FieldDescriptorProto.options:type_name -> google.protobuf.FieldOptions
-	19, // 19: google.protobuf.OneofDescriptorProto.options:type_name -> google.protobuf.OneofOptions
-	13, // 20: google.protobuf.EnumDescriptorProto.value:type_name -> google.protobuf.EnumValueDescriptorProto
-	20, // 21: google.protobuf.EnumDescriptorProto.options:type_name -> google.protobuf.EnumOptions
-	29, // 22: google.protobuf.EnumDescriptorProto.reserved_range:type_name -> google.protobuf.EnumDescriptorProto.EnumReservedRange
-	21, // 23: google.protobuf.EnumValueDescriptorProto.options:type_name -> google.protobuf.EnumValueOptions
-	15, // 24: google.protobuf.ServiceDescriptorProto.method:type_name -> google.protobuf.MethodDescriptorProto
-	22, // 25: google.protobuf.ServiceDescriptorProto.options:type_name -> google.protobuf.ServiceOptions
-	23, // 26: google.protobuf.MethodDescriptorProto.options:type_name -> google.protobuf.MethodOptions
+	21, // 18: google.protobuf.FieldDescriptorProto.options:type_name -> google.protobuf.FieldOptions
+	22, // 19: google.protobuf.OneofDescriptorProto.options:type_name -> google.protobuf.OneofOptions
+	16, // 20: google.protobuf.EnumDescriptorProto.value:type_name -> google.protobuf.EnumValueDescriptorProto
+	23, // 21: google.protobuf.EnumDescriptorProto.options:type_name -> google.protobuf.EnumOptions
+	32, // 22: google.protobuf.EnumDescriptorProto.reserved_range:type_name -> google.protobuf.EnumDescriptorProto.EnumReservedRange
+	24, // 23: google.protobuf.EnumValueDescriptorProto.options:type_name -> google.protobuf.EnumValueOptions
+	18, // 24: google.protobuf.ServiceDescriptorProto.method:type_name -> google.protobuf.MethodDescriptorProto
+	25, // 25: google.protobuf.ServiceDescriptorProto.options:type_name -> google.protobuf.ServiceOptions
+	26, // 26: google.protobuf.MethodDescriptorProto.options:type_name -> google.protobuf.MethodOptions
 	2,  // 27: google.protobuf.FileOptions.optimize_for:type_name -> google.protobuf.FileOptions.OptimizeMode
-	24, // 28: google.protobuf.FileOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	24, // 29: google.protobuf.MessageOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	27, // 28: google.protobuf.FileOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	27, // 29: google.protobuf.MessageOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
 	3,  // 30: google.protobuf.FieldOptions.ctype:type_name -> google.protobuf.FieldOptions.CType
 	4,  // 31: google.protobuf.FieldOptions.jstype:type_name -> google.protobuf.FieldOptions.JSType
-	24, // 32: google.protobuf.FieldOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	24, // 33: google.protobuf.OneofOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	24, // 34: google.protobuf.EnumOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	24, // 35: google.protobuf.EnumValueOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	24, // 36: google.protobuf.ServiceOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	5,  // 37: google.protobuf.MethodOptions.idempotency_level:type_name -> google.protobuf.MethodOptions.IdempotencyLevel
-	24, // 38: google.protobuf.MethodOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
-	30, // 39: google.protobuf.UninterpretedOption.name:type_name -> google.protobuf.UninterpretedOption.NamePart
-	31, // 40: google.protobuf.SourceCodeInfo.location:type_name -> google.protobuf.SourceCodeInfo.Location
-	32, // 41: google.protobuf.GeneratedCodeInfo.annotation:type_name -> google.protobuf.GeneratedCodeInfo.Annotation
-	9,  // 42: google.protobuf.DescriptorProto.ExtensionRange.options:type_name -> google.protobuf.ExtensionRangeOptions
-	43, // [43:43] is the sub-list for method output_type
-	43, // [43:43] is the sub-list for method input_type
-	43, // [43:43] is the sub-list for extension type_name
-	43, // [43:43] is the sub-list for extension extendee
-	0,  // [0:43] is the sub-list for field type_name
+	5,  // 32: google.protobuf.FieldOptions.retention:type_name -> google.protobuf.FieldOptions.OptionRetention
+	6,  // 33: google.protobuf.FieldOptions.target:type_name -> google.protobuf.FieldOptions.OptionTargetType
+	27, // 34: google.protobuf.FieldOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	27, // 35: google.protobuf.OneofOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	27, // 36: google.protobuf.EnumOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	27, // 37: google.protobuf.EnumValueOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	27, // 38: google.protobuf.ServiceOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	7,  // 39: google.protobuf.MethodOptions.idempotency_level:type_name -> google.protobuf.MethodOptions.IdempotencyLevel
+	27, // 40: google.protobuf.MethodOptions.uninterpreted_option:type_name -> google.protobuf.UninterpretedOption
+	33, // 41: google.protobuf.UninterpretedOption.name:type_name -> google.protobuf.UninterpretedOption.NamePart
+	34, // 42: google.protobuf.SourceCodeInfo.location:type_name -> google.protobuf.SourceCodeInfo.Location
+	35, // 43: google.protobuf.GeneratedCodeInfo.annotation:type_name -> google.protobuf.GeneratedCodeInfo.Annotation
+	12, // 44: google.protobuf.DescriptorProto.ExtensionRange.options:type_name -> google.protobuf.ExtensionRangeOptions
+	8,  // 45: google.protobuf.GeneratedCodeInfo.Annotation.semantic:type_name -> google.protobuf.GeneratedCodeInfo.Annotation.Semantic
+	46, // [46:46] is the sub-list for method output_type
+	46, // [46:46] is the sub-list for method input_type
+	46, // [46:46] is the sub-list for extension type_name
+	46, // [46:46] is the sub-list for extension extendee
+	0,  // [0:46] is the sub-list for field type_name
 }
 
 func init() { file_google_protobuf_descriptor_proto_init() }
@@ -3940,7 +4333,7 @@ func file_google_protobuf_descriptor_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_google_protobuf_descriptor_proto_rawDesc,
-			NumEnums:      6,
+			NumEnums:      9,
 			NumMessages:   27,
 			NumExtensions: 0,
 			NumServices:   0,
diff --git a/vendor/modernc.org/libc/Makefile b/vendor/modernc.org/libc/Makefile
index e9c5b256..8664cd6d 100644
--- a/vendor/modernc.org/libc/Makefile
+++ b/vendor/modernc.org/libc/Makefile
@@ -167,7 +167,7 @@ edit:
 	@if [ -f "Session.vim" ]; then gvim -S & else gvim -p Makefile *.go & fi
 
 editor:
-	go generate 2>&1 | tee log
+	# go generate 2>&1 | tee log
 	gofmt -l -s -w *.go
 	go test -short 2>&1 | tee -a log
 	go install -v ./...
diff --git a/vendor/modernc.org/libc/capi_darwin_amd64.go b/vendor/modernc.org/libc/capi_darwin_amd64.go
index ab794096..12cddf4b 100644
--- a/vendor/modernc.org/libc/capi_darwin_amd64.go
+++ b/vendor/modernc.org/libc/capi_darwin_amd64.go
@@ -319,6 +319,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
diff --git a/vendor/modernc.org/libc/capi_darwin_arm64.go b/vendor/modernc.org/libc/capi_darwin_arm64.go
index ab794096..12cddf4b 100644
--- a/vendor/modernc.org/libc/capi_darwin_arm64.go
+++ b/vendor/modernc.org/libc/capi_darwin_arm64.go
@@ -319,6 +319,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
diff --git a/vendor/modernc.org/libc/capi_freebsd_386.go b/vendor/modernc.org/libc/capi_freebsd_386.go
index 006e0c71..fb198405 100644
--- a/vendor/modernc.org/libc/capi_freebsd_386.go
+++ b/vendor/modernc.org/libc/capi_freebsd_386.go
@@ -299,6 +299,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
diff --git a/vendor/modernc.org/libc/capi_freebsd_amd64.go b/vendor/modernc.org/libc/capi_freebsd_amd64.go
index 006e0c71..fb198405 100644
--- a/vendor/modernc.org/libc/capi_freebsd_amd64.go
+++ b/vendor/modernc.org/libc/capi_freebsd_amd64.go
@@ -299,6 +299,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
diff --git a/vendor/modernc.org/libc/capi_freebsd_arm.go b/vendor/modernc.org/libc/capi_freebsd_arm.go
index 006e0c71..fb198405 100644
--- a/vendor/modernc.org/libc/capi_freebsd_arm.go
+++ b/vendor/modernc.org/libc/capi_freebsd_arm.go
@@ -299,6 +299,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
diff --git a/vendor/modernc.org/libc/capi_freebsd_arm64.go b/vendor/modernc.org/libc/capi_freebsd_arm64.go
index 006e0c71..fb198405 100644
--- a/vendor/modernc.org/libc/capi_freebsd_arm64.go
+++ b/vendor/modernc.org/libc/capi_freebsd_arm64.go
@@ -299,6 +299,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
diff --git a/vendor/modernc.org/libc/capi_linux_386.go b/vendor/modernc.org/libc/capi_linux_386.go
index 7ec37f1d..47cef2b5 100644
--- a/vendor/modernc.org/libc/capi_linux_386.go
+++ b/vendor/modernc.org/libc/capi_linux_386.go
@@ -288,6 +288,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
@@ -320,6 +321,7 @@ var CAPI = map[string]struct{}{
 	"mremap":                           {},
 	"munmap":                           {},
 	"nanf":                             {},
+	"nanosleep":                        {},
 	"nl_langinfo":                      {},
 	"ntohs":                            {},
 	"obstack_free":                     {},
diff --git a/vendor/modernc.org/libc/capi_linux_amd64.go b/vendor/modernc.org/libc/capi_linux_amd64.go
index b5b36631..3741ba1f 100644
--- a/vendor/modernc.org/libc/capi_linux_amd64.go
+++ b/vendor/modernc.org/libc/capi_linux_amd64.go
@@ -295,6 +295,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
@@ -329,6 +330,7 @@ var CAPI = map[string]struct{}{
 	"mremap":                           {},
 	"munmap":                           {},
 	"nanf":                             {},
+	"nanosleep":                        {},
 	"nl_langinfo":                      {},
 	"ntohs":                            {},
 	"obstack_free":                     {},
diff --git a/vendor/modernc.org/libc/capi_linux_arm.go b/vendor/modernc.org/libc/capi_linux_arm.go
index 7ec37f1d..47cef2b5 100644
--- a/vendor/modernc.org/libc/capi_linux_arm.go
+++ b/vendor/modernc.org/libc/capi_linux_arm.go
@@ -288,6 +288,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
@@ -320,6 +321,7 @@ var CAPI = map[string]struct{}{
 	"mremap":                           {},
 	"munmap":                           {},
 	"nanf":                             {},
+	"nanosleep":                        {},
 	"nl_langinfo":                      {},
 	"ntohs":                            {},
 	"obstack_free":                     {},
diff --git a/vendor/modernc.org/libc/capi_linux_arm64.go b/vendor/modernc.org/libc/capi_linux_arm64.go
index 7ec37f1d..47cef2b5 100644
--- a/vendor/modernc.org/libc/capi_linux_arm64.go
+++ b/vendor/modernc.org/libc/capi_linux_arm64.go
@@ -288,6 +288,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
@@ -320,6 +321,7 @@ var CAPI = map[string]struct{}{
 	"mremap":                           {},
 	"munmap":                           {},
 	"nanf":                             {},
+	"nanosleep":                        {},
 	"nl_langinfo":                      {},
 	"ntohs":                            {},
 	"obstack_free":                     {},
diff --git a/vendor/modernc.org/libc/capi_linux_ppc64le.go b/vendor/modernc.org/libc/capi_linux_ppc64le.go
index b5b36631..3741ba1f 100644
--- a/vendor/modernc.org/libc/capi_linux_ppc64le.go
+++ b/vendor/modernc.org/libc/capi_linux_ppc64le.go
@@ -295,6 +295,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
@@ -329,6 +330,7 @@ var CAPI = map[string]struct{}{
 	"mremap":                           {},
 	"munmap":                           {},
 	"nanf":                             {},
+	"nanosleep":                        {},
 	"nl_langinfo":                      {},
 	"ntohs":                            {},
 	"obstack_free":                     {},
diff --git a/vendor/modernc.org/libc/capi_linux_riscv64.go b/vendor/modernc.org/libc/capi_linux_riscv64.go
index 29fb7d4e..6defbe83 100644
--- a/vendor/modernc.org/libc/capi_linux_riscv64.go
+++ b/vendor/modernc.org/libc/capi_linux_riscv64.go
@@ -290,6 +290,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
@@ -322,6 +323,7 @@ var CAPI = map[string]struct{}{
 	"mremap":                           {},
 	"munmap":                           {},
 	"nanf":                             {},
+	"nanosleep":                        {},
 	"nl_langinfo":                      {},
 	"ntohs":                            {},
 	"obstack_free":                     {},
diff --git a/vendor/modernc.org/libc/capi_linux_s390x.go b/vendor/modernc.org/libc/capi_linux_s390x.go
index 7ec37f1d..47cef2b5 100644
--- a/vendor/modernc.org/libc/capi_linux_s390x.go
+++ b/vendor/modernc.org/libc/capi_linux_s390x.go
@@ -288,6 +288,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
@@ -320,6 +321,7 @@ var CAPI = map[string]struct{}{
 	"mremap":                           {},
 	"munmap":                           {},
 	"nanf":                             {},
+	"nanosleep":                        {},
 	"nl_langinfo":                      {},
 	"ntohs":                            {},
 	"obstack_free":                     {},
diff --git a/vendor/modernc.org/libc/capi_netbsd_amd64.go b/vendor/modernc.org/libc/capi_netbsd_amd64.go
index 8876e9b4..680fd730 100644
--- a/vendor/modernc.org/libc/capi_netbsd_amd64.go
+++ b/vendor/modernc.org/libc/capi_netbsd_amd64.go
@@ -294,6 +294,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
diff --git a/vendor/modernc.org/libc/capi_netbsd_arm.go b/vendor/modernc.org/libc/capi_netbsd_arm.go
index 8876e9b4..680fd730 100644
--- a/vendor/modernc.org/libc/capi_netbsd_arm.go
+++ b/vendor/modernc.org/libc/capi_netbsd_arm.go
@@ -294,6 +294,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
diff --git a/vendor/modernc.org/libc/capi_openbsd_386.go b/vendor/modernc.org/libc/capi_openbsd_386.go
index dbcc423b..ea4fbda9 100644
--- a/vendor/modernc.org/libc/capi_openbsd_386.go
+++ b/vendor/modernc.org/libc/capi_openbsd_386.go
@@ -305,6 +305,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
diff --git a/vendor/modernc.org/libc/capi_openbsd_amd64.go b/vendor/modernc.org/libc/capi_openbsd_amd64.go
index 7ba9c55d..1c9327fc 100644
--- a/vendor/modernc.org/libc/capi_openbsd_amd64.go
+++ b/vendor/modernc.org/libc/capi_openbsd_amd64.go
@@ -306,6 +306,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
diff --git a/vendor/modernc.org/libc/capi_openbsd_arm64.go b/vendor/modernc.org/libc/capi_openbsd_arm64.go
index 7ba9c55d..1c9327fc 100644
--- a/vendor/modernc.org/libc/capi_openbsd_arm64.go
+++ b/vendor/modernc.org/libc/capi_openbsd_arm64.go
@@ -306,6 +306,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                      {},
 	"log":                              {},
 	"log10":                            {},
+	"log2":                             {},
 	"longjmp":                          {},
 	"lrand48":                          {},
 	"lseek":                            {},
diff --git a/vendor/modernc.org/libc/capi_windows_386.go b/vendor/modernc.org/libc/capi_windows_386.go
index fc04042f..e44b80e8 100644
--- a/vendor/modernc.org/libc/capi_windows_386.go
+++ b/vendor/modernc.org/libc/capi_windows_386.go
@@ -574,6 +574,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                       {},
 	"log":                               {},
 	"log10":                             {},
+	"log2":                              {},
 	"longjmp":                           {},
 	"lseek":                             {},
 	"lseek64":                           {},
diff --git a/vendor/modernc.org/libc/capi_windows_amd64.go b/vendor/modernc.org/libc/capi_windows_amd64.go
index 7fa708d6..8c823a50 100644
--- a/vendor/modernc.org/libc/capi_windows_amd64.go
+++ b/vendor/modernc.org/libc/capi_windows_amd64.go
@@ -554,6 +554,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                       {},
 	"log":                               {},
 	"log10":                             {},
+	"log2":                              {},
 	"longjmp":                           {},
 	"lseek":                             {},
 	"lseek64":                           {},
diff --git a/vendor/modernc.org/libc/capi_windows_arm64.go b/vendor/modernc.org/libc/capi_windows_arm64.go
index f26fc8c5..0df635dd 100644
--- a/vendor/modernc.org/libc/capi_windows_arm64.go
+++ b/vendor/modernc.org/libc/capi_windows_arm64.go
@@ -569,6 +569,7 @@ var CAPI = map[string]struct{}{
 	"localtime_r":                       {},
 	"log":                               {},
 	"log10":                             {},
+	"log2":                              {},
 	"longjmp":                           {},
 	"lseek":                             {},
 	"lseek64":                           {},
diff --git a/vendor/modernc.org/libc/libc.go b/vendor/modernc.org/libc/libc.go
index 1cd63db7..e1c00b0f 100644
--- a/vendor/modernc.org/libc/libc.go
+++ b/vendor/modernc.org/libc/libc.go
@@ -611,6 +611,7 @@ func Xisnanl(t *TLS, x float64) int32             { return Bool32(math.IsNaN(x))
 func Xldexp(t *TLS, x float64, exp int32) float64 { return math.Ldexp(x, int(exp)) }
 func Xlog(t *TLS, x float64) float64              { return math.Log(x) }
 func Xlog10(t *TLS, x float64) float64            { return math.Log10(x) }
+func Xlog2(t *TLS, x float64) float64             { return math.Log2(x) }
 func Xround(t *TLS, x float64) float64            { return math.Round(x) }
 func Xsin(t *TLS, x float64) float64              { return math.Sin(x) }
 func Xsinf(t *TLS, x float32) float32             { return float32(math.Sin(float64(x))) }
diff --git a/vendor/modernc.org/libc/libc_linux.go b/vendor/modernc.org/libc/libc_linux.go
index b2910d9e..1c2f4826 100644
--- a/vendor/modernc.org/libc/libc_linux.go
+++ b/vendor/modernc.org/libc/libc_linux.go
@@ -1592,3 +1592,10 @@ func Xreadlinkat(t *TLS, dirfd int32, pathname, buf uintptr, bufsiz types.Size_t
 
 	return types.Ssize_t(n)
 }
+
+// int nanosleep(const struct timespec *req, struct timespec *rem);
+func Xnanosleep(t *TLS, req, rem uintptr) int32 {
+	v := *(*ctime.Timespec)(unsafe.Pointer(req))
+	time.Sleep(time.Second*time.Duration(v.Ftv_sec) + time.Duration(v.Ftv_nsec))
+	return 0
+}
diff --git a/vendor/modernc.org/memory/Makefile b/vendor/modernc.org/memory/Makefile
index 2da7b2cd..466c940e 100644
--- a/vendor/modernc.org/memory/Makefile
+++ b/vendor/modernc.org/memory/Makefile
@@ -40,6 +40,7 @@ editor:
 	GOOS=freebsd GOARCH=amd64 go build
 	GOOS=freebsd GOARCH=arm go build
 	GOOS=freebsd GOARCH=arm64 go build
+	GOOS=illumos GOARCH=amd64 go build
 	GOOS=linux GOARCH=386 go build
 	GOOS=linux GOARCH=amd64 go build
 	GOOS=linux GOARCH=arm go build
diff --git a/vendor/modernc.org/memory/mmap_illumos_amd64.go b/vendor/modernc.org/memory/mmap_illumos_amd64.go
new file mode 100644
index 00000000..1006fe81
--- /dev/null
+++ b/vendor/modernc.org/memory/mmap_illumos_amd64.go
@@ -0,0 +1,91 @@
+// Copyright 2011 Evan Shaw. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE-MMAP-GO file.
+
+// Modifications (c) 2022 The Memory Authors.
+
+package memory // import "modernc.org/memory"
+
+import (
+	"os"
+	"syscall"
+	_ "unsafe"
+)
+
+const (
+	pageSizeLog = 20
+
+	// $ find /usr/include -name syscall.h
+	// /usr/include/sys/syscall.h
+	// $ grep -ni munmap /usr/include/sys/syscall.h
+	// 293:#define     SYS_munmap      117
+	// $ grep -ni mmap /usr/include/sys/syscall.h
+	// 291:#define	SYS_mmap	115
+	// 303:#define	SYS_mmapobj	127
+	// 442:#define	SYS_mmap64		214
+	// $
+	// $ uname -a
+	// SunOS omnios64 5.11 omnios-r151044-d3b715b9d1 i86pc i386 i86pc
+	// $
+	sys_MUNMAP = 117
+	sys_MMAP   = 214
+)
+
+var (
+	osPageMask = osPageSize - 1
+	osPageSize = os.Getpagesize()
+)
+
+//go:linkname mmapSyscall syscall.mmap
+func mmapSyscall(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+
+func unmap(addr uintptr, size int) error {
+	_, _, errno := syscall.Syscall(sys_MUNMAP, addr, uintptr(size), 0)
+	if errno != 0 {
+		return errno
+	}
+
+	return nil
+}
+
+// pageSize aligned.
+func mmap(size int) (uintptr, int, error) {
+	size = roundup(size, osPageSize)
+	// The actual mmap syscall varies by architecture. mmapSyscall provides same
+	// functionality as the unexported funtion syscall.mmap and is declared in
+	// mmap_*_*.go and mmap_fallback.go. To add support for a new architecture,
+	// check function mmap in src/syscall/syscall_*_*.go or
+	// src/syscall/zsyscall_*_*.go in Go's source code.
+	p, err := mmapSyscall(0, uintptr(size+pageSize), syscall.PROT_READ|syscall.PROT_WRITE, syscall.MAP_PRIVATE|syscall.MAP_ANON, -1, 0)
+	if err != nil {
+		return 0, 0, err
+	}
+
+	n := size + pageSize
+	if p&uintptr(osPageMask) != 0 {
+		panic("internal error")
+	}
+
+	mod := int(p) & pageMask
+	if mod != 0 {
+		m := pageSize - mod
+		if err := unmap(p, m); err != nil {
+			return 0, 0, err
+		}
+
+		n -= m
+		p += uintptr(m)
+	}
+
+	if p&uintptr(pageMask) != 0 {
+		panic("internal error")
+	}
+
+	if n-size != 0 {
+		if err := unmap(p+uintptr(size), n-size); err != nil {
+			return 0, 0, err
+		}
+	}
+
+	return p, size, nil
+}
diff --git a/vendor/modernc.org/memory/mmap_netbsd_32.go b/vendor/modernc.org/memory/mmap_netbsd_32.go
index 2c169112..2c17038a 100644
--- a/vendor/modernc.org/memory/mmap_netbsd_32.go
+++ b/vendor/modernc.org/memory/mmap_netbsd_32.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE-GO file.
 
-//go:build netbsd && 386 || netbsd && arm
+//go:build (netbsd && 386) || (netbsd && arm)
 // +build netbsd,386 netbsd,arm
 
 package memory
diff --git a/vendor/modernc.org/memory/mmap_unix.go b/vendor/modernc.org/memory/mmap_unix.go
index d076ad03..93f9b820 100644
--- a/vendor/modernc.org/memory/mmap_unix.go
+++ b/vendor/modernc.org/memory/mmap_unix.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE-MMAP-GO file.
 
-//go:build darwin || dragonfly || freebsd || linux || openbsd || solaris || netbsd
-// +build darwin dragonfly freebsd linux openbsd solaris netbsd
+//go:build darwin || dragonfly || freebsd || linux || openbsd || (solaris && !illumos) || netbsd
+// +build darwin dragonfly freebsd linux openbsd solaris,!illumos netbsd
 
 // Modifications (c) 2017 The Memory Authors.
 
diff --git a/vendor/modernc.org/sqlite/doc.go b/vendor/modernc.org/sqlite/doc.go
index ebe1bbb7..121810ce 100644
--- a/vendor/modernc.org/sqlite/doc.go
+++ b/vendor/modernc.org/sqlite/doc.go
@@ -19,18 +19,18 @@
 //
 //	OS      Arch    SQLite version
 //	------------------------------
-//	darwin	amd64   3.40.1
-//	darwin	arm64   3.40.1
-//	freebsd	amd64   3.40.1
-//	freebsd	arm64   3.40.1
-//	linux	386     3.40.1
-//	linux	amd64   3.40.1
-//	linux	arm     3.40.1
-//	linux	arm64   3.40.1
-//	linux	ppc64le 3.40.1
-//	linux	riscv64 3.40.1
-//	windows	amd64   3.40.1
-//	windows	arm64   3.40.1
+//	darwin	amd64   3.41.0
+//	darwin	arm64   3.41.0
+//	freebsd	amd64   3.41.0
+//	freebsd	arm64   3.41.0
+//	linux	386     3.41.0
+//	linux	amd64   3.41.0
+//	linux	arm     3.41.0
+//	linux	arm64   3.41.0
+//	linux	ppc64le 3.41.0
+//	linux	riscv64 3.41.0
+//	windows	amd64   3.41.0
+//	windows	arm64   3.41.0
 //
 // Builders
 //
@@ -40,6 +40,10 @@
 //
 // Changelog
 //
+// 2023-02-23 v1.21.0:
+//
+// Upgrade to SQLite 3.41.0, release notes at https://sqlite.org/releaselog/3_41_0.html.
+//
 // 2022-11-28 v1.20.0
 //
 // Support linux/ppc64le.
diff --git a/vendor/modernc.org/sqlite/generator.go b/vendor/modernc.org/sqlite/generator.go
index b9ced856..cd6437ca 100644
--- a/vendor/modernc.org/sqlite/generator.go
+++ b/vendor/modernc.org/sqlite/generator.go
@@ -5,6 +5,10 @@
 //go:build generator
 // +build generator
 
+//TODO 2023-02-23, netbsd/amd64 fails generating SQLite 3.41:
+//
+//	C front end 36/85: testdata/sqlite-src-3410000/ext/recover/sqlite3recover.c ... testdata/sqlite-src-3410000/ext/recover/sqlite3recover.c:2023:41: front-end: undefined: SQLITE_FCNTL_RESET_CACHE
+
 package main
 
 import (
@@ -265,12 +269,12 @@ var (
 		sz       int
 		dev      bool
 	}{
-		{sqliteDir, "https://www.sqlite.org/2022/sqlite-amalgamation-3400100.zip", 2457, false},
-		{sqliteSrcDir, "https://www.sqlite.org/2022/sqlite-src-3400100.zip", 12814, false},
+		{sqliteDir, "https://www.sqlite.org/2023/sqlite-amalgamation-3410000.zip", 2457, false},
+		{sqliteSrcDir, "https://www.sqlite.org/2023/sqlite-src-3410000.zip", 12814, false},
 	}
 
-	sqliteDir    = filepath.FromSlash("testdata/sqlite-amalgamation-3400100")
-	sqliteSrcDir = filepath.FromSlash("testdata/sqlite-src-3400100")
+	sqliteDir    = filepath.FromSlash("testdata/sqlite-amalgamation-3410000")
+	sqliteSrcDir = filepath.FromSlash("testdata/sqlite-src-3410000")
 )
 
 func download() {
@@ -527,8 +531,9 @@ func makeTestfixture(goos, goarch string, more []string) {
 		"ext/fts5/fts5_tcl.c",
 		"ext/fts5/fts5_test_mi.c",
 		"ext/fts5/fts5_test_tok.c",
-		"ext/misc/appendvfs.c",
 		"ext/misc/amatch.c",
+		"ext/misc/appendvfs.c",
+		"ext/misc/basexx.c",
 		"ext/misc/carray.c",
 		"ext/misc/cksumvfs.c",
 		"ext/misc/closure.c",
@@ -566,7 +571,6 @@ func makeTestfixture(goos, goarch string, more []string) {
 		"src/test4.c",
 		"src/test5.c",
 		"src/test6.c",
-		"src/test7.c",
 		"src/test8.c",
 		"src/test9.c",
 		"src/test_async.c",
@@ -595,7 +599,6 @@ func makeTestfixture(goos, goarch string, more []string) {
 		"src/test_quota.c",
 		"src/test_rtree.c",
 		"src/test_schema.c",
-		"src/test_server.c",
 		"src/test_superlock.c",
 		"src/test_syscall.c",
 		"src/test_tclsh.c",
diff --git a/vendor/modernc.org/sqlite/lib/capi_darwin_amd64.go b/vendor/modernc.org/sqlite/lib/capi_darwin_amd64.go
index cc961294..367cb141 100644
--- a/vendor/modernc.org/sqlite/lib/capi_darwin_amd64.go
+++ b/vendor/modernc.org/sqlite/lib/capi_darwin_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_darwin_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1 -DSQLITE_WITHOUT_ZONEMALLOC', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_darwin_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1 -DSQLITE_WITHOUT_ZONEMALLOC', DO NOT EDIT.
 
 package sqlite3
 
@@ -286,6 +286,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -616,6 +617,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -672,7 +674,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -724,6 +725,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -913,6 +915,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1145,6 +1148,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_darwin_arm64.go b/vendor/modernc.org/sqlite/lib/capi_darwin_arm64.go
index 91c38c14..5b22e931 100644
--- a/vendor/modernc.org/sqlite/lib/capi_darwin_arm64.go
+++ b/vendor/modernc.org/sqlite/lib/capi_darwin_arm64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_darwin_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1 -DSQLITE_WITHOUT_ZONEMALLOC', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_darwin_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1 -DSQLITE_WITHOUT_ZONEMALLOC', DO NOT EDIT.
 
 package sqlite3
 
@@ -286,6 +286,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -616,6 +617,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -672,7 +674,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -724,6 +725,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -913,6 +915,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1145,6 +1148,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_freebsd_386.go b/vendor/modernc.org/sqlite/lib/capi_freebsd_386.go
index a9fcf5d0..420a5353 100644
--- a/vendor/modernc.org/sqlite/lib/capi_freebsd_386.go
+++ b/vendor/modernc.org/sqlite/lib/capi_freebsd_386.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_386.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_386.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -262,6 +262,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -592,6 +593,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -648,7 +650,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -700,6 +701,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -889,6 +891,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1121,6 +1124,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_freebsd_amd64.go b/vendor/modernc.org/sqlite/lib/capi_freebsd_amd64.go
index 5796d666..4cd04252 100644
--- a/vendor/modernc.org/sqlite/lib/capi_freebsd_amd64.go
+++ b/vendor/modernc.org/sqlite/lib/capi_freebsd_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -262,6 +262,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -592,6 +593,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -648,7 +650,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -700,6 +701,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -889,6 +891,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1121,6 +1124,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_freebsd_arm.go b/vendor/modernc.org/sqlite/lib/capi_freebsd_arm.go
index b5f8f89c..cd59687d 100644
--- a/vendor/modernc.org/sqlite/lib/capi_freebsd_arm.go
+++ b/vendor/modernc.org/sqlite/lib/capi_freebsd_arm.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_arm.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_arm.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -262,6 +262,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -592,6 +593,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -648,7 +650,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -700,6 +701,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -889,6 +891,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1121,6 +1124,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_freebsd_arm64.go b/vendor/modernc.org/sqlite/lib/capi_freebsd_arm64.go
index 5796d666..4cd04252 100644
--- a/vendor/modernc.org/sqlite/lib/capi_freebsd_arm64.go
+++ b/vendor/modernc.org/sqlite/lib/capi_freebsd_arm64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -262,6 +262,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -592,6 +593,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -648,7 +650,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -700,6 +701,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -889,6 +891,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1121,6 +1124,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_386.go b/vendor/modernc.org/sqlite/lib/capi_linux_386.go
index c9832902..bb0fd5e8 100644
--- a/vendor/modernc.org/sqlite/lib/capi_linux_386.go
+++ b/vendor/modernc.org/sqlite/lib/capi_linux_386.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_386.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_386.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -262,6 +262,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -592,6 +593,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -648,7 +650,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -700,6 +701,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -889,6 +891,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1121,6 +1124,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_amd64.go b/vendor/modernc.org/sqlite/lib/capi_linux_amd64.go
index e9d333f5..ef86ef7f 100644
--- a/vendor/modernc.org/sqlite/lib/capi_linux_amd64.go
+++ b/vendor/modernc.org/sqlite/lib/capi_linux_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -262,6 +262,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -592,6 +593,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -648,7 +650,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -700,6 +701,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -889,6 +891,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1121,6 +1124,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_arm.go b/vendor/modernc.org/sqlite/lib/capi_linux_arm.go
index 32859cdd..e7e52e78 100644
--- a/vendor/modernc.org/sqlite/lib/capi_linux_arm.go
+++ b/vendor/modernc.org/sqlite/lib/capi_linux_arm.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_arm.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_arm.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -262,6 +262,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -592,6 +593,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -648,7 +650,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -700,6 +701,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -889,6 +891,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1121,6 +1124,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_arm64.go b/vendor/modernc.org/sqlite/lib/capi_linux_arm64.go
index 92317048..98b1031f 100644
--- a/vendor/modernc.org/sqlite/lib/capi_linux_arm64.go
+++ b/vendor/modernc.org/sqlite/lib/capi_linux_arm64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -262,6 +262,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -592,6 +593,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -648,7 +650,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -700,6 +701,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -889,6 +891,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1121,6 +1124,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_ppc64le.go b/vendor/modernc.org/sqlite/lib/capi_linux_ppc64le.go
index 0b144f30..0b4e2e1a 100644
--- a/vendor/modernc.org/sqlite/lib/capi_linux_ppc64le.go
+++ b/vendor/modernc.org/sqlite/lib/capi_linux_ppc64le.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_ppc64le.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_ppc64le.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -262,6 +262,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -592,6 +593,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -648,7 +650,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -700,6 +701,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -889,6 +891,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1121,6 +1124,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_riscv64.go b/vendor/modernc.org/sqlite/lib/capi_linux_riscv64.go
index 1d559c5d..eaded130 100644
--- a/vendor/modernc.org/sqlite/lib/capi_linux_riscv64.go
+++ b/vendor/modernc.org/sqlite/lib/capi_linux_riscv64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_riscv64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_riscv64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -262,6 +262,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -592,6 +593,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -648,7 +650,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -700,6 +701,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -889,6 +891,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1121,6 +1124,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_linux_s390x.go b/vendor/modernc.org/sqlite/lib/capi_linux_s390x.go
index 3ff5ad53..4a6842a2 100644
--- a/vendor/modernc.org/sqlite/lib/capi_linux_s390x.go
+++ b/vendor/modernc.org/sqlite/lib/capi_linux_s390x.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_s390x.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_s390x.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -262,6 +262,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -592,6 +593,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -648,7 +650,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -700,6 +701,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -889,6 +891,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1121,6 +1124,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_openbsd_amd64.go b/vendor/modernc.org/sqlite/lib/capi_openbsd_amd64.go
index 63ef31ff..64643835 100644
--- a/vendor/modernc.org/sqlite/lib/capi_openbsd_amd64.go
+++ b/vendor/modernc.org/sqlite/lib/capi_openbsd_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_openbsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_openbsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -261,6 +261,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -591,6 +592,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -647,7 +649,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -699,6 +700,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -888,6 +890,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1120,6 +1123,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_openbsd_arm64.go b/vendor/modernc.org/sqlite/lib/capi_openbsd_arm64.go
index 03f21fd6..3e0fb802 100644
--- a/vendor/modernc.org/sqlite/lib/capi_openbsd_arm64.go
+++ b/vendor/modernc.org/sqlite/lib/capi_openbsd_arm64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_openbsd_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_openbsd_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -261,6 +261,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -591,6 +592,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -647,7 +649,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -699,6 +700,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -888,6 +890,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1120,6 +1123,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_windows_amd64.go b/vendor/modernc.org/sqlite/lib/capi_windows_amd64.go
index 3120ba98..068f7ca1 100644
--- a/vendor/modernc.org/sqlite/lib/capi_windows_amd64.go
+++ b/vendor/modernc.org/sqlite/lib/capi_windows_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_windows_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_WIN=1 -D_MSC_VER=1900', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_windows_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_WIN=1 -D_MSC_VER=1900', DO NOT EDIT.
 
 package sqlite3
 
@@ -266,6 +266,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -596,6 +597,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -652,7 +654,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -704,6 +705,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -893,6 +895,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1126,6 +1129,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/capi_windows_arm64.go b/vendor/modernc.org/sqlite/lib/capi_windows_arm64.go
index 3120ba98..068f7ca1 100644
--- a/vendor/modernc.org/sqlite/lib/capi_windows_arm64.go
+++ b/vendor/modernc.org/sqlite/lib/capi_windows_arm64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_windows_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_WIN=1 -D_MSC_VER=1900', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines  -export-enums  -export-externs X -export-fields F -export-typedefs  -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_windows_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_WIN=1 -D_MSC_VER=1900', DO NOT EDIT.
 
 package sqlite3
 
@@ -266,6 +266,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3ExprCompareCollSeq":                    {},
 	"sqlite3ExprCompareSkip":                       {},
 	"sqlite3ExprCoveredByIndex":                    {},
+	"sqlite3ExprDataType":                          {},
 	"sqlite3ExprDeferredDelete":                    {},
 	"sqlite3ExprDelete":                            {},
 	"sqlite3ExprDup":                               {},
@@ -596,6 +597,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3PrimaryKeyIndex":                       {},
 	"sqlite3PrngRestoreState":                      {},
 	"sqlite3PrngSaveState":                         {},
+	"sqlite3ProgressCheck":                         {},
 	"sqlite3Put4byte":                              {},
 	"sqlite3PutVarint":                             {},
 	"sqlite3QuoteValue":                            {},
@@ -652,7 +654,6 @@ var CAPI = map[string]struct{}{
 	"sqlite3SchemaToIndex":                         {},
 	"sqlite3SectorSize":                            {},
 	"sqlite3Select":                                {},
-	"sqlite3SelectAddColumnTypeAndCollation":       {},
 	"sqlite3SelectDelete":                          {},
 	"sqlite3SelectDestInit":                        {},
 	"sqlite3SelectDup":                             {},
@@ -704,6 +705,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3StrIHash":                              {},
 	"sqlite3Strlen30":                              {},
 	"sqlite3SubInt64":                              {},
+	"sqlite3SubqueryColumnTypes":                   {},
 	"sqlite3SubselectError":                        {},
 	"sqlite3SystemError":                           {},
 	"sqlite3TableAffinity":                         {},
@@ -893,6 +895,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3VdbeTransferError":                     {},
 	"sqlite3VdbeTypeofColumn":                      {},
 	"sqlite3VdbeUsesBtree":                         {},
+	"sqlite3VdbeValueListFree":                     {},
 	"sqlite3VectorErrorMsg":                        {},
 	"sqlite3VectorFieldSubexpr":                    {},
 	"sqlite3ViewGetColumnNames":                    {},
@@ -1126,6 +1129,7 @@ var CAPI = map[string]struct{}{
 	"sqlite3_hard_heap_limit64":                    {},
 	"sqlite3_initialize":                           {},
 	"sqlite3_interrupt":                            {},
+	"sqlite3_is_interrupted":                       {},
 	"sqlite3_keyword_check":                        {},
 	"sqlite3_keyword_count":                        {},
 	"sqlite3_keyword_name":                         {},
diff --git a/vendor/modernc.org/sqlite/lib/defs.go b/vendor/modernc.org/sqlite/lib/defs.go
index 597c4393..71557d8d 100644
--- a/vendor/modernc.org/sqlite/lib/defs.go
+++ b/vendor/modernc.org/sqlite/lib/defs.go
@@ -8,3 +8,9 @@ const (
 	SQLITE_STATIC    = uintptr(0)  // ((sqlite3_destructor_type)0)
 	SQLITE_TRANSIENT = ^uintptr(0) // ((sqlite3_destructor_type)-1)
 )
+
+type (
+	Sqlite3_index_constraint       = sqlite3_index_constraint
+	Sqlite3_index_orderby          = sqlite3_index_orderby
+	Sqlite3_index_constraint_usage = sqlite3_index_constraint_usage
+)
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_darwin_amd64.go b/vendor/modernc.org/sqlite/lib/sqlite_darwin_amd64.go
index 489061cc..be1a6768 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_darwin_amd64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_darwin_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_darwin_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1 -DSQLITE_WITHOUT_ZONEMALLOC', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_darwin_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1 -DSQLITE_WITHOUT_ZONEMALLOC', DO NOT EDIT.
 
 package sqlite3
 
@@ -669,6 +669,7 @@ const (
 	FTS5_LCP                                      = 7
 	FTS5_LP                                       = 10
 	FTS5_MAIN_PREFIX                              = 48
+	FTS5_MAX_LEVEL                                = 64
 	FTS5_MAX_PAGE_SIZE                            = 65536
 	FTS5_MAX_PREFIX_INDEXES                       = 31
 	FTS5_MAX_SEGMENT                              = 2000
@@ -802,6 +803,7 @@ const (
 	HASHTABLE_HASH_1                              = 383
 	HASHTABLE_NPAGE                               = 4096
 	HASHTABLE_NSLOT                               = 8192
+	HAVE_FCHMOD                                   = 0
 	HAVE_FCHOWN                                   = 1
 	HAVE_FULLFSYNC                                = 1
 	HAVE_GETHOSTUUID                              = 1
@@ -1266,6 +1268,7 @@ const (
 	OPFLG_IN2                                     = 0x04
 	OPFLG_IN3                                     = 0x08
 	OPFLG_JUMP                                    = 0x01
+	OPFLG_NCYCLE                                  = 0x40
 	OPFLG_OUT2                                    = 0x10
 	OPFLG_OUT3                                    = 0x20
 	OP_Abortable                                  = 186
@@ -1851,6 +1854,7 @@ const (
 	SF_SUPPORTED                                  = 0x009f0000
 	SF_SYNTHETIC                                  = 0xc0000000
 	SF_UFSrcCheck                                 = 0x0800000
+	SF_UpdateFrom                                 = 0x10000000
 	SF_UsesEphemeral                              = 0x0000020
 	SF_Values                                     = 0x0000200
 	SF_View                                       = 0x0200000
@@ -1928,6 +1932,7 @@ const (
 	SQLITE_ACCESS_READ                            = 2
 	SQLITE_ACCESS_READWRITE                       = 1
 	SQLITE_AFF_BLOB                               = 0x41
+	SQLITE_AFF_FLEXNUM                            = 0x46
 	SQLITE_AFF_INTEGER                            = 0x44
 	SQLITE_AFF_MASK                               = 0x47
 	SQLITE_AFF_NONE                               = 0x40
@@ -2046,6 +2051,7 @@ const (
 	SQLITE_CacheSpill                             = 0x00000020
 	SQLITE_CellSizeCk                             = 0x00200000
 	SQLITE_CkptFullFSync                          = 0x00000010
+	SQLITE_Coroutines                             = 0x02000000
 	SQLITE_CountOfView                            = 0x00000200
 	SQLITE_CoverIdxScan                           = 0x00000020
 	SQLITE_CursorHints                            = 0x00000400
@@ -2412,6 +2418,7 @@ const (
 	SQLITE_NOTADB                                 = 26
 	SQLITE_NOTFOUND                               = 12
 	SQLITE_NOTICE                                 = 27
+	SQLITE_NOTICE_RBU                             = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK                = 539
 	SQLITE_NOTICE_RECOVER_WAL                     = 283
 	SQLITE_NOTNULL                                = 0x90
@@ -2508,11 +2515,14 @@ const (
 	SQLITE_ResetDatabase                          = 0x02000000
 	SQLITE_ReverseOrder                           = 0x00001000
 	SQLITE_SAVEPOINT                              = 32
+	SQLITE_SCANSTAT_COMPLEX                       = 0x0001
 	SQLITE_SCANSTAT_EST                           = 2
 	SQLITE_SCANSTAT_EXPLAIN                       = 4
 	SQLITE_SCANSTAT_NAME                          = 3
+	SQLITE_SCANSTAT_NCYCLE                        = 7
 	SQLITE_SCANSTAT_NLOOP                         = 0
 	SQLITE_SCANSTAT_NVISIT                        = 1
+	SQLITE_SCANSTAT_PARENTID                      = 6
 	SQLITE_SCANSTAT_SELECTID                      = 5
 	SQLITE_SCHEMA                                 = 17
 	SQLITE_SELECT                                 = 21
@@ -2527,7 +2537,7 @@ const (
 	SQLITE_SHM_UNLOCK                             = 1
 	SQLITE_SORTER_PMASZ                           = 250
 	SQLITE_SOUNDEX                                = 1
-	SQLITE_SOURCE_ID                              = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                              = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                                 = 0
 	SQLITE_SO_DESC                                = 1
 	SQLITE_SO_UNDEFINED                           = -1
@@ -2635,8 +2645,8 @@ const (
 	SQLITE_UTF8                                   = 1
 	SQLITE_VDBEINT_H                              = 0
 	SQLITE_VDBE_H                                 = 0
-	SQLITE_VERSION                                = "3.40.1"
-	SQLITE_VERSION_NUMBER                         = 3040001
+	SQLITE_VERSION                                = "3.41.0"
+	SQLITE_VERSION_NUMBER                         = 3041000
 	SQLITE_VTABRISK_High                          = 2
 	SQLITE_VTABRISK_Low                           = 0
 	SQLITE_VTABRISK_Normal                        = 1
@@ -3195,6 +3205,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                         = 1
 	WHERE_DISTINCT_UNORDERED                      = 3
 	WHERE_DUPLICATES_OK                           = 0x0010
+	WHERE_EXPRIDX                                 = 0x04000000
 	WHERE_GROUPBY                                 = 0x0040
 	WHERE_IDX_ONLY                                = 0x00000040
 	WHERE_INDEXED                                 = 0x00000200
@@ -4480,6 +4491,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -8402,10 +8414,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -8461,12 +8471,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -8718,7 +8726,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -8839,7 +8846,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -8863,11 +8870,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -8875,11 +8884,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -9511,7 +9520,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -9649,10 +9658,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -9667,12 +9674,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -9862,10 +9867,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -10069,7 +10076,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1092))
@@ -10221,7 +10228,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -10270,8 +10276,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -10282,6 +10298,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -10398,7 +10423,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -11360,14 +11385,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})), libc.X__builtin_object_size(tls, bp, 0))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = int8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -11375,7 +11400,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.X__builtin___memset_chk(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})), libc.X__builtin_object_size(tls, p, 0))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -13186,7 +13211,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -13442,6 +13467,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -14432,6 +14459,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -14440,11 +14468,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -14456,30 +14508,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1547
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -14488,83 +14540,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -14578,17 +14630,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -14596,90 +14648,90 @@ __219:
 		}
 		return ts + 1553
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(j))) = int8(0)
 	length = int32(j)
@@ -14687,89 +14739,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -14782,32 +14834,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -14866,7 +14918,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -14882,8 +14934,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -14912,12 +14963,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -14926,7 +14978,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.X__builtin___memcpy_chk(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N), libc.X__builtin_object_size(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), 0))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -16154,6 +16206,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -16759,10 +16829,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -16788,6 +16861,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = int8('-')
 	}
 	libc.X__builtin___memcpy_chk(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]int8{}))-uint64(1)-uint64(i), libc.X__builtin_object_size(tls, zOut, 0))
+	return int32(uint64(unsafe.Sizeof([22]int8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -17796,11 +17870,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -19734,7 +19809,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -19972,7 +20047,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -19988,113 +20063,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -20279,7 +20354,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -21046,7 +21121,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3371, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -21063,14 +21138,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3661, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3661, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -21090,7 +21165,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -21158,7 +21233,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -21392,7 +21467,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -21420,7 +21495,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -21519,7 +21594,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3254, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -21649,7 +21724,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -21695,7 +21770,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -21934,7 +22009,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -22161,7 +22236,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+16)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -22178,7 +22253,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 			rc = findInodeInfo(tls, pNew, pNew+16)
 			if rc != SQLITE_OK {
 				Xsqlite3_free(tls, (*UnixFile)(unsafe.Pointer(pNew)).FlockingContext)
-				robust_close(tls, pNew, h, 42407)
+				robust_close(tls, pNew, h, 42698)
 				h = -1
 			}
 			unixLeaveMutex(tls)
@@ -22200,7 +22275,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -22520,7 +22595,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3254, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -22564,7 +22639,7 @@ __25:
 		goto __26
 	}
 	storeLastErrno(tls, p, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-	robust_close(tls, p, fd, 42961)
+	robust_close(tls, p, fd, 43252)
 	return SQLITE_IOERR | int32(13)<<8
 __26:
 	;
@@ -22672,7 +22747,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__error(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43337)
 		}
 		return rc
 	}
@@ -22680,9 +22755,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3860, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3860, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -22725,12 +22800,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*int8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -22749,18 +22821,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*24 + 8)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__error(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3452, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3452, zIn, 43443)
 			}
 		} else if int32((*stat)(unsafe.Pointer(bp)).Fst_mode)&S_IFMT == S_IFLNK {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls, zIn, bp+144, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2))
 			if got <= int64(0) || got >= Ssize_t(unsafe.Sizeof([1026]int8{}))-int64(2) {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3443, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3443, zIn, 43454)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 144 + uintptr(got))) = int8(0)
@@ -22800,14 +22872,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 1032)).FzOut = zOut
 	if int32(*(*int8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, bp, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3272, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3272, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+1032, bp)
 	}
 	appendAllPathElements(tls, bp+1032, zPath)
 	*(*int8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+1032)).FnUsed))) = int8(0)
 	if (*DbPath)(unsafe.Pointer(bp+1032)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+1032)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -22882,7 +22954,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__error(tls))) == EINTR {
 				got = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*24 + 8)))(tls, fd, zBuf, uint64(nBuf)))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -23096,7 +23168,7 @@ __11:
 __12:
 	return SQLITE_IOERR | int32(15)<<8
 __13:
-	return Xsqlite3CantopenError(tls, 43759)
+	return Xsqlite3CantopenError(tls, 44048)
 __10:
 	;
 __8:
@@ -23127,7 +23199,7 @@ __14:
 __15:
 	;
 end_create_proxy:
-	robust_close(tls, pNew, fd, 43783)
+	robust_close(tls, pNew, fd, 44072)
 	Xsqlite3_free(tls, pNew)
 	Xsqlite3_free(tls, pUnused)
 	return rc
@@ -23216,7 +23288,7 @@ __5:
 	;
 	rc = 0
 	libc.Xfprintf(tls, libc.X__stderrp, ts+4066, libc.VaList(bp+40, cPath))
-	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(conchFile)).Fh, 43886)
+	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(conchFile)).Fh, 44175)
 	(*UnixFile)(unsafe.Pointer(conchFile)).Fh = fd
 	(*UnixFile)(unsafe.Pointer(conchFile)).FopenFlags = O_RDWR | O_CREAT
 
@@ -23228,7 +23300,7 @@ end_breaklock:
 		goto __7
 	}
 	(*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 16*24 + 8)))(tls, bp+64)
-	robust_close(tls, pFile, fd, 43894)
+	robust_close(tls, pFile, fd, 44183)
 __7:
 	;
 	libc.Xfprintf(tls, libc.X__stderrp, ts+4090, libc.VaList(bp+48, cPath, bp+1088))
@@ -23508,7 +23580,7 @@ end_takeconch:
 	if !((*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0) {
 		goto __29
 	}
-	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 44147)
+	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 44436)
 __29:
 	;
 	(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
@@ -23520,7 +23592,7 @@ __29:
 	(*UnixFile)(unsafe.Pointer(pFile)).Fh = fd
 	goto __31
 __30:
-	rc = Xsqlite3CantopenError(tls, 44155)
+	rc = Xsqlite3CantopenError(tls, 44444)
 
 __31:
 	;
@@ -27795,7 +27867,7 @@ __26:
 		goto __27
 	}
 
-	libc.X__builtin___memset_chk(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4), libc.X__builtin_object_size(tls, zSuper+libc.UintptrFromInt32(-4), 0))
+	libc.X__builtin___memset_chk(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4), libc.X__builtin_object_size(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -28847,7 +28919,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -28864,7 +28935,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -28930,7 +29000,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -28940,7 +29009,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -29131,36 +29200,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -29332,7 +29390,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -29456,7 +29514,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -29495,7 +29553,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -29572,7 +29630,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -30484,10 +30542,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]int8{int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0)}
@@ -30573,7 +30633,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -31329,7 +31389,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -31428,7 +31488,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -32014,7 +32074,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -32289,7 +32349,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -32762,7 +32822,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -33267,7 +33327,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -33502,8 +33562,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -33511,23 +33571,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -33923,7 +33985,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -34060,7 +34122,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -34077,7 +34139,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -34085,7 +34147,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -34128,7 +34190,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -34138,7 +34200,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -34388,7 +34450,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -34435,7 +34497,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -34445,7 +34507,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -34458,7 +34520,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -34467,14 +34529,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.X__builtin___memmove_chk(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)), libc.X__builtin_object_size(tls, data+uintptr(iFree+sz+sz2), 0))
@@ -34484,7 +34546,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -34548,7 +34610,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -34558,7 +34620,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -34580,7 +34642,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -34615,7 +34677,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -34628,13 +34690,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -34659,7 +34721,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -34670,7 +34732,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -34722,22 +34784,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -34747,7 +34809,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -34755,7 +34817,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -34763,10 +34825,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -34790,13 +34852,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -34804,7 +34865,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -34812,32 +34912,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -34865,11 +34954,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -34880,15 +34969,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -34916,14 +35005,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2) + 1)))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -34937,7 +35026,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -34949,7 +35038,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -35052,7 +35141,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -35080,7 +35169,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -35119,7 +35208,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -36002,7 +36091,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -36417,7 +36506,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -36443,7 +36532,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -36452,7 +36541,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -36463,7 +36552,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -36479,7 +36568,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -36540,7 +36629,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -36575,7 +36664,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -36635,7 +36724,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -36674,7 +36763,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -36705,7 +36794,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -37046,7 +37135,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -37290,14 +37379,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -37342,7 +37431,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -37391,7 +37480,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -37471,7 +37560,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -37562,7 +37651,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -37582,7 +37671,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -37646,18 +37735,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -37673,6 +37752,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -37794,7 +37881,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -37998,7 +38085,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -38063,7 +38150,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -38111,7 +38198,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -38230,7 +38317,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -38390,7 +38477,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -38455,7 +38542,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -38491,7 +38578,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -38535,7 +38622,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -38647,7 +38734,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -38805,7 +38892,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -38862,7 +38949,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -38878,7 +38965,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -38952,7 +39039,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -38964,7 +39051,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -38975,7 +39062,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -39140,7 +39227,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -39164,9 +39251,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -39189,16 +39276,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -39219,9 +39304,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -39355,11 +39446,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -39412,12 +39506,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -39425,7 +39519,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.X__builtin___memmove_chk(tls, pData, pCell, uint64(sz), libc.X__builtin_object_size(tls, pData, 0))
 
@@ -39485,7 +39579,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.X__builtin___memmove_chk(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz), libc.X__builtin_object_size(tls, pSlot, 0))
@@ -39574,7 +39668,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.X__builtin___memmove_chk(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2), libc.X__builtin_object_size(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, 0))
@@ -39690,7 +39784,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -39733,8 +39827,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -39816,6 +39910,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -40008,7 +40104,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -40019,7 +40115,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -40177,7 +40273,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -40251,7 +40347,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -40277,9 +40373,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -40290,8 +40387,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -40313,7 +40410,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -40341,7 +40438,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -40602,11 +40699,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -40792,7 +40889,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -40830,7 +40927,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -40907,7 +41004,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -40919,19 +41016,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -40944,7 +41033,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -40963,6 +41052,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -40998,7 +41104,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -41007,13 +41112,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -41024,7 +41128,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -41137,7 +41241,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -41151,20 +41255,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -41174,7 +41278,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -41182,100 +41292,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx) + 1)))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.X__builtin___memcpy_chk(tls, newCell, oldCell, uint64(4), libc.X__builtin_object_size(tls, newCell, 0))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.X__builtin___memcpy_chk(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))), libc.X__builtin_object_size(tls, oldCell, 0))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -41284,30 +41394,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.X__builtin___memcpy_chk(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey), libc.X__builtin_object_size(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, 0))
+	goto __48
 __47:
+	libc.X__builtin___memcpy_chk(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey), libc.X__builtin_object_size(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, 0))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -41330,7 +41440,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -41349,13 +41458,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.X__builtin___memcpy_chk(tls, aOut, aIn, uint64(nIn), libc.X__builtin_object_size(tls, aOut, 0))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -41372,7 +41483,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -41431,9 +41542,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -41473,7 +41584,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -41481,11 +41592,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx) + 1)))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -41560,7 +41671,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)) + 1)))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -41570,7 +41681,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -41629,7 +41740,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -41658,7 +41769,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -41734,7 +41845,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -41748,7 +41859,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -41882,7 +41993,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -42057,12 +42168,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -42070,15 +42210,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+4465, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4465, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -42102,9 +42242,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4490, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if *(*int32)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb + 432)) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -42118,7 +42255,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4515, libc.VaList(bp, iChild))
 		return
@@ -42192,7 +42329,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -42277,48 +42416,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4711
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4721, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4759, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4797, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -42333,29 +42479,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4845
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -42363,28 +42509,28 @@ __9:
 	pc = U32(int32(*(*U8)(unsafe.Pointer(pCellIdx)))<<8 | int32(*(*U8)(unsafe.Pointer(pCellIdx + 1))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4873,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4903, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -42392,97 +42538,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4927, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4951, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2) + 1))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -42492,48 +42638,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4976, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+5013,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -42562,9 +42708,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -42596,19 +42742,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.X__builtin___memset_chk(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})), libc.X__builtin_object_size(tls, bp+32, 0))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -42620,7 +42760,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -42628,7 +42768,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -42713,7 +42853,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -42756,22 +42896,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -42998,8 +43135,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -43498,7 +43635,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 	defer tls.Free(40)
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+8, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+8, ts+5328,
@@ -43510,6 +43647,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*int8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+8)).FnChar))) = int8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 8)).FnChar)
 	}
 }
 
@@ -43697,7 +43835,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -43871,16 +44008,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -44323,7 +44462,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -44560,43 +44699,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -44981,7 +45111,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -44996,14 +45126,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -45373,7 +45503,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -45385,13 +45517,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -45468,6 +45602,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -46356,7 +46493,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -46365,7 +46502,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -46399,7 +46536,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -46441,7 +46577,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -47193,7 +47329,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -47301,7 +47437,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -47852,7 +47988,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -47917,7 +48053,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -47951,7 +48087,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -48001,7 +48137,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -48147,7 +48283,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -48318,7 +48454,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -48344,7 +48480,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -48618,7 +48754,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -48970,8 +49106,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -48981,15 +49120,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -49177,6 +49316,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -49229,7 +49369,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -49293,6 +49433,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -49304,9 +49453,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5760)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -49540,7 +49690,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -49564,8 +49714,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -49739,15 +49889,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5770, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5760, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -49858,14 +50008,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -50149,7 +50302,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -50293,7 +50446,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -50465,7 +50618,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*int8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5810, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5800, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -50520,21 +50673,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5814, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5804, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5821, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5811, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5834, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5824, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5837, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5827, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5842, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5832, 1)
 			}
 		}
 	}
@@ -50626,11 +50779,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity int8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -50761,8 +50914,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -50997,7 +51150,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -51098,594 +51250,598 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
-		goto __100
-	case OP_NotFound:
-		goto __101
-	case OP_Found:
-		goto __102
 
-	case OP_SeekRowid:
+	case OP_IfNoHope:
+		goto __100
+	case OP_NoConflict:
+		goto __101
+	case OP_NotFound:
+		goto __102
+	case OP_Found:
 		goto __103
 
-	case OP_NotExists:
+	case OP_SeekRowid:
 		goto __104
 
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -51694,56 +51850,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -51751,20 +51907,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -51772,124 +51929,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5844, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5865, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5834, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5855, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5872, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5862, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -51897,10 +52054,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -51911,9 +52068,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -51921,171 +52078,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.X__builtin___memcpy_chk(tls, pOut, pVar, uint64(uintptr(0)+24), libc.X__builtin_object_size(tls, pOut, 0))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -52093,95 +52250,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.X__builtin___memcpy_chk(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn), libc.X__builtin_object_size(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, 0))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.X__builtin___memcpy_chk(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn), libc.X__builtin_object_size(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), 0))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = int8(0)
@@ -52189,231 +52346,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -52422,95 +52579,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.X__builtin___memcpy_chk(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))), libc.X__builtin_object_size(tls, bp+216, 0))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.X__builtin___memcpy_chk(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))), libc.X__builtin_object_size(tls, bp+224, 0))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -52520,189 +52677,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -52711,38 +52872,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -52750,9 +52911,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -52763,298 +52924,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -53064,144 +53226,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.X__builtin___memset_chk(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})), libc.X__builtin_object_size(tls, bp+232, 0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -53209,353 +53371,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.X__builtin___memcpy_chk(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len), libc.X__builtin_object_size(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, 0))
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = int8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5896,
+	Xsqlite3VdbeError(tls, p, ts+5886,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*int8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -53569,319 +53731,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*int8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.X__builtin___memcpy_chk(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))), libc.X__builtin_object_size(tls, bp+296, 0))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.X__builtin___memcpy_chk(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn), libc.X__builtin_object_size(tls, zPayload, 0))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -53889,467 +54040,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.X__builtin___memcpy_chk(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn), libc.X__builtin_object_size(tls, zPayload, 0))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5937, 0)
+	Xsqlite3VdbeError(tls, p, ts+5927, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.X__builtin___memcpy_chk(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1), libc.X__builtin_object_size(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, 0))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5988, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5978, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6010, 0)
+		ts+6000, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6064, 0)
+		ts+6054, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 6119
+				return ts + 6109
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 6167
+					return ts + 6157
 				}
-				return ts + 6210
+				return ts + 6200
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+6251)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+6241)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -54357,67 +54519,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -54428,24 +54590,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -54453,30 +54615,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -54492,22 +54654,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -54521,133 +54683,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1547
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -54655,18 +54817,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -54677,92 +54839,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -54780,106 +54942,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -54888,108 +55050,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -54997,14 +55159,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -55014,108 +55176,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, int8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -55134,35 +55296,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -55170,123 +55332,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -55296,52 +55458,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -55353,15 +55515,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -55369,13 +55532,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -55388,11 +55551,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -55403,38 +55566,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -55446,47 +55609,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -55495,35 +55658,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -55532,51 +55695,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -55586,72 +55749,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -55659,43 +55822,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -55703,84 +55866,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -55790,34 +55958,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -55826,10 +55994,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -55846,14 +56014,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -55866,21 +56034,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -55892,62 +56060,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+6279)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+6269)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -55960,56 +56128,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -56020,54 +56188,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -56075,72 +56243,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -56149,55 +56317,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 6296
+	goto __799
+__798:
+	zSchema = ts + 6286
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+6310,
+		ts+6300,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -56207,66 +56375,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -56275,151 +56443,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+6353, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+6343, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -56427,10 +56596,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -56450,26 +56619,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -56481,7 +56650,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -56492,170 +56661,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -56672,146 +56841,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -56819,70 +56988,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+6390,
+		ts+6380,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6442
+				return ts + 6432
 			}
-			return ts + 6447
+			return ts + 6437
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -56890,17 +57059,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -56910,14 +57079,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -56927,197 +57096,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6454, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6444, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.X__builtin___memset_chk(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})), libc.X__builtin_object_size(tls, bp+912, 0))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.X__builtin___memset_chk(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})), libc.X__builtin_object_size(tls, bp+920, 0))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5760, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6473, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -57131,27 +57300,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -57159,72 +57328,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.X__builtin___memset_chk(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})), libc.X__builtin_object_size(tls, bp+976, 0))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.X__builtin___memset_chk(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})), libc.X__builtin_object_size(tls, bp+984, 0))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -57234,192 +57403,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -57428,63 +57597,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= int8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -57494,104 +57663,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6483, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -57599,52 +57768,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6489,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -57763,8 +57936,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -57784,7 +57957,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -57804,8 +57977,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -57836,8 +58009,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -57870,8 +58043,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6709, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6709, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -57951,8 +58124,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6750, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6750, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -58021,7 +58194,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -58049,12 +58222,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 3658
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -58098,7 +58271,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -58181,7 +58354,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -60720,6 +60893,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6784, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6792+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6811+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6286+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6830+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6830+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -60739,7 +60940,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -60794,7 +60994,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6784, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6844, zDb) == 0) {
 		goto __8
 	}
 
@@ -60915,7 +61115,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6789) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6849) != 0) {
 		goto __33
 	}
 	goto __14
@@ -60923,73 +61123,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -61001,28 +61219,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -61033,160 +61251,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6791, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6851, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6795, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6855, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6799, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6859, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -61195,8 +61414,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -61204,19 +61423,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -61224,81 +61443,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6808, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6868, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6839, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6899, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6876, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -61311,141 +61530,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6894, libc.VaList(bp+16, zCol))
+		ts+6954, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.X__builtin___memset_chk(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})), libc.X__builtin_object_size(tls, pExpr+64, 0))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6929
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6989
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6938
+		zErr = ts + 6998
 	} else {
-		zErr = ts + 6953
+		zErr = ts + 7013
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6975, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+7035, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6988, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6998, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+7048, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+7058, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -61489,15 +61708,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 7005
+	var zIn uintptr = ts + 7065
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 7033
+		zIn = ts + 7093
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 7051
+		zIn = ts + 7111
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 7069
+		zIn = ts + 7129
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7087, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7147, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -61576,10 +61795,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7107
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7167
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7112
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7172
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -61626,7 +61845,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7118, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7178, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -61690,7 +61909,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+7135, libc.VaList(bp, pExpr))
+								ts+7195, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -61706,7 +61925,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+7199,
+							Xsqlite3ErrorMsg(tls, pParse, ts+7259,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -61720,7 +61939,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+7235, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+7295, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -61743,30 +61962,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7263, libc.VaList(bp+16, pExpr))
+						ts+7323, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 7306
+						zType = ts + 7366
 					} else {
-						zType = ts + 7313
+						zType = ts + 7373
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+7323, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7383, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7351, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7411, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7373,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7433,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7417,
+						ts+7477,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -61838,7 +62057,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7465, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7525, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -61854,7 +62073,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7476, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7536, pExpr, pExpr)
 			}
 
 			break
@@ -61910,7 +62129,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6876, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -61985,7 +62204,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7487, libc.VaList(bp, i, zType, mx))
+		ts+7547, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -62005,7 +62224,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7543, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7603, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -62040,7 +62259,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7577, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7637, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -62097,7 +62316,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7583, libc.VaList(bp, i+1))
+				ts+7643, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -62125,7 +62344,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7644, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7704, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -62339,7 +62558,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7675, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7735, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -62379,7 +62598,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7577) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7637) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -62390,7 +62609,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7714) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7774) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -62402,7 +62621,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7720, 0)
+						ts+7780, 0)
 					return WRC_Abort
 				}
 
@@ -62502,12 +62721,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -62543,12 +62762,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -62658,33 +62877,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) int8 {
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) int8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -62754,7 +63074,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -63089,7 +63410,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6876, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
 		return
 	}
 
@@ -63164,7 +63485,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7779, libc.VaList(bp, mxHeight))
+			ts+7839, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -63413,10 +63734,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7827,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7887,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7871
+						return ts + 7931
 					}
 					return ts + 1547
 				}(), nElem))
@@ -63457,7 +63778,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7873)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7933)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -63483,7 +63804,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7875, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7935, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -63511,7 +63832,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7909, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7969, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -63558,7 +63879,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7929,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -63583,7 +63904,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7972, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8032, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -64158,7 +64479,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7995,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8055,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -64281,7 +64602,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8025, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8085, libc.VaList(bp, zObject))
 	}
 }
 
@@ -64337,10 +64658,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+7107) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7167) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+7112) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7172) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -64771,13 +65092,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff int8) int32
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+8048) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8108) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+8056) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8116) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+8062) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8122) == 0 {
 		return 1
 	}
 	return 0
@@ -64981,7 +65302,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8066, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8126, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -65059,7 +65380,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8113, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8173, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -65153,7 +65474,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 8144
+		var zFmt uintptr = ts + 8204
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -65171,7 +65492,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6876, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
 	}
 }
 
@@ -65212,7 +65533,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8188, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8248, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -65242,11 +65563,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8211, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8271, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1547
 			}
-			return ts + 8230
+			return ts + 8290
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -65373,7 +65694,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8242, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8302, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -65388,12 +65709,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8260, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8320, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1547
 		}
-		return ts + 8230
+		return ts + 8290
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -65414,7 +65736,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7873)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7933)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -65423,7 +65745,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+8281)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+8341)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -65809,8 +66131,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+8283, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+8286,
+			if Xsqlite3_strnicmp(tls, z, ts+8343, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+8346,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 5335
@@ -65886,7 +66208,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+8313,
+				Xsqlite3ErrorMsg(tls, pParse, ts+8373,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -65972,8 +66294,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -66059,14 +66381,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 8343, ts + 8348, ts + 8353, ts + 6594, ts + 6589}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8403, ts + 8408, ts + 8413, ts + 6594,
+				ts + 6589, ts + 8421}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8361
+						return ts + 8429
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -66080,7 +66404,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -66103,10 +66427,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -66206,7 +66530,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -66336,12 +66660,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -66350,110 +66675,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8313,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8373,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -66496,13 +66834,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -66512,11 +66850,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -66539,11 +66877,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -66552,15 +66890,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -66587,20 +66925,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -66609,9 +66947,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -66649,14 +66987,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8366, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8434, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -66667,17 +67007,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -66689,128 +67029,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8393, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8461, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -66818,42 +67158,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7995,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8055,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -66876,23 +67216,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -66909,42 +67249,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6876, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -66965,15 +67307,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -66983,22 +67325,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -67007,21 +67349,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -67031,27 +67373,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8417, 0)
+		ts+8485, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -67060,7 +67402,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -67071,7 +67413,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]int8)(unsafe.Pointer(ts + 8467))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8535))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -68446,18 +68788,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -68487,7 +68829,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -68500,12 +68842,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -68513,6 +68953,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})), libc.X__builtin_object_size(tls, bp, 0))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -68527,81 +69007,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -68623,34 +69030,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -68740,7 +69146,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -68748,7 +69154,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -68799,11 +69205,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8475, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8483, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8545, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -68815,13 +69221,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8511,
+		ts+8573,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8686,
+			ts+8748,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -68831,10 +69237,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8860, libc.VaList(bp, zDb, zDb))
+		ts+8922, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9007, 0)
+			ts+9069, 0)
 	}
 }
 
@@ -68898,7 +69304,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+9158, libc.VaList(bp, zName))
+		ts+9220, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -68908,7 +69314,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+9217, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+9279, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -68917,7 +69323,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9223, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+9285, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -68958,19 +69364,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9250, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+9312, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9434,
+		ts+9496,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9739, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9801, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9755,
+		ts+9817,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -68978,7 +69384,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9813, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9875, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -68990,7 +69396,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+10078, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+10140, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -69002,7 +69408,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10091,
+		ts+10153,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -69048,12 +69454,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10129, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+10191, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+10161, 0)
+			ts+10223, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -69063,11 +69469,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+10188)
+				ts+10250)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+10247)
+				ts+10309)
 		}
 
 		if pDflt != 0 {
@@ -69080,12 +69486,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+10300)
+					ts+10362)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10346)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10408)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -69096,7 +69502,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10373,
+			ts+10435,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -69118,7 +69524,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10519,
+				ts+10581,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -69166,14 +69572,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10749, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10811, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10783, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10845, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -69201,7 +69607,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10813, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10875, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -69241,18 +69647,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10832
+		zType = ts + 10894
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10837
+		zType = ts + 10899
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10851,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10913,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10869
+					return ts + 10931
 				}
-				return ts + 10886
+				return ts + 10948
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -69336,7 +69742,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10904, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10966, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -69353,17 +69759,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10925,
+		ts+10987,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11107,
+		ts+11169,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+10078, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+10140, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -69558,7 +69964,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -69621,10 +70027,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11238,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11300,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 11261
+				return ts + 11323
 			}
 			return ts + 1547
 		}(), zWhen,
@@ -69666,8 +70072,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+11263, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+11325, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -69684,7 +70090,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -69706,7 +70112,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+11271, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+11333, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -69746,10 +70152,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.X__builtin___memcpy_chk(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn), libc.X__builtin_object_size(tls, zBuf1, 0))
 				*(*int8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = int8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+11277, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+11339, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*int8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 11261
+							return ts + 11323
 						}
 						return ts + 1547
 					}()))
@@ -69924,8 +70330,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -70008,15 +70414,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.X__builtin___memset_chk(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp+448, 0))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.X__builtin___memset_chk(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp+456, 0))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -70044,7 +70450,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -70077,13 +70483,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -70096,7 +70502,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -70111,7 +70517,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -70167,8 +70573,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -70216,7 +70622,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -70284,8 +70690,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -70327,11 +70733,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.X__builtin___memset_chk(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+496, 0))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.X__builtin___memset_chk(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+504, 0))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -70424,8 +70830,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -70443,16 +70849,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.X__builtin___memset_chk(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})), libc.X__builtin_object_size(tls, bp+416, 0))
-			libc.X__builtin___memset_chk(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp+448, 0))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.X__builtin___memset_chk(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})), libc.X__builtin_object_size(tls, bp+424, 0))
+			libc.X__builtin___memset_chk(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp+456, 0))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -70467,31 +70873,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -70509,8 +70915,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -70536,9 +70942,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.X__builtin___memset_chk(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+416, 0))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.X__builtin___memset_chk(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+424, 0))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -70566,8 +70972,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -70604,7 +71010,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -70628,7 +71034,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+11282, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+11344, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -70709,17 +71115,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10904, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10966, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11289,
+	Xsqlite3ErrorMsg(tls, pParse, ts+11351,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 11317
+				return ts + 11379
 			}
 			return ts + 6530
 		}(),
@@ -70730,7 +71136,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11329, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11391, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -70747,10 +71153,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11377, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11439, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11498, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11560, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -70868,11 +71274,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11516},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11537},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11557},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11576},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11595}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11578},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11599},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11619},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11638},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11657}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -70906,7 +71312,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11618, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11680, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -70915,10 +71321,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11641,
+					ts+11703,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11671, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11733, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -70936,9 +71342,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11689, FzCols: ts + 11702},
-	{FzName: ts + 11715, FzCols: ts + 11728},
-	{FzName: ts + 11756},
+	{FzName: ts + 11751, FzCols: ts + 11764},
+	{FzName: ts + 11777, FzCols: ts + 11790},
+	{FzName: ts + 11818},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -70957,7 +71363,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -71036,7 +71441,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -71082,13 +71487,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -71101,11 +71506,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -71129,17 +71534,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11769}
+	FzName:     ts + 11831}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -71150,8 +71555,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -71194,7 +71599,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -71222,7 +71627,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -71289,7 +71694,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -71305,8 +71710,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -71323,9 +71728,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -71333,14 +71738,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -71348,31 +71753,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -71380,7 +71785,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11779}
+	FzName:     ts + 11841}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -71394,20 +71799,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11789,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11851,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11794, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11856, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -71449,7 +71854,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+11800, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11862, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -71463,7 +71868,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11806}
+	FzName:     ts + 11868}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -71507,7 +71912,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11815, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11877, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -71524,7 +71929,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.X__builtin___memcpy_chk(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11689, uint64(13), libc.X__builtin_object_size(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, 0))
+		libc.X__builtin___memcpy_chk(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11751, uint64(13), libc.X__builtin_object_size(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, 0))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -71680,7 +72085,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11825, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11887, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -71737,7 +72142,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11825, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11887, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -71784,9 +72189,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11829)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11891)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11833)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11895)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -71872,16 +72277,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1547
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*int8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -71891,15 +72296,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*int8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11837, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11899, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11848, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11910, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11858, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11920, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -71979,7 +72384,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -71993,42 +72398,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -72102,15 +72507,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -72175,11 +72580,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11715, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11777, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11870,
-			ts+11924,
+			ts+11932,
+			ts+11986,
 			zDb)
 	}
 	return rc
@@ -72226,10 +72631,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11689, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11751, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11976, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+12038, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -72287,12 +72692,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6784, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6844, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -72303,13 +72708,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -72330,128 +72738,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+4238)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+4238)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+12079, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+12017, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+12020,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+12057, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12082,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12119, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.X__builtin___memcpy_chk(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2), libc.X__builtin_object_size(tls, aNew, 0))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.X__builtin___memset_chk(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})), libc.X__builtin_object_size(tls, pNew, 0))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+12087, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12149, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+12116, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+12178, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -72461,89 +72892,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+12184, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12246, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -72597,14 +73028,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12212, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12274, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12233, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12295, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -72612,7 +73043,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12259, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12321, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -72654,42 +73085,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp, 0))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp, 0))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -72698,13 +73135,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -72723,7 +73160,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12281}
+	FzName:     ts + 12343}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -72736,7 +73173,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12295}
+	FzName:     ts + 12357}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -72750,7 +73187,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+12309, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+12371, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -72782,7 +73219,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+12333,
+						ts+12395,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -72957,7 +73394,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+12379, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12441, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -72983,11 +73420,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+12402, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12464, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12408, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12470, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12414, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12476, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -73034,7 +73471,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 8056
+		zCol = ts + 8116
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -73058,7 +73495,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12441, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12503, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -73283,6 +73720,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -73295,13 +73735,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.X__builtin___memcpy_chk(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280), libc.X__builtin_object_size(tls, bp, 0))
-	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0))
+	libc.X__builtin___memcpy_chk(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288), libc.X__builtin_object_size(tls, bp, 0))
+	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.X__builtin___memcpy_chk(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0))
+	libc.X__builtin___memcpy_chk(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -73326,25 +73766,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6784) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6844) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8475, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6784, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12456+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12475+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6296+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6811+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6286+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+12489)
+						ts+6792)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12475+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+6296)
+						ts+6286)
 				}
 			}
 		}
@@ -73365,12 +73805,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8475, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12475+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+6296)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12456+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6784, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+6286)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6811+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+12489)
+					ts+6792)
 			}
 		}
 	}
@@ -73401,7 +73841,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12508, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12518, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -73419,14 +73859,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12516
+			zMsg = ts + 12526
 		} else {
-			zMsg = ts + 12529
+			zMsg = ts + 12539
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6988, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7048, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6998, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7058, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -73456,12 +73896,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8475, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6296+7) == 0 {
-			return ts + 12475
+	if Xsqlite3_strnicmp(tls, zName, ts+6784, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6286+7) == 0 {
+			return ts + 6830
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12489+7) == 0 {
-			return ts + 12456
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6792+7) == 0 {
+			return ts + 6811
 		}
 	}
 	return zName
@@ -73819,7 +74259,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+6296)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+6286)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -73845,7 +74285,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6784, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6844, zName) {
 				goto __3
 			}
 
@@ -73898,13 +74338,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12543, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12553, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12560, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12570, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -73946,9 +74386,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8475, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6784, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12580,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12590,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -74108,9 +74548,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -74126,7 +74566,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12622, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12632, 0)
 	return
 __4:
 	;
@@ -74154,9 +74594,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10832
+			return ts + 10894
 		}
-		return ts + 9217
+		return ts + 9279
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -74172,9 +74612,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -74205,12 +74645,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12663,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12673,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10832
+				return ts + 10894
 			}
-			return ts + 9217
+			return ts + 9279
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -74225,7 +74665,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12684, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12694, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -74312,7 +74752,7 @@ var nullRow = [6]int8{int8(6), int8(0), int8(0), int8(0), int8(0), int8(0)}
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+12719, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12729, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -74336,7 +74776,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12736, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12746, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -74356,7 +74796,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12719
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12729
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -74368,7 +74808,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12719, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12729, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -74402,7 +74842,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12770, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12780, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -74410,13 +74850,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12793, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12803, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12800, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12810, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -74453,7 +74893,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12810, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12820, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -74617,10 +75057,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12836,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12846,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12881, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12891, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.X__builtin___memset_chk(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})), libc.X__builtin_object_size(tls, bp+8, 0))
@@ -74651,7 +75091,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12922, 0)
+			ts+12932, 0)
 	}
 }
 
@@ -74696,7 +75136,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12974, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12984, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -74785,7 +75225,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13015, 0)
+		ts+13025, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -74880,7 +75320,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13071, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13081, 0)
 	goto generated_done
 __2:
 	;
@@ -74893,13 +75333,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+13114, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+13124, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+13122, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+13132, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -74926,13 +75366,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+13129,
+	Xsqlite3ErrorMsg(tls, pParse, ts+13139,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -75054,12 +75501,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1547
-		zSep2 = ts + 13160
+		zSep2 = ts + 13170
 		zEnd = ts + 5360
 	} else {
-		zSep = ts + 13162
-		zSep2 = ts + 13166
-		zEnd = ts + 13171
+		zSep = ts + 13172
+		zSep2 = ts + 13176
+		zEnd = ts + 13181
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -75067,7 +75514,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+13174, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+13184, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*int8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = int8('(')
@@ -75105,11 +75552,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1547,
-	ts + 13188,
-	ts + 13194,
-	ts + 13199,
+	ts + 13198,
+	ts + 13204,
+	ts + 13209,
+	ts + 13214,
 	ts + 13204,
 }
 
@@ -75517,10 +75965,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+13210,
+						ts+13220,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+13243,
+					Xsqlite3ErrorMsg(tls, pParse, ts+13253,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -75539,11 +75987,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+13270, 0)
+				ts+13280, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13320, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13330, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -75577,7 +76025,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13352, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13362, 0)
 			return
 		}
 	}
@@ -75602,11 +76050,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 9217
-			zType2 = ts + 13396
+			zType = ts + 9279
+			zType2 = ts + 13406
 		} else {
-			zType = ts + 10832
-			zType2 = ts + 13402
+			zType = ts + 10894
+			zType2 = ts + 13412
 		}
 
 		if pSelect != 0 {
@@ -75668,7 +76116,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -75677,11 +76125,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+13407, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13417, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13422,
+			ts+13432,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -75697,13 +76145,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13520,
+					ts+13530,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13562, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13572, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -75718,7 +76166,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9739) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9801) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -75748,7 +76196,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13596, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13606, 0)
 	goto create_view_fail
 __1:
 	;
@@ -75764,7 +76212,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10832, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10894, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -75846,7 +76294,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13632, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13642, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -75874,8 +76322,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, int8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -75972,13 +76419,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13662, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13672, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13677,
+		ts+13687,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -76019,10 +76466,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13744, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13754, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11641,
+				ts+11703,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -76054,12 +76501,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13758,
+			ts+13768,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13803,
+		ts+13813,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -76087,11 +76534,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8475, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7476, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7536, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -76169,9 +76616,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -76230,21 +76677,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13870, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13880, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13898, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13908, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13932, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13942, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -76256,7 +76703,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11833, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11895, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -76320,7 +76767,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13964,
+		ts+13974,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -76332,7 +76779,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14027, 0)
+		ts+14037, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -76417,7 +76864,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14121,
+		ts+14131,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -76644,12 +77091,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+14167,
+				Xsqlite3ErrorMsg(tls, pParse, ts+14177,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 14195
+							return ts + 14205
 						}
-						return ts + 14201
+						return ts + 14211
 					}()))
 				return 1
 			}
@@ -76770,7 +77217,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+14206, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+14216, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -76789,7 +77236,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14212,
+		ts+14222,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -76815,26 +77262,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8475, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14262, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14272, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14290, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14300, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14315, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14325, 0)
 	goto exit_create_index
 __17:
 	;
@@ -76848,7 +77295,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+14206, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+14216, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -76863,7 +77310,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14349, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14359, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -76875,7 +77322,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14383, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14393, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -76904,7 +77351,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14407, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14417, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -76925,9 +77372,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -76966,7 +77413,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+14206)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+14216)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -77067,7 +77514,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14430, 0)
+		ts+14440, 0)
 	goto exit_create_index
 __56:
 	;
@@ -77284,7 +77731,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14491, libc.VaList(bp+48, 0))
+		ts+14501, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -77336,8 +77783,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14533, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14543, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -77383,12 +77830,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14550,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14560,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1547
 			}
-			return ts + 14570
+			return ts + 14580
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -77396,7 +77843,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14578,
+		ts+14588,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -77410,7 +77857,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14637, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14647, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -77571,7 +78018,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14664, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14674, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -77586,7 +78033,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14682, libc.VaList(bp+8, 0))
+		ts+14692, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -77597,9 +78044,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -77625,9 +78072,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14755,
+		ts+14765,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11829, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11891, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -77762,7 +78209,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14815,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14825,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -77970,12 +78417,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14851,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14861,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14887
+				return ts + 14897
 			}
-			return ts + 14890
+			return ts + 14900
 		}()))
 	goto append_from_error
 __1:
@@ -78144,7 +78591,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14896, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14906, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -78180,9 +78627,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14902
+				return ts + 14912
 			}
-			return ts + 14911
+			return ts + 14921
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -78207,7 +78654,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14896, ts + 14918, ts + 14902}
+var az = [3]uintptr{ts + 14906, ts + 14928, ts + 14912}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -78222,7 +78669,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14926, 0)
+				ts+14936, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -78359,14 +78806,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14996, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+15006, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+15007, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+15017, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
@@ -78392,11 +78839,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12402, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15010, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15020, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -78526,7 +78973,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15019, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15029, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -78622,7 +79069,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+15065, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+15075, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -78815,7 +79262,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+15095, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15105, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -79095,7 +79542,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+15126,
+		Xsqlite3ErrorMsg(tls, pParse, ts+15136,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -79127,11 +79574,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+15159, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15169, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+15188, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15198, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -79635,7 +80082,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+15226)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+15236)
 __62:
 	;
 delete_from_cleanup:
@@ -79750,7 +80197,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11689) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11751) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -79980,7 +80427,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6594, ts + 6589, ts + 8348, ts + 8343, ts + 6584}
+var azType2 = [5]uintptr{ts + 6594, ts + 6589, ts + 8408, ts + 8403, ts + 6584}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -80039,7 +80486,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+15239, -1)
+					Xsqlite3_result_error(tls, context, ts+15249, -1)
 					return
 				}
 				iVal = -iVal
@@ -80343,7 +80790,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+15256, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+15266, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -80689,7 +81136,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+15261, -1)
+		Xsqlite3_result_error(tls, context, ts+15271, -1)
 		return
 	}
 	if argc == 3 {
@@ -80699,7 +81146,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+15294, -1)
+				ts+15304, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -80798,7 +81245,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+15339, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+15349, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -80813,21 +81260,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = int8('\'')
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = int8(0)
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = int8('\'')
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = int8(0)
 				*(*int8)(unsafe.Pointer(zText)) = int8('X')
 				*(*int8)(unsafe.Pointer(zText + 1)) = int8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -80835,7 +81282,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+15346, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+15356, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -80949,6 +81396,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1547
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -81151,7 +81711,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 11261}
+var azOne = [1]uintptr{ts + 11323}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -81187,7 +81747,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(j))) = int8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+15349, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+15359, 4, uintptr(0))
 	}
 }
 
@@ -81212,7 +81772,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12441, -1)
+		Xsqlite3_result_error(tls, context, ts+12503, -1)
 		return
 	}
 
@@ -81290,7 +81850,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+15239, -1)
+			Xsqlite3_result_error(tls, context, ts+15249, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -81551,7 +82111,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+15354, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+15364, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -81571,14 +82131,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+15360, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+15370, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+15360, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+15370, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15360, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15360, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15370, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15370, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -81708,17 +82268,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568401799145468436421
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.693147180559945309417232121458176568
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -81777,6 +82337,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846264338327950288)
 }
 
@@ -81817,108 +82378,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 15365},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 15385},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 15398},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15416},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15425},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15433},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15433},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15448},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15474},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15499},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15508},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15540},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15540},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15546},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15546},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15552},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15552},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15557},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15557},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15557},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15561},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15561},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15561},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15565},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15572},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15580},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15587},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15593},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15600},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15607},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15615},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15620},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15624},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15624},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 15375},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 15395},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 15408},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15426},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15435},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15443},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15443},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15458},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15484},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15509},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15518},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15529},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15536},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15550},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15550},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15556},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15556},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15562},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15562},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15567},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15567},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15567},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15571},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15571},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15571},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15575},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15582},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15590},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15597},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15610},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15617},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15625},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15630},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15636},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15642},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15646},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15653},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15660},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15671},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15678},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15693},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15710},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15721},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15727},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15745},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15753},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15767},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15775},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15784},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15784},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15791},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15791},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15801},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15805},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15811},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15815},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15815},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15634},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15634},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15640},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15646},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15652},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15656},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15656},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15662},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15669},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15676},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15687},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15694},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15709},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15726},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15737},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15743},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15761},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15769},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15783},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15791},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15800},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15800},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15807},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15807},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15817},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15821},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15821},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15834},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15360},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15360},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6929},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6929},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15839},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15844},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15852},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15858},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15864},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15867},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15871},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15877},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15867},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15882},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15886},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15890},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15896},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15900},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15905},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15910},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15915},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15827},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15831},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15831},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15837},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15837},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15850},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15370},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15370},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6989},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6989},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15855},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15860},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15868},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15874},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15880},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15883},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15887},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15893},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15883},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15898},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15902},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15906},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15912},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15916},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15921},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15925},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15929},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15933},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15938},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15943},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15948},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15926},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15931},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15937},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15941},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15945},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15949},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15954},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15960},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15966},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15971},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15979},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15987},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15990},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6929},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15995}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15959},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15964},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15970},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15976},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15982},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15987},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15995},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16003},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16006},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6989},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 16011}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -82039,7 +82602,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15999,
+				ts+16015,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -82699,8 +83262,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6795, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6791, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6855, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6851, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -83200,7 +83763,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8313, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8373, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -83668,7 +84231,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+16044,
+		ts+16060,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -83693,7 +84256,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+16085,
+	Xsqlite3ErrorMsg(tls, pParse, ts+16101,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -83842,7 +84405,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+16117,
+		ts+16133,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -83852,7 +84415,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16169, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+16185, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -83904,7 +84467,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16194,
+	Xsqlite3ErrorMsg(tls, pParse, ts+16210,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -83912,7 +84475,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16240, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+16256, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -84324,7 +84887,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+16261)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+16277)
 __125:
 	;
 insert_cleanup:
@@ -84640,8 +85203,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12402, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 							onError, iReg)
 						Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -85730,7 +86294,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -86176,6 +86740,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -86214,7 +86779,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12441, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12503, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -86223,7 +86788,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 16275
+		zEntry = ts + 16291
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -86238,7 +86803,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12402, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12464, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -86274,7 +86839,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.X__builtin___memcpy_chk(tls, zAltEntry, ts+16298, uint64(8), libc.X__builtin_object_size(tls, zAltEntry, 0))
+	libc.X__builtin___memcpy_chk(tls, zAltEntry, ts+16314, uint64(8), libc.X__builtin_object_size(tls, zAltEntry, 0))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -86288,7 +86853,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+16307, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+16323, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -86312,7 +86877,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.X__builtin___memcpy_chk(tls, zAltEntry+uintptr(iEntry), ts+16311, uint64(6), libc.X__builtin_object_size(tls, zAltEntry+uintptr(iEntry), 0))
+	libc.X__builtin___memcpy_chk(tls, zAltEntry+uintptr(iEntry), ts+16327, uint64(6), libc.X__builtin_object_size(tls, zAltEntry+uintptr(iEntry), 0))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -86330,7 +86895,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16317, libc.VaList(bp+16, zEntry, zFile))
+		ts+16333, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -86357,7 +86922,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+16360, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+16376, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -86395,7 +86960,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16392, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16408, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -86405,7 +86970,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16429,
+	ts + 16445,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -86561,7 +87126,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16435, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16451, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -86570,62 +87135,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5460,
-	ts + 16474,
-	ts + 9217,
-	ts + 16478,
-	ts + 16483,
-	ts + 16486,
-	ts + 16496,
-	ts + 16506,
+	ts + 16490,
+	ts + 9279,
+	ts + 16494,
+	ts + 16499,
+	ts + 16502,
 	ts + 16512,
-	ts + 16516,
-	ts + 16521,
-	ts + 16526,
-	ts + 16534,
-	ts + 16545,
-	ts + 16548,
-	ts + 16555,
-	ts + 16516,
-	ts + 16521,
-	ts + 16562,
-	ts + 16567,
-	ts + 16570,
-	ts + 16577,
-	ts + 16512,
-	ts + 16516,
+	ts + 16522,
+	ts + 16528,
+	ts + 16532,
+	ts + 16537,
+	ts + 16542,
+	ts + 16550,
+	ts + 16561,
+	ts + 16564,
+	ts + 16571,
+	ts + 16532,
+	ts + 16537,
+	ts + 16578,
 	ts + 16583,
-	ts + 16588,
+	ts + 16586,
 	ts + 16593,
-	ts + 16516,
-	ts + 16597,
-	ts + 16521,
-	ts + 16605,
+	ts + 16528,
+	ts + 16532,
+	ts + 16599,
+	ts + 16604,
 	ts + 16609,
-	ts + 16614,
-	ts + 11833,
-	ts + 11829,
-	ts + 16620,
+	ts + 16532,
+	ts + 16613,
+	ts + 16537,
+	ts + 16621,
 	ts + 16625,
 	ts + 16630,
-	ts + 16474,
-	ts + 16516,
-	ts + 16635,
-	ts + 16642,
-	ts + 16649,
-	ts + 9217,
-	ts + 16657,
-	ts + 5463,
-	ts + 16663,
-	ts + 16474,
-	ts + 16516,
-	ts + 16668,
+	ts + 11895,
+	ts + 11891,
+	ts + 16636,
+	ts + 16641,
+	ts + 16646,
+	ts + 16490,
+	ts + 16532,
+	ts + 16651,
+	ts + 16658,
+	ts + 16665,
+	ts + 9279,
 	ts + 16673,
-	ts + 15867,
-	ts + 16678,
-	ts + 16691,
-	ts + 16700,
+	ts + 5463,
+	ts + 16679,
+	ts + 16490,
+	ts + 16532,
+	ts + 16684,
+	ts + 16689,
+	ts + 15883,
+	ts + 16694,
 	ts + 16707,
-	ts + 16718,
+	ts + 16716,
+	ts + 16723,
+	ts + 16734,
 }
 
 // Definitions of all built-in pragmas
@@ -86643,241 +87208,241 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [67]PragmaName{
-	{FzName: ts + 16726,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16741,
+	{FzName: ts + 16757,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16756,
+	{FzName: ts + 16772,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16768,
+	{FzName: ts + 16784,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16784,
+	{FzName: ts + 16800,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16723,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16797,
+	{FzName: ts + 16813,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16809,
+	{FzName: ts + 16825,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16829,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16845,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16861,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16866,
+	{FzName: ts + 16882,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16881,
+	{FzName: ts + 16897,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16897,
+	{FzName: ts + 16913,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16911,
+	{FzName: ts + 16927,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16924,
+	{FzName: ts + 16940,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16938,
+	{FzName: ts + 16954,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16957,
+	{FzName: ts + 16973,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16992,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16999,
+	{FzName: ts + 17015,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17008,
+	{FzName: ts + 17024,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 17026,
+	{FzName: ts + 17042,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 17043,
+	{FzName: ts + 17059,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 17056,
+	{FzName: ts + 17072,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 17071,
+	{FzName: ts + 17087,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 17089,
+	{FzName: ts + 17105,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 17099,
+	{FzName: ts + 17115,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 17113,
+	{FzName: ts + 17129,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17129,
+	{FzName: ts + 17145,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 17154,
+	{FzName: ts + 17170,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17189,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 17184,
+	{FzName: ts + 17200,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 17195,
+	{FzName: ts + 17211,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 17207,
+	{FzName: ts + 17223,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 17223,
+	{FzName: ts + 17239,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17236,
+	{FzName: ts + 17252,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17255,
+	{FzName: ts + 17271,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 17274,
+	{FzName: ts + 17290,
 		FePragTyp: U8(PragTyp_LOCK_PROXY_FILE),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17290,
+	{FzName: ts + 17306,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17303,
+	{FzName: ts + 17319,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17318,
+	{FzName: ts + 17334,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 17328,
+	{FzName: ts + 17344,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 17340,
+	{FzName: ts + 17356,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 17349,
+	{FzName: ts + 17365,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17360,
+	{FzName: ts + 17376,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17370,
+	{FzName: ts + 17386,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 17382,
+	{FzName: ts + 17398,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 17393,
+	{FzName: ts + 17409,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 17405,
+	{FzName: ts + 17421,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17422,
+	{FzName: ts + 17438,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17441,
+	{FzName: ts + 17457,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17467,
+	{FzName: ts + 17483,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17482,
+	{FzName: ts + 17498,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17496,
+	{FzName: ts + 17512,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17515,
+	{FzName: ts + 17531,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17529,
+	{FzName: ts + 17545,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17545,
+	{FzName: ts + 17561,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17557,
+	{FzName: ts + 17573,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17568,
+	{FzName: ts + 17584,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17579,
+	{FzName: ts + 17595,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17591,
+	{FzName: ts + 17607,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17602,
+	{FzName: ts + 17618,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17623,
+	{FzName: ts + 17639,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17631,
+	{FzName: ts + 17647,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17646,
+	{FzName: ts + 17662,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17659,
+	{FzName: ts + 17675,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17678,
+	{FzName: ts + 17694,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17693,
+	{FzName: ts + 17709,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -86899,7 +87464,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17709))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17725))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -86911,10 +87476,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17734) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17750) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17744) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17760) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -86923,13 +87488,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+8361) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8429) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17751) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17767) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17756) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17772) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -86944,9 +87509,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*int8)(unsafe.Pointer(z))) >= '0' && int32(*(*int8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*int8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16668) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16684) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17768) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17784) == 0 {
 		return 2
 	} else {
 		return 0
@@ -86960,7 +87525,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17775, 0)
+				ts+17791, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -87051,19 +87616,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17837
+		zName = ts + 17853
 		break
 	case OE_SetDflt:
-		zName = ts + 17846
+		zName = ts + 17862
 		break
 	case OE_Cascade:
-		zName = ts + 17858
+		zName = ts + 17874
 		break
 	case OE_Restrict:
-		zName = ts + 17866
+		zName = ts + 17882
 		break
 	default:
-		zName = ts + 17875
+		zName = ts + 17891
 		break
 	}
 	return zName
@@ -87080,7 +87645,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17885, ts + 17892, ts + 17900, ts + 17904, ts + 17768, ts + 17913,
+	ts + 17901, ts + 17908, ts + 17916, ts + 17920, ts + 17784, ts + 17929,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -87127,13 +87692,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17917
+			zType = ts + 17933
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17919
+			zType = ts + 17935
 		} else {
-			zType = ts + 7871
+			zType = ts + 7931
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17921,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17937,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -87141,7 +87706,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17928, ts + 17933, ts + 17941}
+var azEnc = [4]uintptr{uintptr(0), ts + 17944, ts + 17949, ts + 17957}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -87298,14 +87863,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -87392,7 +87959,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17949, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17965, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -87656,7 +88223,7 @@ __18:
 	if !(zRight != 0) {
 		goto __64
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17953) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17969) == 0) {
 		goto __65
 	}
 	b = 2
@@ -87728,7 +88295,7 @@ __72:
 	goto __15
 
 __20:
-	zRet = ts + 17744
+	zRet = ts + 17760
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -87766,7 +88333,7 @@ __79:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __84
 	}
-	zRet = ts + 17734
+	zRet = ts + 17750
 __84:
 	;
 	returnSingleText(tls, v, zRet)
@@ -88053,7 +88620,7 @@ __124:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __127
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17958, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17974, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __127:
@@ -88111,7 +88678,7 @@ __134:
 	if !(res1 != SQLITE_OK) {
 		goto __135
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17983, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17999, 0)
 	goto pragma_out
 __135:
 	;
@@ -88130,7 +88697,7 @@ __136:
 		goto __138
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+18013, 0)
+		ts+18029, 0)
 	goto __139
 __138:
 	if !(iDb != 1) {
@@ -88184,7 +88751,7 @@ __145:
 __147:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+18066) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+18082) == 0) {
 		goto __148
 	}
 
@@ -88281,9 +88848,9 @@ __161:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 18072
+			return ts + 18088
 		}
-		return ts + 18080
+		return ts + 18096
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -88352,7 +88919,7 @@ __176:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __177
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+18087, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+18103, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __178
 	}
@@ -88398,29 +88965,29 @@ __183:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __184
 	}
-	zType = ts + 10832
+	zType = ts + 10894
 	goto __185
 __184:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __186
 	}
-	zType = ts + 13114
+	zType = ts + 13124
 	goto __187
 __186:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __188
 	}
-	zType = ts + 18103
+	zType = ts + 18119
 	goto __189
 __188:
-	zType = ts + 9217
+	zType = ts + 9279
 __189:
 	;
 __187:
 	;
 __185:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18110,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18126,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -88486,7 +89053,7 @@ __196:
 		goto __198
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18117, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18133, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -88496,7 +89063,7 @@ __196:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __199
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+18122,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+18138,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -88533,8 +89100,8 @@ __202:
 	if !(pIdx1 != 0) {
 		goto __204
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 18127, ts + 18129, ts + 16545}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18131,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 18143, ts + 18145, ts + 16561}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18147,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -88567,7 +89134,7 @@ __205:
 	goto __206
 __208:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18137,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18153,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -88589,7 +89156,7 @@ __209:
 		goto __211
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18141, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18157, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __210
 __210:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -88653,7 +89220,7 @@ __221:
 		goto __223
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7871, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7931, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __222
 __222:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -88669,7 +89236,7 @@ __224:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __226
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7871, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7931, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __225
 __225:
 	i6++
@@ -88704,7 +89271,7 @@ __232:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __234
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18144,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18160,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -88712,7 +89279,7 @@ __232:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+18153))
+			ts+18169))
 	goto __233
 __233:
 	j2++
@@ -88901,7 +89468,7 @@ __262:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __263:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+18158, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+18174, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 608)))
@@ -89118,7 +89685,7 @@ __290:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+18162, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+18178, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -89179,262 +89746,284 @@ __305:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 620)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__306:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __307
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __306
+	}
+	mxCol = -1
+	j4 = 0
+__308:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __310
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __311
+	}
+	mxCol++
+__311:
+	;
+	goto __309
+__309:
+	j4++
+	goto __308
+	goto __310
+__310:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __312
 	}
 	mxCol--
-	goto __306
+__312:
+	;
+	goto __307
+__306:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __307:
 	;
 	if !(mxCol >= 0) {
-		goto __308
+		goto __313
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 620)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__308:
+__313:
 	;
 	if !!(isQuick != 0) {
-		goto __309
+		goto __314
 	}
 	if !(pPk1 != 0) {
-		goto __310
+		goto __315
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 620)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+18186,
+		ts+18202,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__311:
+__316:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __313
+		goto __318
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 620)), j4, r2+j4)
-	goto __312
-__312:
+	goto __317
+__317:
 	j4++
-	goto __311
-	goto __313
-__313:
+	goto __316
+	goto __318
+__318:
 	;
-__310:
+__315:
 	;
-__309:
+__314:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__314:
+__319:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __316
+		goto __321
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __317
+		goto __322
 	}
-	goto __315
-__317:
+	goto __320
+__322:
 	;
 	if !(bStrict != 0) {
-		goto __318
+		goto __323
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __319
-__318:
+	goto __324
+__323:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__319:
+__324:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __320
+		goto __325
 	}
-	goto __315
-__320:
+	goto __320
+__325:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __321
+		goto __326
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __322
-__321:
+	goto __327
+__326:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __323
+		goto __328
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 632)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		uint8((*Column)(unsafe.Pointer(pCol1)).Faffinity), bp+632)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 632)) != 0) {
-		goto __324
+		goto __329
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 632)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 632)))
-__324:
+__329:
 	;
-__323:
+__328:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 620))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __325
+		goto __330
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __326
-__325:
+	goto __331
+__330:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__326:
+__331:
 	;
-__322:
+__327:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __327
+		goto __332
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18222, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18238, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __328
+		goto __333
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __329
-__328:
+	goto __334
+__333:
 	;
-__329:
+__334:
 	;
-__327:
+__332:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __330
+		goto __335
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18242,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18258,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __331
-__330:
+	goto __336
+__335:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __332
+		goto __337
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18264,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18280,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __333
-__332:
+	goto __338
+__337:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __334
+		goto __339
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __335
+		goto __340
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
-__335:
+__340:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+18287, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+18303, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18289,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18305,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__334:
+__339:
 	;
-__333:
+__338:
 	;
-__331:
+__336:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __315
-__315:
+	goto __320
+__320:
 	j4++
-	goto __314
-	goto __316
-__316:
+	goto __319
+	goto __321
+__321:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __336
+		goto __341
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __337
+		goto __342
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 620)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__338:
+__343:
 	if !(k3 > 0) {
-		goto __340
+		goto __345
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __339
-__339:
+	goto __344
+__344:
 	k3--
-	goto __338
-	goto __340
-__340:
+	goto __343
+	goto __345
+__345:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+18309,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+18325,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__337:
+__342:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__336:
+__341:
 	;
 	if !!(isQuick != 0) {
-		goto __341
+		goto __346
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__342:
+__347:
 	if !(pIdx5 != 0) {
-		goto __344
+		goto __349
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __345
+		goto __350
 	}
-	goto __343
-__345:
+	goto __348
+__350:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 620)), 0, 0, bp+640,
 		pPrior, r1)
@@ -89443,80 +90032,119 @@ __345:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 624))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+18339)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18355)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+18344)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+18360)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__351:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __353
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __354
+	}
+	goto __352
+__354:
+	;
+	if !(label6 == 0) {
+		goto __355
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__355:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 624))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __352
+__352:
+	kk++
+	goto __351
+	goto __353
+__353:
+	;
+	if !(label6 != 0) {
+		goto __356
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18355)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+18381)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__356:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __346
+		goto __357
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__347:
+__358:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __349
+		goto __360
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __350
+		goto __361
 	}
-	goto __348
-__350:
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __359
+__359:
+	kk++
+	goto __358
+	goto __360
+__360:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 624))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 624))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18408)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__357:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
 	goto __348
 __348:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __347
 	goto __349
 __349:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 624))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 624))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+18365)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __346:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
-	goto __343
-__343:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __342
-	goto __344
-__344:
-	;
-__341:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 620)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __351
+		goto __362
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+18392)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18435)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__352:
+__363:
 	if !(pIdx5 != 0) {
-		goto __354
+		goto __365
 	}
 	if !(pPk1 == pIdx5) {
-		goto __355
+		goto __366
 	}
-	goto __353
-__355:
+	goto __364
+__366:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 624))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -89525,21 +90153,21 @@ __355:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __353
-__353:
+	goto __364
+__364:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __352
-	goto __354
-__354:
+	goto __363
+	goto __365
+__365:
 	;
 	if !(pPk1 != 0) {
-		goto __356
+		goto __367
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__356:
+__367:
 	;
-__351:
+__362:
 	;
 	goto __297
 __297:
@@ -89557,14 +90185,14 @@ __272:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __357
+		goto __368
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 616))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18421
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18464
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__357:
+__368:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -89572,27 +90200,27 @@ __357:
 
 __46:
 	if !!(zRight != 0) {
-		goto __358
+		goto __369
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __360
+		goto __371
 	}
 	goto pragma_out
-__360:
+__371:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __359
-__358:
+	goto __370
+__369:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __361
+		goto __372
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__362:
+__373:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __364
+		goto __375
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __365
+		goto __376
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -89601,25 +90229,25 @@ __362:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __364
-__365:
+	goto __375
+__376:
 	;
-	goto __363
-__363:
+	goto __374
+__374:
 	pEnc += 16
-	goto __362
-	goto __364
-__364:
+	goto __373
+	goto __375
+__375:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __366
+		goto __377
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18424, libc.VaList(bp+456, zRight))
-__366:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18467, libc.VaList(bp+456, zRight))
+__377:
 	;
-__361:
+__372:
 	;
-__359:
+__370:
 	;
 	goto __15
 
@@ -89627,15 +90255,15 @@ __47:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __367
+		goto __378
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __369
+		goto __380
 	}
 	goto __15
-__369:
+__380:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -89643,41 +90271,41 @@ __369:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __370
+		goto __381
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__370:
+__381:
 	;
-	goto __368
-__367:
+	goto __379
+__378:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __371
+		goto __382
 	}
 	goto __15
-__371:
+__382:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__368:
+__379:
 	;
 	goto __15
 
 __48:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__372:
+__383:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __373
+		goto __384
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __372
-__373:
+	goto __383
+__384:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -89692,31 +90320,31 @@ __49:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17751) == 0) {
-		goto __375
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17767) == 0) {
+		goto __386
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __376
-__375:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18449) == 0) {
-		goto __377
+	goto __387
+__386:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18492) == 0) {
+		goto __388
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __378
-__377:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17904) == 0) {
-		goto __379
+	goto __389
+__388:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17920) == 0) {
+		goto __390
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__379:
+__390:
 	;
-__378:
+__389:
 	;
-__376:
+__387:
 	;
-__374:
+__385:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -89726,10 +90354,10 @@ __374:
 
 __50:
 	if !(zRight != 0) {
-		goto __380
+		goto __391
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__380:
+__391:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -89749,19 +90377,19 @@ __51:
 
 __52:
 	if !(zRight != 0) {
-		goto __381
+		goto __392
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __383
+		goto __394
 	}
 	goto __15
-__383:
+__394:
 	;
-	goto __382
-__381:
+	goto __393
+__392:
 	opMask = U32(0xfffe)
-__382:
+__393:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -89770,86 +90398,86 @@ __382:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__384:
+__395:
 	if !(iDb <= iDbLast) {
-		goto __386
+		goto __397
 	}
 	if !(iDb == 1) {
-		goto __387
+		goto __398
 	}
-	goto __385
-__387:
+	goto __396
+__398:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__388:
+__399:
 	if !(k4 != 0) {
-		goto __390
+		goto __401
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __391
+		goto __402
 	}
-	goto __389
-__391:
+	goto __400
+__402:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__392:
+__403:
 	if !(pIdx6 != 0) {
-		goto __394
+		goto __405
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __395
+		goto __406
 	}
 	szThreshold = int16(0)
-	goto __394
-__395:
+	goto __405
+__406:
 	;
-	goto __393
-__393:
+	goto __404
+__404:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __392
-	goto __394
-__394:
+	goto __403
+	goto __405
+__405:
 	;
 	if !(szThreshold != 0) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__396:
+__407:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18457,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18500,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __397
+		goto __408
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __398
-__397:
+	goto __409
+__408:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__398:
+__409:
 	;
-	goto __389
-__389:
+	goto __400
+__400:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __388
-	goto __390
-__390:
+	goto __399
+	goto __401
+__401:
 	;
-	goto __385
-__385:
+	goto __396
+__396:
 	iDb++
-	goto __384
-	goto __386
-__386:
+	goto __395
+	goto __397
+__397:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -89857,36 +90485,36 @@ __386:
 __53:
 	;
 	if !(zRight != 0) {
-		goto __399
+		goto __410
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__399:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __400
+		goto __411
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__400:
+__411:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __55:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK) {
-		goto __401
+		goto __412
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))) {
-		goto __402
+		goto __413
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))
-__402:
+__413:
 	;
-__401:
+__412:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -89895,10 +90523,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __403
+		goto __414
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664))&int64(0x7fffffff)))
-__403:
+__414:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -89907,10 +90535,10 @@ __57:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+672) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) >= int64(0)) {
-		goto __404
+		goto __415
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) & int64(0x7fffffff))
-__404:
+__415:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -89918,10 +90546,10 @@ __404:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __405
+		goto __416
 	}
 
-__405:
+__416:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -89973,14 +90601,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18475, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18480, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18486, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18495, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18504, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18512, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18520},
-	{FzName: ts + 18527},
+	{FzName: ts + 18518, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18523, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18529, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18538, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18547, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18555, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18563},
+	{FzName: ts + 18570},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -90032,7 +90660,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18533)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18576)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -90040,7 +90668,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18548, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18591, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -90053,16 +90681,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18555, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18598, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18561)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18604)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18573)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18616)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+5360, 1)
@@ -90245,13 +90873,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18588)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18631)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18596, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18639, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18600, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18643, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -90328,12 +90956,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18604, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -90342,19 +90970,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5411
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18632, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18675, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18663, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18706, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18671,
-	ts + 18678,
-	ts + 18690,
+	ts + 18714,
+	ts + 18721,
+	ts + 18733,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -90414,7 +91042,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14533)
+				corruptSchema(tls, pData, argv, ts+14543)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -90446,13 +91074,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18701)
+			corruptSchema(tls, pData, argv, ts+18744)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14533)
+				corruptSchema(tls, pData, argv, ts+14543)
 			}
 		}
 	}
@@ -90485,16 +91113,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 9217
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 9279
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 8281
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18714
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 8341
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18757
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -90572,17 +91200,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+12116)
+		ts+12178)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -90591,44 +91228,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18786)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18829)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18810,
+		ts+18853,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -90639,57 +91276,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -90778,8 +91415,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -90892,8 +91531,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0))
-	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0))
+	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0))
+	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -90904,8 +91543,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -90917,8 +91556,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.X__builtin___memset_chk(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8), libc.X__builtin_object_size(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0))
-	libc.X__builtin___memset_chk(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280), libc.X__builtin_object_size(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0))
+	libc.X__builtin___memset_chk(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8), libc.X__builtin_object_size(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0))
+	libc.X__builtin___memset_chk(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288), libc.X__builtin_object_size(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -90958,7 +91597,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18844, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18887, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -90988,7 +91627,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18874, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18917, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -91084,7 +91723,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -91183,7 +91822,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -91501,8 +92140,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 11261
-		var zSp2 uintptr = ts + 11261
+		var zSp1 uintptr = ts + 11323
+		var zSp2 uintptr = ts + 11323
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -91510,13 +92149,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18893, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18936, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18923))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18966))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -91691,7 +92330,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18957, libc.VaList(bp, 0))
+					ts+19000, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -91736,7 +92375,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+19007, libc.VaList(bp+8, zName))
+						ts+19050, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -91747,7 +92386,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+19071,
+							Xsqlite3ErrorMsg(tls, pParse, ts+19114,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -91791,7 +92430,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6929, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6989, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -92138,9 +92777,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -92378,16 +93014,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 19108
+		z = ts + 19151
 		break
 	case TK_INTERSECT:
-		z = ts + 19118
+		z = ts + 19161
 		break
 	case TK_EXCEPT:
-		z = ts + 19128
+		z = ts + 19171
 		break
 	default:
-		z = ts + 19135
+		z = ts + 19178
 		break
 	}
 	return z
@@ -92397,10 +93033,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19141, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19184, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -92420,6 +93059,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19207, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 19238
+		}
+		return ts + 1547
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -92486,6 +93132,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -92550,6 +93197,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -92604,7 +93252,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16657
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16673
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -92743,13 +93391,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16657
+				zCol = ts + 16673
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+12402, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -92757,7 +93405,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+19164, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+19253, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -92822,7 +93470,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -92847,7 +93495,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16657
+					zName = ts + 16673
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -92857,7 +93505,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+19164, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+19253, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -92873,7 +93521,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+19173, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+19262, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -92898,45 +93547,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp, 0))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -92946,14 +93598,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 19270
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -92963,9 +93647,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -93009,7 +93690,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -93160,7 +93841,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19181, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19274, 0)
 	return
 __1:
 	;
@@ -93251,7 +93932,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19230, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19323, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -93271,7 +93952,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19272, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19365, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -93308,7 +93989,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19278, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19371, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -93342,7 +94023,7 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19293, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19386, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1547
 		}
@@ -93447,8 +94128,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19316, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19331, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19409, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19424, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -93495,7 +94176,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19108, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19151, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -93562,7 +94243,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19350, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19443, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -93624,7 +94305,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19350, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19443, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -93777,10 +94458,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19371, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19464, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19417,
+			ts+19510,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -94034,8 +94715,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7577)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7577)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7637)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7637)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -94062,13 +94743,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19499, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19592, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19510, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19603, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -94080,7 +94761,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19515, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19608, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -94495,6 +95176,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff int8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -94614,15 +95314,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff int8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -94998,16 +95691,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -95067,12 +95777,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15557) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15567) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15561) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15571) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -95138,7 +95848,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19521, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19614, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -95221,7 +95931,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19539, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19632, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -95350,15 +96060,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19562, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19655, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -95376,7 +96083,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19582, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19675, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -95392,7 +96099,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19625
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19718
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -95418,7 +96125,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19648,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19741,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -95429,9 +96136,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19686
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19779
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19720
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19813
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -95478,7 +96185,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19758, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19851, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -95590,7 +96297,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19762,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19855,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -95609,7 +96316,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19801,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19894,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -95617,7 +96324,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+15126,
+					Xsqlite3ErrorMsg(tls, pParse, ts+15136,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -95718,7 +96425,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6789
+							zSchemaName = ts + 6849
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -95733,7 +96440,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19832, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19925, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -95798,7 +96505,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19837,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19930,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -95810,7 +96517,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12402, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12464, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -95829,9 +96536,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19846, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19939, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19864, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19957, 0)
 					}
 				}
 			}
@@ -95841,7 +96548,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19884, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19977, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -95900,11 +96607,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, int8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -95963,6 +96666,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp, 0))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -95978,7 +96756,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -95991,13 +96770,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19915, 0)
+					ts+20008, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19966, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20059, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -96005,7 +96784,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -96025,19 +96804,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -96051,6 +96833,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -96125,7 +96910,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -96137,7 +96924,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -96155,13 +96942,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -96178,11 +96965,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19999,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20092,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 20011
+						return ts + 20104
 					}
 					return ts + 1547
 				}(),
@@ -96203,7 +96990,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8281)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8341)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -96235,14 +97022,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -96296,6 +97084,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -96360,7 +97199,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -96459,7 +97297,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20034,
+		ts+20127,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -96520,7 +97358,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20088,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20181,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -96634,7 +97472,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -96651,11 +97489,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -96666,7 +97500,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20128, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20221, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -96692,7 +97526,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -96724,11 +97558,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20143, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20236, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -96762,7 +97594,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -97071,12 +97903,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -97105,39 +97936,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -97148,24 +97955,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -97198,27 +98005,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 20159
+				return ts + 20252
 			}
-			return ts + 20168
+			return ts + 20261
 		}())
 
 	groupBySort = 1
@@ -97226,47 +98040,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -97282,45 +98096,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -97339,16 +98159,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -97379,16 +98199,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -97401,98 +98221,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -97501,79 +98324,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+20159)
-__148:
+	explainTempTable(tls, pParse, ts+20252)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 20177
-			}
-			return ts + 20200
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -97670,7 +98488,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+20209, 0)
+		ts+20270, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -97903,7 +98721,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20274, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20335, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -97947,7 +98765,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+20320, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+20381, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -97965,7 +98783,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20328, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20389, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -97977,7 +98795,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+20320, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+20381, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -97992,7 +98810,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20369, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20430, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -98004,22 +98822,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8475, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20395, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20456, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20433,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20494,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20470
+				return ts + 20531
 			}
-			return ts + 20477
+			return ts + 20538
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -98028,7 +98846,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20483, libc.VaList(bp+24, pTableName+8))
+		ts+20544, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -98057,9 +98875,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -98177,7 +98995,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+20320, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+20381, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -98210,7 +99028,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20529,
+		ts+20590,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -98235,13 +99053,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20577,
+		ts+20638,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20652, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20713, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -98497,7 +99315,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20681, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20742, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -98536,9 +99354,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12489
+				return ts + 6792
 			}
-			return ts + 6296
+			return ts + 6286
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -98550,7 +99368,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20701,
+			ts+20762,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -98664,12 +99482,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20763,
+		ts+20824,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20811
+				return ts + 20872
 			}
-			return ts + 20818
+			return ts + 20879
 		}()))
 __15:
 	;
@@ -98783,7 +99601,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20825, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20886, 0)
 	return 1
 }
 
@@ -98966,8 +99784,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -99000,8 +99818,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.X__builtin___memset_chk(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+424, 0))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.X__builtin___memset_chk(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+432, 0))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -99013,13 +99831,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20867, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20928, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -99335,7 +100153,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -99605,7 +100424,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20881,
+		ts+20942,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -99637,7 +100456,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20917, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20978, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -99647,7 +100466,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 8056
+				return ts + 8116
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -100517,7 +101336,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20936)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20997)
 __169:
 	;
 update_cleanup:
@@ -100823,10 +101642,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*int8)(unsafe.Pointer(bp + 216)) = int8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20949, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+21010, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20953, libc.VaList(bp+8, bp+216))
+				ts+21014, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -100917,7 +101736,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12543, -1)
+				ts+12553, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -100949,7 +101768,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+21026, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+21030, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+21087, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+21091, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -101097,14 +101916,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21034)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21095)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21074)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21135)
 	return SQLITE_ERROR
 __2:
 	;
@@ -101115,7 +101934,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21117)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21178)
 	return SQLITE_ERROR
 __5:
 	;
@@ -101143,7 +101962,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+21135, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+21196, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -101163,7 +101982,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21158)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21219)
 	goto end_of_vacuum
 __8:
 	;
@@ -101178,7 +101997,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14896)
+	rc = execSql(tls, db, pzErrMsg, ts+14906)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -101223,7 +102042,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21185,
+		ts+21246,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -101232,7 +102051,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21293,
+		ts+21354,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -101243,7 +102062,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21347,
+		ts+21408,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -101254,7 +102073,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21498,
+		ts+21559,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -101476,12 +102295,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -101599,7 +102418,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12770, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12780, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -101683,11 +102502,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21628, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21689, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21652,
+			ts+21713,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -101697,7 +102516,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21751, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21812, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -101731,7 +102550,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -101758,7 +102577,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21770, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21831, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -101796,7 +102615,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21812, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21873, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3658, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -101808,7 +102627,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21842
+			var zFormat uintptr = ts + 21903
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -101825,7 +102644,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16548, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16564, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -101882,7 +102701,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21888, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21949, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -101940,7 +102759,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21888, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21949, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -101960,8 +102779,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -101974,7 +102793,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -102427,7 +103246,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -102454,7 +103273,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -102685,10 +103504,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21907
+		return ts + 21968
 	}
 	if i == -1 {
-		return ts + 16657
+		return ts + 16673
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -102697,15 +103516,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21914, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21975, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21920, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21981, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+13160, 1)
+			Xsqlite3_str_append(tls, pStr, ts+13170, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -102716,11 +103535,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21920, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21981, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+13160, 1)
+			Xsqlite3_str_append(tls, pStr, ts+13170, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5411, 1)
 	}
@@ -102742,27 +103561,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21922, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21983, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21914, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21975, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21925
+				return ts + 21986
 			}
-			return ts + 21930
+			return ts + 21991
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21938)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21999)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21940)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+22001)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+5360, 1)
 }
@@ -102805,11 +103624,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21942, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+22003, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21948
+				return ts + 22009
 			}
-			return ts + 21955
+			return ts + 22016
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -102819,43 +103638,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 11317
+					zFmt = ts + 11379
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21960
+				zFmt = ts + 22021
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21993
+				zFmt = ts + 22054
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 22018
+				zFmt = ts + 22079
 			} else {
-				zFmt = ts + 22036
+				zFmt = ts + 22097
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+22045, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+22106, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp int8
-			var zRowid uintptr = ts + 16657
-			Xsqlite3_str_appendf(tls, bp+64, ts+22053, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16673
+			Xsqlite3_str_appendf(tls, bp+64, ts+22114, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = int8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+22084, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+22145, libc.VaList(bp+32, zRowid))
 				cRangeOp = int8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = int8('>')
 			} else {
 				cRangeOp = int8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+22094, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+22155, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+22099,
+			Xsqlite3_str_appendf(tls, bp+64, ts+22160,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+22126, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+22187, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -102887,28 +103706,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+22137, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+22198, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21925, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21986, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+22158, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+22219, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21914, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21975, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21925, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21986, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+5360, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -102969,52 +103789,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -104492,7 +105318,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22166, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22227, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -104520,7 +105346,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22181, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22242, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -105038,7 +105864,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22190, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22251, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -105395,10 +106221,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16506, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15834, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 15360, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 22204, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16522, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15850, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 15370, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 22265, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -105775,49 +106601,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -105825,13 +106640,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -105896,12 +106714,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22211, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+22272, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22211, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+22272, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -105925,7 +106743,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -105935,7 +106753,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -105980,7 +106798,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7112
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7172
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -106074,7 +106892,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 22252
+				return ts + 22313
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -106085,7 +106903,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -106093,6 +106910,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -106126,7 +106944,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -106279,6 +107097,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -106447,7 +107268,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22259,
+			Xsqlite3ErrorMsg(tls, pParse, ts+22320,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -107181,7 +108002,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+22295, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+22356, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -107252,7 +108073,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 22321
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 22382
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -107759,7 +108580,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -107779,7 +108600,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -107790,10 +108611,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -107804,29 +108625,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -107928,8 +108749,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -107941,7 +108762,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -107951,17 +108772,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -107981,19 +108802,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -108005,19 +108826,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -108027,10 +108848,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -108044,9 +108865,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -108071,8 +108892,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -108084,7 +108905,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -108098,23 +108919,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -108125,7 +108946,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -108447,6 +109268,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -108540,8 +109362,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -108565,8 +109387,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -108718,7 +109541,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -108737,7 +109560,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -108751,7 +109574,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -108760,9 +109583,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -108781,6 +109608,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -108908,30 +109738,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -108939,20 +109788,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp, 0))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -108961,9 +109815,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -109004,7 +109864,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -109044,7 +109904,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -109110,19 +109971,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -109303,7 +110169,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22332, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22393, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -109361,7 +110227,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22332, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22393, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -109759,7 +110625,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+22358, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22419, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -109970,8 +110836,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -110090,14 +110956,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -110249,7 +111124,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -110357,7 +111232,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22393, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22454, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -110619,19 +111494,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -110643,9 +111520,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -110678,13 +111555,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -110836,7 +111713,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22411, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22472, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -110899,7 +111776,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22439, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22500, 0)
 	goto __5
 __4:
 	ii = 0
@@ -111600,7 +112477,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -111781,7 +112658,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22457, -1)
+		pCtx, ts+22518, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -111914,7 +112791,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22513, -1)
+					pCtx, ts+22574, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -112004,17 +112881,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22558))
-var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22569))
-var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22580))
-var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22585))
-var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22598))
-var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22608))
-var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22614))
-var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22625))
-var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22635))
-var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22647))
-var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22652))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22619))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22630))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22641))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22646))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22659))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22669))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22675))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22686))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22696))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22708))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22713))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -112060,7 +112937,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22656, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22717, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -112104,12 +112981,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22675, 0)
+			ts+22736, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22746, 0)
+				ts+22807, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -112132,7 +113009,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8281)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8341)
 					}
 					break
 				}
@@ -112336,7 +113213,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22809, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22870, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -112452,7 +113329,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7873))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7933))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -112463,6 +113340,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, int8(SQLITE_AFF_NONE))
@@ -112566,7 +113444,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22835, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22896, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -112631,15 +113509,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22867
+				zErr = ts + 22928
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22884
+				zErr = ts + 22945
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22900
+				zErr = ts + 22961
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22920, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22981, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -112660,7 +113538,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22953, 0)
+				ts+23014, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -112816,11 +113694,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 23000,
-	ts + 23053,
-	ts + 22457,
-	ts + 23104,
-	ts + 23156,
+	ts + 23061,
+	ts + 23114,
+	ts + 22518,
+	ts + 23165,
+	ts + 23217,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -114017,8 +114895,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -114029,13 +114906,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -114219,19 +115093,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+23206,
+				Xsqlite3ErrorMsg(tls, pParse, ts+23267,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 20200
+							return ts + 23309
 						}
-						return ts + 23248
+						return ts + 23318
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+23254, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+23324, 0)
 		}
 	}
 
@@ -114299,7 +115173,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23288,
+		Xsqlite3ErrorMsg(tls, pParse, ts+23358,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -115396,7 +116270,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+23326, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23396, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -116371,21 +117245,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16657, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16673, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+23348, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23418, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16570, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16586, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+23348, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23418, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -117128,7 +118002,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23375)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23445)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -117292,7 +118166,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+23384, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23454, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -117509,9 +118383,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 7107
+							return ts + 7167
 						}
-						return ts + 7112
+						return ts + 7172
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -117523,6 +118397,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -117790,19 +118669,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23408, 0)
+					ts+23478, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23503, 0)
+					ts+23573, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23587, 0)
+					ts+23657, 0)
 			}
 			break
 		case uint32(273):
@@ -118181,9 +119060,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23384, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23454, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23672, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23742, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -118951,7 +119830,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23689, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23759, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -118974,7 +119853,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3658, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23714, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23784, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -119147,7 +120026,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23725, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23795, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -119160,11 +120039,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+20320, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+20381, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23732, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23802, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23737, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23807, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -119177,9 +120056,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23747, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23817, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23751, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23821, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -119413,7 +120292,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -119988,7 +120867,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -120003,7 +120882,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23759, 0)
+			ts+23829, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -120194,23 +121073,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23827
+	var zErr uintptr = ts + 23897
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23841
+			zErr = ts + 23911
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23863
+			zErr = ts + 23933
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23885
+			zErr = ts + 23955
 			break
 
 		}
@@ -120228,35 +121107,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23908,
-	ts + 23921,
+	ts + 23978,
+	ts + 23991,
 	uintptr(0),
-	ts + 23937,
-	ts + 23962,
-	ts + 23976,
-	ts + 23995,
+	ts + 24007,
+	ts + 24032,
+	ts + 24046,
+	ts + 24065,
 	ts + 1483,
-	ts + 24020,
-	ts + 24057,
-	ts + 24069,
-	ts + 24084,
-	ts + 24117,
-	ts + 24135,
-	ts + 24160,
-	ts + 24189,
+	ts + 24090,
+	ts + 24127,
+	ts + 24139,
+	ts + 24154,
+	ts + 24187,
+	ts + 24205,
+	ts + 24230,
+	ts + 24259,
 	uintptr(0),
-	ts + 6251,
+	ts + 6241,
 	ts + 5737,
-	ts + 24206,
-	ts + 24224,
-	ts + 24242,
-	uintptr(0),
 	ts + 24276,
+	ts + 24294,
+	ts + 24312,
 	uintptr(0),
-	ts + 24297,
-	ts + 24323,
 	ts + 24346,
+	uintptr(0),
 	ts + 24367,
+	ts + 24393,
+	ts + 24416,
+	ts + 24437,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -120357,6 +121236,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	*(*int32)(unsafe.Pointer(db + 432)) = 1
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(*(*int32)(unsafe.Pointer(db + 432)) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -120371,7 +121256,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -120416,7 +121301,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24383, 0)
+				ts+24453, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -120533,7 +121418,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24446, libc.VaList(bp, zName))
+		ts+24516, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -120769,7 +121654,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24497, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24567, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -120862,7 +121747,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -120932,7 +121817,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -120942,7 +121827,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -120974,14 +121859,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24518, 0)
+				ts+24588, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -121111,7 +121996,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24586, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24656, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -121156,10 +122041,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24592, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24662, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24602,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24672,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -121264,7 +122149,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24630, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24700, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -121275,17 +122160,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24634, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24704, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24634
+	zModeType = ts + 24704
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24640, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24710, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -121323,7 +122208,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24645, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24715, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -121331,7 +122216,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24665,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24735,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -121371,7 +122256,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24689, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24759, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -121395,15 +122280,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24705, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24712, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24775, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24782, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24720, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24723, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24726, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17768, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24790, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24793, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24796, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17784, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -121549,10 +122434,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+22252, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+22313, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24730, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24800, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -121566,7 +122451,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -121617,9 +122502,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6784
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6844
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23732
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23802
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -121724,7 +122609,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24736
+		zFilename = ts + 24806
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -121827,21 +122712,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24739,
+	Xsqlite3_log(tls, iErr, ts+24809,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24764)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24834)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24784)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24854)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24791)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24861)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -121999,7 +122884,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24808, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24878, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -122655,7 +123540,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24836, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24906, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -122773,7 +123658,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24844
+			return ts + 24914
 		}
 		return uintptr(0)
 	}(), 0)
@@ -122951,7 +123836,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6584, ts + 7107, ts + 7112, ts + 6594, ts + 6589, ts + 8348, ts + 24867, ts + 24873,
+	ts + 6584, ts + 7167, ts + 7172, ts + 6594, ts + 6589, ts + 8408, ts + 24937, ts + 24943,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -123104,7 +123989,7 @@ __10:
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0' + int32(c)>>4)
-	c = uint8(*(*int8)(unsafe.Pointer(ts + 24880 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24950 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -123159,7 +124044,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24897, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24967, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -123223,13 +124108,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+7107, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7167, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+7112, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7172, uint32(5))
 			break
 
 		}
@@ -123779,12 +124664,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+7107, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7167, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+7112, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7172, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(5)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -123885,7 +124770,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24926, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24996, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -124191,7 +125076,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*int8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24941, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+25011, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -124206,7 +125091,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24945, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+25015, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -124260,7 +125145,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24971,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+25041,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -124365,11 +125250,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*int8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zPath)))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+25014, uint32(2))
+					jsonAppendRaw(tls, bp, ts+25084, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+5401, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+25017, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+25087, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -124526,14 +125411,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+25020, -1)
+			ts+25090, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, int8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+25071, -1)
+			Xsqlite3_result_error(tls, ctx, ts+25141, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -124628,7 +125513,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15767)
+	jsonWrongNumArgs(tls, ctx, ts+15783)
 	return
 __2:
 	;
@@ -124703,9 +125588,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 25105
+			return ts + 25175
 		}
-		return ts + 25109
+		return ts + 25179
 	}())
 	return
 __2:
@@ -124838,7 +125723,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+25116, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+25186, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -124935,7 +125820,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+25119, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+25189, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -124979,7 +125864,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+25122)
+		ts+25192)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -125110,7 +125995,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+25205, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+25275, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -125129,7 +126014,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+25211, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+25281, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -125225,7 +126110,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, int8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+25211, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+25281, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -125249,7 +126134,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 25216
+				zRoot = ts + 25286
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -125314,6 +126199,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -125365,7 +126256,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24926, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24996, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -125460,25 +126351,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25218},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25223},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25234},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25234},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25252},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 25265},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 25268},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25272},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25284},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25296},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25307},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25318},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25330},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25343},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25352},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25352},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25362},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25373},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25390}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25288},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25293},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25304},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25304},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25322},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 25335},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 25338},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25342},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25354},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25366},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25377},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25388},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25400},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25413},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25422},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25422},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25432},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25443},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25460}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -125497,8 +126388,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25408, FpModule: 0},
-	{FzName: ts + 25418, FpModule: 0},
+	{FzName: ts + 25478, FpModule: 0},
+	{FzName: ts + 25488, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -125758,11 +126649,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25428, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25498, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25436, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25506, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -125973,7 +126864,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25441,
+		ts+25511,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -126676,7 +127567,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25523)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25593)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -128017,7 +128908,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25537, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25607, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -128029,12 +128920,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25557, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25627, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25589, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25659, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -128260,7 +129151,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25626, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25696, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -128283,14 +129174,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25771
+	var zFmt uintptr = ts + 25841
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11689, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11751, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -128331,7 +129222,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25827, ts + 5463, ts + 16657,
+	ts + 25897, ts + 5463, ts + 16673,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -128374,19 +129265,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25832,
+			ts+25902,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25894, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25964, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25899,
+			ts+25969,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25963,
+			ts+26033,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26033,
+			ts+26103,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -128415,7 +129306,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 26082
+			zFormat = ts + 26152
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -128427,7 +129318,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+26190,
+			ts+26260,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -128435,18 +129326,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+26235, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+26305, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+13160, 1)
+					Xsqlite3_str_append(tls, p, ts+13170, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+26262, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+26332, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+26284, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+26354, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+26292, 0)
+			Xsqlite3_str_appendf(tls, p, ts+26362, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -128461,14 +129352,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 26308,
-	ts + 26361,
-	ts + 26406,
-	ts + 26458,
-	ts + 26512,
-	ts + 26557,
-	ts + 26615,
-	ts + 26670,
+	ts + 26378,
+	ts + 26431,
+	ts + 26476,
+	ts + 26528,
+	ts + 26582,
+	ts + 26627,
+	ts + 26685,
+	ts + 26740,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -128497,7 +129388,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26717, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26787, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -128509,7 +129400,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26737,
+			ts+26807,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -128517,7 +129408,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26794,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26864,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -128559,10 +129450,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26829,
-		ts + 26872,
-		ts + 26907,
-		ts + 26943,
+		ts + 26899,
+		ts + 26942,
+		ts + 26977,
+		ts + 27013,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -128593,7 +129484,7 @@ __2:
 	libc.X__builtin___memcpy_chk(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName), libc.X__builtin_object_size(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, 0))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26980,
+	Xsqlite3_str_appendf(tls, pSql, ts+27050,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -128605,7 +129496,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27004, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+27074, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -128628,7 +129519,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27010, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27080, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -128724,7 +129615,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 27013, ts + 27024}
+var azFormat = [2]uintptr{ts + 27083, ts + 27094}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -128762,13 +129653,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+11261, 1)
+			Xsqlite3_str_append(tls, pOut, ts+11323, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+27034, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+27104, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+27040, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+27110, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+27044, 1)
+		Xsqlite3_str_append(tls, pOut, ts+27114, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -128779,7 +129670,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+27046, -1)
+		Xsqlite3_result_error(tls, ctx, ts+27116, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -128857,7 +129748,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+27079,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+27149,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4465
@@ -128881,7 +129772,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+27086,
+			ts+27156,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -128900,7 +129791,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+27131, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+27201, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -128914,8 +129805,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 27163,
-		ts + 27217,
+		ts + 27233,
+		ts + 27287,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -128930,23 +129821,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+27265,
+		rtreeCheckAppendMsg(tls, pCheck, ts+27335,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 27310
+					return ts + 27380
 				}
-				return ts + 27318
+				return ts + 27388
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27327,
+				ts+27397,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 27310
+						return ts + 27380
 					}
-					return ts + 27318
+					return ts + 27388
 				}(), iKey, iVal))
 		}
 	}
@@ -128970,7 +129861,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27385, libc.VaList(bp, i, iCell, iNode))
+				ts+27455, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -128990,7 +129881,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27433, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27503, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -129007,14 +129898,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27500, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27570, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27534, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27604, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -129022,7 +129913,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27564,
+					ts+27634,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -129051,14 +129942,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27619,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27689,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27650, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27720, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -129080,12 +129971,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14896, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14906, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27717, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27787, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -129094,12 +129985,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25537, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25607, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27745, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27815, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -129113,8 +130004,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27776, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27783, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27846, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27853, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -129122,7 +130013,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27791, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27861, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -129137,7 +130028,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27795, -1)
+			ts+27865, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -129145,7 +130036,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6784
+			zDb = ts + 6844
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -129155,7 +130046,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 18421
+				return ts + 18464
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -129450,7 +130341,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -129508,6 +130399,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -129520,15 +130412,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27846, 1)
+		Xsqlite3_str_append(tls, x, ts+27916, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27848, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27918, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27859, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27929, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -129548,19 +130441,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep int8 = int8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27870, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27940, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27888, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27958, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = int8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27896, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27966, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*int8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27904, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27974, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27908, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27978, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -129579,6 +130472,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -129610,6 +130504,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -129618,6 +130513,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -129676,6 +130572,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -129844,6 +130741,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -129865,6 +130763,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -129949,6 +130848,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -129977,6 +130878,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -130415,6 +131317,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -130428,6 +131331,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -130442,6 +131348,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -130466,7 +131373,7 @@ __1:
 	libc.X__builtin___memcpy_chk(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName), libc.X__builtin_object_size(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, 0))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27921, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27991, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -130475,7 +131382,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27943, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+28013, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -130483,7 +131390,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27010, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27080, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -130562,6 +131469,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -130690,6 +131598,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -130708,7 +131617,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16657
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16673
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -130718,7 +131627,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27947
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28017
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -130726,7 +131635,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27953
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28023
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -130838,7 +131747,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27962, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28032, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -130968,14 +131877,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+28002) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+28072) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+28018) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+28088) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -131012,8 +131923,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -131030,7 +131941,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -131040,7 +131951,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+28033, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28103, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -131052,25 +131963,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28041},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28054},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28067},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 28080},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28018},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 28092},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28002},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 28115},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28129},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 28142},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 28156},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28172},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28111},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28124},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28137},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 28150},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28088},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 28162},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28072},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 28185},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28199},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 28212},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 28226},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28242},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 28184},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 28254},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -131080,26 +131991,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+28203, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+28273, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+28213, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+28283, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+28224, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+28294, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27947, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28017, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+28235, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28305, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -131153,7 +132064,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25523, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25593, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -131480,7 +132391,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+28245, -1)
+		Xsqlite3_result_error(tls, context, ts+28315, -1)
 		return
 	}
 
@@ -131491,7 +132402,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+28245, -1)
+			Xsqlite3_result_error(tls, context, ts+28315, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -131592,7 +132503,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+28266, uintptr(0), uintptr(0), p+64)
+				ts+28336, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -131656,7 +132567,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25436, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25506, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -131677,16 +132588,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28437, libc.VaList(bp, func() uintptr {
+			ts+28507, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28587
+					return ts + 28657
 				}
 				return ts + 1547
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28628)
+			ts+28698)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -131802,7 +132713,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28753, libc.VaList(bp, zTab)))
+			ts+28823, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -131820,7 +132731,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28872, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28942, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -131838,7 +132749,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28893, libc.VaList(bp+16, zIdx)))
+			ts+28963, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -131861,7 +132772,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28944, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+29014, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -131907,7 +132818,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.X__builtin___memcpy_chk(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol), libc.X__builtin_object_size(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+28965, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29035, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -131922,7 +132833,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.X__builtin___memset_chk(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol), libc.X__builtin_object_size(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+28993, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -131962,7 +132873,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19846, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19939, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -131972,18 +132883,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+29022, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+29092, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+29041, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+29111, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+29046, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+29116, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -131995,18 +132906,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+29056, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+29126, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 29085
+							return ts + 29155
 						}
-						return ts + 29098
+						return ts + 29168
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+29107, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+29177, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -132020,7 +132931,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29129,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29199,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -132067,8 +132978,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+29156, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 15007
+		zList = rbuMPrintf(tls, p, ts+29226, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 15017
 	}
 	return zList
 }
@@ -132085,7 +132996,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+29165, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+29235, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -132107,25 +133018,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+29178, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+29248, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+29210, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+29280, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15007, ts+29233)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+29239, ts+29246, ts+5360)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15007, ts+1547)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15017, ts+29303)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+29309, ts+29316, ts+5360)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15017, ts+1547)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+29254,
+					ts+29324,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+29296, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+29366, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -132167,7 +133078,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+28993, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -132202,7 +133113,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 29316
+	zCol = ts + 29386
 __7:
 	;
 	goto __5
@@ -132210,13 +133121,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+29324,
+	zLhs = rbuMPrintf(tls, p, ts+29394,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+29345,
+	zOrder = rbuMPrintf(tls, p, ts+29415,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+29381,
+	zSelect = rbuMPrintf(tls, p, ts+29451,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 15007
+	zSep = ts + 15017
 	iCol++
 	goto __1
 __2:
@@ -132234,7 +133145,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+29408,
+		Xsqlite3_mprintf(tls, ts+29478,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -132261,8 +133172,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29456, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 15007
+	zVector = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 15017
 	goto __15
 __15:
 	iCol++
@@ -132273,7 +133184,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29463, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -132306,7 +133217,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28993, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -132318,7 +133229,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29475, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29545, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1547
 		} else {
@@ -132330,37 +133241,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 29316
+					zCol = ts + 29386
 				} else {
-					zCol = ts + 29046
+					zCol = ts + 29116
 				}
 				zType = ts + 1112
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29497, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29567, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 29233
+					return ts + 29303
 				}
 				return ts + 1547
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29517,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29587,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29538,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29608,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29571, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29641, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 15007
-		zAnd = ts + 21914
+		zCom = ts + 15017
+		zAnd = ts + 21975
 		nBind++
 	}
 
@@ -132399,11 +133310,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+29595, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29665, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29607, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29677, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 15007
+			zS = ts + 15017
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -132411,7 +133322,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29616, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29686, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -132423,18 +133334,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29631, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29701, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1547
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29645, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21914
+				zList = rbuMPrintf(tls, p, ts+29715, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21975
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29657, libc.VaList(bp+40, zList))
+			ts+29727, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1547
@@ -132442,8 +133353,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29707, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21914
+				zList = rbuMPrintf(tls, p, ts+29777, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21975
 			}
 		}
 	}
@@ -132452,7 +133363,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29720, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29790, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -132470,17 +133381,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c int8 = *(*int8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29707,
+					zList = rbuMPrintf(tls, p, ts+29777,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15007
+					zSep = ts + 15017
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29746,
+					zList = rbuMPrintf(tls, p, ts+29816,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15007
+					zSep = ts + 15017
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29776,
+					zList = rbuMPrintf(tls, p, ts+29846,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15007
+					zSep = ts + 15017
 				}
 			}
 		}
@@ -132515,19 +133426,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29813
+		var zSep uintptr = ts + 29883
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+28965, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29035, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16545) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16561) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+28993, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -132539,15 +133450,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 29233
+					zDesc = ts + 29303
 				} else {
 					zDesc = ts + 1547
 				}
-				z = rbuMPrintf(tls, p, ts+29826, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 15007
+				z = rbuMPrintf(tls, p, ts+29896, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 15017
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29837, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29907, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -132567,7 +133478,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29841)
+			ts+29911)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -132576,7 +133487,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+28993, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -132586,25 +133497,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29891, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29961, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29913, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29983, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 29233
+						return ts + 29303
 					}
 					return ts + 1547
 				}()))
-				zComma = ts + 15007
+				zComma = ts + 15017
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29923, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29993, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29938,
+			ts+30008,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 0))
 	}
 }
 
@@ -132617,7 +133528,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1547
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1547
@@ -132625,39 +133536,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 30000
+				zPk = ts + 30070
 			}
-			zSql = rbuMPrintf(tls, p, ts+30013,
+			zSql = rbuMPrintf(tls, p, ts+30083,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 30040
+							return ts + 30110
 						}
 						return ts + 1547
 					}()))
-			zComma = ts + 15007
+			zComma = ts + 15017
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+30050, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+30120, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+30057,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+30127,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 30089
+						return ts + 30159
 					}
 					return ts + 1547
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 0))
 	}
 }
 
@@ -132670,7 +133581,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+30104,
+				ts+30174,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -132707,7 +133618,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+30161)
+			ts+30231)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -132812,7 +133723,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+30227, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+30297, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -132832,24 +133743,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+30247,
+				ts+30317,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+30312, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+30382, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+30348, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30418, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -132865,7 +133776,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30382,
+						ts+30452,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -132873,9 +133784,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30443
+											return ts + 30513
 										}
-										return ts + 30447
+										return ts + 30517
 									}()
 								}
 								return ts + 1547
@@ -132884,20 +133795,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30453,
+						ts+30523,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30514,
+						ts+30584,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 30443
+									return ts + 30513
 								}
-								return ts + 30447
+								return ts + 30517
 							}(),
 							zCollist, zLimit))
 				}
@@ -132922,8 +133833,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6795)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6791)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6855)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6851)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -132934,16 +133845,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1547
 				}
-				return ts + 30673
+				return ts + 30743
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30682,
+						ts+30752,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30718
+								return ts + 30788
 							}
 							return ts + 1547
 						}(), zBindings)))
@@ -132952,32 +133863,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30728, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30798, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1547
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30756
+					zRbuRowid = ts + 30826
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30768, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30838, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30844
+							return ts + 30914
 						}
 						return ts + 1547
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30861,
+					ts+30931,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+31160,
+						ts+31230,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -132990,9 +133901,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 31259
+						zRbuRowid = ts + 31329
 					} else {
-						zRbuRowid = ts + 31269
+						zRbuRowid = ts + 31339
 					}
 				}
 
@@ -133005,20 +133916,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+29316, 0)
+						zOrder = rbuMPrintf(tls, p, ts+29386, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15007, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15017, ts+1547)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+31280,
+							ts+31350,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 31328
+										return ts + 31398
 									}
 									return ts + 1547
 								}(),
@@ -133031,7 +133942,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 20200
+										return ts + 23309
 									}
 									return ts + 1547
 								}(), zOrder,
@@ -133099,9 +134010,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1547
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30673
+				zPrefix = ts + 30743
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+31334,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31404,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -133160,7 +134071,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+31364, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31434, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -133230,28 +134141,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6784, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6784)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31394, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31464, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31422, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31492, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.X__builtin___memcpy_chk(tls, p+48, ts+3279, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
 	} else {
-		libc.X__builtin___memcpy_chk(tls, p+48, ts+6784, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
+		libc.X__builtin___memcpy_chk(tls, p+48, ts+6844, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31440, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31510, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6784, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -133284,11 +134195,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31506, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31576, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24586, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24656, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*int8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -133300,13 +134211,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31538,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6784),
+			zTarget = Xsqlite3_mprintf(tls, ts+31608,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
 						}
-						return ts + 31570
+						return ts + 31640
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
@@ -133325,37 +134236,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31572, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31642, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31587, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31657, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31604, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31674, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31620, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31690, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31648, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31718, 0)
 	}
 }
 
@@ -133384,15 +134295,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31620, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31690, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31666, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31736, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -133440,7 +134351,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -133500,7 +134411,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6784, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6844, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -133517,23 +134428,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31701, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31771, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6784)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31726, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31733, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31796, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31803, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -133650,7 +134561,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+24224, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+24294, 0)
 			return
 		}
 
@@ -133743,7 +134654,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+31740)
+			ts+31810)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -133751,7 +134662,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31762, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31832, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -133772,7 +134683,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+31789,
+				ts+31859,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -133802,9 +134713,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+31947, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+32017, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31962,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32032,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -133818,10 +134729,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31982, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32052, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+32007)
+			ts+32077)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -133835,12 +134746,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+32115)
+			ts+32185)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+32180)
+			ts+32250)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -133852,7 +134763,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32224, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32294, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -133872,15 +134783,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17646)
-					rbuCopyPragma(tls, p, ts+16741)
+					rbuCopyPragma(tls, p, ts+17662)
+					rbuCopyPragma(tls, p, ts+16757)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+32249, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+32319, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -133904,10 +134815,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14911, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14921, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14911, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14921, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -134002,7 +134913,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32277, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32347, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -134015,16 +134926,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31726, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31796, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -134034,7 +134946,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+32302, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+32372, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -134068,7 +134980,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+32313, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+32383, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -134098,13 +135010,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+32385, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32455, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+32399)
+				ts+32469)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -134115,7 +135027,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+32456)
+				ts+32526)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -134189,7 +135101,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32530, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32600, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -134207,12 +135119,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32562,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32632,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32594
+							return ts + 32664
 						}
-						return ts + 32601
+						return ts + 32671
 					}()))
 			}
 		}
@@ -134220,7 +135132,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14896, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14906, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -134231,19 +135143,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+17360)
-						rbuCopyPragma(tls, p, ts+16756)
+						rbuCopyPragma(tls, p, ts+17376)
+						rbuCopyPragma(tls, p, ts+16772)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32608, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32678, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6784, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6844, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32624, uintptr(0), uintptr(0), p+64)
+								db, ts+32694, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -134297,7 +135209,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32648, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32718, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -134324,7 +135236,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30673, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30743, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -134341,7 +135253,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14911, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14921, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -134354,13 +135266,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14911, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14921, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32656, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32726, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -134455,7 +135367,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14911, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14921, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134472,19 +135384,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14911, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14921, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14896
+				zBegin = ts + 14906
 			} else {
-				zBegin = ts + 32608
+				zBegin = ts + 32678
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32608, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32678, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134607,11 +135519,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -134750,7 +135665,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -134827,7 +135742,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32683, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32753, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -134852,7 +135767,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32706, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32776, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -134997,7 +135912,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6784)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6844)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -135012,7 +135927,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32717, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32787, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -135023,7 +135938,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -135053,6 +135974,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -135816,11 +136752,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11689, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11751, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32728, 0)
+				ts+32798, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
 		} else {
@@ -135833,7 +136769,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32849, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32919, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -135931,7 +136867,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11689, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11751, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -136398,6 +137334,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -136480,6 +137419,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -136509,9 +137449,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32878,
+			zRet = Xsqlite3_mprintf(tls, ts+32948,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 21914
+			zSep = ts + 21975
 			if zRet == uintptr(0) {
 				break
 			}
@@ -136534,9 +137474,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32912,
+				ts+32982,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 32953
+			zSep = ts + 33023
 			if zRet == uintptr(0) {
 				break
 			}
@@ -136544,18 +137484,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7873, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7933, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32958,
+		ts+33028,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -136565,7 +137505,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -136598,7 +137538,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+33036,
+			ts+33106,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -136725,7 +137665,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33089, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33159, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -137199,9 +138139,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11689, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11751, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+33116, libc.VaList(bp, zDb))
+			ts+33186, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -137210,18 +138150,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1547
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+33226, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33296, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1560, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+33241, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33311, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+33249, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33319, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21914
+				zSep = ts + 21975
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -137330,7 +138270,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33255, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33325, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -137422,7 +138362,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+33275, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33345, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -137685,7 +138625,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -137708,7 +138648,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -137750,7 +138690,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -137811,7 +138751,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -137885,13 +138825,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -137953,7 +138893,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -138326,7 +139266,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -138494,7 +139434,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11689) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11751) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -138505,34 +139445,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.X__builtin___memcpy_chk(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))), libc.X__builtin_object_size(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, 0))
 
-				sessionAppendStr(tls, bp, ts+33293, bp+16)
+				sessionAppendStr(tls, bp, ts+33363, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+33306, bp+16)
+				sessionAppendStr(tls, bp, ts+33376, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+33312, bp+16)
+						sessionAppendStr(tls, bp, ts+33382, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 15007
+						zSep = ts + 15017
 					}
 				}
 
 				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+33241, bp+16)
+				sessionAppendStr(tls, bp, ts+33311, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+33317, bp+16)
+								ts+33387, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+33249, bp+16)
+							sessionAppendStr(tls, bp, ts+33319, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21914
+						zSep = ts + 21975
 					}
 				}
 
@@ -138584,34 +139524,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33392, bp+16)
+	sessionAppendStr(tls, bp, ts+33462, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+33241, bp+16)
+	sessionAppendStr(tls, bp, ts+33311, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+33312, bp+16)
+			sessionAppendStr(tls, bp, ts+33382, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21914
+			zSep = ts + 21975
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33410, bp+16)
+		sessionAppendStr(tls, bp, ts+33480, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32953, bp+16)
+		sessionAppendStr(tls, bp, ts+33023, bp+16)
 
 		zSep = ts + 1547
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+33249, bp+16)
+				sessionAppendStr(tls, bp, ts+33319, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33418
+				zSep = ts + 33488
 			}
 		}
 		sessionAppendStr(tls, bp, ts+5360, bp+16)
@@ -138627,7 +139567,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6784, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6844, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -138638,19 +139578,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33423, bp+16)
+	sessionAppendStr(tls, bp, ts+33493, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21920, bp+16)
+	sessionAppendStr(tls, bp, ts+21981, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+15007, bp+16)
+			sessionAppendStr(tls, bp, ts+15017, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33441, bp+16)
+	sessionAppendStr(tls, bp, ts+33511, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33452, bp+16)
+		sessionAppendStr(tls, bp, ts+33522, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+5360, bp+16)
 
@@ -138666,14 +139606,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11689, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11751, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33456)
+			ts+33526)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33569)
+			ts+33639)
 	}
 	return rc
 }
@@ -138701,7 +139641,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -138710,7 +139650,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -138787,7 +139727,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -138913,7 +139853,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -138954,7 +139894,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33713, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33783, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -138970,7 +139910,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33734, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33804, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -139043,10 +139983,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33753, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33823, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33779, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33849, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -139092,7 +140032,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6784, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6844, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -139105,19 +140045,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33809, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33879, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33853,
+						ts+33923,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33924, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33994, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11689) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11751) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -139168,14 +140108,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33984, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34054, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+34014, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34084, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+34038, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+34014, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34108, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34084, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -140423,7 +141363,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+34066, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34136, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -140711,7 +141651,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+34094, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34164, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -140898,7 +141838,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34125, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34195, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -140966,7 +141906,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 34132
+		var zErr uintptr = ts + 34202
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -141148,7 +142088,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 34182
+		var zErr uintptr = ts + 34252
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -141472,13 +142412,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 34230, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34300, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 34238, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34308, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 34248, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34318, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -142029,7 +142969,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+34253, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34323, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -142056,14 +142996,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*int8)(unsafe.Pointer(p))) < '0' || int32(*(*int8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34260, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34330, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+34291, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34361, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -142074,7 +143014,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34324, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34394, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -142087,7 +143027,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34361, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34431, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -142096,7 +143036,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34370, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34440, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -142115,7 +143055,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34403, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34473, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -142130,14 +143070,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34437, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34507, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34445, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34515, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*int8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34477, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34547, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -142145,9 +143085,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34483, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34553, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34497, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34567, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -142155,9 +143095,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34535, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34605, zCmd, nCmd) == 0 {
 		if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || int32(*(*int8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34546, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34616, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -142167,19 +143107,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5478, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8361, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17751},
-			{FzName: ts + 34581, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8429, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17767},
+			{FzName: ts + 34651, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34589, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34659, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34620, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34690, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -142226,15 +143166,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22580) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16657) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34648, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22641) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16673) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34718, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34678) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34748) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34688, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34758, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -142251,13 +143191,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34719, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34789, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34724, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34794, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34731, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34801, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -142295,8 +143235,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22580) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34739, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22641) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34809, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -142328,7 +143268,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34768, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34838, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -142365,19 +143305,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 34437
+			zTail = ts + 34507
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34788
+			zTail = ts + 34858
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34796, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34866, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16657, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16673, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -142421,18 +143361,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34807, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34877, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1547
 			}
-			return ts + 15007
+			return ts + 15017
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34823, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34893, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34830,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22580))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34900,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22641))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -142542,7 +143482,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34856) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34926) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -142552,7 +143492,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34861) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34931) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -142562,7 +143502,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34870) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34940) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -142575,7 +143515,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34880) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34950) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -142585,7 +143525,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34890) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34960) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -142601,7 +143541,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22580) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22641) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -142624,7 +143564,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34902
+	var zSelect uintptr = ts + 34972
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -142646,7 +143586,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34934) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35004) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -142660,7 +143600,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34942,
+				ts+35012,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -142758,7 +143698,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+35007, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35077, 0)
 					return FTS5_EOF
 				}
 			}
@@ -142771,20 +143711,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+35027, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35097, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35058, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35128, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35061, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35131, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30443, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30513, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -142870,6 +143810,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*int8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -142898,7 +143849,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 1))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*int8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = int8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -144551,9 +145502,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35065, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35135, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+34094, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34164, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -144569,7 +145520,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c int8 = *(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+35070, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35140, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -144656,7 +145607,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20917, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20978, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -144737,7 +145688,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+35099, 0)
+			ts+35169, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -144907,12 +145858,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+35152,
+								ts+35222,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 35202
+										return ts + 35272
 									}
-									return ts + 35065
+									return ts + 35135
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -145855,7 +146806,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35209, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35279, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -145934,7 +146885,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+35215,
+			ts+35285,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -145959,7 +146910,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+35266,
+			ts+35336,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -145982,7 +146933,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+35315,
+			ts+35385,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -146221,7 +147172,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+35355, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35425, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -147420,7 +148371,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+35378,
+			ts+35448,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -148886,7 +149837,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+35462,
+			ts+35532,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -149377,10 +150328,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -149963,13 +150919,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35519, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35589, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+25436, ts+35527, 0, pzErr)
+				pConfig, ts+25506, ts+35597, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11829,
-					ts+35562,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11891,
+					ts+35632,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -150222,7 +151178,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+35209, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35279, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -150336,7 +151292,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35606,
+		ts+35676,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -150506,7 +151462,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35692)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35762)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -150777,7 +151733,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35697, 0)
+			ts+35767, 0)
 		return SQLITE_ERROR
 	}
 
@@ -151201,11 +152157,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35736,
+		ts+35806,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 15007
+					return ts + 15017
 				}
 				return ts + 1547
 			}(),
@@ -151217,9 +152173,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35791
+					return ts + 35861
 				}
-				return ts + 35796
+				return ts + 35866
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -151265,12 +152221,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35800, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35870, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5460, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35806, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35876, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -151301,7 +152257,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35834, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35904, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -151332,7 +152288,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35844, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35914, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -151364,14 +152320,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35865, libc.VaList(bp, z))
+				ts+35935, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34248
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34318
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -151427,7 +152383,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35697, 0)
+		ts+35767, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -151644,7 +152600,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35898, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -151789,28 +152745,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35934, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36004, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35945, 0)
+				ts+36015, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36025, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36095, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+36033, 0)
+				ts+36103, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+17340, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+17356, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36089, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36159, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36095, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36165, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -151868,7 +152824,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17885, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17901, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -151881,12 +152837,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+36111,
+				ts+36181,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20818
+						return ts + 20879
 					}
-					return ts + 36148
+					return ts + 36218
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -152516,7 +153472,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36160, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36230, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -152760,7 +153716,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36181, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36251, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -152779,7 +153735,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36203, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36273, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -152826,7 +153782,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36234)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36304)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -152835,7 +153791,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+36247, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36317, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -152849,7 +153805,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 36338, ts + 34437, ts + 25436, ts + 34788, ts + 11829,
+	ts + 36408, ts + 34507, ts + 25506, ts + 34858, ts + 11891,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -152873,7 +153829,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+36345, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36415, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -152891,13 +153847,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+36345, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36415, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+36350, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36420, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -152952,17 +153910,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 36365,
-			ts + 36433,
-			ts + 36502,
-			ts + 36535,
-			ts + 36574,
-			ts + 36614,
-			ts + 36653,
-			ts + 36694,
-			ts + 36733,
-			ts + 36775,
-			ts + 36815,
+			ts + 36435,
+			ts + 36503,
+			ts + 36572,
+			ts + 36605,
+			ts + 36644,
+			ts + 36684,
+			ts + 36723,
+			ts + 36764,
+			ts + 36803,
+			ts + 36845,
+			ts + 36885,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -153064,18 +154022,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36838,
+		ts+36908,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36942,
+			ts+37012,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36980,
+			ts+37050,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -153087,7 +154045,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+37018,
+			ts+37088,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -153099,14 +154057,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+25436, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11829, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+36338, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25506, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11891, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36408, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34788, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34858, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34437, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34507, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -153118,17 +154076,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37060,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37130,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 30089
+					return ts + 30159
 				}
 				return ts + 1547
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+37090,
+			ts+37160,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -153165,27 +154123,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37134, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37204, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37157, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37227, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34437, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34507, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34788, ts+37163, 0, pzErr)
+				pConfig, ts+34858, ts+37233, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+36338, ts+37195, 1, pzErr)
+				pConfig, ts+36408, ts+37265, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34934, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35004, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -153391,12 +154349,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+37212,
+		ts+37282,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+37262,
+			ts+37332,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -153404,7 +154362,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34934, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35004, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -153580,7 +154538,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+37291,
+	zSql = Xsqlite3_mprintf(tls, ts+37361,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -153762,14 +154720,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34437, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34507, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34788, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34858, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -153964,9 +154922,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.X__builtin___memcpy_chk(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)), libc.X__builtin_object_size(tls, p, 0))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37323) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37393) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37334) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37404) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -154181,7 +155139,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 37345
+			var zCat uintptr = ts + 37415
 			var i int32
 			libc.X__builtin___memset_chk(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})), libc.X__builtin_object_size(tls, p, 0))
 
@@ -154193,7 +155151,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37354) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37424) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -154204,18 +155162,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37365) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37435) {
 					if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' && int32(*(*int8)(unsafe.Pointer(zArg))) != '2' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*int8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37323) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37393) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37334) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37404) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37354) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37424) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -154491,7 +155449,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 37383
+	var zBase uintptr = ts + 37453
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -154633,7 +155591,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37393, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37463, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -154641,11 +155599,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37396, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37466, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37401, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37471, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -154653,7 +155611,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37406, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37476, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -154661,7 +155619,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37409, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37479, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -154669,11 +155627,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37412, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37482, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37417, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37487, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -154681,19 +155639,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37422, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37492, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37426, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37496, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37432, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37502, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37437, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37507, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154701,11 +155659,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37441, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37511, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37445, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37515, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -154713,7 +155671,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37448, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37518, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154721,11 +155679,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37452, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37522, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37456, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37526, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154733,7 +155691,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37460, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37530, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154741,7 +155699,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37464, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37534, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154749,7 +155707,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37468, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37538, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154765,24 +155723,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37472, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37452, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37542, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37475, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37478, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37545, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37548, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37482, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37468, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37552, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37538, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -154797,137 +155755,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37485, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37555, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37452, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37493, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37563, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+37500, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+37570, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37505, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37575, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37401, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37471, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37510, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37580, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37396, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37466, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37515, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37585, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37468, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37538, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37520, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37590, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+15867, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+15883, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37525, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37595, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37478, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37548, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37529, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37599, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37393, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37534, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37604, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37437, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37507, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37540, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37610, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37544, uint64(1), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37614, uint64(1), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37546, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37616, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37460, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37530, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37552, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37622, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37468, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37538, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37560, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37630, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37452, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37566, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37636, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37452, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37571, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37641, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37393, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37577, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37647, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37464, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37534, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37585, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37655, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37593, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37663, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37597, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37667, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37460, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37530, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37605, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37675, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37393, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37611, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37681, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37464, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37534, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37617, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37687, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+37478, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+37548, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -154942,16 +155900,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37624, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37694, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37409, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37629, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37699, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -154959,21 +155917,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37634, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37704, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37409, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37640, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37710, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37409, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37593, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37663, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -154981,7 +155939,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37646, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37716, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -154989,9 +155947,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37652, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37722, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37393, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -155006,12 +155964,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37728, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37662, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37732, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37735, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -155020,7 +155978,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37668, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37738, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -155176,7 +156134,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37672) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37742) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -155356,22 +156314,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 37383, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37453, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37687, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37757, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37693, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37763, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37700, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37770, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -156514,14 +157472,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37708) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37778) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37712) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37782) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37716) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37786) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37725, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37795, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -156547,19 +157505,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 37759,
-		ts + 37799,
-		ts + 37834,
+		ts + 37829,
+		ts + 37869,
+		ts + 37904,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23732, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23802, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37877, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37947, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -156692,11 +157650,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37910, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37980, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37941,
+		ts+38011,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -156720,7 +157678,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37992, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38062, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -157115,7 +158073,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+38018, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38088, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -157137,7 +158095,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 38028
+	return ts + 38098
 }
 
 func init() {
@@ -157192,114 +158150,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -157926,6 +158886,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -158244,6 +159216,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -158265,5 +159238,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-12.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00S\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00nfs\x00hfs\x00ufs\x00afpfs\x00smbfs\x00webdav\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00msdos\x00exfat\x00SQLITE_FORCE_PROXY_LOCKING\x00:auto:\x00fsync\x00/dev/urandom\x00sqliteplocks\x00/\x00dummy\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00break\x00path error (len %d)\x00read error (len %d)\x00create failed (%d)\x00write failed (%d)\x00rename failed (%d)\x00broke stale lock on %s\n\x00failed to break stale lock on %s, %s\n\x00-conch\x00.lock\x00:auto: (not held)\x00unix\x00unix-none\x00unix-dotfile\x00unix-posix\x00unix-flock\x00unix-afp\x00unix-nfs\x00unix-proxy\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00dylib\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00lock_proxy_file\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00failed to set lock proxy file\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-12.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00S\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00nfs\x00hfs\x00ufs\x00afpfs\x00smbfs\x00webdav\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00msdos\x00exfat\x00SQLITE_FORCE_PROXY_LOCKING\x00:auto:\x00fsync\x00/dev/urandom\x00sqliteplocks\x00/\x00dummy\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00break\x00path error (len %d)\x00read error (len %d)\x00create failed (%d)\x00write failed (%d)\x00rename failed (%d)\x00broke stale lock on %s\n\x00failed to break stale lock on %s, %s\n\x00-conch\x00.lock\x00:auto: (not held)\x00unix\x00unix-none\x00unix-dotfile\x00unix-posix\x00unix-flock\x00unix-afp\x00unix-nfs\x00unix-proxy\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00dylib\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00lock_proxy_file\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00failed to set lock proxy file\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_darwin_arm64.go b/vendor/modernc.org/sqlite/lib/sqlite_darwin_arm64.go
index dd184fc5..985e1aa2 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_darwin_arm64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_darwin_arm64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_darwin_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1 -DSQLITE_WITHOUT_ZONEMALLOC', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_darwin_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1 -DSQLITE_WITHOUT_ZONEMALLOC', DO NOT EDIT.
 
 package sqlite3
 
@@ -669,6 +669,7 @@ const (
 	FTS5_LCP                                       = 7
 	FTS5_LP                                        = 10
 	FTS5_MAIN_PREFIX                               = 48
+	FTS5_MAX_LEVEL                                 = 64
 	FTS5_MAX_PAGE_SIZE                             = 65536
 	FTS5_MAX_PREFIX_INDEXES                        = 31
 	FTS5_MAX_SEGMENT                               = 2000
@@ -811,6 +812,7 @@ const (
 	HASHTABLE_HASH_1                               = 383
 	HASHTABLE_NPAGE                                = 4096
 	HASHTABLE_NSLOT                                = 8192
+	HAVE_FCHMOD                                    = 0
 	HAVE_FCHOWN                                    = 1
 	HAVE_FULLFSYNC                                 = 1
 	HAVE_GETHOSTUUID                               = 1
@@ -1339,6 +1341,7 @@ const (
 	OPFLG_IN2                                      = 0x04
 	OPFLG_IN3                                      = 0x08
 	OPFLG_JUMP                                     = 0x01
+	OPFLG_NCYCLE                                   = 0x40
 	OPFLG_OUT2                                     = 0x10
 	OPFLG_OUT3                                     = 0x20
 	OP_Abortable                                   = 186
@@ -1934,6 +1937,7 @@ const (
 	SF_SUPPORTED                                   = 0x009f0000
 	SF_SYNTHETIC                                   = 0xc0000000
 	SF_UFSrcCheck                                  = 0x0800000
+	SF_UpdateFrom                                  = 0x10000000
 	SF_UsesEphemeral                               = 0x0000020
 	SF_Values                                      = 0x0000200
 	SF_View                                        = 0x0200000
@@ -2011,6 +2015,7 @@ const (
 	SQLITE_ACCESS_READ                             = 2
 	SQLITE_ACCESS_READWRITE                        = 1
 	SQLITE_AFF_BLOB                                = 0x41
+	SQLITE_AFF_FLEXNUM                             = 0x46
 	SQLITE_AFF_INTEGER                             = 0x44
 	SQLITE_AFF_MASK                                = 0x47
 	SQLITE_AFF_NONE                                = 0x40
@@ -2129,6 +2134,7 @@ const (
 	SQLITE_CacheSpill                              = 0x00000020
 	SQLITE_CellSizeCk                              = 0x00200000
 	SQLITE_CkptFullFSync                           = 0x00000010
+	SQLITE_Coroutines                              = 0x02000000
 	SQLITE_CountOfView                             = 0x00000200
 	SQLITE_CoverIdxScan                            = 0x00000020
 	SQLITE_CursorHints                             = 0x00000400
@@ -2495,6 +2501,7 @@ const (
 	SQLITE_NOTADB                                  = 26
 	SQLITE_NOTFOUND                                = 12
 	SQLITE_NOTICE                                  = 27
+	SQLITE_NOTICE_RBU                              = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK                 = 539
 	SQLITE_NOTICE_RECOVER_WAL                      = 283
 	SQLITE_NOTNULL                                 = 0x90
@@ -2591,11 +2598,14 @@ const (
 	SQLITE_ResetDatabase                           = 0x02000000
 	SQLITE_ReverseOrder                            = 0x00001000
 	SQLITE_SAVEPOINT                               = 32
+	SQLITE_SCANSTAT_COMPLEX                        = 0x0001
 	SQLITE_SCANSTAT_EST                            = 2
 	SQLITE_SCANSTAT_EXPLAIN                        = 4
 	SQLITE_SCANSTAT_NAME                           = 3
+	SQLITE_SCANSTAT_NCYCLE                         = 7
 	SQLITE_SCANSTAT_NLOOP                          = 0
 	SQLITE_SCANSTAT_NVISIT                         = 1
+	SQLITE_SCANSTAT_PARENTID                       = 6
 	SQLITE_SCANSTAT_SELECTID                       = 5
 	SQLITE_SCHEMA                                  = 17
 	SQLITE_SELECT                                  = 21
@@ -2610,7 +2620,7 @@ const (
 	SQLITE_SHM_UNLOCK                              = 1
 	SQLITE_SORTER_PMASZ                            = 250
 	SQLITE_SOUNDEX                                 = 1
-	SQLITE_SOURCE_ID                               = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                               = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                                  = 0
 	SQLITE_SO_DESC                                 = 1
 	SQLITE_SO_UNDEFINED                            = -1
@@ -2718,8 +2728,8 @@ const (
 	SQLITE_UTF8                                    = 1
 	SQLITE_VDBEINT_H                               = 0
 	SQLITE_VDBE_H                                  = 0
-	SQLITE_VERSION                                 = "3.40.1"
-	SQLITE_VERSION_NUMBER                          = 3040001
+	SQLITE_VERSION                                 = "3.41.0"
+	SQLITE_VERSION_NUMBER                          = 3041000
 	SQLITE_VTABRISK_High                           = 2
 	SQLITE_VTABRISK_Low                            = 0
 	SQLITE_VTABRISK_Normal                         = 1
@@ -3284,6 +3294,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                          = 1
 	WHERE_DISTINCT_UNORDERED                       = 3
 	WHERE_DUPLICATES_OK                            = 0x0010
+	WHERE_EXPRIDX                                  = 0x04000000
 	WHERE_GROUPBY                                  = 0x0040
 	WHERE_IDX_ONLY                                 = 0x00000040
 	WHERE_INDEXED                                  = 0x00000200
@@ -4585,6 +4596,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -6939,10 +6951,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -6998,12 +7008,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -7255,7 +7263,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -7376,7 +7383,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -7400,11 +7407,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -7412,11 +7421,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -8048,7 +8057,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -8186,10 +8195,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -8204,12 +8211,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -8399,10 +8404,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -8606,7 +8613,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1092))
@@ -8758,7 +8765,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -8807,8 +8813,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -8819,6 +8835,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -8935,7 +8960,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -9897,14 +9922,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})), libc.X__builtin_object_size(tls, bp, 0))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = int8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -9912,7 +9937,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.X__builtin___memset_chk(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})), libc.X__builtin_object_size(tls, p, 0))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -11723,7 +11748,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -11979,6 +12004,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -12969,6 +12996,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -12977,11 +13005,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -12993,30 +13045,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1547
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -13025,83 +13077,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -13115,17 +13167,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -13133,90 +13185,90 @@ __219:
 		}
 		return ts + 1553
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(j))) = int8(0)
 	length = int32(j)
@@ -13224,89 +13276,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -13319,32 +13371,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -13403,7 +13455,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -13419,8 +13471,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -13449,12 +13500,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -13463,7 +13515,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.X__builtin___memcpy_chk(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N), libc.X__builtin_object_size(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), 0))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -14691,6 +14743,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -15296,10 +15366,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -15325,6 +15398,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = int8('-')
 	}
 	libc.X__builtin___memcpy_chk(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]int8{}))-uint64(1)-uint64(i), libc.X__builtin_object_size(tls, zOut, 0))
+	return int32(uint64(unsafe.Sizeof([22]int8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -16333,11 +16407,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -18244,7 +18319,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -18482,7 +18557,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -18498,113 +18573,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -18789,7 +18864,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -19556,7 +19631,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3371, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -19573,14 +19648,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3661, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3661, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -19600,7 +19675,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -19668,7 +19743,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -19902,7 +19977,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -19930,7 +20005,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -20029,7 +20104,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3254, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -20159,7 +20234,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -20205,7 +20280,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -20444,7 +20519,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -20671,7 +20746,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+16)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -20688,7 +20763,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 			rc = findInodeInfo(tls, pNew, pNew+16)
 			if rc != SQLITE_OK {
 				Xsqlite3_free(tls, (*UnixFile)(unsafe.Pointer(pNew)).FlockingContext)
-				robust_close(tls, pNew, h, 42407)
+				robust_close(tls, pNew, h, 42698)
 				h = -1
 			}
 			unixLeaveMutex(tls)
@@ -20710,7 +20785,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -21030,7 +21105,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3254, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -21074,7 +21149,7 @@ __25:
 		goto __26
 	}
 	storeLastErrno(tls, p, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-	robust_close(tls, p, fd, 42961)
+	robust_close(tls, p, fd, 43252)
 	return SQLITE_IOERR | int32(13)<<8
 __26:
 	;
@@ -21182,7 +21257,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__error(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43337)
 		}
 		return rc
 	}
@@ -21190,9 +21265,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3860, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3860, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -21235,12 +21310,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*int8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -21259,18 +21331,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*24 + 8)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__error(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3452, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3452, zIn, 43443)
 			}
 		} else if int32((*stat)(unsafe.Pointer(bp)).Fst_mode)&S_IFMT == S_IFLNK {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls, zIn, bp+144, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2))
 			if got <= int64(0) || got >= Ssize_t(unsafe.Sizeof([1026]int8{}))-int64(2) {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3443, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3443, zIn, 43454)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 144 + uintptr(got))) = int8(0)
@@ -21310,14 +21382,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 1032)).FzOut = zOut
 	if int32(*(*int8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, bp, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3272, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3272, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+1032, bp)
 	}
 	appendAllPathElements(tls, bp+1032, zPath)
 	*(*int8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+1032)).FnUsed))) = int8(0)
 	if (*DbPath)(unsafe.Pointer(bp+1032)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+1032)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -21392,7 +21464,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__error(tls))) == EINTR {
 				got = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*24 + 8)))(tls, fd, zBuf, uint64(nBuf)))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -21606,7 +21678,7 @@ __11:
 __12:
 	return SQLITE_IOERR | int32(15)<<8
 __13:
-	return Xsqlite3CantopenError(tls, 43759)
+	return Xsqlite3CantopenError(tls, 44048)
 __10:
 	;
 __8:
@@ -21637,7 +21709,7 @@ __14:
 __15:
 	;
 end_create_proxy:
-	robust_close(tls, pNew, fd, 43783)
+	robust_close(tls, pNew, fd, 44072)
 	Xsqlite3_free(tls, pNew)
 	Xsqlite3_free(tls, pUnused)
 	return rc
@@ -21726,7 +21798,7 @@ __5:
 	;
 	rc = 0
 	libc.Xfprintf(tls, libc.X__stderrp, ts+4066, libc.VaList(bp+40, cPath))
-	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(conchFile)).Fh, 43886)
+	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(conchFile)).Fh, 44175)
 	(*UnixFile)(unsafe.Pointer(conchFile)).Fh = fd
 	(*UnixFile)(unsafe.Pointer(conchFile)).FopenFlags = O_RDWR | O_CREAT
 
@@ -21738,7 +21810,7 @@ end_breaklock:
 		goto __7
 	}
 	(*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 16*24 + 8)))(tls, bp+64)
-	robust_close(tls, pFile, fd, 43894)
+	robust_close(tls, pFile, fd, 44183)
 __7:
 	;
 	libc.Xfprintf(tls, libc.X__stderrp, ts+4090, libc.VaList(bp+48, cPath, bp+1088))
@@ -22018,7 +22090,7 @@ end_takeconch:
 	if !((*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0) {
 		goto __29
 	}
-	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 44147)
+	robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 44436)
 __29:
 	;
 	(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
@@ -22030,7 +22102,7 @@ __29:
 	(*UnixFile)(unsafe.Pointer(pFile)).Fh = fd
 	goto __31
 __30:
-	rc = Xsqlite3CantopenError(tls, 44155)
+	rc = Xsqlite3CantopenError(tls, 44444)
 
 __31:
 	;
@@ -26305,7 +26377,7 @@ __26:
 		goto __27
 	}
 
-	libc.X__builtin___memset_chk(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4), libc.X__builtin_object_size(tls, zSuper+libc.UintptrFromInt32(-4), 0))
+	libc.X__builtin___memset_chk(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4), libc.X__builtin_object_size(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -27357,7 +27429,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -27374,7 +27445,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -27440,7 +27510,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -27450,7 +27519,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -27641,36 +27710,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -27842,7 +27900,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -27966,7 +28024,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -28005,7 +28063,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -28082,7 +28140,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -28994,10 +29052,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]int8{int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0)}
@@ -29083,7 +29143,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -29839,7 +29899,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -29938,7 +29998,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -30524,7 +30584,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -30799,7 +30859,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -31272,7 +31332,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -31777,7 +31837,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -32012,8 +32072,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -32021,23 +32081,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -32433,7 +32495,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -32570,7 +32632,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -32587,7 +32649,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -32595,7 +32657,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -32638,7 +32700,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -32648,7 +32710,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -32898,7 +32960,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -32945,7 +33007,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -32955,7 +33017,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -32968,7 +33030,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -32977,14 +33039,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.X__builtin___memmove_chk(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)), libc.X__builtin_object_size(tls, data+uintptr(iFree+sz+sz2), 0))
@@ -32994,7 +33056,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -33058,7 +33120,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -33068,7 +33130,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -33090,7 +33152,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -33125,7 +33187,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -33138,13 +33200,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -33169,7 +33231,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -33180,7 +33242,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -33232,22 +33294,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -33257,7 +33319,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -33265,7 +33327,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -33273,10 +33335,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -33300,13 +33362,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -33314,7 +33375,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -33322,32 +33422,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -33375,11 +33464,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -33390,15 +33479,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -33426,14 +33515,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2) + 1)))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -33447,7 +33536,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -33459,7 +33548,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -33562,7 +33651,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -33590,7 +33679,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -33629,7 +33718,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -34512,7 +34601,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -34927,7 +35016,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -34953,7 +35042,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -34962,7 +35051,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -34973,7 +35062,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -34989,7 +35078,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -35050,7 +35139,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -35085,7 +35174,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -35145,7 +35234,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -35184,7 +35273,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -35215,7 +35304,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -35556,7 +35645,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -35800,14 +35889,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -35852,7 +35941,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -35901,7 +35990,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -35981,7 +36070,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -36072,7 +36161,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -36092,7 +36181,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -36156,18 +36245,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -36183,6 +36262,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -36304,7 +36391,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -36508,7 +36595,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -36573,7 +36660,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -36621,7 +36708,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -36740,7 +36827,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -36900,7 +36987,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -36965,7 +37052,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -37001,7 +37088,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -37045,7 +37132,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -37157,7 +37244,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -37315,7 +37402,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -37372,7 +37459,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -37388,7 +37475,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -37462,7 +37549,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -37474,7 +37561,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -37485,7 +37572,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -37650,7 +37737,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -37674,9 +37761,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -37699,16 +37786,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -37729,9 +37814,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -37865,11 +37956,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -37922,12 +38016,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -37935,7 +38029,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.X__builtin___memmove_chk(tls, pData, pCell, uint64(sz), libc.X__builtin_object_size(tls, pData, 0))
 
@@ -37995,7 +38089,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.X__builtin___memmove_chk(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz), libc.X__builtin_object_size(tls, pSlot, 0))
@@ -38084,7 +38178,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.X__builtin___memmove_chk(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2), libc.X__builtin_object_size(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, 0))
@@ -38200,7 +38294,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -38243,8 +38337,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -38326,6 +38420,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -38518,7 +38614,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -38529,7 +38625,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -38687,7 +38783,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -38761,7 +38857,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -38787,9 +38883,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -38800,8 +38897,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -38823,7 +38920,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -38851,7 +38948,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -39112,11 +39209,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -39302,7 +39399,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -39340,7 +39437,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -39417,7 +39514,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -39429,19 +39526,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -39454,7 +39543,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -39473,6 +39562,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -39508,7 +39614,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -39517,13 +39622,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -39534,7 +39638,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -39647,7 +39751,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -39661,20 +39765,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -39684,7 +39788,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -39692,100 +39802,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx) + 1)))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.X__builtin___memcpy_chk(tls, newCell, oldCell, uint64(4), libc.X__builtin_object_size(tls, newCell, 0))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.X__builtin___memcpy_chk(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))), libc.X__builtin_object_size(tls, oldCell, 0))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -39794,30 +39904,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.X__builtin___memcpy_chk(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey), libc.X__builtin_object_size(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, 0))
+	goto __48
 __47:
+	libc.X__builtin___memcpy_chk(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey), libc.X__builtin_object_size(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, 0))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -39840,7 +39950,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -39859,13 +39968,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.X__builtin___memcpy_chk(tls, aOut, aIn, uint64(nIn), libc.X__builtin_object_size(tls, aOut, 0))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -39882,7 +39993,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -39941,9 +40052,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -39983,7 +40094,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -39991,11 +40102,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx) + 1)))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -40070,7 +40181,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)) + 1)))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -40080,7 +40191,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -40139,7 +40250,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -40168,7 +40279,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -40244,7 +40355,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -40258,7 +40369,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -40392,7 +40503,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -40567,12 +40678,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -40580,15 +40720,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+4465, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4465, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -40612,9 +40752,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4490, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if *(*int32)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb + 432)) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -40628,7 +40765,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4515, libc.VaList(bp, iChild))
 		return
@@ -40702,7 +40839,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -40787,48 +40926,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4711
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4721, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4759, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4797, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -40843,29 +40989,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4845
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -40873,28 +41019,28 @@ __9:
 	pc = U32(int32(*(*U8)(unsafe.Pointer(pCellIdx)))<<8 | int32(*(*U8)(unsafe.Pointer(pCellIdx + 1))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4873,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4903, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -40902,97 +41048,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4927, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4951, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2) + 1))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -41002,48 +41148,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4976, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+5013,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -41072,9 +41218,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -41106,19 +41252,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.X__builtin___memset_chk(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})), libc.X__builtin_object_size(tls, bp+32, 0))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -41130,7 +41270,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -41138,7 +41278,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -41223,7 +41363,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -41266,22 +41406,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -41508,8 +41645,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -42008,7 +42145,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 	defer tls.Free(40)
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+8, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+8, ts+5328,
@@ -42020,6 +42157,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*int8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+8)).FnChar))) = int8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 8)).FnChar)
 	}
 }
 
@@ -42207,7 +42345,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -42381,16 +42518,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -42833,7 +42972,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -43070,43 +43209,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -43491,7 +43621,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -43506,14 +43636,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -43883,7 +44013,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -43895,13 +44027,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -43978,6 +44112,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -44866,7 +45003,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -44875,7 +45012,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -44909,7 +45046,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -44951,7 +45087,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -45703,7 +45839,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -45811,7 +45947,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -46362,7 +46498,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -46427,7 +46563,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -46461,7 +46597,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -46511,7 +46647,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -46657,7 +46793,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -46828,7 +46964,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -46854,7 +46990,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -47128,7 +47264,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -47480,8 +47616,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -47491,15 +47630,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -47687,6 +47826,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -47739,7 +47879,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -47803,6 +47943,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -47814,9 +47963,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5760)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -48050,7 +48200,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -48074,8 +48224,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -48249,15 +48399,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5770, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5760, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -48368,14 +48518,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -48659,7 +48812,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -48803,7 +48956,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -48975,7 +49128,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*int8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5810, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5800, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -49030,21 +49183,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5814, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5804, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5821, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5811, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5834, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5824, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5837, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5827, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5842, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5832, 1)
 			}
 		}
 	}
@@ -49136,11 +49289,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity int8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -49271,8 +49424,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -49507,7 +49660,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -49608,594 +49760,598 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
-		goto __100
-	case OP_NotFound:
-		goto __101
-	case OP_Found:
-		goto __102
 
-	case OP_SeekRowid:
+	case OP_IfNoHope:
+		goto __100
+	case OP_NoConflict:
+		goto __101
+	case OP_NotFound:
+		goto __102
+	case OP_Found:
 		goto __103
 
-	case OP_NotExists:
+	case OP_SeekRowid:
 		goto __104
 
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -50204,56 +50360,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -50261,20 +50417,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -50282,124 +50439,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5844, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5865, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5834, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5855, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5872, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5862, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -50407,10 +50564,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -50421,9 +50578,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -50431,171 +50588,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.X__builtin___memcpy_chk(tls, pOut, pVar, uint64(uintptr(0)+24), libc.X__builtin_object_size(tls, pOut, 0))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -50603,95 +50760,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.X__builtin___memcpy_chk(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn), libc.X__builtin_object_size(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, 0))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.X__builtin___memcpy_chk(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn), libc.X__builtin_object_size(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), 0))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = int8(0)
@@ -50699,231 +50856,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -50932,95 +51089,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.X__builtin___memcpy_chk(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))), libc.X__builtin_object_size(tls, bp+216, 0))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.X__builtin___memcpy_chk(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))), libc.X__builtin_object_size(tls, bp+224, 0))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -51030,189 +51187,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -51221,38 +51382,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -51260,9 +51421,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -51273,298 +51434,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -51574,144 +51736,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.X__builtin___memset_chk(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})), libc.X__builtin_object_size(tls, bp+232, 0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -51719,353 +51881,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.X__builtin___memcpy_chk(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len), libc.X__builtin_object_size(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, 0))
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = int8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5896,
+	Xsqlite3VdbeError(tls, p, ts+5886,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*int8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -52079,319 +52241,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*int8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.X__builtin___memcpy_chk(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))), libc.X__builtin_object_size(tls, bp+296, 0))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.X__builtin___memcpy_chk(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn), libc.X__builtin_object_size(tls, zPayload, 0))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -52399,467 +52550,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.X__builtin___memcpy_chk(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn), libc.X__builtin_object_size(tls, zPayload, 0))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5937, 0)
+	Xsqlite3VdbeError(tls, p, ts+5927, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.X__builtin___memcpy_chk(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1), libc.X__builtin_object_size(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, 0))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5988, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5978, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6010, 0)
+		ts+6000, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6064, 0)
+		ts+6054, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 6119
+				return ts + 6109
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 6167
+					return ts + 6157
 				}
-				return ts + 6210
+				return ts + 6200
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+6251)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+6241)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -52867,67 +53029,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -52938,24 +53100,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -52963,30 +53125,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -53002,22 +53164,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -53031,133 +53193,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1547
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -53165,18 +53327,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -53187,92 +53349,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -53290,106 +53452,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -53398,108 +53560,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -53507,14 +53669,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -53524,108 +53686,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, int8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -53644,35 +53806,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -53680,123 +53842,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -53806,52 +53968,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -53863,15 +54025,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -53879,13 +54042,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -53898,11 +54061,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -53913,38 +54076,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -53956,47 +54119,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -54005,35 +54168,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -54042,51 +54205,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -54096,72 +54259,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -54169,43 +54332,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -54213,84 +54376,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -54300,34 +54468,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -54336,10 +54504,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -54356,14 +54524,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -54376,21 +54544,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -54402,62 +54570,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+6279)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+6269)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -54470,56 +54638,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -54530,54 +54698,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -54585,72 +54753,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -54659,55 +54827,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 6296
+	goto __799
+__798:
+	zSchema = ts + 6286
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+6310,
+		ts+6300,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -54717,66 +54885,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -54785,151 +54953,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+6353, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+6343, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -54937,10 +55106,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -54960,26 +55129,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -54991,7 +55160,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -55002,170 +55171,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -55182,146 +55351,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -55329,70 +55498,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+6390,
+		ts+6380,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6442
+				return ts + 6432
 			}
-			return ts + 6447
+			return ts + 6437
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -55400,17 +55569,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -55420,14 +55589,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -55437,197 +55606,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6454, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6444, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.X__builtin___memset_chk(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})), libc.X__builtin_object_size(tls, bp+912, 0))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.X__builtin___memset_chk(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})), libc.X__builtin_object_size(tls, bp+920, 0))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5760, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6473, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -55641,27 +55810,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -55669,72 +55838,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.X__builtin___memset_chk(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})), libc.X__builtin_object_size(tls, bp+976, 0))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.X__builtin___memset_chk(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})), libc.X__builtin_object_size(tls, bp+984, 0))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -55744,192 +55913,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -55938,63 +56107,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= int8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -56004,104 +56173,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6483, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3658, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -56109,52 +56278,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6489,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -56273,8 +56446,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -56294,7 +56467,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -56314,8 +56487,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -56346,8 +56519,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -56380,8 +56553,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6709, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6709, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -56461,8 +56634,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6750, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6750, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -56531,7 +56704,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -56559,12 +56732,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 3658
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -56608,7 +56781,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -56691,7 +56864,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -59230,6 +59403,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6784, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6792+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6811+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6286+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6830+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6830+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -59249,7 +59450,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -59304,7 +59504,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6784, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6844, zDb) == 0) {
 		goto __8
 	}
 
@@ -59425,7 +59625,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6789) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6849) != 0) {
 		goto __33
 	}
 	goto __14
@@ -59433,73 +59633,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -59511,28 +59729,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -59543,160 +59761,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6791, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6851, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6795, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6855, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6799, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6859, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -59705,8 +59924,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -59714,19 +59933,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -59734,81 +59953,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6808, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6868, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6839, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6899, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6876, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -59821,141 +60040,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6894, libc.VaList(bp+16, zCol))
+		ts+6954, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.X__builtin___memset_chk(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})), libc.X__builtin_object_size(tls, pExpr+64, 0))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6929
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6989
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6938
+		zErr = ts + 6998
 	} else {
-		zErr = ts + 6953
+		zErr = ts + 7013
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6975, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+7035, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6988, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6998, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+7048, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+7058, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -59999,15 +60218,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 7005
+	var zIn uintptr = ts + 7065
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 7033
+		zIn = ts + 7093
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 7051
+		zIn = ts + 7111
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 7069
+		zIn = ts + 7129
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7087, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7147, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -60086,10 +60305,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7107
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7167
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7112
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7172
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -60136,7 +60355,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7118, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7178, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -60200,7 +60419,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+7135, libc.VaList(bp, pExpr))
+								ts+7195, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -60216,7 +60435,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+7199,
+							Xsqlite3ErrorMsg(tls, pParse, ts+7259,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -60230,7 +60449,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+7235, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+7295, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -60253,30 +60472,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7263, libc.VaList(bp+16, pExpr))
+						ts+7323, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 7306
+						zType = ts + 7366
 					} else {
-						zType = ts + 7313
+						zType = ts + 7373
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+7323, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7383, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7351, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7411, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+7373,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7433,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7417,
+						ts+7477,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -60348,7 +60567,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7465, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7525, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -60364,7 +60583,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7476, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7536, pExpr, pExpr)
 			}
 
 			break
@@ -60420,7 +60639,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6876, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -60495,7 +60714,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7487, libc.VaList(bp, i, zType, mx))
+		ts+7547, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -60515,7 +60734,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7543, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7603, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -60550,7 +60769,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7577, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7637, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -60607,7 +60826,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7583, libc.VaList(bp, i+1))
+				ts+7643, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -60635,7 +60854,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7644, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7704, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -60849,7 +61068,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7675, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7735, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -60889,7 +61108,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7577) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7637) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -60900,7 +61119,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7714) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7774) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -60912,7 +61131,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7720, 0)
+						ts+7780, 0)
 					return WRC_Abort
 				}
 
@@ -61012,12 +61231,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -61053,12 +61272,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -61168,33 +61387,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) int8 {
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) int8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -61264,7 +61584,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -61599,7 +61920,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6876, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
 		return
 	}
 
@@ -61674,7 +61995,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7779, libc.VaList(bp, mxHeight))
+			ts+7839, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -61923,10 +62244,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7827,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7887,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7871
+						return ts + 7931
 					}
 					return ts + 1547
 				}(), nElem))
@@ -61967,7 +62288,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7873)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7933)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -61993,7 +62314,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7875, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7935, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -62021,7 +62342,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7909, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7969, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -62068,7 +62389,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7929,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7989,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -62093,7 +62414,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7972, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8032, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -62668,7 +62989,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7995,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8055,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -62791,7 +63112,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8025, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8085, libc.VaList(bp, zObject))
 	}
 }
 
@@ -62847,10 +63168,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+7107) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7167) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+7112) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+7172) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -63281,13 +63602,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff int8) int32
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+8048) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8108) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+8056) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8116) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+8062) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+8122) == 0 {
 		return 1
 	}
 	return 0
@@ -63491,7 +63812,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8066, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8126, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -63569,7 +63890,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8113, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8173, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -63663,7 +63984,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 8144
+		var zFmt uintptr = ts + 8204
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -63681,7 +64002,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6876, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
 	}
 }
 
@@ -63722,7 +64043,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8188, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8248, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -63752,11 +64073,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8211, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8271, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1547
 			}
-			return ts + 8230
+			return ts + 8290
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -63883,7 +64204,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8242, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+8302, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -63898,12 +64219,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8260, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+8320, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1547
 		}
-		return ts + 8230
+		return ts + 8290
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -63924,7 +64246,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7873)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7933)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -63933,7 +64255,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+8281)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+8341)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -64319,8 +64641,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+8283, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+8286,
+			if Xsqlite3_strnicmp(tls, z, ts+8343, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+8346,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 5335
@@ -64396,7 +64718,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+8313,
+				Xsqlite3ErrorMsg(tls, pParse, ts+8373,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -64482,8 +64804,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -64569,14 +64891,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 8343, ts + 8348, ts + 8353, ts + 6594, ts + 6589}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8403, ts + 8408, ts + 8413, ts + 6594,
+				ts + 6589, ts + 8421}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 8361
+						return ts + 8429
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -64590,7 +64914,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -64613,10 +64937,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -64716,7 +65040,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -64846,12 +65170,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -64860,110 +65185,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8313,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8373,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -65006,13 +65344,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -65022,11 +65360,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -65049,11 +65387,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -65062,15 +65400,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -65097,20 +65435,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -65119,9 +65457,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -65159,14 +65497,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+8366, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8434, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -65177,17 +65517,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -65199,128 +65539,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8393, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8461, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -65328,42 +65668,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7995,
+	Xsqlite3ErrorMsg(tls, pParse, ts+8055,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -65386,23 +65726,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -65419,42 +65759,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6876, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6936, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -65475,15 +65817,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -65493,22 +65835,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -65517,21 +65859,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -65541,27 +65883,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8417, 0)
+		ts+8485, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -65570,7 +65912,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -65581,7 +65923,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]int8)(unsafe.Pointer(ts + 8467))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8535))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -66956,18 +67298,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -66997,7 +67339,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -67010,12 +67352,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -67023,6 +67463,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})), libc.X__builtin_object_size(tls, bp, 0))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -67037,81 +67517,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -67133,34 +67540,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -67250,7 +67656,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -67258,7 +67664,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -67309,11 +67715,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8475, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8483, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8545, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -67325,13 +67731,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8511,
+		ts+8573,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8686,
+			ts+8748,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -67341,10 +67747,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8860, libc.VaList(bp, zDb, zDb))
+		ts+8922, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9007, 0)
+			ts+9069, 0)
 	}
 }
 
@@ -67408,7 +67814,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+9158, libc.VaList(bp, zName))
+		ts+9220, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -67418,7 +67824,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+9217, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+9279, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -67427,7 +67833,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9223, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+9285, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -67468,19 +67874,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9250, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+9312, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9434,
+		ts+9496,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9739, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9801, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9755,
+		ts+9817,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -67488,7 +67894,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9813, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9875, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -67500,7 +67906,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+10078, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+10140, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -67512,7 +67918,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10091,
+		ts+10153,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -67558,12 +67964,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10129, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+10191, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+10161, 0)
+			ts+10223, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -67573,11 +67979,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+10188)
+				ts+10250)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+10247)
+				ts+10309)
 		}
 
 		if pDflt != 0 {
@@ -67590,12 +67996,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+10300)
+					ts+10362)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10346)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10408)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -67606,7 +68012,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+10373,
+			ts+10435,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -67628,7 +68034,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10519,
+				ts+10581,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -67676,14 +68082,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10749, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10811, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10783, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10845, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -67711,7 +68117,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10813, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10875, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -67751,18 +68157,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10832
+		zType = ts + 10894
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10837
+		zType = ts + 10899
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10851,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10913,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10869
+					return ts + 10931
 				}
-				return ts + 10886
+				return ts + 10948
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -67846,7 +68252,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10904, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10966, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -67863,17 +68269,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10925,
+		ts+10987,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11107,
+		ts+11169,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+10078, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+10140, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -68068,7 +68474,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -68131,10 +68537,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11238,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11300,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 11261
+				return ts + 11323
 			}
 			return ts + 1547
 		}(), zWhen,
@@ -68176,8 +68582,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+11263, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+11325, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -68194,7 +68600,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -68216,7 +68622,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+11271, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+11333, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -68256,10 +68662,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.X__builtin___memcpy_chk(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn), libc.X__builtin_object_size(tls, zBuf1, 0))
 				*(*int8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = int8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+11277, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+11339, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*int8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 11261
+							return ts + 11323
 						}
 						return ts + 1547
 					}()))
@@ -68434,8 +68840,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -68518,15 +68924,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.X__builtin___memset_chk(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp+448, 0))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.X__builtin___memset_chk(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp+456, 0))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -68554,7 +68960,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -68587,13 +68993,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -68606,7 +69012,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -68621,7 +69027,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -68677,8 +69083,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -68726,7 +69132,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -68794,8 +69200,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -68837,11 +69243,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.X__builtin___memset_chk(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+496, 0))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.X__builtin___memset_chk(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+504, 0))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -68934,8 +69340,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -68953,16 +69359,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.X__builtin___memset_chk(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})), libc.X__builtin_object_size(tls, bp+416, 0))
-			libc.X__builtin___memset_chk(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp+448, 0))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.X__builtin___memset_chk(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})), libc.X__builtin_object_size(tls, bp+424, 0))
+			libc.X__builtin___memset_chk(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp+456, 0))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -68977,31 +69383,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -69019,8 +69425,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -69046,9 +69452,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.X__builtin___memset_chk(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+416, 0))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.X__builtin___memset_chk(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+424, 0))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -69076,8 +69482,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -69114,7 +69520,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -69138,7 +69544,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+11282, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+11344, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -69219,17 +69625,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10904, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10966, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11289,
+	Xsqlite3ErrorMsg(tls, pParse, ts+11351,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 11317
+				return ts + 11379
 			}
 			return ts + 6530
 		}(),
@@ -69240,7 +69646,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11329, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11391, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -69257,10 +69663,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11377, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11439, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11498, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11560, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -69378,11 +69784,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11516},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11537},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11557},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11576},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11595}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11578},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11599},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11619},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11638},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11657}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -69416,7 +69822,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11618, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11680, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -69425,10 +69831,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11641,
+					ts+11703,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11671, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11733, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -69446,9 +69852,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11689, FzCols: ts + 11702},
-	{FzName: ts + 11715, FzCols: ts + 11728},
-	{FzName: ts + 11756},
+	{FzName: ts + 11751, FzCols: ts + 11764},
+	{FzName: ts + 11777, FzCols: ts + 11790},
+	{FzName: ts + 11818},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -69467,7 +69873,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -69546,7 +69951,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -69592,13 +69997,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -69611,11 +70016,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -69639,17 +70044,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11769}
+	FzName:     ts + 11831}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -69660,8 +70065,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -69704,7 +70109,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -69732,7 +70137,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -69799,7 +70204,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -69815,8 +70220,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -69833,9 +70238,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -69843,14 +70248,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -69858,31 +70263,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -69890,7 +70295,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11779}
+	FzName:     ts + 11841}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -69904,20 +70309,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11789,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11851,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11794, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11856, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -69959,7 +70364,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+11800, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11862, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -69973,7 +70378,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11806}
+	FzName:     ts + 11868}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -70017,7 +70422,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11815, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11877, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -70034,7 +70439,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.X__builtin___memcpy_chk(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11689, uint64(13), libc.X__builtin_object_size(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, 0))
+		libc.X__builtin___memcpy_chk(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11751, uint64(13), libc.X__builtin_object_size(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, 0))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -70190,7 +70595,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11825, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11887, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -70247,7 +70652,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11825, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11887, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -70294,9 +70699,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11829)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11891)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11833)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11895)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -70382,16 +70787,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1547
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*int8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -70401,15 +70806,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*int8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11837, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11899, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11848, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11910, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11858, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11920, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -70489,7 +70894,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -70503,42 +70908,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -70612,15 +71017,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -70685,11 +71090,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11715, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11777, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11870,
-			ts+11924,
+			ts+11932,
+			ts+11986,
 			zDb)
 	}
 	return rc
@@ -70736,10 +71141,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11689, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11751, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11976, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+12038, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -70797,12 +71202,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6784, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6844, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -70813,13 +71218,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -70840,128 +71248,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+4238)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+4238)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+12079, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+12017, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+12020,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+12057, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12082,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12119, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.X__builtin___memcpy_chk(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2), libc.X__builtin_object_size(tls, aNew, 0))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.X__builtin___memset_chk(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})), libc.X__builtin_object_size(tls, pNew, 0))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+12087, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12149, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+12116, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+12178, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -70971,89 +71402,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+12184, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+12246, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -71107,14 +71538,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12212, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12274, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12233, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12295, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -71122,7 +71553,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12259, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+12321, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -71164,42 +71595,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp, 0))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp, 0))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -71208,13 +71645,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -71233,7 +71670,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12281}
+	FzName:     ts + 12343}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -71246,7 +71683,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12295}
+	FzName:     ts + 12357}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -71260,7 +71697,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+12309, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+12371, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -71292,7 +71729,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+12333,
+						ts+12395,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -71467,7 +71904,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+12379, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12441, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -71493,11 +71930,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+12402, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12464, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12408, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12470, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12414, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12476, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -71544,7 +71981,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 8056
+		zCol = ts + 8116
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -71568,7 +72005,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12441, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12503, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -71793,6 +72230,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -71805,13 +72245,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.X__builtin___memcpy_chk(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280), libc.X__builtin_object_size(tls, bp, 0))
-	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0))
+	libc.X__builtin___memcpy_chk(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288), libc.X__builtin_object_size(tls, bp, 0))
+	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.X__builtin___memcpy_chk(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0))
+	libc.X__builtin___memcpy_chk(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -71836,25 +72276,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6784) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6844) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8475, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6784, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12456+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12475+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6296+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6811+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6286+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+12489)
+						ts+6792)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12475+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+6296)
+						ts+6286)
 				}
 			}
 		}
@@ -71875,12 +72315,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8475, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12475+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+6296)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12456+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6784, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6830+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+6286)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6811+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+12489)
+					ts+6792)
 			}
 		}
 	}
@@ -71911,7 +72351,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12508, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12518, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -71929,14 +72369,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12516
+			zMsg = ts + 12526
 		} else {
-			zMsg = ts + 12529
+			zMsg = ts + 12539
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6988, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7048, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6998, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7058, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -71966,12 +72406,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8475, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6296+7) == 0 {
-			return ts + 12475
+	if Xsqlite3_strnicmp(tls, zName, ts+6784, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6286+7) == 0 {
+			return ts + 6830
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12489+7) == 0 {
-			return ts + 12456
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6792+7) == 0 {
+			return ts + 6811
 		}
 	}
 	return zName
@@ -72329,7 +72769,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+6296)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+6286)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -72355,7 +72795,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6784, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6844, zName) {
 				goto __3
 			}
 
@@ -72408,13 +72848,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12543, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12553, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12560, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12570, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -72456,9 +72896,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8475, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6784, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12580,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12590,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -72618,9 +73058,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -72636,7 +73076,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12622, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12632, 0)
 	return
 __4:
 	;
@@ -72664,9 +73104,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10832
+			return ts + 10894
 		}
-		return ts + 9217
+		return ts + 9279
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -72682,9 +73122,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -72715,12 +73155,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12663,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12673,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10832
+				return ts + 10894
 			}
-			return ts + 9217
+			return ts + 9279
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -72735,7 +73175,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12684, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12694, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -72822,7 +73262,7 @@ var nullRow = [6]int8{int8(6), int8(0), int8(0), int8(0), int8(0), int8(0)}
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+12719, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12729, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -72846,7 +73286,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12736, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12746, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -72866,7 +73306,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12719
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12729
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -72878,7 +73318,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12719, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12729, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -72912,7 +73352,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12770, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12780, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -72920,13 +73360,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12793, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12803, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12800, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12810, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -72963,7 +73403,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12810, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12820, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -73127,10 +73567,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12836,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12846,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12881, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12891, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.X__builtin___memset_chk(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})), libc.X__builtin_object_size(tls, bp+8, 0))
@@ -73161,7 +73601,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12922, 0)
+			ts+12932, 0)
 	}
 }
 
@@ -73206,7 +73646,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12974, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12984, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -73295,7 +73735,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13015, 0)
+		ts+13025, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -73390,7 +73830,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13071, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13081, 0)
 	goto generated_done
 __2:
 	;
@@ -73403,13 +73843,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+13114, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+13124, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+13122, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+13132, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -73436,13 +73876,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+13129,
+	Xsqlite3ErrorMsg(tls, pParse, ts+13139,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -73564,12 +74011,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1547
-		zSep2 = ts + 13160
+		zSep2 = ts + 13170
 		zEnd = ts + 5360
 	} else {
-		zSep = ts + 13162
-		zSep2 = ts + 13166
-		zEnd = ts + 13171
+		zSep = ts + 13172
+		zSep2 = ts + 13176
+		zEnd = ts + 13181
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -73577,7 +74024,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+13174, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+13184, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*int8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = int8('(')
@@ -73615,11 +74062,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1547,
-	ts + 13188,
-	ts + 13194,
-	ts + 13199,
+	ts + 13198,
+	ts + 13204,
+	ts + 13209,
+	ts + 13214,
 	ts + 13204,
 }
 
@@ -74027,10 +74475,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+13210,
+						ts+13220,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+13243,
+					Xsqlite3ErrorMsg(tls, pParse, ts+13253,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -74049,11 +74497,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+13270, 0)
+				ts+13280, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13320, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13330, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -74087,7 +74535,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13352, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13362, 0)
 			return
 		}
 	}
@@ -74112,11 +74560,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 9217
-			zType2 = ts + 13396
+			zType = ts + 9279
+			zType2 = ts + 13406
 		} else {
-			zType = ts + 10832
-			zType2 = ts + 13402
+			zType = ts + 10894
+			zType2 = ts + 13412
 		}
 
 		if pSelect != 0 {
@@ -74178,7 +74626,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -74187,11 +74635,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+13407, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13417, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13422,
+			ts+13432,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -74207,13 +74655,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13520,
+					ts+13530,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13562, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13572, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -74228,7 +74676,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9739) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9801) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -74258,7 +74706,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13596, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13606, 0)
 	goto create_view_fail
 __1:
 	;
@@ -74274,7 +74722,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10832, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10894, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -74356,7 +74804,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13632, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13642, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -74384,8 +74832,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, int8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -74482,13 +74929,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13662, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13672, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13677,
+		ts+13687,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -74529,10 +74976,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13744, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13754, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11641,
+				ts+11703,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -74564,12 +75011,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13758,
+			ts+13768,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13803,
+		ts+13813,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -74597,11 +75044,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8475, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7476, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7536, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -74679,9 +75126,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -74740,21 +75187,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13870, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13880, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13898, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13908, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13932, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13942, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -74766,7 +75213,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11833, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11895, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -74830,7 +75277,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13964,
+		ts+13974,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -74842,7 +75289,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14027, 0)
+		ts+14037, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -74927,7 +75374,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14121,
+		ts+14131,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -75154,12 +75601,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+14167,
+				Xsqlite3ErrorMsg(tls, pParse, ts+14177,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 14195
+							return ts + 14205
 						}
-						return ts + 14201
+						return ts + 14211
 					}()))
 				return 1
 			}
@@ -75280,7 +75727,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+14206, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+14216, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -75299,7 +75746,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14212,
+		ts+14222,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -75325,26 +75772,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8475, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14262, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14272, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14290, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14300, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14315, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14325, 0)
 	goto exit_create_index
 __17:
 	;
@@ -75358,7 +75805,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+14206, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+14216, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -75373,7 +75820,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14349, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14359, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -75385,7 +75832,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14383, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14393, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -75414,7 +75861,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14407, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14417, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -75435,9 +75882,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -75476,7 +75923,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+14206)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+14216)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -75577,7 +76024,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14430, 0)
+		ts+14440, 0)
 	goto exit_create_index
 __56:
 	;
@@ -75794,7 +76241,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14491, libc.VaList(bp+48, 0))
+		ts+14501, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -75846,8 +76293,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14533, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14543, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -75893,12 +76340,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14550,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14560,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1547
 			}
-			return ts + 14570
+			return ts + 14580
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -75906,7 +76353,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14578,
+		ts+14588,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -75920,7 +76367,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14637, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14647, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -76081,7 +76528,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14664, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14674, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -76096,7 +76543,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14682, libc.VaList(bp+8, 0))
+		ts+14692, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -76107,9 +76554,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -76135,9 +76582,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14755,
+		ts+14765,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11829, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11891, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -76272,7 +76719,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14815,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14825,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -76480,12 +76927,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14851,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14861,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14887
+				return ts + 14897
 			}
-			return ts + 14890
+			return ts + 14900
 		}()))
 	goto append_from_error
 __1:
@@ -76654,7 +77101,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14896, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14906, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -76690,9 +77137,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14902
+				return ts + 14912
 			}
-			return ts + 14911
+			return ts + 14921
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -76717,7 +77164,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14896, ts + 14918, ts + 14902}
+var az = [3]uintptr{ts + 14906, ts + 14928, ts + 14912}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -76732,7 +77179,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14926, 0)
+				ts+14936, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -76869,14 +77316,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14996, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+15006, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+15007, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+15017, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
@@ -76902,11 +77349,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12402, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15010, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15020, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -77036,7 +77483,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15019, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15029, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -77132,7 +77579,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+15065, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+15075, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -77325,7 +77772,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+15095, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15105, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -77605,7 +78052,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+15126,
+		Xsqlite3ErrorMsg(tls, pParse, ts+15136,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -77637,11 +78084,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+15159, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15169, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+15188, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+15198, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -78145,7 +78592,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+15226)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+15236)
 __62:
 	;
 delete_from_cleanup:
@@ -78260,7 +78707,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11689) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11751) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -78490,7 +78937,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6594, ts + 6589, ts + 8348, ts + 8343, ts + 6584}
+var azType2 = [5]uintptr{ts + 6594, ts + 6589, ts + 8408, ts + 8403, ts + 6584}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -78549,7 +78996,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+15239, -1)
+					Xsqlite3_result_error(tls, context, ts+15249, -1)
 					return
 				}
 				iVal = -iVal
@@ -78853,7 +79300,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+15256, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+15266, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -79199,7 +79646,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+15261, -1)
+		Xsqlite3_result_error(tls, context, ts+15271, -1)
 		return
 	}
 	if argc == 3 {
@@ -79209,7 +79656,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+15294, -1)
+				ts+15304, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -79308,7 +79755,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+15339, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+15349, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -79323,21 +79770,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = int8('\'')
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = int8(0)
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = int8('\'')
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = int8(0)
 				*(*int8)(unsafe.Pointer(zText)) = int8('X')
 				*(*int8)(unsafe.Pointer(zText + 1)) = int8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -79345,7 +79792,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+15346, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+15356, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -79459,6 +79906,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1547
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -79661,7 +80221,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 11261}
+var azOne = [1]uintptr{ts + 11323}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -79697,7 +80257,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(j))) = int8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+15349, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+15359, 4, uintptr(0))
 	}
 }
 
@@ -79722,7 +80282,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12441, -1)
+		Xsqlite3_result_error(tls, context, ts+12503, -1)
 		return
 	}
 
@@ -79800,7 +80360,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+15239, -1)
+			Xsqlite3_result_error(tls, context, ts+15249, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -80061,7 +80621,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+15354, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+15364, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -80081,14 +80641,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+15360, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+15370, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+15360, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+15370, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15360, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15360, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15370, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+15370, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -80218,17 +80778,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568401799145468436421
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.693147180559945309417232121458176568
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -80287,6 +80847,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846264338327950288)
 }
 
@@ -80327,108 +80888,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 15365},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 15385},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 15398},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15416},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15425},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15433},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15433},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15448},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15474},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15499},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15508},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15540},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15540},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15546},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15546},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15552},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15552},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15557},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15557},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15557},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15561},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15561},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15561},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15565},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15572},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15580},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15587},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15593},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15600},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15607},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15615},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15620},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15624},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15624},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 15375},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 15395},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 15408},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15426},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15435},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15443},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15443},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15458},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15484},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15509},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15518},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15529},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15536},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15550},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15550},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15556},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15556},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15562},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15562},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15567},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15567},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15567},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15571},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15571},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15571},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15575},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15582},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15590},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15597},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15610},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15617},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15625},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15630},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15636},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15642},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15646},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15653},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15660},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15671},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15678},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15693},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15710},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15721},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15727},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15745},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15753},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15767},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15775},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15784},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15784},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15791},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15791},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15801},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15805},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15811},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15815},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15815},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15634},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15634},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15640},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15646},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15652},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15656},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15656},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15662},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15669},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15676},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15687},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15694},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15709},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15726},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15737},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15743},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15761},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15769},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15783},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15791},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15800},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15800},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15807},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15807},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15817},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15821},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15821},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15834},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15360},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15360},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6929},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6929},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15839},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15844},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15852},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15858},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15864},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15867},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15871},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15877},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15867},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15882},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15886},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15890},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15896},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15900},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15905},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15910},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15915},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15827},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15831},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15831},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15837},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15837},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15850},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15370},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15370},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6989},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6989},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15855},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15860},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15868},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15874},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15880},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15883},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15887},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15893},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15883},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15898},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15902},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15906},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15912},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15916},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15921},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15925},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15929},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15933},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15938},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15943},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15948},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15926},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15931},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15937},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15941},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15945},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15949},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15954},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15960},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15966},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15971},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15979},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15987},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15990},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6929},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15995}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15959},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15964},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15970},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15976},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15982},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15987},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15995},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16003},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16006},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6989},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 16011}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -80549,7 +81112,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15999,
+				ts+16015,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -81209,8 +81772,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6795, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6791, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6855, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6851, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -81710,7 +82273,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8313, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8373, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -82178,7 +82741,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+16044,
+		ts+16060,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -82203,7 +82766,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+16085,
+	Xsqlite3ErrorMsg(tls, pParse, ts+16101,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -82352,7 +82915,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+16117,
+		ts+16133,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -82362,7 +82925,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16169, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+16185, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -82414,7 +82977,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16194,
+	Xsqlite3ErrorMsg(tls, pParse, ts+16210,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -82422,7 +82985,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+16240, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+16256, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -82834,7 +83397,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+16261)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+16277)
 __125:
 	;
 insert_cleanup:
@@ -83150,8 +83713,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12402, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 							onError, iReg)
 						Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -84240,7 +84804,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -84686,6 +85250,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -84724,7 +85289,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12441, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12503, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -84733,7 +85298,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 16275
+		zEntry = ts + 16291
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -84748,7 +85313,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+12402, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12464, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -84784,7 +85349,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.X__builtin___memcpy_chk(tls, zAltEntry, ts+16298, uint64(8), libc.X__builtin_object_size(tls, zAltEntry, 0))
+	libc.X__builtin___memcpy_chk(tls, zAltEntry, ts+16314, uint64(8), libc.X__builtin_object_size(tls, zAltEntry, 0))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -84798,7 +85363,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+16307, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+16323, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -84822,7 +85387,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.X__builtin___memcpy_chk(tls, zAltEntry+uintptr(iEntry), ts+16311, uint64(6), libc.X__builtin_object_size(tls, zAltEntry+uintptr(iEntry), 0))
+	libc.X__builtin___memcpy_chk(tls, zAltEntry+uintptr(iEntry), ts+16327, uint64(6), libc.X__builtin_object_size(tls, zAltEntry+uintptr(iEntry), 0))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -84840,7 +85405,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16317, libc.VaList(bp+16, zEntry, zFile))
+		ts+16333, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -84867,7 +85432,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+16360, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+16376, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -84905,7 +85470,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+16392, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16408, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -84915,7 +85480,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16429,
+	ts + 16445,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -85071,7 +85636,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16435, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16451, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -85080,62 +85645,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5460,
-	ts + 16474,
-	ts + 9217,
-	ts + 16478,
-	ts + 16483,
-	ts + 16486,
-	ts + 16496,
-	ts + 16506,
+	ts + 16490,
+	ts + 9279,
+	ts + 16494,
+	ts + 16499,
+	ts + 16502,
 	ts + 16512,
-	ts + 16516,
-	ts + 16521,
-	ts + 16526,
-	ts + 16534,
-	ts + 16545,
-	ts + 16548,
-	ts + 16555,
-	ts + 16516,
-	ts + 16521,
-	ts + 16562,
-	ts + 16567,
-	ts + 16570,
-	ts + 16577,
-	ts + 16512,
-	ts + 16516,
+	ts + 16522,
+	ts + 16528,
+	ts + 16532,
+	ts + 16537,
+	ts + 16542,
+	ts + 16550,
+	ts + 16561,
+	ts + 16564,
+	ts + 16571,
+	ts + 16532,
+	ts + 16537,
+	ts + 16578,
 	ts + 16583,
-	ts + 16588,
+	ts + 16586,
 	ts + 16593,
-	ts + 16516,
-	ts + 16597,
-	ts + 16521,
-	ts + 16605,
+	ts + 16528,
+	ts + 16532,
+	ts + 16599,
+	ts + 16604,
 	ts + 16609,
-	ts + 16614,
-	ts + 11833,
-	ts + 11829,
-	ts + 16620,
+	ts + 16532,
+	ts + 16613,
+	ts + 16537,
+	ts + 16621,
 	ts + 16625,
 	ts + 16630,
-	ts + 16474,
-	ts + 16516,
-	ts + 16635,
-	ts + 16642,
-	ts + 16649,
-	ts + 9217,
-	ts + 16657,
-	ts + 5463,
-	ts + 16663,
-	ts + 16474,
-	ts + 16516,
-	ts + 16668,
+	ts + 11895,
+	ts + 11891,
+	ts + 16636,
+	ts + 16641,
+	ts + 16646,
+	ts + 16490,
+	ts + 16532,
+	ts + 16651,
+	ts + 16658,
+	ts + 16665,
+	ts + 9279,
 	ts + 16673,
-	ts + 15867,
-	ts + 16678,
-	ts + 16691,
-	ts + 16700,
+	ts + 5463,
+	ts + 16679,
+	ts + 16490,
+	ts + 16532,
+	ts + 16684,
+	ts + 16689,
+	ts + 15883,
+	ts + 16694,
 	ts + 16707,
-	ts + 16718,
+	ts + 16716,
+	ts + 16723,
+	ts + 16734,
 }
 
 // Definitions of all built-in pragmas
@@ -85153,241 +85718,241 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [67]PragmaName{
-	{FzName: ts + 16726,
+	{FzName: ts + 16742,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16741,
+	{FzName: ts + 16757,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16756,
+	{FzName: ts + 16772,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16768,
+	{FzName: ts + 16784,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16784,
+	{FzName: ts + 16800,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16723,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16797,
+	{FzName: ts + 16813,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16809,
+	{FzName: ts + 16825,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16829,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16845,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16861,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16866,
+	{FzName: ts + 16882,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16881,
+	{FzName: ts + 16897,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16897,
+	{FzName: ts + 16913,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16911,
+	{FzName: ts + 16927,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16924,
+	{FzName: ts + 16940,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16938,
+	{FzName: ts + 16954,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16957,
+	{FzName: ts + 16973,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16992,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16999,
+	{FzName: ts + 17015,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17008,
+	{FzName: ts + 17024,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 17026,
+	{FzName: ts + 17042,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 17043,
+	{FzName: ts + 17059,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 17056,
+	{FzName: ts + 17072,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 17071,
+	{FzName: ts + 17087,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 17089,
+	{FzName: ts + 17105,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 17099,
+	{FzName: ts + 17115,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 17113,
+	{FzName: ts + 17129,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17129,
+	{FzName: ts + 17145,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 17154,
+	{FzName: ts + 17170,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17189,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 17184,
+	{FzName: ts + 17200,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 17195,
+	{FzName: ts + 17211,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 17207,
+	{FzName: ts + 17223,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 17223,
+	{FzName: ts + 17239,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17236,
+	{FzName: ts + 17252,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17255,
+	{FzName: ts + 17271,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 17274,
+	{FzName: ts + 17290,
 		FePragTyp: U8(PragTyp_LOCK_PROXY_FILE),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17290,
+	{FzName: ts + 17306,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17303,
+	{FzName: ts + 17319,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17318,
+	{FzName: ts + 17334,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 17328,
+	{FzName: ts + 17344,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 17340,
+	{FzName: ts + 17356,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 17349,
+	{FzName: ts + 17365,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 17360,
+	{FzName: ts + 17376,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17370,
+	{FzName: ts + 17386,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 17382,
+	{FzName: ts + 17398,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 17393,
+	{FzName: ts + 17409,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 17405,
+	{FzName: ts + 17421,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17422,
+	{FzName: ts + 17438,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17441,
+	{FzName: ts + 17457,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17467,
+	{FzName: ts + 17483,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17482,
+	{FzName: ts + 17498,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17496,
+	{FzName: ts + 17512,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17515,
+	{FzName: ts + 17531,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17529,
+	{FzName: ts + 17545,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17545,
+	{FzName: ts + 17561,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17557,
+	{FzName: ts + 17573,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17568,
+	{FzName: ts + 17584,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17579,
+	{FzName: ts + 17595,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17591,
+	{FzName: ts + 17607,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17602,
+	{FzName: ts + 17618,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17623,
+	{FzName: ts + 17639,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17631,
+	{FzName: ts + 17647,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17646,
+	{FzName: ts + 17662,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17659,
+	{FzName: ts + 17675,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17678,
+	{FzName: ts + 17694,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17693,
+	{FzName: ts + 17709,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -85409,7 +85974,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17709))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17725))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -85421,10 +85986,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17734) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17750) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17744) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17760) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -85433,13 +85998,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+8361) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8429) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17751) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17767) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17756) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17772) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -85454,9 +86019,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*int8)(unsafe.Pointer(z))) >= '0' && int32(*(*int8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*int8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16668) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16684) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17768) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17784) == 0 {
 		return 2
 	} else {
 		return 0
@@ -85470,7 +86035,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17775, 0)
+				ts+17791, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -85561,19 +86126,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17837
+		zName = ts + 17853
 		break
 	case OE_SetDflt:
-		zName = ts + 17846
+		zName = ts + 17862
 		break
 	case OE_Cascade:
-		zName = ts + 17858
+		zName = ts + 17874
 		break
 	case OE_Restrict:
-		zName = ts + 17866
+		zName = ts + 17882
 		break
 	default:
-		zName = ts + 17875
+		zName = ts + 17891
 		break
 	}
 	return zName
@@ -85590,7 +86155,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17885, ts + 17892, ts + 17900, ts + 17904, ts + 17768, ts + 17913,
+	ts + 17901, ts + 17908, ts + 17916, ts + 17920, ts + 17784, ts + 17929,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -85637,13 +86202,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17917
+			zType = ts + 17933
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17919
+			zType = ts + 17935
 		} else {
-			zType = ts + 7871
+			zType = ts + 7931
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17921,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17937,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -85651,7 +86216,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17928, ts + 17933, ts + 17941}
+var azEnc = [4]uintptr{uintptr(0), ts + 17944, ts + 17949, ts + 17957}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -85808,14 +86373,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -85902,7 +86469,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17949, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17965, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -86166,7 +86733,7 @@ __18:
 	if !(zRight != 0) {
 		goto __64
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17953) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17969) == 0) {
 		goto __65
 	}
 	b = 2
@@ -86238,7 +86805,7 @@ __72:
 	goto __15
 
 __20:
-	zRet = ts + 17744
+	zRet = ts + 17760
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -86276,7 +86843,7 @@ __79:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __84
 	}
-	zRet = ts + 17734
+	zRet = ts + 17750
 __84:
 	;
 	returnSingleText(tls, v, zRet)
@@ -86563,7 +87130,7 @@ __124:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __127
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17958, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17974, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __127:
@@ -86621,7 +87188,7 @@ __134:
 	if !(res1 != SQLITE_OK) {
 		goto __135
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17983, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17999, 0)
 	goto pragma_out
 __135:
 	;
@@ -86640,7 +87207,7 @@ __136:
 		goto __138
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+18013, 0)
+		ts+18029, 0)
 	goto __139
 __138:
 	if !(iDb != 1) {
@@ -86694,7 +87261,7 @@ __145:
 __147:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+18066) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+18082) == 0) {
 		goto __148
 	}
 
@@ -86791,9 +87358,9 @@ __161:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 18072
+			return ts + 18088
 		}
-		return ts + 18080
+		return ts + 18096
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -86862,7 +87429,7 @@ __176:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __177
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+18087, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+18103, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __178
 	}
@@ -86908,29 +87475,29 @@ __183:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __184
 	}
-	zType = ts + 10832
+	zType = ts + 10894
 	goto __185
 __184:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __186
 	}
-	zType = ts + 13114
+	zType = ts + 13124
 	goto __187
 __186:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __188
 	}
-	zType = ts + 18103
+	zType = ts + 18119
 	goto __189
 __188:
-	zType = ts + 9217
+	zType = ts + 9279
 __189:
 	;
 __187:
 	;
 __185:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18110,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18126,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -86996,7 +87563,7 @@ __196:
 		goto __198
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18117, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18133, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -87006,7 +87573,7 @@ __196:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __199
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+18122,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+18138,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -87043,8 +87610,8 @@ __202:
 	if !(pIdx1 != 0) {
 		goto __204
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 18127, ts + 18129, ts + 16545}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18131,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 18143, ts + 18145, ts + 16561}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18147,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -87077,7 +87644,7 @@ __205:
 	goto __206
 __208:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18137,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18153,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -87099,7 +87666,7 @@ __209:
 		goto __211
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18141, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18157, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __210
 __210:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -87163,7 +87730,7 @@ __221:
 		goto __223
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7871, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7931, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __222
 __222:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -87179,7 +87746,7 @@ __224:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __226
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7871, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7931, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __225
 __225:
 	i6++
@@ -87214,7 +87781,7 @@ __232:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __234
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18144,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18160,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -87222,7 +87789,7 @@ __232:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+18153))
+			ts+18169))
 	goto __233
 __233:
 	j2++
@@ -87411,7 +87978,7 @@ __262:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __263:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+18158, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+18174, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 608)))
@@ -87628,7 +88195,7 @@ __290:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+18162, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+18178, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -87689,262 +88256,284 @@ __305:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 620)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__306:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __307
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __306
+	}
+	mxCol = -1
+	j4 = 0
+__308:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __310
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __311
+	}
+	mxCol++
+__311:
+	;
+	goto __309
+__309:
+	j4++
+	goto __308
+	goto __310
+__310:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __312
 	}
 	mxCol--
-	goto __306
+__312:
+	;
+	goto __307
+__306:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __307:
 	;
 	if !(mxCol >= 0) {
-		goto __308
+		goto __313
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 620)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__308:
+__313:
 	;
 	if !!(isQuick != 0) {
-		goto __309
+		goto __314
 	}
 	if !(pPk1 != 0) {
-		goto __310
+		goto __315
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 620)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+18186,
+		ts+18202,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__311:
+__316:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __313
+		goto __318
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 620)), j4, r2+j4)
-	goto __312
-__312:
+	goto __317
+__317:
 	j4++
-	goto __311
-	goto __313
-__313:
+	goto __316
+	goto __318
+__318:
 	;
-__310:
+__315:
 	;
-__309:
+__314:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__314:
+__319:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __316
+		goto __321
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __317
+		goto __322
 	}
-	goto __315
-__317:
+	goto __320
+__322:
 	;
 	if !(bStrict != 0) {
-		goto __318
+		goto __323
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __319
-__318:
+	goto __324
+__323:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__319:
+__324:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __320
+		goto __325
 	}
-	goto __315
-__320:
+	goto __320
+__325:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __321
+		goto __326
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __322
-__321:
+	goto __327
+__326:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __323
+		goto __328
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 632)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		uint8((*Column)(unsafe.Pointer(pCol1)).Faffinity), bp+632)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 632)) != 0) {
-		goto __324
+		goto __329
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 632)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 632)))
-__324:
+__329:
 	;
-__323:
+__328:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 620))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __325
+		goto __330
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __326
-__325:
+	goto __331
+__330:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__326:
+__331:
 	;
-__322:
+__327:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __327
+		goto __332
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18222, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18238, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __328
+		goto __333
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __329
-__328:
+	goto __334
+__333:
 	;
-__329:
+__334:
 	;
-__327:
+__332:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __330
+		goto __335
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18242,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18258,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __331
-__330:
+	goto __336
+__335:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __332
+		goto __337
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18264,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18280,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __333
-__332:
+	goto __338
+__337:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __334
+		goto __339
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __335
+		goto __340
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
-__335:
+__340:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+18287, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+18303, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+18289,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+18305,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__334:
+__339:
 	;
-__333:
+__338:
 	;
-__331:
+__336:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __315
-__315:
+	goto __320
+__320:
 	j4++
-	goto __314
-	goto __316
-__316:
+	goto __319
+	goto __321
+__321:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __336
+		goto __341
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __337
+		goto __342
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 620)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__338:
+__343:
 	if !(k3 > 0) {
-		goto __340
+		goto __345
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __339
-__339:
+	goto __344
+__344:
 	k3--
-	goto __338
-	goto __340
-__340:
+	goto __343
+	goto __345
+__345:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+18309,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+18325,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__337:
+__342:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__336:
+__341:
 	;
 	if !!(isQuick != 0) {
-		goto __341
+		goto __346
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__342:
+__347:
 	if !(pIdx5 != 0) {
-		goto __344
+		goto __349
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __345
+		goto __350
 	}
-	goto __343
-__345:
+	goto __348
+__350:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 620)), 0, 0, bp+640,
 		pPrior, r1)
@@ -87953,80 +88542,119 @@ __345:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 624))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+18339)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18355)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+18344)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+18360)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__351:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __353
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __354
+	}
+	goto __352
+__354:
+	;
+	if !(label6 == 0) {
+		goto __355
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__355:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 624))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __352
+__352:
+	kk++
+	goto __351
+	goto __353
+__353:
+	;
+	if !(label6 != 0) {
+		goto __356
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18355)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+18381)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__356:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __346
+		goto __357
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__347:
+__358:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __349
+		goto __360
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __350
+		goto __361
 	}
-	goto __348
-__350:
+	goto __359
+__361:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __359
+__359:
+	kk++
+	goto __358
+	goto __360
+__360:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 624))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 624))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+18408)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__357:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
 	goto __348
 __348:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __347
 	goto __349
 __349:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 624))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 624))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+18365)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __346:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
-	goto __343
-__343:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __342
-	goto __344
-__344:
-	;
-__341:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 620)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __351
+		goto __362
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+18392)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+18435)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__352:
+__363:
 	if !(pIdx5 != 0) {
-		goto __354
+		goto __365
 	}
 	if !(pPk1 == pIdx5) {
-		goto __355
+		goto __366
 	}
-	goto __353
-__355:
+	goto __364
+__366:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 624))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -88035,21 +88663,21 @@ __355:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __353
-__353:
+	goto __364
+__364:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __352
-	goto __354
-__354:
+	goto __363
+	goto __365
+__365:
 	;
 	if !(pPk1 != 0) {
-		goto __356
+		goto __367
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__356:
+__367:
 	;
-__351:
+__362:
 	;
 	goto __297
 __297:
@@ -88067,14 +88695,14 @@ __272:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __357
+		goto __368
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 616))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18421
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18464
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__357:
+__368:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -88082,27 +88710,27 @@ __357:
 
 __46:
 	if !!(zRight != 0) {
-		goto __358
+		goto __369
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __360
+		goto __371
 	}
 	goto pragma_out
-__360:
+__371:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __359
-__358:
+	goto __370
+__369:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __361
+		goto __372
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__362:
+__373:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __364
+		goto __375
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __365
+		goto __376
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -88111,25 +88739,25 @@ __362:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __364
-__365:
+	goto __375
+__376:
 	;
-	goto __363
-__363:
+	goto __374
+__374:
 	pEnc += 16
-	goto __362
-	goto __364
-__364:
+	goto __373
+	goto __375
+__375:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __366
+		goto __377
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18424, libc.VaList(bp+456, zRight))
-__366:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18467, libc.VaList(bp+456, zRight))
+__377:
 	;
-__361:
+__372:
 	;
-__359:
+__370:
 	;
 	goto __15
 
@@ -88137,15 +88765,15 @@ __47:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __367
+		goto __378
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __369
+		goto __380
 	}
 	goto __15
-__369:
+__380:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -88153,41 +88781,41 @@ __369:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __370
+		goto __381
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__370:
+__381:
 	;
-	goto __368
-__367:
+	goto __379
+__378:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __371
+		goto __382
 	}
 	goto __15
-__371:
+__382:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__368:
+__379:
 	;
 	goto __15
 
 __48:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__372:
+__383:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __373
+		goto __384
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __372
-__373:
+	goto __383
+__384:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -88202,31 +88830,31 @@ __49:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17751) == 0) {
-		goto __375
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17767) == 0) {
+		goto __386
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __376
-__375:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18449) == 0) {
-		goto __377
+	goto __387
+__386:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18492) == 0) {
+		goto __388
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __378
-__377:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17904) == 0) {
-		goto __379
+	goto __389
+__388:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17920) == 0) {
+		goto __390
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__379:
+__390:
 	;
-__378:
+__389:
 	;
-__376:
+__387:
 	;
-__374:
+__385:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -88236,10 +88864,10 @@ __374:
 
 __50:
 	if !(zRight != 0) {
-		goto __380
+		goto __391
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__380:
+__391:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -88259,19 +88887,19 @@ __51:
 
 __52:
 	if !(zRight != 0) {
-		goto __381
+		goto __392
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __383
+		goto __394
 	}
 	goto __15
-__383:
+__394:
 	;
-	goto __382
-__381:
+	goto __393
+__392:
 	opMask = U32(0xfffe)
-__382:
+__393:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -88280,86 +88908,86 @@ __382:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__384:
+__395:
 	if !(iDb <= iDbLast) {
-		goto __386
+		goto __397
 	}
 	if !(iDb == 1) {
-		goto __387
+		goto __398
 	}
-	goto __385
-__387:
+	goto __396
+__398:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__388:
+__399:
 	if !(k4 != 0) {
-		goto __390
+		goto __401
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __391
+		goto __402
 	}
-	goto __389
-__391:
+	goto __400
+__402:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__392:
+__403:
 	if !(pIdx6 != 0) {
-		goto __394
+		goto __405
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __395
+		goto __406
 	}
 	szThreshold = int16(0)
-	goto __394
-__395:
+	goto __405
+__406:
 	;
-	goto __393
-__393:
+	goto __404
+__404:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __392
-	goto __394
-__394:
+	goto __403
+	goto __405
+__405:
 	;
 	if !(szThreshold != 0) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__396:
+__407:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18457,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18500,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __397
+		goto __408
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __398
-__397:
+	goto __409
+__408:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__398:
+__409:
 	;
-	goto __389
-__389:
+	goto __400
+__400:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __388
-	goto __390
-__390:
+	goto __399
+	goto __401
+__401:
 	;
-	goto __385
-__385:
+	goto __396
+__396:
 	iDb++
-	goto __384
-	goto __386
-__386:
+	goto __395
+	goto __397
+__397:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -88367,36 +88995,36 @@ __386:
 __53:
 	;
 	if !(zRight != 0) {
-		goto __399
+		goto __410
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__399:
+__410:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __400
+		goto __411
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__400:
+__411:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __55:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK) {
-		goto __401
+		goto __412
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))) {
-		goto __402
+		goto __413
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))
-__402:
+__413:
 	;
-__401:
+__412:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -88405,10 +89033,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __403
+		goto __414
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664))&int64(0x7fffffff)))
-__403:
+__414:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -88417,10 +89045,10 @@ __57:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+672) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) >= int64(0)) {
-		goto __404
+		goto __415
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) & int64(0x7fffffff))
-__404:
+__415:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -88428,10 +89056,10 @@ __404:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __405
+		goto __416
 	}
 
-__405:
+__416:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -88483,14 +89111,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18475, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18480, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18486, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18495, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18504, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18512, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18520},
-	{FzName: ts + 18527},
+	{FzName: ts + 18518, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18523, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18529, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18538, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18547, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18555, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18563},
+	{FzName: ts + 18570},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -88542,7 +89170,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18533)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18576)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -88550,7 +89178,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18548, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18591, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -88563,16 +89191,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18555, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18598, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18561)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18604)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18573)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18616)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+5360, 1)
@@ -88755,13 +89383,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18588)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18631)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18596, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18639, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18600, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18643, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -88838,12 +89466,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18604, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18647, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -88852,19 +89480,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5411
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18632, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18675, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18663, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18706, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18671,
-	ts + 18678,
-	ts + 18690,
+	ts + 18714,
+	ts + 18721,
+	ts + 18733,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -88924,7 +89552,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14533)
+				corruptSchema(tls, pData, argv, ts+14543)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -88956,13 +89584,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18701)
+			corruptSchema(tls, pData, argv, ts+18744)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14533)
+				corruptSchema(tls, pData, argv, ts+14543)
 			}
 		}
 	}
@@ -88995,16 +89623,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 9217
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 9279
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 8281
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18714
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 8341
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18757
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -89082,17 +89710,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+12116)
+		ts+12178)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -89101,44 +89738,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18786)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18829)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18810,
+		ts+18853,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -89149,57 +89786,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -89288,8 +89925,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -89402,8 +90041,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0))
-	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0))
+	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0))
+	libc.X__builtin___memset_chk(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288), libc.X__builtin_object_size(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -89414,8 +90053,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -89427,8 +90066,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.X__builtin___memset_chk(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8), libc.X__builtin_object_size(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0))
-	libc.X__builtin___memset_chk(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280), libc.X__builtin_object_size(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0))
+	libc.X__builtin___memset_chk(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8), libc.X__builtin_object_size(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0))
+	libc.X__builtin___memset_chk(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288), libc.X__builtin_object_size(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -89468,7 +90107,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18844, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18887, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -89498,7 +90137,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18874, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18917, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -89594,7 +90233,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -89693,7 +90332,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -90011,8 +90650,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 11261
-		var zSp2 uintptr = ts + 11261
+		var zSp1 uintptr = ts + 11323
+		var zSp2 uintptr = ts + 11323
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -90020,13 +90659,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18893, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18936, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18923))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18966))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -90201,7 +90840,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18957, libc.VaList(bp, 0))
+					ts+19000, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -90246,7 +90885,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+19007, libc.VaList(bp+8, zName))
+						ts+19050, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -90257,7 +90896,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+19071,
+							Xsqlite3ErrorMsg(tls, pParse, ts+19114,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -90301,7 +90940,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6929, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6989, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -90648,9 +91287,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -90888,16 +91524,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 19108
+		z = ts + 19151
 		break
 	case TK_INTERSECT:
-		z = ts + 19118
+		z = ts + 19161
 		break
 	case TK_EXCEPT:
-		z = ts + 19128
+		z = ts + 19171
 		break
 	default:
-		z = ts + 19135
+		z = ts + 19178
 		break
 	}
 	return z
@@ -90907,10 +91543,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19141, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19184, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -90930,6 +91569,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19207, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 19238
+		}
+		return ts + 1547
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -90996,6 +91642,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -91060,6 +91707,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -91114,7 +91762,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16657
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16673
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -91253,13 +91901,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16657
+				zCol = ts + 16673
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+12402, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12464, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -91267,7 +91915,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+19164, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+19253, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -91332,7 +91980,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -91357,7 +92005,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16657
+					zName = ts + 16673
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -91367,7 +92015,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+19164, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+19253, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -91383,7 +92031,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+19173, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+19262, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -91408,45 +92057,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp, 0))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -91456,14 +92108,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 19270
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -91473,9 +92157,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -91519,7 +92200,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -91670,7 +92351,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19181, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19274, 0)
 	return
 __1:
 	;
@@ -91761,7 +92442,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19230, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19323, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -91781,7 +92462,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19272, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19365, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -91818,7 +92499,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19278, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19371, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -91852,7 +92533,7 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19293, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19386, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1547
 		}
@@ -91957,8 +92638,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19316, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19331, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19409, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19424, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -92005,7 +92686,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19108, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19151, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -92072,7 +92753,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19350, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19443, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -92134,7 +92815,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19350, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19443, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -92287,10 +92968,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19371, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19464, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19417,
+			ts+19510,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -92544,8 +93225,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7577)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7577)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7637)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7637)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -92572,13 +93253,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19499, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19592, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19510, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19603, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -92590,7 +93271,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19515, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19608, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -93005,6 +93686,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff int8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -93124,15 +93824,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff int8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -93508,16 +94201,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -93577,12 +94287,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15557) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15567) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15561) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15571) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -93648,7 +94358,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19521, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19614, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -93731,7 +94441,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19539, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19632, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -93860,15 +94570,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19562, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19655, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -93886,7 +94593,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19582, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19675, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -93902,7 +94609,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19625
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19718
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -93928,7 +94635,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19648,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19741,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -93939,9 +94646,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19686
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19779
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19720
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19813
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -93988,7 +94695,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19758, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19851, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -94100,7 +94807,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19762,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19855,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -94119,7 +94826,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19801,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19894,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -94127,7 +94834,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+15126,
+					Xsqlite3ErrorMsg(tls, pParse, ts+15136,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -94228,7 +94935,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6789
+							zSchemaName = ts + 6849
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -94243,7 +94950,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19832, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19925, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -94308,7 +95015,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19837,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19930,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -94320,7 +95027,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12402, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12464, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -94339,9 +95046,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19846, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19939, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19864, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19957, 0)
 					}
 				}
 			}
@@ -94351,7 +95058,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19884, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19977, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -94410,11 +95117,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, int8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -94473,6 +95176,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp, 0))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -94488,7 +95266,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -94501,13 +95280,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19915, 0)
+					ts+20008, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19966, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20059, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -94515,7 +95294,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -94535,19 +95314,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -94561,6 +95343,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -94635,7 +95420,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -94647,7 +95434,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -94665,13 +95452,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -94688,11 +95475,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19999,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20092,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 20011
+						return ts + 20104
 					}
 					return ts + 1547
 				}(),
@@ -94713,7 +95500,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8281)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8341)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -94745,14 +95532,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -94806,6 +95594,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -94870,7 +95709,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -94969,7 +95807,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20034,
+		ts+20127,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -95030,7 +95868,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20088,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20181,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -95144,7 +95982,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -95161,11 +95999,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -95176,7 +96010,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20128, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20221, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -95202,7 +96036,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -95234,11 +96068,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20143, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20236, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -95272,7 +96104,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -95581,12 +96413,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -95615,39 +96446,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -95658,24 +96465,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -95708,27 +96515,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 20159
+				return ts + 20252
 			}
-			return ts + 20168
+			return ts + 20261
 		}())
 
 	groupBySort = 1
@@ -95736,47 +96550,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -95792,45 +96606,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -95849,16 +96669,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -95889,16 +96709,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -95911,98 +96731,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -96011,79 +96834,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+20159)
-__148:
+	explainTempTable(tls, pParse, ts+20252)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 20177
-			}
-			return ts + 20200
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -96180,7 +96998,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+20209, 0)
+		ts+20270, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -96413,7 +97231,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20274, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20335, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -96457,7 +97275,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+20320, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+20381, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -96475,7 +97293,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20328, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20389, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -96487,7 +97305,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+20320, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+20381, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -96502,7 +97320,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20369, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20430, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -96514,22 +97332,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8475, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6784, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20395, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20456, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20433,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20494,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20470
+				return ts + 20531
 			}
-			return ts + 20477
+			return ts + 20538
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -96538,7 +97356,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20483, libc.VaList(bp+24, pTableName+8))
+		ts+20544, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -96567,9 +97385,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12489
+			return ts + 6792
 		}
-		return ts + 6296
+		return ts + 6286
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -96687,7 +97505,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+20320, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+20381, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -96720,7 +97538,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20529,
+		ts+20590,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -96745,13 +97563,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20577,
+		ts+20638,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20652, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20713, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -97007,7 +97825,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20681, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20742, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -97046,9 +97864,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12489
+				return ts + 6792
 			}
-			return ts + 6296
+			return ts + 6286
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -97060,7 +97878,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20701,
+			ts+20762,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -97174,12 +97992,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20763,
+		ts+20824,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20811
+				return ts + 20872
 			}
-			return ts + 20818
+			return ts + 20879
 		}()))
 __15:
 	;
@@ -97293,7 +98111,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20825, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20886, 0)
 	return 1
 }
 
@@ -97476,8 +98294,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -97510,8 +98328,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.X__builtin___memset_chk(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+424, 0))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.X__builtin___memset_chk(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})), libc.X__builtin_object_size(tls, bp+432, 0))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -97523,13 +98341,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20867, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20928, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -97845,7 +98663,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -98115,7 +98934,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20881,
+		ts+20942,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -98147,7 +98966,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20917, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20978, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -98157,7 +98976,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 8056
+				return ts + 8116
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -99027,7 +99846,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20936)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20997)
 __169:
 	;
 update_cleanup:
@@ -99333,10 +100152,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*int8)(unsafe.Pointer(bp + 216)) = int8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20949, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+21010, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20953, libc.VaList(bp+8, bp+216))
+				ts+21014, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -99427,7 +100246,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12543, -1)
+				ts+12553, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -99459,7 +100278,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+21026, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+21030, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+21087, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+21091, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -99607,14 +100426,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21034)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21095)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21074)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21135)
 	return SQLITE_ERROR
 __2:
 	;
@@ -99625,7 +100444,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21117)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21178)
 	return SQLITE_ERROR
 __5:
 	;
@@ -99653,7 +100472,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+21135, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+21196, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -99673,7 +100492,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21158)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+21219)
 	goto end_of_vacuum
 __8:
 	;
@@ -99688,7 +100507,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14896)
+	rc = execSql(tls, db, pzErrMsg, ts+14906)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -99733,7 +100552,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21185,
+		ts+21246,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -99742,7 +100561,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21293,
+		ts+21354,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -99753,7 +100572,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21347,
+		ts+21408,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -99764,7 +100583,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21498,
+		ts+21559,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -99986,12 +100805,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -100109,7 +100928,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12770, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12780, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -100193,11 +101012,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21628, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21689, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21652,
+			ts+21713,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -100207,7 +101026,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21751, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21812, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -100241,7 +101060,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -100268,7 +101087,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21770, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21831, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -100306,7 +101125,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21812, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21873, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3658, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -100318,7 +101137,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21842
+			var zFormat uintptr = ts + 21903
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -100335,7 +101154,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16548, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16564, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -100392,7 +101211,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21888, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21949, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -100450,7 +101269,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21888, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21949, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -100470,8 +101289,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -100484,7 +101303,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -100937,7 +101756,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -100964,7 +101783,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -101195,10 +102014,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21907
+		return ts + 21968
 	}
 	if i == -1 {
-		return ts + 16657
+		return ts + 16673
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -101207,15 +102026,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21914, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21975, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21920, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21981, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+13160, 1)
+			Xsqlite3_str_append(tls, pStr, ts+13170, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -101226,11 +102045,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21920, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21981, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+13160, 1)
+			Xsqlite3_str_append(tls, pStr, ts+13170, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5411, 1)
 	}
@@ -101252,27 +102071,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21922, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21983, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21914, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21975, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21925
+				return ts + 21986
 			}
-			return ts + 21930
+			return ts + 21991
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21938)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21999)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21940)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+22001)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+5360, 1)
 }
@@ -101315,11 +102134,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21942, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+22003, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21948
+				return ts + 22009
 			}
-			return ts + 21955
+			return ts + 22016
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -101329,43 +102148,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 11317
+					zFmt = ts + 11379
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21960
+				zFmt = ts + 22021
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21993
+				zFmt = ts + 22054
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 22018
+				zFmt = ts + 22079
 			} else {
-				zFmt = ts + 22036
+				zFmt = ts + 22097
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+22045, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+22106, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp int8
-			var zRowid uintptr = ts + 16657
-			Xsqlite3_str_appendf(tls, bp+64, ts+22053, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16673
+			Xsqlite3_str_appendf(tls, bp+64, ts+22114, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = int8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+22084, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+22145, libc.VaList(bp+32, zRowid))
 				cRangeOp = int8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = int8('>')
 			} else {
 				cRangeOp = int8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+22094, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+22155, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+22099,
+			Xsqlite3_str_appendf(tls, bp+64, ts+22160,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+22126, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+22187, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -101397,28 +102216,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+22137, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+22198, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21925, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21986, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+22158, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+22219, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21914, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21975, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21925, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21986, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+5360, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -101479,52 +102299,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -103002,7 +103828,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22166, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22227, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -103030,7 +103856,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22181, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22242, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -103548,7 +104374,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22190, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+22251, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -103905,10 +104731,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16506, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15834, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 15360, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 22204, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16522, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15850, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 15370, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 22265, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -104285,49 +105111,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -104335,13 +105150,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -104406,12 +105224,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22211, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+22272, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22211, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+22272, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -104435,7 +105253,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -104445,7 +105263,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -104490,7 +105308,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7112
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7172
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -104584,7 +105402,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 22252
+				return ts + 22313
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -104595,7 +105413,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -104603,6 +105420,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -104636,7 +105454,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -104789,6 +105607,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -104957,7 +105778,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22259,
+			Xsqlite3ErrorMsg(tls, pParse, ts+22320,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -105691,7 +106512,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+22295, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+22356, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -105762,7 +106583,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 22321
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 22382
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -106269,7 +107090,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -106289,7 +107110,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -106300,10 +107121,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -106314,29 +107135,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -106438,8 +107259,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -106451,7 +107272,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -106461,17 +107282,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -106491,19 +107312,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -106515,19 +107336,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -106537,10 +107358,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -106554,9 +107375,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -106581,8 +107402,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -106594,7 +107415,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -106608,23 +107429,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -106635,7 +107456,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -106957,6 +107778,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -107050,8 +107872,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -107075,8 +107897,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -107228,7 +108051,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -107247,7 +108070,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -107261,7 +108084,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -107270,9 +108093,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -107291,6 +108118,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -107418,30 +108248,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -107449,20 +108298,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.X__builtin___memset_chk(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})), libc.X__builtin_object_size(tls, bp, 0))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -107471,9 +108325,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -107514,7 +108374,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -107554,7 +108414,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -107620,19 +108481,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -107813,7 +108679,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22332, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+22393, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -107871,7 +108737,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22332, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+22393, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -108269,7 +109135,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+22358, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+22419, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -108480,8 +109346,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -108600,14 +109466,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -108759,7 +109634,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -108867,7 +109742,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22393, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22454, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -109129,19 +110004,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -109153,9 +110030,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -109188,13 +110065,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -109346,7 +110223,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22411, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22472, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -109409,7 +110286,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22439, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22500, 0)
 	goto __5
 __4:
 	ii = 0
@@ -110110,7 +110987,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -110291,7 +111168,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22457, -1)
+		pCtx, ts+22518, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -110424,7 +111301,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22513, -1)
+					pCtx, ts+22574, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -110514,17 +111391,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22558))
-var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22569))
-var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22580))
-var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22585))
-var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22598))
-var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22608))
-var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22614))
-var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22625))
-var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22635))
-var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22647))
-var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22652))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22619))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22630))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22641))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22646))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22659))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22669))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22675))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22686))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22696))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22708))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22713))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -110570,7 +111447,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22656, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22717, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -110614,12 +111491,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22675, 0)
+			ts+22736, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22746, 0)
+				ts+22807, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -110642,7 +111519,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8281)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8341)
 					}
 					break
 				}
@@ -110846,7 +111723,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22809, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22870, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -110962,7 +111839,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7873))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7933))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -110973,6 +111850,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, int8(SQLITE_AFF_NONE))
@@ -111076,7 +111954,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22835, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22896, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -111141,15 +112019,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22867
+				zErr = ts + 22928
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22884
+				zErr = ts + 22945
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22900
+				zErr = ts + 22961
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22920, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22981, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -111170,7 +112048,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22953, 0)
+				ts+23014, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -111326,11 +112204,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 23000,
-	ts + 23053,
-	ts + 22457,
-	ts + 23104,
-	ts + 23156,
+	ts + 23061,
+	ts + 23114,
+	ts + 22518,
+	ts + 23165,
+	ts + 23217,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -112527,8 +113405,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -112539,13 +113416,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -112729,19 +113603,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+23206,
+				Xsqlite3ErrorMsg(tls, pParse, ts+23267,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 20200
+							return ts + 23309
 						}
-						return ts + 23248
+						return ts + 23318
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+23254, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+23324, 0)
 		}
 	}
 
@@ -112809,7 +113683,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23288,
+		Xsqlite3ErrorMsg(tls, pParse, ts+23358,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -113906,7 +114780,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+23326, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23396, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -114881,21 +115755,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16657, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16673, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+23348, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23418, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16570, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16586, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+23348, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+23418, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -115638,7 +116512,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23375)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+23445)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -115802,7 +116676,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+23384, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23454, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -116019,9 +116893,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 7107
+							return ts + 7167
 						}
-						return ts + 7112
+						return ts + 7172
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -116033,6 +116907,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -116300,19 +117179,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23408, 0)
+					ts+23478, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23503, 0)
+					ts+23573, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23587, 0)
+					ts+23657, 0)
 			}
 			break
 		case uint32(273):
@@ -116691,9 +117570,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23384, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23454, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23672, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23742, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -117461,7 +118340,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23689, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23759, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -117484,7 +118363,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3658, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23714, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23784, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -117657,7 +118536,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23725, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23795, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -117670,11 +118549,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+20320, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+20381, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23732, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23802, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23737, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23807, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -117687,9 +118566,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23747, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23817, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23751, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23821, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -117923,7 +118802,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -118498,7 +119377,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -118513,7 +119392,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23759, 0)
+			ts+23829, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -118704,23 +119583,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23827
+	var zErr uintptr = ts + 23897
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23841
+			zErr = ts + 23911
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23863
+			zErr = ts + 23933
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23885
+			zErr = ts + 23955
 			break
 
 		}
@@ -118738,35 +119617,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23908,
-	ts + 23921,
+	ts + 23978,
+	ts + 23991,
 	uintptr(0),
-	ts + 23937,
-	ts + 23962,
-	ts + 23976,
-	ts + 23995,
+	ts + 24007,
+	ts + 24032,
+	ts + 24046,
+	ts + 24065,
 	ts + 1483,
-	ts + 24020,
-	ts + 24057,
-	ts + 24069,
-	ts + 24084,
-	ts + 24117,
-	ts + 24135,
-	ts + 24160,
-	ts + 24189,
+	ts + 24090,
+	ts + 24127,
+	ts + 24139,
+	ts + 24154,
+	ts + 24187,
+	ts + 24205,
+	ts + 24230,
+	ts + 24259,
 	uintptr(0),
-	ts + 6251,
+	ts + 6241,
 	ts + 5737,
-	ts + 24206,
-	ts + 24224,
-	ts + 24242,
-	uintptr(0),
 	ts + 24276,
+	ts + 24294,
+	ts + 24312,
 	uintptr(0),
-	ts + 24297,
-	ts + 24323,
 	ts + 24346,
+	uintptr(0),
 	ts + 24367,
+	ts + 24393,
+	ts + 24416,
+	ts + 24437,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -118867,6 +119746,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	*(*int32)(unsafe.Pointer(db + 432)) = 1
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(*(*int32)(unsafe.Pointer(db + 432)) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -118881,7 +119766,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -118926,7 +119811,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24383, 0)
+				ts+24453, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -119043,7 +119928,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+24446, libc.VaList(bp, zName))
+		ts+24516, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -119279,7 +120164,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24497, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24567, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -119372,7 +120257,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -119442,7 +120327,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -119452,7 +120337,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -119484,14 +120369,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24518, 0)
+				ts+24588, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -119621,7 +120506,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24586, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24656, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -119666,10 +120551,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24592, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24662, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24602,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24672,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -119774,7 +120659,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24630, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24700, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -119785,17 +120670,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24634, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24704, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24634
+	zModeType = ts + 24704
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24640, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24710, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -119833,7 +120718,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24645, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24715, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -119841,7 +120726,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24665,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24735,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -119881,7 +120766,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24689, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24759, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -119905,15 +120790,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24705, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24712, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24775, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24782, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24720, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24723, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24726, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17768, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24790, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24793, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24796, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17784, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -120059,10 +120944,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+22252, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+22313, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24730, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24800, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -120076,7 +120961,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -120127,9 +121012,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6784
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6844
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23732
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23802
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -120234,7 +121119,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24736
+		zFilename = ts + 24806
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -120337,21 +121222,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24739,
+	Xsqlite3_log(tls, iErr, ts+24809,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24764)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24834)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24784)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24854)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24791)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24861)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -120509,7 +121394,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24808, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24878, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -121165,7 +122050,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24836, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24906, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -121283,7 +122168,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24844
+			return ts + 24914
 		}
 		return uintptr(0)
 	}(), 0)
@@ -121461,7 +122346,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6584, ts + 7107, ts + 7112, ts + 6594, ts + 6589, ts + 8348, ts + 24867, ts + 24873,
+	ts + 6584, ts + 7167, ts + 7172, ts + 6594, ts + 6589, ts + 8408, ts + 24937, ts + 24943,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -121614,7 +122499,7 @@ __10:
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0' + int32(c)>>4)
-	c = uint8(*(*int8)(unsafe.Pointer(ts + 24880 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24950 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -121669,7 +122554,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24897, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24967, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -121733,13 +122618,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+7107, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+7167, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+7112, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+7172, uint32(5))
 			break
 
 		}
@@ -122289,12 +123174,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+7107, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7167, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+7112, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+7172, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(5)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -122395,7 +123280,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24926, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24996, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -122701,7 +123586,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*int8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24941, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+25011, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -122716,7 +123601,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24945, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+25015, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -122770,7 +123655,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24971,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+25041,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -122875,11 +123760,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*int8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zPath)))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+25014, uint32(2))
+					jsonAppendRaw(tls, bp, ts+25084, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+5401, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+25017, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+25087, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -123036,14 +123921,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+25020, -1)
+			ts+25090, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, int8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+25071, -1)
+			Xsqlite3_result_error(tls, ctx, ts+25141, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -123138,7 +124023,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15767)
+	jsonWrongNumArgs(tls, ctx, ts+15783)
 	return
 __2:
 	;
@@ -123213,9 +124098,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 25105
+			return ts + 25175
 		}
-		return ts + 25109
+		return ts + 25179
 	}())
 	return
 __2:
@@ -123348,7 +124233,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+25116, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+25186, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -123445,7 +124330,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+25119, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+25189, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -123489,7 +124374,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+25122)
+		ts+25192)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -123620,7 +124505,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+25205, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+25275, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -123639,7 +124524,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+25211, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+25281, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -123735,7 +124620,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, int8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+25211, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+25281, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -123759,7 +124644,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 25216
+				zRoot = ts + 25286
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -123824,6 +124709,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -123875,7 +124766,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24926, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24996, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -123970,25 +124861,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25218},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25223},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25234},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25234},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25252},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 25265},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 25268},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25272},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25284},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25296},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25307},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25318},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25330},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25343},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25352},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25352},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25362},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25373},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25390}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25288},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25293},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25304},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25304},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25322},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 25335},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 25338},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25342},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25354},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25366},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25377},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25388},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25400},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 25413},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25422},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25422},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 25432},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25443},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25460}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -124007,8 +124898,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 25408, FpModule: 0},
-	{FzName: ts + 25418, FpModule: 0},
+	{FzName: ts + 25478, FpModule: 0},
+	{FzName: ts + 25488, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -124268,11 +125159,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25428, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25498, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25436, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25506, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -124483,7 +125374,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+25441,
+		ts+25511,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -125186,7 +126077,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25523)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25593)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -126527,7 +127418,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25537, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25607, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -126539,12 +127430,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25557, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25627, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25589, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25659, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -126770,7 +127661,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25626, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25696, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -126793,14 +127684,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25771
+	var zFmt uintptr = ts + 25841
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11689, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11751, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -126841,7 +127732,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25827, ts + 5463, ts + 16657,
+	ts + 25897, ts + 5463, ts + 16673,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -126884,19 +127775,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25832,
+			ts+25902,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25894, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25964, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25899,
+			ts+25969,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25963,
+			ts+26033,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26033,
+			ts+26103,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -126925,7 +127816,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 26082
+			zFormat = ts + 26152
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -126937,7 +127828,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+26190,
+			ts+26260,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -126945,18 +127836,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+26235, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+26305, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+13160, 1)
+					Xsqlite3_str_append(tls, p, ts+13170, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+26262, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+26332, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+26284, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+26354, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+26292, 0)
+			Xsqlite3_str_appendf(tls, p, ts+26362, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -126971,14 +127862,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 26308,
-	ts + 26361,
-	ts + 26406,
-	ts + 26458,
-	ts + 26512,
-	ts + 26557,
-	ts + 26615,
-	ts + 26670,
+	ts + 26378,
+	ts + 26431,
+	ts + 26476,
+	ts + 26528,
+	ts + 26582,
+	ts + 26627,
+	ts + 26685,
+	ts + 26740,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -127007,7 +127898,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26717, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26787, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -127019,7 +127910,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26737,
+			ts+26807,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -127027,7 +127918,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26794,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26864,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -127069,10 +127960,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26829,
-		ts + 26872,
-		ts + 26907,
-		ts + 26943,
+		ts + 26899,
+		ts + 26942,
+		ts + 26977,
+		ts + 27013,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -127103,7 +127994,7 @@ __2:
 	libc.X__builtin___memcpy_chk(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName), libc.X__builtin_object_size(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, 0))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26980,
+	Xsqlite3_str_appendf(tls, pSql, ts+27050,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -127115,7 +128006,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27004, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+27074, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -127138,7 +128029,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27010, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27080, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -127234,7 +128125,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 27013, ts + 27024}
+var azFormat = [2]uintptr{ts + 27083, ts + 27094}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -127272,13 +128163,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+11261, 1)
+			Xsqlite3_str_append(tls, pOut, ts+11323, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+27034, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+27104, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+27040, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+27110, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+27044, 1)
+		Xsqlite3_str_append(tls, pOut, ts+27114, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -127289,7 +128180,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+27046, -1)
+		Xsqlite3_result_error(tls, ctx, ts+27116, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -127367,7 +128258,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+27079,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+27149,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4465
@@ -127391,7 +128282,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+27086,
+			ts+27156,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -127410,7 +128301,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+27131, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+27201, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -127424,8 +128315,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 27163,
-		ts + 27217,
+		ts + 27233,
+		ts + 27287,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -127440,23 +128331,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+27265,
+		rtreeCheckAppendMsg(tls, pCheck, ts+27335,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 27310
+					return ts + 27380
 				}
-				return ts + 27318
+				return ts + 27388
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27327,
+				ts+27397,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 27310
+						return ts + 27380
 					}
-					return ts + 27318
+					return ts + 27388
 				}(), iKey, iVal))
 		}
 	}
@@ -127480,7 +128371,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27385, libc.VaList(bp, i, iCell, iNode))
+				ts+27455, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -127500,7 +128391,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27433, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27503, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -127517,14 +128408,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27500, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27570, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27534, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27604, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -127532,7 +128423,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27564,
+					ts+27634,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -127561,14 +128452,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27619,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27689,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27650, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27720, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -127590,12 +128481,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14896, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14906, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27717, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27787, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -127604,12 +128495,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25537, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25607, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27745, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27815, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -127623,8 +128514,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27776, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27783, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27846, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27853, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -127632,7 +128523,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27791, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27861, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -127647,7 +128538,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27795, -1)
+			ts+27865, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -127655,7 +128546,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6784
+			zDb = ts + 6844
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -127665,7 +128556,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 18421
+				return ts + 18464
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -127960,7 +128851,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -128018,6 +128909,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -128030,15 +128922,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27846, 1)
+		Xsqlite3_str_append(tls, x, ts+27916, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27848, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27918, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27859, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27929, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -128058,19 +128951,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep int8 = int8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27870, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27940, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27888, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27958, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = int8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27896, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27966, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*int8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27904, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27974, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27908, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27978, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -128089,6 +128982,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -128120,6 +129014,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -128128,6 +129023,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -128186,6 +129082,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -128354,6 +129251,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -128375,6 +129273,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -128459,6 +129358,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -128487,6 +129388,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -128925,6 +129827,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -128938,6 +129841,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -128952,6 +129858,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -128976,7 +129883,7 @@ __1:
 	libc.X__builtin___memcpy_chk(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName), libc.X__builtin_object_size(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, 0))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27921, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27991, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -128985,7 +129892,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27943, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+28013, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -128993,7 +129900,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27010, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27080, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -129072,6 +129979,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -129200,6 +130108,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -129218,7 +130127,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16657
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16673
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -129228,7 +130137,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27947
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28017
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -129236,7 +130145,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27953
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28023
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -129348,7 +130257,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27962, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28032, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -129478,14 +130387,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+28002) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+28072) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+28018) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+28088) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -129522,8 +130433,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -129540,7 +130451,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -129550,7 +130461,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+28033, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28103, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -129562,25 +130473,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28041},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28054},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28067},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 28080},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28018},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 28092},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28002},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 28115},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28129},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 28142},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 28156},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28172},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28111},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28124},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28137},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 28150},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28088},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 28162},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28072},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 28185},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28199},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 28212},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 28226},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28242},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 28184},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 28254},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -129590,26 +130501,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+28203, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+28273, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+28213, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+28283, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+28224, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+28294, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27947, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28017, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+28235, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28305, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -129663,7 +130574,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25523, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25593, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -129990,7 +130901,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+28245, -1)
+		Xsqlite3_result_error(tls, context, ts+28315, -1)
 		return
 	}
 
@@ -130001,7 +130912,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+28245, -1)
+			Xsqlite3_result_error(tls, context, ts+28315, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -130102,7 +131013,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+28266, uintptr(0), uintptr(0), p+64)
+				ts+28336, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -130166,7 +131077,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25436, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25506, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -130187,16 +131098,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28437, libc.VaList(bp, func() uintptr {
+			ts+28507, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28587
+					return ts + 28657
 				}
 				return ts + 1547
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28628)
+			ts+28698)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -130312,7 +131223,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28753, libc.VaList(bp, zTab)))
+			ts+28823, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -130330,7 +131241,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28872, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28942, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -130348,7 +131259,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28893, libc.VaList(bp+16, zIdx)))
+			ts+28963, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -130371,7 +131282,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28944, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+29014, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -130417,7 +131328,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.X__builtin___memcpy_chk(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol), libc.X__builtin_object_size(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+28965, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29035, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -130432,7 +131343,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.X__builtin___memset_chk(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol), libc.X__builtin_object_size(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+28993, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -130472,7 +131383,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19846, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19939, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -130482,18 +131393,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+29022, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+29092, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+29041, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+29111, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+29046, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+29116, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -130505,18 +131416,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+29056, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+29126, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 29085
+							return ts + 29155
 						}
-						return ts + 29098
+						return ts + 29168
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+29107, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+29177, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -130530,7 +131441,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29129,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29199,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -130577,8 +131488,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+29156, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 15007
+		zList = rbuMPrintf(tls, p, ts+29226, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 15017
 	}
 	return zList
 }
@@ -130595,7 +131506,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+29165, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+29235, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -130617,25 +131528,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+29178, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+29248, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+29210, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+29280, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15007, ts+29233)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+29239, ts+29246, ts+5360)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15007, ts+1547)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15017, ts+29303)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+29309, ts+29316, ts+5360)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15017, ts+1547)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+29254,
+					ts+29324,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+29296, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+29366, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -130677,7 +131588,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+28993, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -130712,7 +131623,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 29316
+	zCol = ts + 29386
 __7:
 	;
 	goto __5
@@ -130720,13 +131631,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+29324,
+	zLhs = rbuMPrintf(tls, p, ts+29394,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+29345,
+	zOrder = rbuMPrintf(tls, p, ts+29415,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+29381,
+	zSelect = rbuMPrintf(tls, p, ts+29451,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 15007
+	zSep = ts + 15017
 	iCol++
 	goto __1
 __2:
@@ -130744,7 +131655,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+29408,
+		Xsqlite3_mprintf(tls, ts+29478,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -130771,8 +131682,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29456, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 15007
+	zVector = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 15017
 	goto __15
 __15:
 	iCol++
@@ -130783,7 +131694,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29463, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -130816,7 +131727,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28993, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -130828,7 +131739,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29475, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29545, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1547
 		} else {
@@ -130840,37 +131751,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 29316
+					zCol = ts + 29386
 				} else {
-					zCol = ts + 29046
+					zCol = ts + 29116
 				}
 				zType = ts + 1112
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29497, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29567, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 29233
+					return ts + 29303
 				}
 				return ts + 1547
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29517,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29587,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29538,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29608,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29571, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29641, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 15007
-		zAnd = ts + 21914
+		zCom = ts + 15017
+		zAnd = ts + 21975
 		nBind++
 	}
 
@@ -130909,11 +131820,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+29595, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29665, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29607, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29677, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 15007
+			zS = ts + 15017
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -130921,7 +131832,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29616, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29686, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -130933,18 +131844,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29631, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29701, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1547
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29645, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21914
+				zList = rbuMPrintf(tls, p, ts+29715, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21975
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29657, libc.VaList(bp+40, zList))
+			ts+29727, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1547
@@ -130952,8 +131863,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29707, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21914
+				zList = rbuMPrintf(tls, p, ts+29777, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21975
 			}
 		}
 	}
@@ -130962,7 +131873,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29720, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29790, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -130980,17 +131891,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c int8 = *(*int8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29707,
+					zList = rbuMPrintf(tls, p, ts+29777,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15007
+					zSep = ts + 15017
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29746,
+					zList = rbuMPrintf(tls, p, ts+29816,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15007
+					zSep = ts + 15017
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29776,
+					zList = rbuMPrintf(tls, p, ts+29846,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15007
+					zSep = ts + 15017
 				}
 			}
 		}
@@ -131025,19 +131936,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29813
+		var zSep uintptr = ts + 29883
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+28965, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29035, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16545) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16561) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+28993, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -131049,15 +131960,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 29233
+					zDesc = ts + 29303
 				} else {
 					zDesc = ts + 1547
 				}
-				z = rbuMPrintf(tls, p, ts+29826, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 15007
+				z = rbuMPrintf(tls, p, ts+29896, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 15017
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29837, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29907, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -131077,7 +131988,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29841)
+			ts+29911)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -131086,7 +131997,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+28993, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+29063, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -131096,25 +132007,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29891, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29961, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29913, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29983, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 29233
+						return ts + 29303
 					}
 					return ts + 1547
 				}()))
-				zComma = ts + 15007
+				zComma = ts + 15017
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29923, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29993, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29938,
+			ts+30008,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 0))
 	}
 }
 
@@ -131127,7 +132038,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1547
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1547
@@ -131135,39 +132046,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 30000
+				zPk = ts + 30070
 			}
-			zSql = rbuMPrintf(tls, p, ts+30013,
+			zSql = rbuMPrintf(tls, p, ts+30083,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 30040
+							return ts + 30110
 						}
 						return ts + 1547
 					}()))
-			zComma = ts + 15007
+			zComma = ts + 15017
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+30050, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+30120, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+30057,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+30127,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 30089
+						return ts + 30159
 					}
 					return ts + 1547
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 0))
 	}
 }
 
@@ -131180,7 +132091,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+30104,
+				ts+30174,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -131217,7 +132128,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+30161)
+			ts+30231)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -131322,7 +132233,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+30227, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+30297, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -131342,24 +132253,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+30247,
+				ts+30317,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+30312, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+30382, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+30348, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+30418, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -131375,7 +132286,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30382,
+						ts+30452,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -131383,9 +132294,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 30443
+											return ts + 30513
 										}
-										return ts + 30447
+										return ts + 30517
 									}()
 								}
 								return ts + 1547
@@ -131394,20 +132305,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30453,
+						ts+30523,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30514,
+						ts+30584,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 30443
+									return ts + 30513
 								}
-								return ts + 30447
+								return ts + 30517
 							}(),
 							zCollist, zLimit))
 				}
@@ -131432,8 +132343,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6795)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6791)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6855)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6851)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -131444,16 +132355,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1547
 				}
-				return ts + 30673
+				return ts + 30743
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30682,
+						ts+30752,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30718
+								return ts + 30788
 							}
 							return ts + 1547
 						}(), zBindings)))
@@ -131462,32 +132373,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30728, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30798, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1547
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30756
+					zRbuRowid = ts + 30826
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30768, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30838, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30844
+							return ts + 30914
 						}
 						return ts + 1547
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30861,
+					ts+30931,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+31160,
+						ts+31230,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -131500,9 +132411,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 31259
+						zRbuRowid = ts + 31329
 					} else {
-						zRbuRowid = ts + 31269
+						zRbuRowid = ts + 31339
 					}
 				}
 
@@ -131515,20 +132426,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+29316, 0)
+						zOrder = rbuMPrintf(tls, p, ts+29386, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15007, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+15017, ts+1547)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+31280,
+							ts+31350,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 31328
+										return ts + 31398
 									}
 									return ts + 1547
 								}(),
@@ -131541,7 +132452,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 20200
+										return ts + 23309
 									}
 									return ts + 1547
 								}(), zOrder,
@@ -131609,9 +132520,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1547
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30673
+				zPrefix = ts + 30743
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+31334,
+			zUpdate = Xsqlite3_mprintf(tls, ts+31404,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -131670,7 +132581,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+31364, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+31434, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -131740,28 +132651,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6784, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6784)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31394, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31464, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31422, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31492, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.X__builtin___memcpy_chk(tls, p+48, ts+3279, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
 	} else {
-		libc.X__builtin___memcpy_chk(tls, p+48, ts+6784, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
+		libc.X__builtin___memcpy_chk(tls, p+48, ts+6844, uint64(4), libc.X__builtin_object_size(tls, p+48, 0))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31440, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31510, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6784, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -131794,11 +132705,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31506, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31576, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24586, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24656, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*int8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -131810,13 +132721,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31538,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6784),
+			zTarget = Xsqlite3_mprintf(tls, ts+31608,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
 						}
-						return ts + 31570
+						return ts + 31640
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
@@ -131835,37 +132746,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31572, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31642, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31587, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31657, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31604, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31674, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31620, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31690, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31648, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31718, 0)
 	}
 }
 
@@ -131894,15 +132805,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31620, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31690, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31666, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31736, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -131950,7 +132861,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -132010,7 +132921,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6784, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6844, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -132027,23 +132938,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31701, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31771, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6784)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6784)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6844)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31726, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31733, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31796, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31803, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -132160,7 +133071,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+24224, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+24294, 0)
 			return
 		}
 
@@ -132253,7 +133164,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+31740)
+			ts+31810)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -132261,7 +133172,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31762, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31832, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -132282,7 +133193,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+31789,
+				ts+31859,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -132312,9 +133223,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+31947, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+32017, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31962,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32032,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -132328,10 +133239,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31982, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32052, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+32007)
+			ts+32077)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -132345,12 +133256,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+32115)
+			ts+32185)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+32180)
+			ts+32250)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -132362,7 +133273,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32224, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32294, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -132382,15 +133293,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17646)
-					rbuCopyPragma(tls, p, ts+16741)
+					rbuCopyPragma(tls, p, ts+17662)
+					rbuCopyPragma(tls, p, ts+16757)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+32249, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+32319, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -132414,10 +133325,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14911, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14921, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14911, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14921, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -132512,7 +133423,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32277, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32347, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -132525,16 +133436,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31726, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31796, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6844, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -132544,7 +133456,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+32302, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+32372, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -132578,7 +133490,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+32313, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+32383, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -132608,13 +133520,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+32385, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32455, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+32399)
+				ts+32469)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -132625,7 +133537,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+32456)
+				ts+32526)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -132699,7 +133611,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32530, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32600, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -132717,12 +133629,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32562,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32632,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32594
+							return ts + 32664
 						}
-						return ts + 32601
+						return ts + 32671
 					}()))
 			}
 		}
@@ -132730,7 +133642,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14896, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14906, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -132741,19 +133653,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+17360)
-						rbuCopyPragma(tls, p, ts+16756)
+						rbuCopyPragma(tls, p, ts+17376)
+						rbuCopyPragma(tls, p, ts+16772)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32608, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32678, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6784, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6844, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32624, uintptr(0), uintptr(0), p+64)
+								db, ts+32694, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -132807,7 +133719,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32648, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32718, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -132834,7 +133746,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30673, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30743, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -132851,7 +133763,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14911, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14921, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -132864,13 +133776,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14911, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14921, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32656, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32726, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -132965,7 +133877,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14911, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14921, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -132982,19 +133894,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14911, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14921, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14896
+				zBegin = ts + 14906
 			} else {
-				zBegin = ts + 32608
+				zBegin = ts + 32678
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32608, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32678, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -133117,11 +134029,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -133260,7 +134175,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -133337,7 +134252,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32683, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32753, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -133362,7 +134277,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32706, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32776, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -133507,7 +134422,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6784)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6844)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -133522,7 +134437,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32717, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32787, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -133533,7 +134448,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -133563,6 +134484,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -134326,11 +135262,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11689, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11751, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32728, 0)
+				ts+32798, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
 		} else {
@@ -134343,7 +135279,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32849, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32919, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -134441,7 +135377,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11689, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11751, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -134908,6 +135844,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -134990,6 +135929,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -135019,9 +135959,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32878,
+			zRet = Xsqlite3_mprintf(tls, ts+32948,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 21914
+			zSep = ts + 21975
 			if zRet == uintptr(0) {
 				break
 			}
@@ -135044,9 +135984,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32912,
+				ts+32982,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 32953
+			zSep = ts + 33023
 			if zRet == uintptr(0) {
 				break
 			}
@@ -135054,18 +135994,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7873, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7933, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32958,
+		ts+33028,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -135075,7 +136015,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -135108,7 +136048,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+33036,
+			ts+33106,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -135235,7 +136175,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33089, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+33159, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -135709,9 +136649,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11689, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11751, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+33116, libc.VaList(bp, zDb))
+			ts+33186, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -135720,18 +136660,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1547
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+33226, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33296, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1560, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+33241, bp+24)
+		sessionAppendStr(tls, bp+8, ts+33311, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+33249, bp+24)
+				sessionAppendStr(tls, bp+8, ts+33319, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21914
+				zSep = ts + 21975
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -135840,7 +136780,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33255, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+33325, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -135932,7 +136872,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+33275, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33345, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -136195,7 +137135,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -136218,7 +137158,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -136260,7 +137200,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -136321,7 +137261,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -136395,13 +137335,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -136463,7 +137403,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -136836,7 +137776,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -137004,7 +137944,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11689) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11751) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -137015,34 +137955,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.X__builtin___memcpy_chk(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))), libc.X__builtin_object_size(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, 0))
 
-				sessionAppendStr(tls, bp, ts+33293, bp+16)
+				sessionAppendStr(tls, bp, ts+33363, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+33306, bp+16)
+				sessionAppendStr(tls, bp, ts+33376, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+33312, bp+16)
+						sessionAppendStr(tls, bp, ts+33382, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 15007
+						zSep = ts + 15017
 					}
 				}
 
 				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+33241, bp+16)
+				sessionAppendStr(tls, bp, ts+33311, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+33317, bp+16)
+								ts+33387, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+33249, bp+16)
+							sessionAppendStr(tls, bp, ts+33319, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21914
+						zSep = ts + 21975
 					}
 				}
 
@@ -137094,34 +138034,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+33392, bp+16)
+	sessionAppendStr(tls, bp, ts+33462, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+33241, bp+16)
+	sessionAppendStr(tls, bp, ts+33311, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+33312, bp+16)
+			sessionAppendStr(tls, bp, ts+33382, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21914
+			zSep = ts + 21975
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+33410, bp+16)
+		sessionAppendStr(tls, bp, ts+33480, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32953, bp+16)
+		sessionAppendStr(tls, bp, ts+33023, bp+16)
 
 		zSep = ts + 1547
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+33249, bp+16)
+				sessionAppendStr(tls, bp, ts+33319, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 33418
+				zSep = ts + 33488
 			}
 		}
 		sessionAppendStr(tls, bp, ts+5360, bp+16)
@@ -137137,7 +138077,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6784, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6844, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -137148,19 +138088,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+33423, bp+16)
+	sessionAppendStr(tls, bp, ts+33493, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21920, bp+16)
+	sessionAppendStr(tls, bp, ts+21981, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+15007, bp+16)
+			sessionAppendStr(tls, bp, ts+15017, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+33441, bp+16)
+	sessionAppendStr(tls, bp, ts+33511, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33452, bp+16)
+		sessionAppendStr(tls, bp, ts+33522, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+5360, bp+16)
 
@@ -137176,14 +138116,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11689, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11751, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33456)
+			ts+33526)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33569)
+			ts+33639)
 	}
 	return rc
 }
@@ -137211,7 +138151,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -137220,7 +138160,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -137297,7 +138237,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -137423,7 +138363,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -137464,7 +138404,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33713, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33783, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -137480,7 +138420,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33734, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33804, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -137553,10 +138493,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33753, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33823, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33779, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33849, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -137602,7 +138542,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6784, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6844, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -137615,19 +138555,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33809, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33879, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33853,
+						ts+33923,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33924, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33994, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11689) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11751) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -137678,14 +138618,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33984, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34054, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+34014, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34084, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+34038, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+34014, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34108, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+34084, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -138933,7 +139873,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+34066, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+34136, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -139221,7 +140161,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+34094, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+34164, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -139408,7 +140348,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34125, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+34195, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -139476,7 +140416,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 34132
+		var zErr uintptr = ts + 34202
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -139658,7 +140598,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 34182
+		var zErr uintptr = ts + 34252
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -139982,13 +140922,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 34230, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34300, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 34238, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34308, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 34248, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 34318, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -140539,7 +141479,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+34253, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34323, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -140566,14 +141506,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*int8)(unsafe.Pointer(p))) < '0' || int32(*(*int8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34260, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34330, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+34291, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+34361, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -140584,7 +141524,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34324, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34394, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -140597,7 +141537,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34361, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34431, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -140606,7 +141546,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34370, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34440, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -140625,7 +141565,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34403, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34473, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -140640,14 +141580,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34437, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34507, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34445, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34515, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*int8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34477, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34547, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -140655,9 +141595,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34483, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34553, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34497, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34567, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -140665,9 +141605,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34535, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34605, zCmd, nCmd) == 0 {
 		if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || int32(*(*int8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34546, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34616, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -140677,19 +141617,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5478, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 8361, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17751},
-			{FzName: ts + 34581, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8429, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17767},
+			{FzName: ts + 34651, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34589, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34659, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34620, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34690, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -140736,15 +141676,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22580) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16657) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34648, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22641) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16673) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34718, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34678) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34748) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34688, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34758, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -140761,13 +141701,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34719, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34789, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34724, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34794, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34731, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34801, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -140805,8 +141745,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22580) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34739, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22641) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34809, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -140838,7 +141778,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34768, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34838, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -140875,19 +141815,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 34437
+			zTail = ts + 34507
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34788
+			zTail = ts + 34858
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34796, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34866, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16657, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16673, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -140931,18 +141871,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34807, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34877, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1547
 			}
-			return ts + 15007
+			return ts + 15017
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34823, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34893, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34830,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22580))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34900,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22641))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -141052,7 +141992,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34856) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34926) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -141062,7 +142002,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34861) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34931) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -141072,7 +142012,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34870) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34940) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -141085,7 +142025,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34880) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34950) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -141095,7 +142035,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34890) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34960) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -141111,7 +142051,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22580) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22641) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -141134,7 +142074,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34902
+	var zSelect uintptr = ts + 34972
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -141156,7 +142096,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34934) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35004) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -141170,7 +142110,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34942,
+				ts+35012,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -141268,7 +142208,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+35007, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+35077, 0)
 					return FTS5_EOF
 				}
 			}
@@ -141281,20 +142221,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+35027, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+35097, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35058, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35128, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35061, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35131, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30443, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30513, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -141380,6 +142320,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*int8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -141408,7 +142359,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 1))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*int8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = int8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -143061,9 +144012,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35065, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35135, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+34094, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+34164, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -143079,7 +144030,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c int8 = *(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+35070, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+35140, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -143166,7 +144117,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20917, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20978, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -143247,7 +144198,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+35099, 0)
+			ts+35169, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -143417,12 +144368,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+35152,
+								ts+35222,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 35202
+										return ts + 35272
 									}
-									return ts + 35065
+									return ts + 35135
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -144365,7 +145316,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35209, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+35279, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -144444,7 +145395,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+35215,
+			ts+35285,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -144469,7 +145420,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+35266,
+			ts+35336,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -144492,7 +145443,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+35315,
+			ts+35385,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -144731,7 +145682,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+35355, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+35425, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -145930,7 +146881,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+35378,
+			ts+35448,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -147396,7 +148347,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+35462,
+			ts+35532,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -147887,10 +148838,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -148473,13 +149429,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35519, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35589, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+25436, ts+35527, 0, pzErr)
+				pConfig, ts+25506, ts+35597, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11829,
-					ts+35562,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11891,
+					ts+35632,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -148732,7 +149688,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+35209, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+35279, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -148846,7 +149802,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35606,
+		ts+35676,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -149016,7 +149972,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35692)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35762)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -149287,7 +150243,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35697, 0)
+			ts+35767, 0)
 		return SQLITE_ERROR
 	}
 
@@ -149711,11 +150667,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35736,
+		ts+35806,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 15007
+					return ts + 15017
 				}
 				return ts + 1547
 			}(),
@@ -149727,9 +150683,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35791
+					return ts + 35861
 				}
-				return ts + 35796
+				return ts + 35866
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -149775,12 +150731,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35800, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35870, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5460, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35806, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35876, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -149811,7 +150767,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35834, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35904, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -149842,7 +150798,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35844, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35914, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -149874,14 +150830,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35865, libc.VaList(bp, z))
+				ts+35935, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34248
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 34318
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -149937,7 +150893,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35697, 0)
+		ts+35767, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -150154,7 +151110,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35898, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -150299,28 +151255,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35934, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36004, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35945, 0)
+				ts+36015, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36025, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36095, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+36033, 0)
+				ts+36103, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+17340, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+17356, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36089, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36159, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36095, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+36165, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -150378,7 +151334,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17885, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17901, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -150391,12 +151347,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+36111,
+				ts+36181,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20818
+						return ts + 20879
 					}
-					return ts + 36148
+					return ts + 36218
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -151026,7 +151982,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36160, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+36230, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -151270,7 +152226,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36181, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36251, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -151289,7 +152245,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36203, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+36273, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -151336,7 +152292,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36234)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+36304)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -151345,7 +152301,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+36247, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+36317, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -151359,7 +152315,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 36338, ts + 34437, ts + 25436, ts + 34788, ts + 11829,
+	ts + 36408, ts + 34507, ts + 25506, ts + 34858, ts + 11891,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -151383,7 +152339,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+36345, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+36415, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -151401,13 +152357,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+36345, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36415, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+36350, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+36420, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -151462,17 +152420,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 36365,
-			ts + 36433,
-			ts + 36502,
-			ts + 36535,
-			ts + 36574,
-			ts + 36614,
-			ts + 36653,
-			ts + 36694,
-			ts + 36733,
-			ts + 36775,
-			ts + 36815,
+			ts + 36435,
+			ts + 36503,
+			ts + 36572,
+			ts + 36605,
+			ts + 36644,
+			ts + 36684,
+			ts + 36723,
+			ts + 36764,
+			ts + 36803,
+			ts + 36845,
+			ts + 36885,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -151574,18 +152532,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36838,
+		ts+36908,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36942,
+			ts+37012,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36980,
+			ts+37050,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -151597,7 +152555,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+37018,
+			ts+37088,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -151609,14 +152567,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+25436, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11829, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+36338, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25506, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11891, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+36408, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34788, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34858, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34437, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34507, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -151628,17 +152586,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37060,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37130,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 30089
+					return ts + 30159
 				}
 				return ts + 1547
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+37090,
+			ts+37160,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -151675,27 +152633,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37134, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+37204, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37157, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+37227, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34437, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34507, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34788, ts+37163, 0, pzErr)
+				pConfig, ts+34858, ts+37233, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+36338, ts+37195, 1, pzErr)
+				pConfig, ts+36408, ts+37265, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34934, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35004, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -151901,12 +152859,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+37212,
+		ts+37282,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+37262,
+			ts+37332,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -151914,7 +152872,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34934, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35004, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -152090,7 +153048,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+37291,
+	zSql = Xsqlite3_mprintf(tls, ts+37361,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -152272,14 +153230,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34437, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34507, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34788, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34858, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -152474,9 +153432,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.X__builtin___memcpy_chk(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)), libc.X__builtin_object_size(tls, p, 0))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37323) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37393) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37334) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37404) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -152691,7 +153649,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 37345
+			var zCat uintptr = ts + 37415
 			var i int32
 			libc.X__builtin___memset_chk(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})), libc.X__builtin_object_size(tls, p, 0))
 
@@ -152703,7 +153661,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37354) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37424) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -152714,18 +153672,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37365) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37435) {
 					if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' && int32(*(*int8)(unsafe.Pointer(zArg))) != '2' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*int8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37323) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37393) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37334) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37404) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37354) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37424) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -153001,7 +153959,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 37383
+	var zBase uintptr = ts + 37453
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -153143,7 +154101,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37393, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37463, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -153151,11 +154109,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37396, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37466, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37401, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37471, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -153163,7 +154121,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37406, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37476, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -153171,7 +154129,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37409, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37479, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -153179,11 +154137,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37412, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37482, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37417, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37487, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -153191,19 +154149,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37422, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37492, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37426, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37496, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37432, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37502, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37437, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37507, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -153211,11 +154169,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37441, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37511, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37445, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37515, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -153223,7 +154181,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37448, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37518, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -153231,11 +154189,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37452, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37522, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37456, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37526, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -153243,7 +154201,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37460, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37530, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -153251,7 +154209,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37464, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37534, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -153259,7 +154217,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37468, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37538, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -153275,24 +154233,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37472, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37452, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37542, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37475, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37478, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37545, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37548, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37482, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37468, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37552, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-2), ts+37538, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-2), 0))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -153307,137 +154265,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37485, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37555, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37452, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37493, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37563, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+37500, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+37570, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37505, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37575, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37401, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37471, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37510, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37580, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37396, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37466, uint64(4), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37515, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37585, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37468, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37538, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37520, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37590, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+15867, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+15883, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37525, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37595, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37478, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37548, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37529, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37599, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37393, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37534, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37604, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37437, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37507, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37540, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37610, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37544, uint64(1), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37614, uint64(1), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37546, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37616, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37460, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37530, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37552, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37622, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37468, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37538, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37560, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37630, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37452, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37566, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37636, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37452, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37522, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37571, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37641, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37393, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37577, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37647, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37464, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37534, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37585, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37655, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37593, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37663, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37597, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37667, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37460, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-7), ts+37530, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-7), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37605, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37675, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37393, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37611, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37681, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37464, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37534, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37617, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37687, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+37478, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-6), ts+37548, uint64(3), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-6), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -153452,16 +154410,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37624, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37694, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37409, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-4), ts+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-4), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37629, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37699, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -153469,21 +154427,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37634, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37704, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37409, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37640, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37710, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37409, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37479, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37593, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37663, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -153491,7 +154449,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37646, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37716, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -153499,9 +154457,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37652, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37722, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37393, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-5), ts+37463, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-5), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -153516,12 +154474,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37658, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37728, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37662, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
+				libc.X__builtin___memcpy_chk(tls, aBuf+uintptr(nBuf-3), ts+37732, uint64(2), libc.X__builtin_object_size(tls, aBuf+uintptr(nBuf-3), 0))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37665, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37735, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -153530,7 +154488,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37668, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37738, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -153686,7 +154644,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37672) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37742) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -153866,22 +154824,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 37383, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37453, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37687, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37757, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37693, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37763, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37700, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37770, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -155024,14 +155982,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37708) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37778) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37712) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37782) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37716) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37786) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37725, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37795, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -155057,19 +156015,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 37759,
-		ts + 37799,
-		ts + 37834,
+		ts + 37829,
+		ts + 37869,
+		ts + 37904,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23732, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23802, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37877, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37947, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -155202,11 +156160,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37910, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37980, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37941,
+		ts+38011,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -155230,7 +156188,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37992, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38062, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -155625,7 +156583,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+38018, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+38088, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -155647,7 +156605,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 38028
+	return ts + 38098
 }
 
 func init() {
@@ -155702,114 +156660,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -156436,6 +157396,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -156754,6 +157726,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -156775,5 +157748,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-14.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00S\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00nfs\x00hfs\x00ufs\x00afpfs\x00smbfs\x00webdav\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00msdos\x00exfat\x00SQLITE_FORCE_PROXY_LOCKING\x00:auto:\x00fsync\x00/dev/urandom\x00sqliteplocks\x00/\x00dummy\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00break\x00path error (len %d)\x00read error (len %d)\x00create failed (%d)\x00write failed (%d)\x00rename failed (%d)\x00broke stale lock on %s\n\x00failed to break stale lock on %s, %s\n\x00-conch\x00.lock\x00:auto: (not held)\x00unix\x00unix-none\x00unix-dotfile\x00unix-posix\x00unix-flock\x00unix-afp\x00unix-nfs\x00unix-proxy\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00dylib\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00lock_proxy_file\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00failed to set lock proxy file\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-14.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00S\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00nfs\x00hfs\x00ufs\x00afpfs\x00smbfs\x00webdav\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00msdos\x00exfat\x00SQLITE_FORCE_PROXY_LOCKING\x00:auto:\x00fsync\x00/dev/urandom\x00sqliteplocks\x00/\x00dummy\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00break\x00path error (len %d)\x00read error (len %d)\x00create failed (%d)\x00write failed (%d)\x00rename failed (%d)\x00broke stale lock on %s\n\x00failed to break stale lock on %s, %s\n\x00-conch\x00.lock\x00:auto: (not held)\x00unix\x00unix-none\x00unix-dotfile\x00unix-posix\x00unix-flock\x00unix-afp\x00unix-nfs\x00unix-proxy\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00dylib\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00lock_proxy_file\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00failed to set lock proxy file\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_freebsd_386.go b/vendor/modernc.org/sqlite/lib/sqlite_freebsd_386.go
index 74e2ff6e..9baeb026 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_freebsd_386.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_freebsd_386.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_386.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_386.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -412,6 +412,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -519,6 +520,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -797,6 +799,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1313,6 +1316,7 @@ const (
 	SF_SETTABLE                           = 0xffff0000
 	SF_SNAPSHOT                           = 0x00200000
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1348,6 +1352,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1466,6 +1471,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -1832,6 +1838,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -1928,11 +1935,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -1947,7 +1957,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2055,8 +2065,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2448,6 +2458,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -3709,6 +3720,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -4930,10 +4942,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -4988,12 +4998,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -5355,7 +5363,7 @@ type Parse1 = struct {
 	FnLabelAlloc      int32
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -5374,6 +5382,7 @@ type Parse1 = struct {
 	FnQueryLoop       U32
 	Foldmask          U32
 	Fnewmask          U32
+	FnProgressSteps   U32
 	FeTriggerOp       U8
 	FbReturning       U8
 	FeOrconf          U8
@@ -6007,7 +6016,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -6135,7 +6144,6 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
 }
@@ -6154,7 +6162,6 @@ type AggInfo_col = struct {
 type AggInfo_func = struct {
 	FpFExpr    uintptr
 	FpFunc     uintptr
-	FiMem      int32
 	FiDistinct int32
 	FiDistAddr int32
 }
@@ -6335,9 +6342,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
-	FpIdx    uintptr
-	FiTabCur int32
+type CoveringIndexCheck1 = struct {
+	FpIdx        uintptr
+	FiTabCur     int32
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -6541,7 +6551,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1092))
@@ -6690,7 +6700,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -6739,8 +6748,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -6751,6 +6770,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -6867,7 +6895,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint32(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint32(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7692,14 +7720,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = int8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -7707,7 +7735,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -9517,7 +9545,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = (int32(zEnd) - int32(zStart)) / 1
-	for n > 0 && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -9773,6 +9801,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -10763,6 +10793,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -10771,11 +10802,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -10787,30 +10842,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1547
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -10819,83 +10874,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 21)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = (int32(z) - int32(bufpt)) / 1
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = (int32(z) - int32(bufpt)) / 1
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -10909,17 +10964,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -10927,90 +10982,90 @@ __219:
 		}
 		return ts + 1553
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(j))) = int8(0)
 	length = int32(j)
@@ -11018,89 +11073,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -11113,32 +11168,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -11197,7 +11252,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -11213,8 +11268,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -11243,12 +11297,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -11257,7 +11312,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint32(N))
 		*(*U32)(unsafe.Pointer(p + 16)) += U32(N)
@@ -12381,6 +12436,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 304)) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -12986,10 +13059,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13015,6 +13091,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = int8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint32(unsafe.Sizeof([22]int8{}))-uint32(1)-uint32(i))
+	return int32(uint32(unsafe.Sizeof([22]int8{})) - uint32(2) - uint32(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14023,11 +14100,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -14991,7 +15069,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15214,7 +15292,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -15230,113 +15308,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -15468,7 +15546,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15759,7 +15837,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3371, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15776,14 +15854,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3659, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3659, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*12 + 4)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15803,7 +15881,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -15871,7 +15949,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -16098,7 +16176,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16126,7 +16204,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -16225,7 +16303,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3254, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -16355,7 +16433,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -16401,7 +16479,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -16640,7 +16718,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -16774,7 +16852,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+8)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16795,7 +16873,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17111,7 +17189,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3254, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -17202,7 +17280,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__error(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43337)
 		}
 		return rc
 	}
@@ -17210,9 +17288,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*12 + 4)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3781, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3781, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -17255,12 +17333,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*int8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -17279,18 +17354,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*12 + 4)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__error(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3452, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3452, zIn, 43443)
 			}
 		} else if int32((*stat)(unsafe.Pointer(bp)).Fst_mode)&0170000 == 0120000 {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*12 + 4)))(tls, zIn, bp+208, uint32(unsafe.Sizeof([1026]int8{}))-uint32(2))
 			if got <= 0 || got >= Ssize_t(unsafe.Sizeof([1026]int8{}))-2 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3443, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3443, zIn, 43454)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 208 + uintptr(got))) = int8(0)
@@ -17330,14 +17405,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 1028)).FzOut = zOut
 	if int32(*(*int8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*12 + 4)))(tls, bp, uint32(unsafe.Sizeof([1026]int8{}))-uint32(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3272, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3272, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+1028, bp)
 	}
 	appendAllPathElements(tls, bp+1028, zPath)
 	*(*int8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+1028)).FnUsed))) = int8(0)
 	if (*DbPath)(unsafe.Pointer(bp+1028)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+1028)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1028)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17432,7 +17507,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__error(tls))) == EINTR {
 				got = (*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*12 + 4)))(tls, fd, zBuf, uint32(nBuf))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -21350,7 +21425,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint32(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint32(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -22402,7 +22477,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -22419,7 +22493,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 8)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -22485,7 +22558,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + Size_t(1))
 	z += uintptr(libc.Xstrlen(tls, z) + Size_t(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -22495,7 +22567,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22686,36 +22758,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -22887,7 +22948,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23011,7 +23072,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23050,7 +23111,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23127,7 +23188,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24039,10 +24100,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]int8{int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0)}
@@ -24128,7 +24191,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 28)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -24882,7 +24945,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -24981,7 +25044,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -25566,7 +25629,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+12)
@@ -25841,7 +25904,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -26314,7 +26377,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26819,7 +26882,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27053,8 +27116,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27062,23 +27125,24 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt    uintptr
+	FpPager uintptr
+	FaPgRef uintptr
+	FnPage  Pgno
+	FmxErr  int32
+	FnErr   int32
+	Frc     int32
+	FnStep  U32
+	FzPfx   uintptr
+	Fv1     Pgno
+	Fv2     int32
+	FerrMsg StrAccum
+	Fheap   uintptr
+	Fdb     uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27474,7 +27538,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27611,7 +27675,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -27628,7 +27692,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -27636,7 +27700,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -27679,7 +27743,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27689,7 +27753,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -27939,7 +28003,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -27986,7 +28050,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -27996,7 +28060,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28009,7 +28073,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28018,14 +28082,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint32(iFree2-(iFree+sz)))
@@ -28035,7 +28099,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -28099,7 +28163,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -28109,7 +28173,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28131,7 +28195,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28166,7 +28230,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28179,13 +28243,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -28210,7 +28274,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -28221,7 +28285,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, (int32(pSpace)-int32(data))/1)
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -28273,22 +28337,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -28298,7 +28362,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -28306,7 +28370,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -28314,10 +28378,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -28341,13 +28405,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -28355,7 +28418,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -28363,32 +28465,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -28416,11 +28507,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -28431,15 +28522,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -28467,14 +28558,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2) + 1)))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -28488,7 +28579,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28500,7 +28591,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28603,7 +28694,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28631,7 +28722,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28670,7 +28761,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29553,7 +29644,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -29968,7 +30059,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -29994,7 +30085,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -30003,7 +30094,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30014,7 +30105,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30030,7 +30121,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30091,7 +30182,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30126,7 +30217,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 20)))
 				if *(*Pgno)(unsafe.Pointer(bp + 24)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -30186,7 +30277,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -30225,7 +30316,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -30256,7 +30347,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30597,7 +30688,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -30841,14 +30932,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int32(aPayload)-int32((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > (*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -30893,7 +30984,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -30942,7 +31033,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -31022,7 +31113,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31113,7 +31204,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -31133,7 +31224,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -31197,18 +31288,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -31224,6 +31305,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -31345,7 +31434,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -31549,7 +31638,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31614,7 +31703,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -31662,7 +31751,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -31781,7 +31870,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -31941,7 +32030,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32006,7 +32095,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+4, 0)
@@ -32042,7 +32131,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32086,7 +32175,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -32198,7 +32287,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -32356,7 +32445,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -32413,7 +32502,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -32429,7 +32518,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -32503,7 +32592,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32515,7 +32604,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 4)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+4)
@@ -32526,7 +32615,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32691,7 +32780,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -32715,9 +32804,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -32740,16 +32829,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -32770,9 +32857,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -32905,11 +32998,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*4)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*4)))
 		} else {
 		}
 		idx++
@@ -32962,12 +33058,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int32(pCell)-int32(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -32975,7 +33071,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int32(pData) - int32(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint32(sz))
 
@@ -33035,7 +33131,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4)), uint32(sz))
@@ -33124,7 +33220,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint32(nCell*2))
@@ -33240,7 +33336,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 80)) = allocateBtreePage(tls, pBt, bp, bp+4, uint32(0), uint8(0))
@@ -33283,8 +33379,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 80)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, (int32(pOut)-int32(pSpace))/1,
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+80)
+			*(*int32)(unsafe.Pointer(bp + 80)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, (int32(pOut)-int32(pSpace))/1,
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 4)))
@@ -33366,6 +33462,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -33558,7 +33656,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 72)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -33569,7 +33667,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -33727,7 +33825,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -33801,7 +33899,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -33827,9 +33925,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -33840,8 +33939,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 136 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -33863,7 +33962,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -33891,7 +33990,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 112)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != 0) {
@@ -34152,11 +34251,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+112)
+	*(*int32)(unsafe.Pointer(bp + 112)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != SQLITE_OK) {
 		goto __122
 	}
@@ -34344,7 +34443,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -34382,7 +34481,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 112 + uintptr(iPage-1)*4))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 64 + uintptr(iPage-1)*2)))
@@ -34459,7 +34558,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(4)
 	defer tls.Free(4)
 
@@ -34471,19 +34570,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -34496,7 +34587,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34515,6 +34606,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -34550,7 +34658,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -34559,13 +34666,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 88)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 84)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 84)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 84)) != 0) {
 		goto __2
 	}
@@ -34576,7 +34682,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -34689,7 +34795,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 84)) = btreeComputeFreeSpace(tls, pPage)
@@ -34703,20 +34809,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 84)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 88)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 88)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 88)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 88)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 88)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 88)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -34726,7 +34832,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 88))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+84)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+84)
+	if !(*(*int32)(unsafe.Pointer(bp + 84)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -34734,100 +34846,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 84)) = fillInCell(tls, pPage, newCell, pX, bp+88)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 84)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 84)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx) + 1)))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint32(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+92)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+92)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+92)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 84)) = clearCellOverflow(tls, pPage, oldCell, bp+92)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 84)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 84)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+92)).FnSize) == *(*int32)(unsafe.Pointer(bp + 88)) && U32((*CellInfo)(unsafe.Pointer(bp+92)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+92)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 88)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 88)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 88))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 88))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint32(*(*int32)(unsafe.Pointer(bp + 88))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+92)).FnSize), bp+84)
 	if !(*(*int32)(unsafe.Pointer(bp + 84)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 88)), uintptr(0), uint32(0), bp+84)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 84)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 88)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -34836,30 +34948,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 84)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 84)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint32((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint32((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 84))
@@ -34882,7 +34994,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -34901,13 +35012,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, nIn)
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(nIn + U32((int32(aOut)-int32((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1))
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -34924,7 +35037,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -34983,9 +35096,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 12))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 12))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -35025,7 +35138,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 20))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -35033,11 +35146,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx) + 1)))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35112,7 +35225,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)) + 1)))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35122,7 +35235,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 20)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 20)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+20)
+			*(*int32)(unsafe.Pointer(bp + 20)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+20)
 		if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
@@ -35181,7 +35294,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -35210,7 +35323,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 24)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+16, bp+20)
 			if int32(*(*U8)(unsafe.Pointer(bp + 16))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 16))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 12)))
@@ -35286,7 +35399,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 24)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -35300,7 +35413,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -35434,7 +35547,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35609,12 +35722,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 304)) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -35622,15 +35764,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+40, ts+4055, 1)
+		Xsqlite3_str_append(tls, pCheck+44, ts+4055, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+40, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+44, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+40, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+44, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -35654,9 +35796,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4080, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if *(*int32)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb + 304)) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -35670,7 +35809,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4105, libc.VaList(bp, iChild))
 		return
@@ -35744,7 +35883,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -35829,48 +35970,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4301
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4311, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4349, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4387, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -35885,29 +36033,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+100, *(*I64)(unsafe.Pointer(bp + 100)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -35915,28 +36063,28 @@ __9:
 	pc = U32(int32(*(*U8)(unsafe.Pointer(pCellIdx)))<<8 | int32(*(*U8)(unsafe.Pointer(pCellIdx + 1))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4463,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+108)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+108)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4493, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -35944,97 +36092,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+108)).FnKey >= *(*I64)(unsafe.Pointer(bp + 100)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4517, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+108)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 100)) = (*CellInfo)(unsafe.Pointer(bp + 108)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+108)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+108)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+108)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+108)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+108)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+100, *(*I64)(unsafe.Pointer(bp + 100)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4541, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+108)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+108)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 100))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2) + 1))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -36044,48 +36192,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+128) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 128))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4566, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 128))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 128))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 128))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4603,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -36114,9 +36262,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(212)
-	defer tls.Free(212)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(216)
+	defer tls.Free(216)
 
 	var i Pgno
 
@@ -36148,19 +36296,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint32(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+40, uintptr(0), bp+104, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+44, uintptr(0), bp+108, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -36172,7 +36314,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -36180,7 +36322,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -36265,7 +36407,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+204, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+208, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -36308,22 +36450,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+40)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+40)
+	Xsqlite3_str_reset(tls, bp+32+44)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+44)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+40)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -36550,8 +36689,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(292)
-	defer tls.Free(292)
+	bp := tls.Alloc(296)
+	defer tls.Free(296)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -37050,7 +37189,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 	defer tls.Free(32)
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+8, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+8, ts+4918,
@@ -37062,6 +37201,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*int8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+8)).FnChar))) = int8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 8)).FnChar)
 	}
 }
 
@@ -37249,7 +37389,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & Size_t(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 16)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -37423,16 +37562,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -37875,7 +38016,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38111,43 +38252,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*4)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -38532,7 +38664,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38547,14 +38679,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -38924,7 +39056,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -38936,13 +39070,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -39019,6 +39155,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -39907,7 +40046,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 88
+	var aMem uintptr = p + 80
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*40
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -39916,7 +40055,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+40, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+36, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -39950,7 +40089,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -39992,7 +40130,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*40, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -40744,7 +40882,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -40852,7 +40990,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -41403,7 +41541,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -41468,7 +41606,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -41502,7 +41640,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 48)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41552,7 +41690,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 48)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -41698,7 +41836,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -41869,7 +42007,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -41895,7 +42033,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42169,7 +42307,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42521,8 +42659,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -42532,15 +42673,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -42728,6 +42869,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -42780,7 +42922,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -42844,6 +42986,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(48)
 	defer tls.Free(48)
@@ -42855,9 +43006,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5350)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -43091,7 +43243,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -43115,8 +43267,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*40
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*40
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -43290,15 +43442,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5360, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5350, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -43409,14 +43561,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -43700,7 +43855,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -43844,7 +43999,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -44016,7 +44171,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*int8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5400, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5390, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, (int32(zRawSql)-int32(zStart))/1)
 		}
@@ -44071,21 +44226,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 80
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5404, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5394, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+80)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5401, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5424, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5414, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5427, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5417, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5432, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5422, 1)
 			}
 		}
 	}
@@ -44177,11 +44332,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity int8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -44312,8 +44467,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(804)
-	defer tls.Free(804)
+	bp := tls.Alloc(808)
+	defer tls.Free(808)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -44548,7 +44703,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -44649,594 +44803,598 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 156 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(*(*int32)(unsafe.Pointer(db + 304)) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*20
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
-		goto __100
-	case OP_NotFound:
-		goto __101
-	case OP_Found:
-		goto __102
 
-	case OP_SeekRowid:
+	case OP_IfNoHope:
+		goto __100
+	case OP_NoConflict:
+		goto __101
+	case OP_NotFound:
+		goto __102
+	case OP_Found:
 		goto __103
 
-	case OP_NotExists:
+	case OP_SeekRowid:
 		goto __104
 
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
 
 check_for_interrupt:
 	if !(*(*int32)(unsafe.Pointer(db + 304)) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
@@ -45245,56 +45403,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*20
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -45302,20 +45460,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64((int32(pOp) - int32(aOp)) / 20)
 
 	pOp = aOp + uintptr(pcDest)*20
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -45323,124 +45482,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*20)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*20
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5434, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5455, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5424, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5445, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = (int32(pOp) - int32(aOp)) / 20
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5462, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5452, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 116))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -45448,10 +45607,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -45462,9 +45621,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 40
 
@@ -45472,171 +45631,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*40
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*40
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint32(uintptr(0)+20))
 	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*40
 	pOut = aMem + uintptr(p2)*40
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 40
 	pOut += 40
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 40
 	pIn1 += 40
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 212))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp)-int32(aOp))/20 + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
@@ -45644,95 +45803,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 116)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint32((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint32((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = int8(0)
@@ -45740,231 +45899,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -45973,95 +46132,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint32(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint32(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
@@ -46071,189 +46230,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -46262,38 +46425,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*20 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -46301,9 +46464,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -46314,298 +46477,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*40, aMem+uintptr(U32(p21)+idx)*40, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*40)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*40)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*20
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*20
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*20
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*20
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32((int32(pOp) - int32((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 20)
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 80 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -46615,144 +46779,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*40
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+76, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 36))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 12)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 12)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+76)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint32(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -46760,353 +46924,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+80+uintptr(i1)*4, libc.AssignPtrUint32(bp+272, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 272)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+272))
 	*(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 272))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 272))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int32(zHdr) - int32(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 272)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int32(zHdr) - int32(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 272)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 272)) = *(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 272)) = *(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 272)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 272)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 272))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 116))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint32(len))
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = int8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 272))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 272)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 272))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 272))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 272)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 116))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 272)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*20
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 40
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 40
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*16 + 4)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 40
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5486,
+	Xsqlite3VdbeError(tls, p, ts+5476,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*16 + 4))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*int8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 40
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -47120,319 +47284,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*int8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 40
 
-	goto __455
-__455:
-	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 16)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 40
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 116)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+276, pRec, uint32(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 276)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 276)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 276)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 276)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 276)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint32((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -47440,467 +47593,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint32((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 40
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 40
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)) + 36))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 284)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 284)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+284)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 284))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5527, 0)
+	Xsqlite3VdbeError(tls, p, ts+5517, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(unsafe.Sizeof(Savepoint{}))+uint32(nName)+uint32(1)))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*24
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint32(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5578, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5568, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5600, 0)
+		ts+5590, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*16)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*16)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5654, 0)
+		ts+5644, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5709
+				return ts + 5699
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5757
+					return ts + 5747
 				}
-				return ts + 5800
+				return ts + 5790
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 292)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+292)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 144))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 292)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5841)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5831)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 292))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+144, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -47908,67 +48072,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt, iCookie, bp+296)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 296)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 36)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 144))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -47979,24 +48143,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*40
@@ -48004,30 +48168,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -48043,22 +48207,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 36)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*4))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -48072,133 +48236,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 12)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 36)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fz = ts + 1547
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+12,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+40, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), pCx1+48,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 36)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 36)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -48206,18 +48370,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 36)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -48228,92 +48392,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), bp+300)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), int64(U64(iKey)), 0, bp+300)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -48331,106 +48495,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 304)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), bp+304, bp+300)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+304)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 300)) < 0 || *(*int32)(unsafe.Pointer(bp + 300)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 300)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 300)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 300)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 300)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 300)) > 0 || *(*int32)(unsafe.Pointer(bp + 300)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 300)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 300)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 300)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 300)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 300)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 20
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*20)).Fp1)*4))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 36))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -48439,108 +48603,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 332)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 332)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*20)).Fp3)*40
 	*(*int32)(unsafe.Pointer(bp + 360)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+332, bp+360)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 360)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 20
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 360)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 360)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 36)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -48548,14 +48712,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 364)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+364)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 364)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 364)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 36)), bp+364, pC9+28)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+364)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -48565,108 +48729,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+364)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+364)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 36)), pIdxKey, pC9+28)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+364)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+364)).FaMem+uintptr(ii1)*40)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 392)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+392, int8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+392)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 392)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -48685,35 +48849,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 432))
 	if !(*(*int32)(unsafe.Pointer(bp + 432)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 440)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 436)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -48721,123 +48885,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)), bp+436)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 436)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 440)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 436)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 440)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 440)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)))
 	if !(*(*I64)(unsafe.Pointer(bp + 440)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 440))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 440))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 440)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 440)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 440)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 440)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 440))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+440)
 	*(*I64)(unsafe.Pointer(bp + 440)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 440))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)), int64(U64(*(*I64)(unsafe.Pointer(bp + 440)))),
 		0, bp+436)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 436)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 436)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 436)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 440))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -48847,52 +49011,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 448)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*16)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+448)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 448)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 448)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -48904,15 +49068,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 448)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 448)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 448)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 448)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 36)), bp+448,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -48920,13 +49085,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -48939,11 +49104,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+448)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*4))
@@ -48954,38 +49119,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 36)), *(*uintptr)(unsafe.Pointer(pSrc + 36)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*16)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 36)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -48997,47 +49162,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 36)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
@@ -49046,35 +49211,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+480)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 480)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 480)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -49083,51 +49248,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 116)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 484)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 36)))).FpVtab
@@ -49137,72 +49302,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)), bp+484)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 484)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 484)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 484))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 36)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 36)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49210,43 +49375,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 492)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+492)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 492)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 492)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49254,84 +49419,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+496)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 496)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 496)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 496)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 496)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 496)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 156 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	*(*int32)(unsafe.Pointer(bp + 500)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+500)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 36))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+500)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 500)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 500)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 500)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 500)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 36)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49341,34 +49511,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 156 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -49377,10 +49547,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 504)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 504)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -49397,14 +49567,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49417,21 +49587,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49443,62 +49613,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 536)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+536, bp+564)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 564)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5869)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5859)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 568)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 36)), bp+568)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
@@ -49511,56 +49681,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 12)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 568))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 616)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 616)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 616)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 616)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 616)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
@@ -49571,54 +49741,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+576, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+576)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+576)).Fn, (*Mem)(unsafe.Pointer(bp+576)).Fz, bp+616, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+576)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 644)) = 0
@@ -49626,72 +49796,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 644)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 644)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 644))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 648)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*16)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+648)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 40)) += *(*I64)(unsafe.Pointer(bp + 648))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)) += *(*I64)(unsafe.Pointer(bp + 648))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 36)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 36)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 656)) = Pgno(0)
@@ -49700,55 +49870,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+656, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 656)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+120, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5886
+	goto __799
+__798:
+	zSchema = ts + 5876
 	(*InitData)(unsafe.Pointer(bp + 660)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 660)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 660)).FpzErrMsg = p + 120
 	(*InitData)(unsafe.Pointer(bp + 660)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 660)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5900,
+		ts+5890,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 660)).Frc = SQLITE_OK
@@ -49758,66 +49928,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+660, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 660)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+660)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -49826,151 +49996,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*16)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+688)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*16)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+688, bp+692)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 688)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 692)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 688)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 692)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+692) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+696) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40, *(*I64)(unsafe.Pointer(bp + 692)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40, *(*I64)(unsafe.Pointer(bp + 696)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 116 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5943, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 116 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5933, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint32(unsafe.Sizeof(VdbeFrame{}))+uint32(7))&libc.Uint32FromInt32(libc.CplInt32(7)) +
 		uint32(nMem)*uint32(unsafe.Sizeof(Mem{})) +
@@ -49978,10 +50149,10 @@ __826:
 		uint32(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -50001,26 +50172,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 88 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*40
-	pMem1 = pFrame2 + 88
-__828:
+	pEnd = pFrame2 + 80 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*40
+	pMem1 = pFrame2 + 80
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 40
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -50032,7 +50203,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+88)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+80)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*40
@@ -50043,170 +50214,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*20
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*20)).Fp1)*40
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 528)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 520)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 60)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 528)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 520)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 60)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 700)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 700)) <= int64(0) || Xsqlite3AddInt64(tls, bp+700, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 704)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 704)) <= int64(0) || Xsqlite3AddInt64(tls, bp+704, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 700))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(n4)*uint32(unsafe.Sizeof(uintptr(0)))+(uint32(unsafe.Sizeof(Sqlite3_context{}))+uint32(unsafe.Sizeof(Mem{}))-uint32(unsafe.Sizeof(uintptr(0))))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 28 + uintptr(n4)*4
@@ -50223,146 +50394,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 28 + uintptr(i5)*4)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*40
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+28)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+28)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*20)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*40, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 708)) = 0
-	*(*int32)(unsafe.Pointer(bp + 708 + 1*4)) = libc.AssignPtrInt32(bp+708+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 712)) = 0
+	*(*int32)(unsafe.Pointer(bp + 712 + 1*4)) = libc.AssignPtrInt32(bp+712+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+708+1*4, bp+708+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+712+1*4, bp+712+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 708)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 712)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 708 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 712 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 40
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -50370,70 +50541,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5980,
+		ts+5970,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6032
+				return ts + 6022
 			}
-			return ts + 6037
+			return ts + 6027
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -50441,17 +50612,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -50461,14 +50632,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+120, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -50478,197 +50649,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+144, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+144, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 36)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 36)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*16)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6044, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6034, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+720, 0, uint32(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 720)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+720, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
-
-	zTab = Xsqlite3_value_text(tls, bp+720)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+120)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+720)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+724, 0, uint32(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 724)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+724, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
+
+	zTab = Xsqlite3_value_text(tls, bp+724)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+120)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+724)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 760)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+760)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 760)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 764)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+764)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 764)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 36)) = *(*uintptr)(unsafe.Pointer(bp + 760))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 36)) = *(*uintptr)(unsafe.Pointer(bp + 764))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 760)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 764)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 36))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5350, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6063, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pArgc = pQuery + 1*40
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -50682,27 +50853,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*4)) = pArgc + uintptr(i7+1)*40
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -50710,72 +50881,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 36)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+764, 0, uint32(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 764)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 764)).Fenc = encoding
+	libc.Xmemset(tls, bp+768, 0, uint32(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 768)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 768)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 36)), bp+764, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 36)), bp+768, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+764)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+768)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 764)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 768)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 36)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -50785,192 +50956,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 36)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 36)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 28)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 28)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 796)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 28)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 800)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*4)) = pX1
 	pX1 += 40
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+796)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+800)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 796))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 800))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 28 + uintptr(i9)*4)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*40
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -50979,63 +51150,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+28)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+220, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= int8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 156 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 156 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -51045,104 +51216,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 212))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 212))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 212))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*20)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*20)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 156 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 20
-	goto __5
 	goto __7
 __7:
+	pOp += 20
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -51150,52 +51321,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6079,
 		libc.VaList(bp+184, (int32(pOp)-int32(aOp))/20, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 28)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 28)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 156 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -51314,8 +51489,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(328)
-	defer tls.Free(328)
+	bp := tls.Alloc(332)
+	defer tls.Free(332)
 
 	var nAttempt int32
 	var iCol int32
@@ -51335,7 +51510,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -51355,8 +51530,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -51387,8 +51562,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -51421,8 +51596,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51502,8 +51677,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51572,7 +51747,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+324)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+328)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -51600,12 +51775,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 324)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 328)) != 0 {
 			return ts + 3656
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 324))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 328))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51649,7 +51824,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51732,7 +51907,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -54261,6 +54436,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6374, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6382+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6401+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5876+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(100)
 	defer tls.Free(100)
@@ -54280,7 +54483,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -54335,7 +54537,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6374, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6434, zDb) == 0) {
 		goto __8
 	}
 
@@ -54456,7 +54658,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6379) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6439) != 0) {
 		goto __33
 	}
 	goto __14
@@ -54464,73 +54666,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+44)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 48)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -54542,28 +54762,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 16
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -54574,160 +54794,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6381, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6441, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6385, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6445, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6389, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6449, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 16
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 8)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 8)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 144)) |= func() uint32 {
@@ -54736,8 +54957,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 148)) |= func() uint32 {
 		if iCol >= 32 {
@@ -54745,19 +54966,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -54765,81 +54986,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 8))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*20)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*20 + 8 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*20)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6398, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6458, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6429, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6489, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -54852,144 +55073,144 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6484, libc.VaList(bp+16, zCol))
+		ts+6544, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+44, 0, uint32(unsafe.Sizeof(struct {
 		FpTab        uintptr
 		F__ccgo_pad1 [4]byte
 	}{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6519
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6579
 	*(*uintptr)(unsafe.Pointer(pExpr + 20)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6528
+		zErr = ts + 6588
 	} else {
-		zErr = ts + 6543
+		zErr = ts + 6603
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6565, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6625, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6578, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6588, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 52)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -55033,15 +55254,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6595
+	var zIn uintptr = ts + 6655
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6623
+		zIn = ts + 6683
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6641
+		zIn = ts + 6701
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6659
+		zIn = ts + 6719
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6677, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6737, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55120,10 +55341,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6697
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6757
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6702
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -55170,7 +55391,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6708, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6768, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -55234,7 +55455,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*20)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6725, libc.VaList(bp, pExpr))
+								ts+6785, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -55250,7 +55471,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6789,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6849,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -55264,7 +55485,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6825, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6885, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -55287,30 +55508,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6853, libc.VaList(bp+16, pExpr))
+						ts+6913, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6896
+						zType = ts + 6956
 					} else {
-						zType = ts + 6903
+						zType = ts + 6963
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6913, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6973, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6941, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7001, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6963,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7023,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7007,
+						ts+7067,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -55382,7 +55603,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7055, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7115, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
 				}
@@ -55398,7 +55619,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7066, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7126, pExpr, pExpr)
 			}
 
 			break
@@ -55454,7 +55675,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55529,7 +55750,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7077, libc.VaList(bp, i, zType, mx))
+		ts+7137, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55549,7 +55770,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 116 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7133, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7193, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55584,7 +55805,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7167, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7227, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55641,7 +55862,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 8 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7173, libc.VaList(bp, i+1))
+				ts+7233, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -55669,7 +55890,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 116 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7234, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7294, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -55883,7 +56104,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 24)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7265, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7325, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -55923,7 +56144,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7167) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7227) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -55934,7 +56155,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7304) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7364) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -55946,7 +56167,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7310, 0)
+						ts+7370, 0)
 					return WRC_Abort
 				}
 
@@ -56046,12 +56267,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 24)) |= savedHasAgg
@@ -56087,12 +56308,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -56202,33 +56423,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) int8 {
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) int8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 20)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*20)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 44)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 20)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*20)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 20))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*20)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -56298,7 +56620,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 44)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -56633,7 +56956,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 		return
 	}
 
@@ -56708,7 +57031,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 116 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7369, libc.VaList(bp, mxHeight))
+			ts+7429, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -56957,10 +57280,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7417,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7477,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7461
+						return ts + 7521
 					}
 					return ts + 1547
 				}(), nElem))
@@ -57001,7 +57324,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57027,7 +57350,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 116 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7465, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7525, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 20)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57055,7 +57378,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7499, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7559, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57102,7 +57425,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 116 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7519,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7579,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 116 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57127,7 +57450,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 116 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7562, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7622, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -57702,7 +58025,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7585,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -57825,7 +58148,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 116 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7615, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7675, libc.VaList(bp, zObject))
 	}
 }
 
@@ -57881,10 +58204,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6697) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6757) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6702) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6762) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -58315,13 +58638,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff int8) int32
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7638) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7698) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7646) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7706) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7652) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7712) == 0 {
 		return 1
 	}
 	return 0
@@ -58525,7 +58848,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7656, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7716, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -58603,7 +58926,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7703, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7763, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -58697,7 +59020,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7734
+		var zFmt uintptr = ts + 7794
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -58715,7 +59038,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	}
 }
 
@@ -58756,7 +59079,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7778, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7838, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
@@ -58786,11 +59109,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7801, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7861, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1547
 			}
-			return ts + 7820
+			return ts + 7880
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -58917,7 +59240,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7832, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7892, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 44)))
@@ -58932,12 +59255,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7850, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7910, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1547
 		}
-		return ts + 7820
+		return ts + 7880
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -58958,7 +59282,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -58967,7 +59291,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7871)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7931)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -59353,8 +59677,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7873, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7876,
+			if Xsqlite3_strnicmp(tls, z, ts+7933, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7936,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4925
@@ -59430,7 +59754,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7903,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7963,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -59516,8 +59840,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(76)
+	defer tls.Free(76)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -59603,14 +59927,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 52)) = [5]uintptr{ts + 7933, ts + 7938, ts + 7943, ts + 6184, ts + 6179}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 7993, ts + 7998, ts + 8003, ts + 6184,
+				ts + 6179, ts + 8011}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7951
+						return ts + 8019
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 52 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*4))
 				}())
@@ -59624,7 +59950,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -59647,10 +59973,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -59750,7 +60076,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -59880,12 +60206,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -59894,110 +60221,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*16)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*16)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 44)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 44))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*16
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7903,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7963,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 12)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 12)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 44)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -60040,13 +60380,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -60056,11 +60396,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -60083,11 +60423,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -60096,15 +60436,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -60131,20 +60471,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -60153,9 +60493,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -60193,14 +60533,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7956, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8024, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -60211,17 +60553,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 	if pFarg != 0 {
@@ -60233,128 +60575,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7983, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8051, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*20)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*20)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 44)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*20)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*20)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -60362,42 +60704,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7585,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -60420,23 +60762,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -60453,42 +60795,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*16)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -60509,15 +60853,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60527,22 +60871,22 @@ __128:
 	pTest = bp + 100
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 100)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -60551,21 +60895,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*20)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*20)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -60575,27 +60919,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8007, 0)
+		ts+8075, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -60604,7 +60948,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -60615,7 +60959,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]int8)(unsafe.Pointer(ts + 8057))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8125))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -61990,18 +62334,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*20)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*16)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*20)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*16)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*20)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*16)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*20)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*16)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -62031,7 +62375,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+32,
+		pInfo+24,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -62044,12 +62388,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+44,
+		pInfo+36,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 16
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*16
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 44))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 20
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 24))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -62057,6 +62499,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 8))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*16)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -62071,81 +62553,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 20
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*20
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 44))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 20
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -62167,34 +62576,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 20
-				goto __10
-				goto __12
-			__12:
+				pItem += 16
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*20
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*16
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -62284,7 +62692,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 156 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 160 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -62292,7 +62700,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint32(unsafe.Sizeof([8]int32{}))/uint32(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 156 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 160 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -62343,11 +62751,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8073, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8135, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -62359,13 +62767,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8101,
+		ts+8163,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8276,
+			ts+8338,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -62375,10 +62783,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8450, libc.VaList(bp, zDb, zDb))
+		ts+8512, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8597, 0)
+			ts+8659, 0)
 	}
 }
 
@@ -62442,7 +62850,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8748, libc.VaList(bp, zName))
+		ts+8810, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -62452,7 +62860,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8807, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8869, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -62461,7 +62869,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8813, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8875, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -62502,19 +62910,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8840, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8902, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9024,
+		ts+9086,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9329, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9391, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9345,
+		ts+9407,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -62522,7 +62930,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9403, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9465, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -62534,7 +62942,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9668, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9730, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -62546,7 +62954,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9681,
+		ts+9743,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -62592,12 +63000,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9719, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9781, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9751, 0)
+			ts+9813, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -62607,11 +63015,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 44 + 4)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9778)
+				ts+9840)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9837)
+				ts+9899)
 		}
 
 		if pDflt != 0 {
@@ -62624,12 +63032,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9890)
+					ts+9952)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9936)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9998)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -62640,7 +63048,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9963,
+			ts+10025,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 44)), zCol, *(*int32)(unsafe.Pointer(pNew + 44)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -62662,7 +63070,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10109,
+				ts+10171,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -62710,14 +63118,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10339, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10401, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10373, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10435, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -62745,7 +63153,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(uint32(unsafe.Sizeof(Column{}))*uint32(nAlloc)))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10403, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10465, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -62785,18 +63193,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10422
+		zType = ts + 10484
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10427
+		zType = ts + 10489
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10441,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10503,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10459
+					return ts + 10521
 				}
-				return ts + 10476
+				return ts + 10538
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -62880,7 +63288,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10494, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -62897,17 +63305,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10515,
+		ts+10577,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10697,
+		ts+10759,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9668, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9730, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63102,7 +63510,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 272; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 12 {
+	for pp = pParse + 276; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 12 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -63165,10 +63573,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10828,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10890,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10851
+				return ts + 10913
 			}
 			return ts + 1547
 		}(), zWhen,
@@ -63210,8 +63618,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10853, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10915, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63228,7 +63636,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63250,7 +63658,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10861, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10923, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -63290,10 +63698,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)
 				*(*int8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = int8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10867, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10929, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*int8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10851
+							return ts + 10913
 						}
 						return ts + 1547
 					}()))
@@ -63469,8 +63877,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(324)
-	defer tls.Free(324)
+	bp := tls.Alloc(328)
+	defer tls.Free(328)
 
 	var db uintptr
 
@@ -63553,15 +63961,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+20, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+296, 0, uint32(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 296)).FpParse = bp + 20
-	(*Walker)(unsafe.Pointer(bp + 296)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+300, 0, uint32(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 300)).FpParse = bp + 20
+	(*Walker)(unsafe.Pointer(bp + 300)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 296)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 300)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 296 + 24)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 300 + 24)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -63589,7 +63997,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+296, pSelect)
+	Xsqlite3WalkSelect(tls, bp+300, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -63622,13 +64030,13 @@ __15:
 	renameTokenFind(tls, bp+20, bp, (*Parse)(unsafe.Pointer(bp+20)).FpNewTable+32)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+296, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+300, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 20)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63641,7 +64049,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63656,7 +64064,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+20)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FaCol+uintptr(i)*16)
-	Xsqlite3WalkExpr(tls, bp+296, pExpr)
+	Xsqlite3WalkExpr(tls, bp+300, pExpr)
 	goto __24
 __24:
 	i++
@@ -63712,8 +64120,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+20)
@@ -63761,7 +64169,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+20, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+296, (*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+300, (*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -63829,8 +64237,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(356)
-	defer tls.Free(356)
+	bp := tls.Alloc(360)
+	defer tls.Free(360)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -63872,11 +64280,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 44))
 
-						libc.Xmemset(tls, bp+324, 0, uint32(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 324)).FpParse = bp + 48
+						libc.Xmemset(tls, bp+328, 0, uint32(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 328)).FpParse = bp + 48
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+48, *(*uintptr)(unsafe.Pointer(pTab + 44)), bp+324)
+						Xsqlite3SelectPrep(tls, bp+48, *(*uintptr)(unsafe.Pointer(pTab + 44)), bp+328)
 						if (*Parse)(unsafe.Pointer(bp+48)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 48)).Frc
 						} else {
@@ -63969,8 +64377,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(324)
-	defer tls.Free(324)
+	bp := tls.Alloc(328)
+	defer tls.Free(328)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -63988,16 +64396,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+276, 0, uint32(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+296, 0, uint32(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 296)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 296)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+280, 0, uint32(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+300, 0, uint32(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 300)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 300)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 296)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 300)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 296 + 24)) = bp + 276
+			*(*uintptr)(unsafe.Pointer(bp + 300 + 24)) = bp + 280
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -64012,31 +64420,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+296, pSelect)
+						Xsqlite3WalkSelect(tls, bp+300, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+296, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+300, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+296,
+						Xsqlite3WalkExpr(tls, bp+300,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*16))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+296, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+300, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+276, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+280, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+276)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+280)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -64054,8 +64462,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(308)
-	defer tls.Free(308)
+	bp := tls.Alloc(312)
+	defer tls.Free(312)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64081,9 +64489,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 28)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+276, 0, uint32(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 276)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 44)), bp+276)
+				libc.Xmemset(tls, bp+280, 0, uint32(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 280)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 44)), bp+280)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -64111,8 +64519,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(300)
-	defer tls.Free(300)
+	bp := tls.Alloc(304)
+	defer tls.Free(304)
 
 	var db uintptr
 	var iSchema int32
@@ -64149,7 +64557,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -64173,7 +64581,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10872, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10934, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -64254,17 +64662,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10494, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10879,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10941,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10907
+				return ts + 10969
 			}
 			return ts + 6120
 		}(),
@@ -64275,7 +64683,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10919, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10981, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -64292,10 +64700,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10967, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11029, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11088, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11150, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -64413,11 +64821,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11106},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11127},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11147},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11166},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11185}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11168},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11189},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11209},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11228},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11247}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -64451,7 +64859,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11208, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11270, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -64460,10 +64868,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11231,
+					ts+11293,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11261, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11323, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -64481,9 +64889,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11279, FzCols: ts + 11292},
-	{FzName: ts + 11305, FzCols: ts + 11318},
-	{FzName: ts + 11346},
+	{FzName: ts + 11341, FzCols: ts + 11354},
+	{FzName: ts + 11367, FzCols: ts + 11380},
+	{FzName: ts + 11408},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -64580,7 +64988,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*36)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+28)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+36)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -64626,13 +65034,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*100
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*112
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -64645,11 +65053,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*36
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*36
 		for i = 0; i < mxSample+nCol; i++ {
@@ -64673,17 +65081,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11359}
+	FzName:     ts + 11421}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -64694,8 +65102,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -64738,7 +65146,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*36
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -64766,7 +65174,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -64833,7 +65241,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*36
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*36) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -64849,8 +65257,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*36)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*36)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*36)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*36)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -64867,9 +65275,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -64877,14 +65285,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -64892,31 +65300,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+28, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+36, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+28, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+36, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+72, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+84, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+28, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+36, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+28, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*36) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*36, p+28)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+36, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*36) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*36, p+36)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -64924,7 +65332,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11369}
+	FzName:     ts + 11431}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(72)
@@ -64938,20 +65346,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11379,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11441,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11384, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11446, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -64993,7 +65401,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+48, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+48, ts+11390, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+48, ts+11452, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+48)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+48)).FnChar--
@@ -65007,7 +65415,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11396}
+	FzName:     ts + 11458}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -65051,7 +65459,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11405, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11467, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65068,7 +65476,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*64
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11279, uint32(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11341, uint32(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -65224,7 +65632,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11415, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11477, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -65281,7 +65689,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11415, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11477, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -65328,9 +65736,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 40)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11419)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11481)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11423)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11485)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -65416,16 +65824,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1547
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*int8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -65435,15 +65843,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(0), 6, 0x40)
 		for *(*int8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11427, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11489, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11438, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11500, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11448, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11510, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -65457,8 +65865,8 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 }
 
 func analysisLoader(tls *libc.TLS, pData uintptr, argc int32, argv uintptr, NotUsed uintptr) int32 {
-	bp := tls.Alloc(92)
-	defer tls.Free(92)
+	bp := tls.Alloc(96)
+	defer tls.Free(96)
 
 	var pInfo uintptr = pData
 	var pIndex uintptr
@@ -65523,7 +65931,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -65537,42 +65945,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*20)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*20)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -65646,15 +66054,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*20
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 28)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -65719,11 +66127,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11305, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11367, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11460,
-			ts+11514,
+			ts+11522,
+			ts+11576,
 			zDb)
 	}
 	return rc
@@ -65770,10 +66178,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11279, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11341, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11566, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11628, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -65831,12 +66239,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6374, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6434, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(44)
-	defer tls.Free(44)
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
 
 	var i int32
 	var rc int32
@@ -65847,13 +66255,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -65874,128 +66285,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 28)) = Xsqlite3_vfs_find(tls, ts+3828)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 28)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3828)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*16
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11669, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*16
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 28)), ts+11607, db, pNew+4, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 116 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11610,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 116 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11647, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11672,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 116 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11709, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+468) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(unsafe.Sizeof(Db{}))*uint32(3)))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint32(unsafe.Sizeof(Db{}))*uint32(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(uint32(unsafe.Sizeof(Db{}))*uint32((*Sqlite3)(unsafe.Pointer(db)).FnDb+1)))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*16
 	libc.Xmemset(tls, pNew, 0, uint32(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+28, bp+32, bp+36)
+	*(*uint32)(unsafe.Pointer(bp + 28)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+28, bp+32, bp+36, bp+40)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 36)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 36)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 40)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 28)), *(*uintptr)(unsafe.Pointer(bp + 32)), db, pNew+4, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 28)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 36)), db, pNew+4, 0, int32(*(*uint32)(unsafe.Pointer(bp + 28))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11677, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11739, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db,
-		ts+11706, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db,
+		ts+11768, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -66005,89 +66439,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 36)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 168 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+40)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+44)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 168 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 40)))
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11774, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11836, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 40)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 40)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 44)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66141,14 +66575,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11802, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11864, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11823, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11885, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66156,7 +66590,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11849, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11911, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66198,42 +66632,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -66242,13 +66682,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -66267,7 +66707,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11871}
+	FzName:     ts + 11933}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -66280,7 +66720,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11885}
+	FzName:     ts + 11947}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -66294,7 +66734,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11899, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11961, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -66326,7 +66766,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11923,
+						ts+11985,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -66501,7 +66941,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11969, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12031, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -66527,11 +66967,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11992, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+11998, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12060, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12004, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12066, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -66578,7 +67018,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName
 	} else {
-		zCol = ts + 7646
+		zCol = ts + 7706
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -66602,7 +67042,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12031, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12093, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -66827,6 +67267,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -66839,13 +67282,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint32(uintptr(0)+200)), uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint32(uintptr(0)+204)), uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint32(uintptr(0)+200)), bp, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemcpy(tls, pParse+uintptr(uint32(uintptr(0)+204)), bp, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -66870,25 +67313,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6374) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6434) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12046+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-						ts+12079)
+						ts+6382)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8,
-						ts+5886)
+						ts+5876)
 				}
 			}
 		}
@@ -66909,12 +67352,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5886)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12046+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5876)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-					ts+12079)
+					ts+6382)
 			}
 		}
 	}
@@ -66945,7 +67388,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+396, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12098, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12108, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -66963,14 +67406,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12106
+			zMsg = ts + 12116
 		} else {
-			zMsg = ts + 12119
+			zMsg = ts + 12129
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6578, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6588, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67000,12 +67443,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
-			return ts + 12065
+	if Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
+			return ts + 6420
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12079+7) == 0 {
-			return ts + 12046
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6382+7) == 0 {
+			return ts + 6401
 		}
 	}
 	return zName
@@ -67363,7 +67806,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5886)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5876)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -67389,7 +67832,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6374, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6434, zName) {
 				goto __3
 			}
 
@@ -67442,13 +67885,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12133, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12143, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12150, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12160, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -67490,9 +67933,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8065, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6374, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12170,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12180,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -67652,9 +68095,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -67670,7 +68113,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12212, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12222, 0)
 	return
 __4:
 	;
@@ -67698,9 +68141,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10422
+			return ts + 10484
 		}
-		return ts + 8807
+		return ts + 8869
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -67716,9 +68159,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -67749,12 +68192,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12253,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12263,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10422
+				return ts + 10484
 			}
-			return ts + 8807
+			return ts + 8869
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -67769,7 +68212,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12274, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12284, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -67856,7 +68299,7 @@ var nullRow = [6]int8{int8(6), int8(0), int8(0), int8(0), int8(0), int8(0)}
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema + 40
-	Xsqlite3HashInsert(tls, pHash, ts+12309, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12319, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -67880,7 +68323,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12326, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12336, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -67900,7 +68343,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12309
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12319
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -67912,7 +68355,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema + 40
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12309, pRet+8) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12319, pRet+8) ==
 		pRet+8 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -67946,7 +68389,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 116 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12360, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -67954,13 +68397,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+24)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12383, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12393, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 24 + 4)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+24)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+24)).Fz + uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(1)))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+24)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+24)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12390, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12400, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 24 + 4)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+24)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+24)).Fz + uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(1)))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+24)).Fn--
@@ -67997,7 +68440,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*16)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*16)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12400, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12410, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68161,10 +68604,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*16
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12426,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12436,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12471, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12481, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint32(unsafe.Sizeof(Expr{})))
@@ -68195,7 +68638,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 12)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12512, 0)
+			ts+12522, 0)
 	}
 }
 
@@ -68240,7 +68683,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12564, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12574, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -68329,7 +68772,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12605, 0)
+		ts+12615, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -68424,7 +68867,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12661, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12671, 0)
 	goto generated_done
 __2:
 	;
@@ -68437,13 +68880,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12704, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12714, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12712, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12722, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -68470,13 +68913,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12719,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12729,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -68598,12 +69048,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1547
-		zSep2 = ts + 12750
+		zSep2 = ts + 12760
 		zEnd = ts + 4950
 	} else {
-		zSep = ts + 12752
-		zSep2 = ts + 12756
-		zEnd = ts + 12761
+		zSep = ts + 12762
+		zSep2 = ts + 12766
+		zEnd = ts + 12771
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -68611,7 +69061,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12764, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12774, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*int8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = int8('(')
@@ -68649,11 +69099,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1547,
-	ts + 12778,
-	ts + 12784,
-	ts + 12789,
+	ts + 12788,
+	ts + 12794,
+	ts + 12799,
+	ts + 12804,
 	ts + 12794,
 }
 
@@ -69061,10 +69512,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12800,
+						ts+12810,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12833,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12843,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69083,11 +69534,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12860, 0)
+				ts+12870, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12910, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12920, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 28)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69121,7 +69572,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12942, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12952, 0)
 			return
 		}
 	}
@@ -69146,11 +69597,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8807
-			zType2 = ts + 12986
+			zType = ts + 8869
+			zType2 = ts + 12996
 		} else {
-			zType = ts + 10422
-			zType2 = ts + 12992
+			zType = ts + 10484
+			zType2 = ts + 13002
 		}
 
 		if pSelect != 0 {
@@ -69212,7 +69663,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 200
+				pEnd2 = pParse + 204
 			} else {
 				pEnd2 = pEnd
 			}
@@ -69221,11 +69672,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+12997, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13007, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13012,
+			ts+13022,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69241,13 +69692,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13110,
+					ts+13120,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13152, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13162, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -69262,7 +69713,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9329) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9391) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -69292,7 +69743,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13186, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13196, 0)
 	goto create_view_fail
 __1:
 	;
@@ -69308,7 +69759,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10422, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10484, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+4, pSelect) != 0) {
 		goto __3
 	}
@@ -69390,7 +69841,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13222, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13232, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -69418,8 +69869,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+34, pTable+4)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, int8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -69516,13 +69966,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13252, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13262, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13267,
+		ts+13277,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*16)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -69563,10 +70013,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*16)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13334, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13344, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11231,
+				ts+11293,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -69598,12 +70048,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13348,
+			ts+13358,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13393,
+		ts+13403,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -69631,11 +70081,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7066, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7126, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -69713,9 +70163,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zArg2 = uintptr(0)
@@ -69774,21 +70224,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13460, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13470, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13488, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13498, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13522, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13532, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -69800,7 +70250,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11423, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11485, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -69864,7 +70314,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13554,
+		ts+13564,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*16)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -69876,7 +70326,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13617, 0)
+		ts+13627, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -69961,7 +70411,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13711,
+		ts+13721,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*20)).FzEName))
 	goto fk_end
 __23:
@@ -70188,12 +70638,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*20 + 8 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*20)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13757,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13767,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13785
+							return ts + 13795
 						}
-						return ts + 13791
+						return ts + 13801
 					}()))
 				return 1
 			}
@@ -70314,7 +70764,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13796, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13806, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+132, pTblName) != 0) {
 		goto __10
 	}
@@ -70333,7 +70783,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13802,
+		ts+13812,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -70359,26 +70809,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13852, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13880, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13890, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13905, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13915, 0)
 	goto exit_create_index
 __17:
 	;
@@ -70392,7 +70842,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13796, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13806, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -70407,7 +70857,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13939, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13949, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -70419,7 +70869,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13973, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13983, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -70448,7 +70898,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+13997, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14007, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -70469,9 +70919,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -70510,7 +70960,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13796)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13806)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -70611,7 +71061,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14020, 0)
+		ts+14030, 0)
 	goto exit_create_index
 __56:
 	;
@@ -70828,7 +71278,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14081, libc.VaList(bp+48, 0))
+		ts+14091, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -70880,8 +71330,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14123, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14133, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -70927,12 +71377,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14140,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14150,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1547
 			}
-			return ts + 14160
+			return ts + 14170
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -70940,7 +71390,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14168,
+		ts+14178,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -70954,7 +71404,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14227, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14237, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71115,7 +71565,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14254, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14264, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71130,7 +71580,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14272, libc.VaList(bp+8, 0))
+		ts+14282, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71141,9 +71591,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71169,9 +71619,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14345,
+		ts+14355,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11419, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11481, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -71306,7 +71756,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14405,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14415,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -71514,12 +71964,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14441,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14451,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14477
+				return ts + 14487
 			}
-			return ts + 14480
+			return ts + 14490
 		}()))
 	goto append_from_error
 __1:
@@ -71688,7 +72138,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14486, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14496, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -71724,9 +72174,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14492
+				return ts + 14502
 			}
-			return ts + 14501
+			return ts + 14511
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -71751,7 +72201,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14486, ts + 14508, ts + 14492}
+var az = [3]uintptr{ts + 14496, ts + 14518, ts + 14502}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -71766,7 +72216,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14516, 0)
+				ts+14526, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -71903,14 +72353,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 116)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14586, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14596, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*16)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14597, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14607, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
@@ -71936,11 +72386,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14600, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14610, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72070,7 +72520,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14609, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14619, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72166,7 +72616,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+12+uintptr(i)*24)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14655, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14665, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -72359,7 +72809,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14685, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14695, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -72639,7 +73089,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14716,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14726,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -72671,11 +73121,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14749, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14759, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14778, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14788, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -73179,7 +73629,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14816)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14826)
 __62:
 	;
 delete_from_cleanup:
@@ -73294,7 +73744,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11279) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11341) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -73524,7 +73974,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6184, ts + 6179, ts + 7938, ts + 7933, ts + 6174}
+var azType2 = [5]uintptr{ts + 6184, ts + 6179, ts + 7998, ts + 7993, ts + 6174}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -73583,7 +74033,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14829, -1)
+					Xsqlite3_result_error(tls, context, ts+14839, -1)
 					return
 				}
 				iVal = -iVal
@@ -73887,7 +74337,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14846, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14856, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74233,7 +74683,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 116 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14851, -1)
+		Xsqlite3_result_error(tls, context, ts+14861, -1)
 		return
 	}
 	if argc == 3 {
@@ -74243,7 +74693,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14884, -1)
+				ts+14894, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -74342,7 +74792,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14929, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14939, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -74357,21 +74807,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = int8('\'')
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = int8(0)
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = int8('\'')
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = int8(0)
 				*(*int8)(unsafe.Pointer(zText)) = int8('X')
 				*(*int8)(unsafe.Pointer(zText + 1)) = int8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -74379,7 +74829,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14936, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14946, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -74493,6 +74943,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1547
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, (int32(p)-int32(pBlob))/1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -74695,7 +75258,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10851}
+var azOne = [1]uintptr{ts + 10913}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -74731,7 +75294,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(j))) = int8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14939, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14949, 4, uintptr(0))
 	}
 }
 
@@ -74756,7 +75319,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12031, -1)
+		Xsqlite3_result_error(tls, context, ts+12093, -1)
 		return
 	}
 
@@ -74834,7 +75397,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14829, -1)
+			Xsqlite3_result_error(tls, context, ts+14839, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75096,7 +75659,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14944, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14954, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75116,14 +75679,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14950, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14960, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14950, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14960, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14950, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14950, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14960, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14960, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -75253,17 +75816,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -75322,6 +75885,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -75362,108 +75926,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_implies_nonnull_row), FxSFunc: 0, FzName: ts + 14955},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_compare), FxSFunc: 0, FzName: ts + 14975},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_implies_expr), FxSFunc: 0, FzName: ts + 14988},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_affinity), FxSFunc: 0, FzName: ts + 15006},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15015},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15023},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15023},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15038},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15064},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15089},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15098},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15109},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_sqlite_offset), FxSFunc: 0, FzName: ts + 15116},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15130},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15130},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15136},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15136},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15142},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15142},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15147},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15147},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15147},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15151},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15151},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(1), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15151},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15155},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15162},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15170},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15177},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15183},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15190},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15197},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15205},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15210},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_implies_nonnull_row), FxSFunc: 0, FzName: ts + 14965},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_compare), FxSFunc: 0, FzName: ts + 14985},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_implies_expr), FxSFunc: 0, FzName: ts + 14998},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_affinity), FxSFunc: 0, FzName: ts + 15016},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15025},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15033},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15033},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15048},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15074},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15099},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15108},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15119},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_sqlite_offset), FxSFunc: 0, FzName: ts + 15126},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15140},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15140},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15146},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15146},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15152},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15152},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15157},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15157},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15157},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15161},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15161},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(1), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15161},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15165},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15180},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15187},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15193},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15200},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15207},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15215},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15220},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15226},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15232},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15236},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15261},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15268},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15283},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15300},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15311},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15317},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15335},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15343},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15357},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15365},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15374},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15374},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15391},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15395},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15401},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15405},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15405},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15224},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15224},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15230},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15236},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15242},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15252},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15259},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15266},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15277},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15284},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15299},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15316},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15327},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15333},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15351},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15359},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15373},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15390},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15390},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15407},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15411},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15411},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15424},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14950},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14950},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6519},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15429},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15434},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15442},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15448},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15454},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15457},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15461},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15467},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15457},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15472},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15476},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15480},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15486},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15490},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15495},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15500},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15505},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15417},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15421},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15421},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15427},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15427},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15440},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14960},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14960},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6579},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6579},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15445},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15450},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15458},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15464},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15470},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15473},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15483},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15473},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15488},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15492},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15496},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15506},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15511},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15515},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15523},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15528},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15533},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15538},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15516},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15521},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15527},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15531},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15539},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15544},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15550},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15556},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15561},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15569},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15577},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15580},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6519},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_iif), FxSFunc: 0, FzName: ts + 15585}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15549},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15554},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15560},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15566},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15572},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15577},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15585},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15593},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15596},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6579},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_iif), FxSFunc: 0, FzName: ts + 15601}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -75584,7 +76150,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15589,
+				ts+15605,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -76244,8 +76810,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6385, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6381, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6445, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6441, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -76745,7 +77311,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7903, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77213,7 +77779,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15634,
+		ts+15650,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77238,7 +77804,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15675,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15691,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*8)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -77387,7 +77953,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15707,
+		ts+15723,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -77397,7 +77963,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15759, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15775, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -77449,7 +78015,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15784,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15800,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -77457,7 +78023,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15830, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15846, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -77869,7 +78435,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15851)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15867)
 __125:
 	;
 insert_cleanup:
@@ -78184,8 +78750,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 							onError, iReg)
 						Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -79274,7 +79841,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -79720,6 +80287,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -79758,7 +80326,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12031, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12093, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -79767,7 +80335,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15865
+		zEntry = ts + 15881
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -79782,7 +80350,7 @@ __5:
 	if !(ii < int32(uint32(unsafe.Sizeof(azEndings))/uint32(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11992, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -79818,7 +80386,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15888, uint32(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15904, uint32(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -79832,7 +80400,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15897, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15913, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -79856,7 +80424,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15901, uint32(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15917, uint32(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -79874,7 +80442,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15907, libc.VaList(bp+16, zEntry, zFile))
+		ts+15923, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -79901,7 +80469,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15950, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15966, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -79939,7 +80507,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15982, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+15998, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -79949,7 +80517,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16019,
+	ts + 16035,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80104,7 +80672,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16022, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16038, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80113,62 +80681,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5050,
-	ts + 16061,
-	ts + 8807,
-	ts + 16065,
-	ts + 16070,
-	ts + 16073,
-	ts + 16083,
-	ts + 16093,
+	ts + 16077,
+	ts + 8869,
+	ts + 16081,
+	ts + 16086,
+	ts + 16089,
 	ts + 16099,
-	ts + 16103,
-	ts + 16108,
-	ts + 16113,
-	ts + 16121,
-	ts + 16132,
-	ts + 16135,
-	ts + 16142,
-	ts + 16103,
-	ts + 16108,
-	ts + 16149,
-	ts + 16154,
-	ts + 16157,
-	ts + 16164,
-	ts + 16099,
-	ts + 16103,
+	ts + 16109,
+	ts + 16115,
+	ts + 16119,
+	ts + 16124,
+	ts + 16129,
+	ts + 16137,
+	ts + 16148,
+	ts + 16151,
+	ts + 16158,
+	ts + 16119,
+	ts + 16124,
+	ts + 16165,
 	ts + 16170,
-	ts + 16175,
+	ts + 16173,
 	ts + 16180,
-	ts + 16103,
-	ts + 16184,
-	ts + 16108,
-	ts + 16192,
+	ts + 16115,
+	ts + 16119,
+	ts + 16186,
+	ts + 16191,
 	ts + 16196,
-	ts + 16201,
-	ts + 11423,
-	ts + 11419,
-	ts + 16207,
+	ts + 16119,
+	ts + 16200,
+	ts + 16124,
+	ts + 16208,
 	ts + 16212,
 	ts + 16217,
-	ts + 16061,
-	ts + 16103,
-	ts + 16222,
-	ts + 16229,
-	ts + 16236,
-	ts + 8807,
-	ts + 16244,
-	ts + 5053,
-	ts + 16250,
-	ts + 16061,
-	ts + 16103,
-	ts + 16255,
+	ts + 11485,
+	ts + 11481,
+	ts + 16223,
+	ts + 16228,
+	ts + 16233,
+	ts + 16077,
+	ts + 16119,
+	ts + 16238,
+	ts + 16245,
+	ts + 16252,
+	ts + 8869,
 	ts + 16260,
-	ts + 15457,
-	ts + 16265,
-	ts + 16278,
-	ts + 16287,
+	ts + 5053,
+	ts + 16266,
+	ts + 16077,
+	ts + 16119,
+	ts + 16271,
+	ts + 16276,
+	ts + 15473,
+	ts + 16281,
 	ts + 16294,
-	ts + 16305,
+	ts + 16303,
+	ts + 16310,
+	ts + 16321,
 }
 
 // Definitions of all built-in pragmas
@@ -80185,238 +80753,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16313,
+	{FzName: ts + 16329,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16328,
+	{FzName: ts + 16344,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16343,
+	{FzName: ts + 16359,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16355,
+	{FzName: ts + 16371,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16371,
+	{FzName: ts + 16387,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16294,
+	{FzName: ts + 16310,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16384,
+	{FzName: ts + 16400,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16396,
+	{FzName: ts + 16412,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16416,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16432,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16448,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16453,
+	{FzName: ts + 16469,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16468,
+	{FzName: ts + 16484,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16484,
+	{FzName: ts + 16500,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16498,
+	{FzName: ts + 16514,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16511,
+	{FzName: ts + 16527,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16525,
+	{FzName: ts + 16541,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16544,
+	{FzName: ts + 16560,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16563,
+	{FzName: ts + 16579,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16586,
+	{FzName: ts + 16602,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16595,
+	{FzName: ts + 16611,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16613,
+	{FzName: ts + 16629,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16630,
+	{FzName: ts + 16646,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16643,
+	{FzName: ts + 16659,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16658,
+	{FzName: ts + 16674,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16676,
+	{FzName: ts + 16692,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16686,
+	{FzName: ts + 16702,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16700,
+	{FzName: ts + 16716,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16716,
+	{FzName: ts + 16732,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16741,
+	{FzName: ts + 16757,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16760,
+	{FzName: ts + 16776,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16771,
+	{FzName: ts + 16787,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16782,
+	{FzName: ts + 16798,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16794,
+	{FzName: ts + 16810,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16810,
+	{FzName: ts + 16826,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16823,
+	{FzName: ts + 16839,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16842,
+	{FzName: ts + 16858,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16861,
+	{FzName: ts + 16877,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16874,
+	{FzName: ts + 16890,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16889,
+	{FzName: ts + 16905,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16899,
+	{FzName: ts + 16915,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16911,
+	{FzName: ts + 16927,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16920,
+	{FzName: ts + 16936,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16931,
+	{FzName: ts + 16947,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16941,
+	{FzName: ts + 16957,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16953,
+	{FzName: ts + 16969,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16964,
+	{FzName: ts + 16980,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16992,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 16993,
+	{FzName: ts + 17009,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17012,
+	{FzName: ts + 17028,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17038,
+	{FzName: ts + 17054,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17053,
+	{FzName: ts + 17069,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17067,
+	{FzName: ts + 17083,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17086,
+	{FzName: ts + 17102,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17100,
+	{FzName: ts + 17116,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17116,
+	{FzName: ts + 17132,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17128,
+	{FzName: ts + 17144,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17139,
+	{FzName: ts + 17155,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17150,
+	{FzName: ts + 17166,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17162,
+	{FzName: ts + 17178,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17189,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17194,
+	{FzName: ts + 17210,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17202,
+	{FzName: ts + 17218,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17217,
+	{FzName: ts + 17233,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17230,
+	{FzName: ts + 17246,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17249,
+	{FzName: ts + 17265,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17264,
+	{FzName: ts + 17280,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -80438,7 +81006,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17280))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17296))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -80450,10 +81018,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17305) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17321) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17315) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17331) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -80462,13 +81030,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7951) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8019) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17327) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17343) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -80483,9 +81051,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*int8)(unsafe.Pointer(z))) >= '0' && int32(*(*int8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*int8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16255) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16271) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17339) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17355) == 0 {
 		return 2
 	} else {
 		return 0
@@ -80499,7 +81067,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17346, 0)
+				ts+17362, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt)
@@ -80590,19 +81158,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17408
+		zName = ts + 17424
 		break
 	case OE_SetDflt:
-		zName = ts + 17417
+		zName = ts + 17433
 		break
 	case OE_Cascade:
-		zName = ts + 17429
+		zName = ts + 17445
 		break
 	case OE_Restrict:
-		zName = ts + 17437
+		zName = ts + 17453
 		break
 	default:
-		zName = ts + 17446
+		zName = ts + 17462
 		break
 	}
 	return zName
@@ -80619,7 +81187,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17456, ts + 17463, ts + 17471, ts + 17475, ts + 17339, ts + 17484,
+	ts + 17472, ts + 17479, ts + 17487, ts + 17491, ts + 17355, ts + 17500,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -80666,13 +81234,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17488
+			zType = ts + 17504
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17490
+			zType = ts + 17506
 		} else {
-			zType = ts + 7461
+			zType = ts + 7521
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17492,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17508,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -80680,7 +81248,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17499, ts + 17504, ts + 17512}
+var azEnc = [4]uintptr{uintptr(0), ts + 17515, ts + 17520, ts + 17528}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -80831,14 +81399,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -80925,7 +81495,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17520, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17536, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81186,7 +81756,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17524) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17540) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81258,7 +81828,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17315
+	zRet = ts + 17331
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -81296,7 +81866,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17305
+	zRet = ts + 17321
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -81583,7 +82153,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 532)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17529, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17545, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -81624,7 +82194,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17554, 0)
+		ts+17570, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -81678,7 +82248,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17607) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17623) == 0) {
 		goto __142
 	}
 
@@ -81775,9 +82345,9 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17613
+			return ts + 17629
 		}
-		return ts + 17621
+		return ts + 17637
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -81846,7 +82416,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17628, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17644, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -81892,29 +82462,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10422
+	zType = ts + 10484
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12704
+	zType = ts + 12714
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17644
+	zType = ts + 17660
 	goto __183
 __182:
-	zType = ts + 8807
+	zType = ts + 8869
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17651,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17667,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*16)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -81980,7 +82550,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -81990,7 +82560,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17663,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17679,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*4)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -82027,8 +82597,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 540)) = [3]uintptr{ts + 17668, ts + 17670, ts + 16132}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17672,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 540)) = [3]uintptr{ts + 17684, ts + 17686, ts + 16148}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17688,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82061,7 +82631,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17678,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17694,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*16)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*16)).FpBt)))
@@ -82083,7 +82653,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17682, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17698, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82147,7 +82717,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7461, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82163,7 +82733,7 @@ __218:
 	if !(i6 < int32(uint32(unsafe.Sizeof(aPragmaName))/uint32(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7461, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -82198,7 +82768,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82206,7 +82776,7 @@ __226:
 			(*sColMap)(unsafe.Pointer(pFK+36+uintptr(j2)*8)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 25 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 25))),
-			ts+17694))
+			ts+17710))
 	goto __227
 __227:
 	j2++
@@ -82395,7 +82965,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17699, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17715, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 556)))
@@ -82612,7 +83182,7 @@ __284:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17703, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17719, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -82673,262 +83243,284 @@ __299:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 564)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__300:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __301
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __300
+	}
+	mxCol = -1
+	j4 = 0
+__302:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __304
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __305
+	}
+	mxCol++
+__305:
+	;
+	goto __303
+__303:
+	j4++
+	goto __302
+	goto __304
+__304:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __306
 	}
 	mxCol--
-	goto __300
+__306:
+	;
+	goto __301
+__300:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __301:
 	;
 	if !(mxCol >= 0) {
-		goto __302
+		goto __307
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 564)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 564)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__302:
+__307:
 	;
 	if !!(isQuick != 0) {
-		goto __303
+		goto __308
 	}
 	if !(pPk1 != 0) {
-		goto __304
+		goto __309
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 564)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17727,
+		ts+17743,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__305:
+__310:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __307
+		goto __312
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 564)), j4, r2+j4)
-	goto __306
-__306:
+	goto __311
+__311:
 	j4++
-	goto __305
-	goto __307
-__307:
+	goto __310
+	goto __312
+__312:
 	;
-__304:
+__309:
 	;
-__303:
+__308:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__308:
+__313:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __310
+		goto __315
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*16
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __311
+		goto __316
 	}
-	goto __309
-__311:
+	goto __314
+__316:
 	;
 	if !(bStrict != 0) {
-		goto __312
+		goto __317
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4) > COLTYPE_ANY)
-	goto __313
-__312:
+	goto __318
+__317:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__313:
+__318:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __314
+		goto __319
 	}
-	goto __309
-__314:
+	goto __314
+__319:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 564)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __316
-__315:
+	goto __321
+__320:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __317
+		goto __322
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 572)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		uint8((*Column)(unsafe.Pointer(pCol1)).Faffinity), bp+572)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 572)) != 0) {
-		goto __318
+		goto __323
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 572)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 572)))
-__318:
+__323:
 	;
-__317:
+__322:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 564))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __319
+		goto __324
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __320
-__319:
+	goto __325
+__324:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__320:
+__325:
 	;
-__316:
+__321:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf>>0)) != 0) {
-		goto __321
+		goto __326
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17763, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17779, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __323
-__322:
+	goto __328
+__327:
 	;
-__323:
+__328:
 	;
-__321:
+__326:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __324
+		goto __329
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17783,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17799,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __325
-__324:
+	goto __330
+__329:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __326
+		goto __331
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17805,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17821,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __327
-__326:
+	goto __332
+__331:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __328
+		goto __333
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 564)), j4, 3)
-__329:
+__334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17828, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17844, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17830,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17846,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__328:
+__333:
 	;
-__327:
+__332:
 	;
-__325:
+__330:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __309
-__309:
+	goto __314
+__314:
 	j4++
-	goto __308
-	goto __310
-__310:
+	goto __313
+	goto __315
+__315:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __330
+		goto __335
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __331
+		goto __336
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 564)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__332:
+__337:
 	if !(k3 > 0) {
-		goto __334
+		goto __339
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*20)).FpExpr, addrCkFault, 0)
-	goto __333
-__333:
+	goto __338
+__338:
 	k3--
-	goto __332
-	goto __334
-__334:
+	goto __337
+	goto __339
+__339:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17850,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17866,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__331:
+__336:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__330:
+__335:
 	;
 	if !!(isQuick != 0) {
-		goto __335
+		goto __340
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__336:
+__341:
 	if !(pIdx5 != 0) {
-		goto __338
+		goto __343
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __339
+		goto __344
 	}
-	goto __337
-__339:
+	goto __342
+__344:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 564)), 0, 0, bp+576,
 		pPrior, r1)
@@ -82937,80 +83529,119 @@ __339:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 568))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17880)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17885)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17901)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__345:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __347
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*4)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __348
+	}
+	goto __346
+__348:
+	;
+	if !(label6 == 0) {
+		goto __349
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__349:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 568))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	if !(label6 != 0) {
+		goto __350
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17922)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__350:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __340
+		goto __351
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__341:
+__352:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __343
+		goto __354
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*16 + 4))&0xf>>0)) != 0) {
-		goto __344
+		goto __355
 	}
-	goto __342
-__344:
+	goto __353
+__355:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 568))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 568))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17949)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__351:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 576)))
 	goto __342
 __342:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __341
 	goto __343
 __343:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 568))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 568))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17906)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __340:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 576)))
-	goto __337
-__337:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __336
-	goto __338
-__338:
-	;
-__335:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 564)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __345
+		goto __356
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17933)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17976)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__346:
+__357:
 	if !(pIdx5 != 0) {
-		goto __348
+		goto __359
 	}
 	if !(pPk1 == pIdx5) {
-		goto __349
+		goto __360
 	}
-	goto __347
-__349:
+	goto __358
+__360:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 568))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83019,21 +83650,21 @@ __349:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __347
-__347:
+	goto __358
+__358:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __346
-	goto __348
-__348:
+	goto __357
+	goto __359
+__359:
 	;
 	if !(pPk1 != 0) {
-		goto __350
+		goto __361
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__350:
+__361:
 	;
-__345:
+__356:
 	;
 	goto __291
 __291:
@@ -83051,14 +83682,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(endCode))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __351
+		goto __362
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 560))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*20)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 17962
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 18005
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*20)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*20 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__351:
+__362:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83066,27 +83697,27 @@ __351:
 
 __45:
 	if !!(zRight != 0) {
-		goto __352
+		goto __363
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __354
+		goto __365
 	}
 	goto pragma_out
-__354:
+__365:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __353
-__352:
+	goto __364
+__363:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __355
+		goto __366
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__356:
+__367:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __358
+		goto __369
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __359
+		goto __370
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83095,25 +83726,25 @@ __356:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __358
-__359:
+	goto __369
+__370:
 	;
-	goto __357
-__357:
+	goto __368
+__368:
 	pEnc += 8
-	goto __356
-	goto __358
-__358:
+	goto __367
+	goto __369
+__369:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __360
+		goto __371
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17965, libc.VaList(bp+456, zRight))
-__360:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18008, libc.VaList(bp+456, zRight))
+__371:
 	;
-__355:
+__366:
 	;
-__353:
+__364:
 	;
 	goto __15
 
@@ -83121,15 +83752,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __361
+		goto __372
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(setCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __363
+		goto __374
 	}
 	goto __15
-__363:
+__374:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp1 = iDb
@@ -83137,41 +83768,41 @@ __363:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __364
+		goto __375
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fopcode = U8(OP_Noop)
-__364:
+__375:
 	;
-	goto __362
-__361:
+	goto __373
+__372:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(readCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __365
+		goto __376
 	}
 	goto __15
-__365:
+__376:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*20)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*20)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__362:
+__373:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__366:
+__377:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __366
-__367:
+	goto __377
+__378:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83186,31 +83817,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17322) == 0) {
-		goto __369
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17338) == 0) {
+		goto __380
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __370
-__369:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17990) == 0) {
-		goto __371
+	goto __381
+__380:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18033) == 0) {
+		goto __382
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __372
-__371:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17475) == 0) {
-		goto __373
+	goto __383
+__382:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17491) == 0) {
+		goto __384
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__373:
+__384:
 	;
-__372:
+__383:
 	;
-__370:
+__381:
 	;
-__368:
+__379:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83220,10 +83851,10 @@ __368:
 
 __49:
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__374:
+__385:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83243,19 +83874,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __377
+		goto __388
 	}
 	goto __15
-__377:
+__388:
 	;
-	goto __376
-__375:
+	goto __387
+__386:
 	opMask = U32(0xfffe)
-__376:
+__387:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -83264,86 +83895,86 @@ __376:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__378:
+__389:
 	if !(iDb <= iDbLast) {
-		goto __380
+		goto __391
 	}
 	if !(iDb == 1) {
-		goto __381
+		goto __392
 	}
-	goto __379
-__381:
+	goto __390
+__392:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__382:
+__393:
 	if !(k4 != 0) {
-		goto __384
+		goto __395
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __385
+		goto __396
 	}
-	goto __383
-__385:
+	goto __394
+__396:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__386:
+__397:
 	if !(pIdx6 != 0) {
-		goto __388
+		goto __399
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
-		goto __389
+		goto __400
 	}
 	szThreshold = int16(0)
-	goto __388
-__389:
+	goto __399
+__400:
 	;
-	goto __387
-__387:
+	goto __398
+__398:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __386
-	goto __388
-__388:
+	goto __397
+	goto __399
+__399:
 	;
 	if !(szThreshold != 0) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__390:
+__401:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+17998,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18041,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __391
+		goto __402
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __392
-__391:
+	goto __403
+__402:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__392:
+__403:
 	;
-	goto __383
-__383:
+	goto __394
+__394:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __382
-	goto __384
-__384:
+	goto __393
+	goto __395
+__395:
 	;
-	goto __379
-__379:
+	goto __390
+__390:
 	iDb++
-	goto __378
-	goto __380
-__380:
+	goto __389
+	goto __391
+__391:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -83351,36 +83982,36 @@ __380:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __393
+		goto __404
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__393:
+__404:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+580) == SQLITE_OK) {
-		goto __394
+		goto __405
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 580)))
-__394:
+__405:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+588) == SQLITE_OK) {
-		goto __395
+		goto __406
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 588)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 588)))) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 588)))
-__396:
+__407:
 	;
-__395:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -83389,10 +84020,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+596) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 596)) >= int64(0)) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 596))&int64(0x7fffffff)))
-__397:
+__408:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -83401,10 +84032,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+604) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 604)) >= int64(0)) {
-		goto __398
+		goto __409
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 604)) & int64(0x7fffffff))
-__398:
+__409:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -83412,10 +84043,10 @@ __398:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __399
+		goto __410
 	}
 
-__399:
+__410:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -83467,14 +84098,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18016, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18021, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18027, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18036, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18045, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18053, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18061},
-	{FzName: ts + 18068},
+	{FzName: ts + 18059, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18064, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18070, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18079, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18088, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18096, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18104},
+	{FzName: ts + 18111},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -83526,7 +84157,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+56, int32(unsafe.Sizeof([200]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18074)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18117)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -83534,7 +84165,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18089, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18132, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -83547,16 +84178,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18096, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18102)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18145)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18114)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18157)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4950, 1)
@@ -83739,13 +84370,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 116 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18129)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18172)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18137, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18180, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18141, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18184, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -83822,12 +84453,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18145, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
+			ts+18188, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -83836,19 +84467,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5001
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18173, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18216, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18204, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18247, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18212,
-	ts + 18219,
-	ts + 18231,
+	ts + 18255,
+	ts + 18262,
+	ts + 18274,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -83908,7 +84539,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)), db+168) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14123)
+				corruptSchema(tls, pData, argv, ts+14133)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+168+8, uint32(0), 0, 0x1)
@@ -83940,13 +84571,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*4)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18242)
+			corruptSchema(tls, pData, argv, ts+18285)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)), pIndex+44) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14123)
+				corruptSchema(tls, pData, argv, ts+14133)
 			}
 		}
 	}
@@ -83979,16 +84610,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8807
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8869
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*4)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*4)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*4))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7871
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18255
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7931
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18298
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*4)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 40)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 40)).FiDb = iDb
@@ -84066,17 +84697,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 68 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11706)
+		ts+11768)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -84085,44 +84725,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 68 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 68 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18327)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 68 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 28)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18370)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 68 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 28)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 40)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18351,
+		ts+18394,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -84133,57 +84773,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 40)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema + 78)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -84272,8 +84912,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -84386,8 +85028,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+156)-uint32(uintptr(0)+4))
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+160)-uint32(uintptr(0)+4))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -84398,8 +85040,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(292)
-	defer tls.Free(292)
+	bp := tls.Alloc(296)
+	defer tls.Free(296)
 
 	var rc int32
 	var i int32
@@ -84411,8 +85053,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+156)-uint32(uintptr(0)+4))
-	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+160)-uint32(uintptr(0)+4))
+	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -84452,7 +85094,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*16)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18385, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18428, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -84482,7 +85124,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18415, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18458, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -84578,7 +85220,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -84677,7 +85319,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -84995,8 +85637,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10851
-		var zSp2 uintptr = ts + 10851
+		var zSp1 uintptr = ts + 10913
+		var zSp2 uintptr = ts + 10913
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85004,13 +85646,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18434, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18477, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18464))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18507))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85185,7 +85827,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 48)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18498, libc.VaList(bp, 0))
+					ts+18541, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85230,7 +85872,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18548, libc.VaList(bp+8, zName))
+						ts+18591, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85241,7 +85883,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*68 + 36 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*68 + 48)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18612,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18655,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -85285,7 +85927,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6519, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6579, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -85632,9 +86274,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -85872,16 +86511,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18649
+		z = ts + 18692
 		break
 	case TK_INTERSECT:
-		z = ts + 18659
+		z = ts + 18702
 		break
 	case TK_EXCEPT:
-		z = ts + 18669
+		z = ts + 18712
 		break
 	default:
-		z = ts + 18676
+		z = ts + 18719
 		break
 	}
 	return z
@@ -85891,10 +86530,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18682, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18725, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -85914,6 +86556,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18748, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18779
+		}
+		return ts + 1547
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -85980,6 +86629,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -86044,6 +86694,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -86098,7 +86749,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16244
+					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16260
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 40)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, uintptr(0))
@@ -86237,13 +86888,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16244
+				zCol = ts + 16260
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -86251,7 +86902,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*20)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18705, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -86316,7 +86967,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -86341,7 +86992,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 				} else {
-					zName = ts + 16244
+					zName = ts + 16260
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -86351,7 +87002,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18705, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 48)) = U32(0)
@@ -86367,7 +87018,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18714, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18803, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 48)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+48)
 			}
@@ -86392,45 +87044,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*16)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -86440,14 +87095,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*20)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*20)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18811
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -86457,9 +87144,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 12)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -86503,7 +87187,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+34, pTab+4)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -86654,7 +87338,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18722, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18815, 0)
 	return
 __1:
 	;
@@ -86745,7 +87429,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18771, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18864, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -86765,7 +87449,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18813, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18906, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -86802,7 +87486,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18819, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18912, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -86836,11 +87520,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18834, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18927, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1547
 		}
-		return ts + 18857
+		return ts + 18950
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -86941,8 +87625,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18859, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18874, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18952, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18967, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -86989,7 +87673,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18649, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18692, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87056,7 +87740,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 48)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18893, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18986, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+48)
 
@@ -87118,7 +87802,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 76)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18893, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18986, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+76)
 
@@ -87271,10 +87955,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18914, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19007, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18960,
+			ts+19053,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -87528,8 +88212,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7167)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7167)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7227)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7227)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -87556,13 +88240,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+36, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19042, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19135, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19053, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19146, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -87574,7 +88258,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19058, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19151, 0)
 	Xsqlite3Select(tls, pParse, p, bp+36)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -87988,6 +88672,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff int8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*20)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
@@ -88107,15 +88810,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff int8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*20)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*20)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -88491,16 +89187,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -88560,12 +89273,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15147) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15157) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15151) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15161) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -88631,7 +89344,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19064, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19157, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -88714,7 +89427,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19082, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19175, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -88843,15 +89556,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19105, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 60))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19198, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 60))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+36+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 64)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -88869,7 +89579,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+36+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19125, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19218, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -88885,7 +89595,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19168
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19261
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -88911,7 +89621,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19191,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19284,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -88922,9 +89632,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+34, pTab+4)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19229
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19322
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19263
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19356
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -88971,7 +89681,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19301, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19394, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89083,7 +89793,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19305,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19398,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89102,7 +89812,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19344,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19437,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 44)), 0)
@@ -89110,7 +89820,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14716,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14726,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -89211,7 +89921,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 						} else {
-							zSchemaName = ts + 6379
+							zSchemaName = ts + 6439
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -89226,7 +89936,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*20
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19375, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19468, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 7, 0x80)
 							}
@@ -89291,7 +90001,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*20)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19380,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19473,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -89303,7 +90013,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -89322,9 +90032,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19389, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19482, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19407, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19500, 0)
 					}
 				}
 			}
@@ -89334,7 +90044,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 116 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19427, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19520, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -89393,11 +90103,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, int8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -89456,6 +90162,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*16)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 24)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*16)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(28)
+	defer tls.Free(28)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 44)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -89471,7 +90252,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -89484,13 +90266,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 20)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 20)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19458, 0)
+					ts+19551, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 20)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19509, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19602, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -89498,7 +90280,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 20
+	pFunc += 16
 	goto __1
 	goto __3
 __3:
@@ -89518,19 +90300,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 20))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 20
+	pF += 16
 	goto __1
 	goto __3
 __3:
@@ -89544,6 +90329,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -89618,7 +90406,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -89630,7 +90420,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 20
+	pF += 16
 	goto __1
 	goto __3
 __3:
@@ -89648,13 +90438,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 20
+	pC += 16
 	goto __7
 	goto __9
 __9:
@@ -89671,11 +90461,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19542,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19635,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19554
+						return ts + 19647
 					}
 					return ts + 1547
 				}(),
@@ -89696,7 +90486,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7871)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7931)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -89728,14 +90518,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 68 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*68
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -89789,6 +90580,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*68
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 64))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*68)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 68
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -89853,7 +90695,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -89952,7 +90793,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19577,
+		ts+19670,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90013,7 +90854,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19631,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19724,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -90127,7 +90968,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 220)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 224)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 36 + 4))&0x100>>8) == 0 ||
@@ -90144,11 +90985,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*68)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 36 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 64)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -90159,7 +90996,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19671, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19764, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+36+4, uint32(1), 5, 0x20)
@@ -90185,7 +91022,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -90217,11 +91054,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19686, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 88)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19779, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+88)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 88)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -90255,7 +91090,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 220)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 224)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -90564,12 +91399,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 128)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 128 + 8)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+128, pEList)
@@ -90598,39 +91432,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*20)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 128 + 24)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+128, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+128, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 128 + 24)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+128)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -90641,24 +91451,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -90691,27 +91501,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+128)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+116)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19702
+				return ts + 19795
 			}
-			return ts + 19711
+			return ts + 19804
 		}())
 
 	groupBySort = 1
@@ -90719,47 +91536,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*20)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*16)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*20
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*16
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -90775,45 +91592,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*20)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -90832,16 +91655,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -90872,16 +91695,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -90894,98 +91717,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 36 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*20)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*20)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20))
@@ -90994,79 +91820,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 160)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+116)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19702)
-__148:
+	explainTempTable(tls, pParse, ts+19795)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19720
-			}
-			return ts + 19743
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -91162,7 +91983,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19752, 0)
+		ts+19813, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -91395,7 +92216,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19817, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19878, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -91439,7 +92260,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19863, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19924, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+36, pTableName) != 0) {
 		goto __9
 	}
@@ -91457,7 +92278,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19932, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -91469,7 +92290,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19863, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19924, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -91484,7 +92305,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19912, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19973, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -91496,22 +92317,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19938, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19999, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19976,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20037,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20013
+				return ts + 20074
 			}
-			return ts + 20020
+			return ts + 20081
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -91520,7 +92341,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20026, libc.VaList(bp+24, pTableName+8))
+		ts+20087, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -91549,9 +92370,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -91669,7 +92490,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19863, bp+56)
+	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19924, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+64, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+64, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -91702,7 +92523,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20072,
+		ts+20133,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -91727,13 +92548,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20120,
+		ts+20181,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20195, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20256, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -91989,7 +92810,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20224, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20285, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92028,9 +92849,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12079
+				return ts + 6382
 			}
-			return ts + 5886
+			return ts + 5876
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92042,7 +92863,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20244,
+			ts+20305,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -92156,12 +92977,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20306,
+		ts+20367,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20354
+				return ts + 20415
 			}
-			return ts + 20361
+			return ts + 20422
 		}()))
 __15:
 	;
@@ -92275,7 +93096,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20368, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20429, 0)
 	return 1
 }
 
@@ -92458,8 +93279,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(316)
-	defer tls.Free(316)
+	bp := tls.Alloc(320)
+	defer tls.Free(320)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -92492,8 +93313,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 16 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+284, 0, uint32(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 284)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+288, 0, uint32(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 288)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -92505,13 +93326,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20410, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20471, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+284, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+288, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -92827,7 +93648,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -93097,7 +93919,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20424,
+		ts+20485,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto update_cleanup
 __27:
@@ -93129,7 +93951,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20460, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20521, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -93139,7 +93961,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7646
+				return ts + 7706
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*16)).FzCnName
 		}(),
@@ -94009,7 +94831,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20479)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20540)
 __169:
 	;
 update_cleanup:
@@ -94315,10 +95137,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*int8)(unsafe.Pointer(bp + 152)) = int8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+152, ts+20492, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+152, ts+20553, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20496, libc.VaList(bp+8, bp+152))
+				ts+20557, libc.VaList(bp+8, bp+152))
 			return SQLITE_ERROR
 		}
 
@@ -94409,7 +95231,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12133, -1)
+				ts+12143, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -94441,7 +95263,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20569, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20573, uint32(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20630, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20634, uint32(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -94589,14 +95411,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20577)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20638)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20617)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20678)
 	return SQLITE_ERROR
 __2:
 	;
@@ -94607,7 +95429,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20660)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20721)
 	return SQLITE_ERROR
 __5:
 	;
@@ -94635,7 +95457,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20678, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20739, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -94655,7 +95477,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20701)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20762)
 	goto end_of_vacuum
 __8:
 	;
@@ -94670,7 +95492,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14486)
+	rc = execSql(tls, db, pzErrMsg, ts+14496)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -94715,7 +95537,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20728,
+		ts+20789,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -94724,7 +95546,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20836,
+		ts+20897,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -94735,7 +95557,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20890,
+		ts+20951,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -94746,7 +95568,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21041,
+		ts+21102,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -94968,12 +95790,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -95091,7 +95913,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint32(unsafe.Sizeof(uintptr(0))) * uint32(2+*(*int32)(unsafe.Pointer(pTable + 44))))
 	if *(*int32)(unsafe.Pointer(pTable + 44))+3 >= *(*int32)(unsafe.Pointer(db + 116 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12360, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 44 + 4)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -95175,11 +95997,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32((int32((*Token)(unsafe.Pointer(pEnd)).Fz)-int32((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21171, libc.VaList(bp, pParse+192))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21232, libc.VaList(bp, pParse+196))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21195,
+			ts+21256,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -95189,7 +96011,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21294, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21355, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -95223,7 +96045,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 256
+	var pArg uintptr = pParse + 260
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -95250,7 +96072,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21313, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21374, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -95288,7 +96110,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21355, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21416, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
@@ -95300,7 +96122,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21385
+			var zFormat uintptr = ts + 21446
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -95317,7 +96139,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16135, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16151, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -95374,7 +96196,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 4))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21431, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21492, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -95432,7 +96254,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+396, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21431, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21492, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -95452,8 +96274,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(284)
-	defer tls.Free(284)
+	bp := tls.Alloc(288)
+	defer tls.Free(288)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -95466,7 +96288,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -95919,7 +96741,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -95946,7 +96768,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -96172,10 +96994,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21450
+		return ts + 21511
 	}
 	if i == -1 {
-		return ts + 16244
+		return ts + 16260
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*16)).FzCnName
 }
@@ -96184,15 +97006,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21457, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21518, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21463, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12750, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -96203,11 +97025,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21463, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12750, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5001, 1)
 	}
@@ -96229,27 +97051,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21465, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21526, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21457, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21518, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21468
+				return ts + 21529
 			}
-			return ts + 21473
+			return ts + 21534
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21481)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21542)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21483)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21544)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4950, 1)
 }
@@ -96292,11 +97114,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+88, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21485, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21546, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21491
+				return ts + 21552
 			}
-			return ts + 21498
+			return ts + 21559
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -96306,43 +97128,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10907
+					zFmt = ts + 10969
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21503
+				zFmt = ts + 21564
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21536
+				zFmt = ts + 21597
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21561
+				zFmt = ts + 21622
 			} else {
-				zFmt = ts + 21579
+				zFmt = ts + 21640
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21588, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21649, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp int8
-			var zRowid uintptr = ts + 16244
-			Xsqlite3_str_appendf(tls, bp+64, ts+21596, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16260
+			Xsqlite3_str_appendf(tls, bp+64, ts+21657, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = int8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21627, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21688, libc.VaList(bp+32, zRowid))
 				cRangeOp = int8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = int8('>')
 			} else {
 				cRangeOp = int8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21637, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21698, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21642,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21703,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 12))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21669, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21730, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -96374,28 +97196,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+48, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21680, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21741, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21468, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21701, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21762, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21457, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21518, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21468, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4950, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -96456,52 +97279,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 20)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 20)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 20)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)) + 24 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)) + 24 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*20)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*20)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 20)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 20))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 16)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 16)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -97979,7 +98808,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21709, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21770, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98007,7 +98836,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21724, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21785, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -98525,7 +99354,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21733, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21794, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -98883,10 +99712,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16093, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15424, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14950, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21747, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16109, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15440, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14960, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21808, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -99263,49 +100092,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*68)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*68)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*68)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*68)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -99313,13 +100131,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*68)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -99384,12 +100205,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21754, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21754, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -99413,7 +100234,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 20)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 24 + 4))-1)*20)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 24)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -99423,7 +100244,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 10)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -99468,7 +100289,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6702
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -99562,7 +100383,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
-				return ts + 21795
+				return ts + 21856
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -99573,7 +100394,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -99581,6 +100401,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*48
 		if *(*int32)(unsafe.Pointer(bp + 12)) != 0 {
@@ -99614,7 +100435,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 24 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -99767,6 +100588,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FleftCursor != iCsr {
 				return
 			}
@@ -99935,7 +100759,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21802,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21863,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100668,7 +101492,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21838, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21899, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*16)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -100739,7 +101563,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21864
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21925
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101246,7 +102070,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -101266,7 +102090,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*20)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*20)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -101277,10 +102101,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -101291,29 +102115,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -101415,8 +102239,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(24)
-	defer tls.Free(24)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -101428,7 +102252,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -101438,17 +102262,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -101468,19 +102292,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+12)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 12)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+20)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 12)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -101492,19 +102316,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -101514,10 +102338,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -101531,9 +102355,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 20)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+20)
-			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 28)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+28)
+			if *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 				return rc
 			}
 		}
@@ -101558,8 +102382,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(16)
-	defer tls.Free(16)
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -101571,7 +102395,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -101587,21 +102411,21 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 
 	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+8)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 8 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 8 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -101612,7 +102436,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -101934,6 +102758,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*68)).Ffg.Fjointype)&
@@ -102027,8 +102852,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(100)
-	defer tls.Free(100)
+	bp := tls.Alloc(104)
+	defer tls.Free(104)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -102052,8 +102877,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -102205,7 +103031,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 96)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 96)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -102224,7 +103050,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 96)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 96))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 96)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 10)) |= U16(TERM_HIGHTRUTH)
@@ -102238,7 +103064,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 96)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 96)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -102247,9 +103073,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -102268,6 +103098,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -102395,51 +103228,75 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 24))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
-	bp := tls.Alloc(36)
-	defer tls.Free(36)
+	bp := tls.Alloc(40)
+	defer tls.Free(40)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 28)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 28)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -102448,19 +103305,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = bp + 28
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+28)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+28)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
-	bp := tls.Alloc(98)
-	defer tls.Free(98)
+	bp := tls.Alloc(102)
+	defer tls.Free(102)
 
 	var pWInfo uintptr
 	var pProbe uintptr
 
-	*(*I16)(unsafe.Pointer(bp + 92)) = int16(-1)
+	*(*I16)(unsafe.Pointer(bp + 96)) = int16(-1)
 	var pTabList uintptr
 	var pSrc uintptr
 	var pNew uintptr
@@ -102487,14 +103350,14 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Index{})))
 		(*Index)(unsafe.Pointer(bp)).FnKeyCol = U16(1)
 		(*Index)(unsafe.Pointer(bp)).FnColumn = U16(1)
-		(*Index)(unsafe.Pointer(bp)).FaiColumn = bp + 92
-		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 94
+		(*Index)(unsafe.Pointer(bp)).FaiColumn = bp + 96
+		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 98
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+56, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
-		*(*LogEst)(unsafe.Pointer(bp + 94)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
-		*(*LogEst)(unsafe.Pointer(bp + 94 + 1*2)) = int16(0)
+		*(*LogEst)(unsafe.Pointer(bp + 98)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
+		*(*LogEst)(unsafe.Pointer(bp + 98 + 1*2)) = int16(0)
 		pFirst = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FpIndex
 		if int32(*(*uint16)(unsafe.Pointer(pSrc + 36 + 4))&0x1>>0) == 0 {
 			(*Index)(unsafe.Pointer(bp)).FpNext = pFirst
@@ -102531,7 +103394,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -102597,19 +103461,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 44)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -102789,7 +103658,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*4)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21875, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21936, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -102847,7 +103716,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*4)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21875, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21936, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -103245,7 +104114,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21901, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21962, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -103456,8 +104325,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*20)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*20)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -103576,14 +104445,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -103735,7 +104613,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -103843,7 +104721,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21936, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+21997, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104105,19 +104983,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 752)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 752 + uintptr(i)*84)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*68
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*68
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 44)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 44)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -104129,9 +105009,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -104164,13 +105044,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -104322,7 +105202,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21954, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22015, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
 	return uintptr(0)
 __2:
 	;
@@ -104386,7 +105266,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21982, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22043, 0)
 	goto __5
 __4:
 	ii = 0
@@ -105087,7 +105967,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -105268,7 +106148,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22000, -1)
+		pCtx, ts+22061, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -105401,7 +106281,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22056, -1)
+					pCtx, ts+22117, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -105490,17 +106370,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22101))
-var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22112))
-var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22123))
-var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22128))
-var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22141))
-var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22151))
-var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22157))
-var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22168))
-var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22178))
-var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22190))
-var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22195))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22162))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22173))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22184))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22189))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22202))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22212))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22218))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22229))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22239))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22251))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22256))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -105546,7 +106426,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22199, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22260, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -105590,12 +106470,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22218, 0)
+			ts+22279, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22289, 0)
+				ts+22350, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -105618,7 +106498,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*16)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7871)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7931)
 					}
 					break
 				}
@@ -105821,7 +106701,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22352, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22413, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -105937,7 +106817,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 28)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 28)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -105948,6 +106828,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+36+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, int8(SQLITE_AFF_NONE))
@@ -106051,7 +106932,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22378, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22439, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -106116,15 +106997,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22410
+				zErr = ts + 22471
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22427
+				zErr = ts + 22488
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22443
+				zErr = ts + 22504
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22463, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22524, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -106145,7 +107026,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22496, 0)
+				ts+22557, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -106301,11 +107182,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22543,
-	ts + 22596,
-	ts + 22000,
-	ts + 22647,
-	ts + 22699,
+	ts + 22604,
+	ts + 22657,
+	ts + 22061,
+	ts + 22708,
+	ts + 22760,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -107501,8 +108382,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -107513,13 +108393,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -107701,19 +108578,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22749,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22810,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19743
+							return ts + 22852
 						}
-						return ts + 22791
+						return ts + 22861
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 116 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22797, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22867, 0)
 		}
 	}
 
@@ -107784,7 +108661,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22831,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22901,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -108879,7 +109756,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22869, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22939, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -109854,21 +110731,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16244, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16260, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22891, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16157, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16173, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22891, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 4)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -110611,7 +111488,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*12 + 4)), yymsp+libc.UintptrFromInt32(-4)*12+4)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+22918)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+22988)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -110775,7 +111652,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 92)) = *(*Token)(unsafe.Pointer(yymsp + 4))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22927, libc.VaList(bp+32, bp+92))
+						Xsqlite3ErrorMsg(tls, pParse, ts+22997, libc.VaList(bp+32, bp+92))
 						*(*uintptr)(unsafe.Pointer(yymsp + 4)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 4)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -110992,9 +111869,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*12 + 4)) != 0 {
-							return ts + 6697
+							return ts + 6757
 						}
-						return ts + 6702
+						return ts + 6762
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
@@ -111006,6 +111883,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), *(*uintptr)(unsafe.Pointer(pRHS + 20)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 20)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) == uintptr(0) {
@@ -111273,19 +112155,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)) = *(*Token)(unsafe.Pointer(yymsp + 4))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22951, 0)
+					ts+23021, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23046, 0)
+					ts+23116, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23130, 0)
+					ts+23200, 0)
 			}
 			break
 		case uint32(273):
@@ -111664,9 +112546,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22927, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22997, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23215, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23285, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -112434,7 +113316,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 1248)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 1248)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23232, libc.VaList(bp, bp+1248))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23302, libc.VaList(bp, bp+1248))
 				break
 			}
 		}
@@ -112457,7 +113339,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23257, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23327, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -112630,7 +113512,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23268, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23338, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -112643,11 +113525,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19863, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19924, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23275, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23280, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23350, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -112660,9 +113542,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23290, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23360, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23294, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23364, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -112896,7 +113778,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -113471,7 +114353,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -113486,7 +114368,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23302, 0)
+			ts+23372, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -113677,23 +114559,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23370
+	var zErr uintptr = ts + 23440
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23384
+			zErr = ts + 23454
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23406
+			zErr = ts + 23476
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23428
+			zErr = ts + 23498
 			break
 
 		}
@@ -113711,35 +114593,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23451,
-	ts + 23464,
+	ts + 23521,
+	ts + 23534,
 	uintptr(0),
-	ts + 23480,
-	ts + 23505,
-	ts + 23519,
-	ts + 23538,
+	ts + 23550,
+	ts + 23575,
+	ts + 23589,
+	ts + 23608,
 	ts + 1483,
-	ts + 23563,
-	ts + 23600,
-	ts + 23612,
-	ts + 23627,
-	ts + 23660,
-	ts + 23678,
-	ts + 23703,
-	ts + 23732,
+	ts + 23633,
+	ts + 23670,
+	ts + 23682,
+	ts + 23697,
+	ts + 23730,
+	ts + 23748,
+	ts + 23773,
+	ts + 23802,
 	uintptr(0),
-	ts + 5841,
+	ts + 5831,
 	ts + 5327,
-	ts + 23749,
-	ts + 23767,
-	ts + 23785,
-	uintptr(0),
 	ts + 23819,
+	ts + 23837,
+	ts + 23855,
 	uintptr(0),
-	ts + 23840,
-	ts + 23866,
 	ts + 23889,
+	uintptr(0),
 	ts + 23910,
+	ts + 23936,
+	ts + 23959,
+	ts + 23980,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -113840,6 +114722,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	*(*int32)(unsafe.Pointer(db + 304)) = 1
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(*(*int32)(unsafe.Pointer(db + 304)) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -113854,7 +114742,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -113899,7 +114787,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23926, 0)
+				ts+23996, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114016,7 +114904,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23989, libc.VaList(bp, zName))
+		ts+24059, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -114252,7 +115140,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24040, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24110, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -114345,7 +115233,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -114415,7 +115303,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114425,7 +115313,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114457,14 +115345,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24061, 0)
+				ts+24131, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -114594,7 +115482,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24129, uint32(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24199, uint32(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -114639,10 +115527,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24135, zUri+7, uint32(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24205, zUri+7, uint32(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24145,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -114747,7 +115635,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24173, zOpt, uint32(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24243, zOpt, uint32(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -114758,17 +115646,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24177, zOpt, uint32(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24247, zOpt, uint32(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24177
+	zModeType = ts + 24247
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24183, zOpt, uint32(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24253, zOpt, uint32(4)) == 0) {
 		goto __32
 	}
 
@@ -114806,7 +115694,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24188, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24258, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -114814,7 +115702,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24208,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24278,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -114854,7 +115742,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24232, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24302, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -114877,15 +115765,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24248, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24255, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24318, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24325, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24263, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24266, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24269, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17339, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24333, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24336, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24339, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17355, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115031,10 +115919,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21795, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21856, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24273, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24343, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -115048,7 +115936,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+12, bp+16)
@@ -115099,9 +115987,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6374
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6434
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23275
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23345
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -115206,7 +116094,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24279
+		zFilename = ts + 24349
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -115309,21 +116197,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24282,
+	Xsqlite3_log(tls, iErr, ts+24352,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24307)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24377)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24327)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24397)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24334)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24404)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -115481,7 +116369,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24351, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24421, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -116137,7 +117025,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24379, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24449, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -116255,7 +117143,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24387
+			return ts + 24457
 		}
 		return uintptr(0)
 	}(), 0)
@@ -116432,7 +117320,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6174, ts + 6697, ts + 6702, ts + 6184, ts + 6179, ts + 7938, ts + 24410, ts + 24416,
+	ts + 6174, ts + 6757, ts + 6762, ts + 6184, ts + 6179, ts + 7998, ts + 24480, ts + 24486,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -116585,7 +117473,7 @@ __10:
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0' + int32(c)>>4)
-	c = uint8(*(*int8)(unsafe.Pointer(ts + 24423 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24493 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -116640,7 +117528,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24440, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24510, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -116704,13 +117592,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6697, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6757, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6702, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6762, uint32(5))
 			break
 
 		}
@@ -117260,12 +118148,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6697, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6757, uint32(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6702, uint32(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6762, uint32(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(5)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -117366,7 +118254,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24469, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24539, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -117672,7 +118560,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*int8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24484, uint32(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24554, uint32(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -117687,7 +118575,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24488, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24558, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -117741,7 +118629,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24514,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24584,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -117846,11 +118734,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*int8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zPath)))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24557, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24627, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4991, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24560, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24630, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -118007,14 +118895,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24563, -1)
+			ts+24633, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, int8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24614, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24684, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -118109,7 +118997,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15357)
+	jsonWrongNumArgs(tls, ctx, ts+15373)
 	return
 __2:
 	;
@@ -118184,9 +119072,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24648
+			return ts + 24718
 		}
-		return ts + 24652
+		return ts + 24722
 	}())
 	return
 __2:
@@ -118319,7 +119207,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24659, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24729, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118416,7 +119304,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24662, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24732, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118460,7 +119348,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24665)
+		ts+24735)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -118591,7 +119479,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24748, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24818, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -118610,7 +119498,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*12
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*12
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24754, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24824, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 12
@@ -118706,7 +119594,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, int8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24754, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24824, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -118730,7 +119618,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24759
+				zRoot = ts + 24829
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -118795,6 +119683,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -118846,7 +119740,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24469, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24539, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -118941,25 +119835,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24761},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24766},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24777},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24777},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24795},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24808},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24811},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24815},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24827},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24839},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24850},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24861},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24873},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 24886},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24895},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24895},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24905},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24916},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24933}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24831},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24836},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24847},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24847},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24865},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24878},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24881},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24885},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24897},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24909},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24920},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24931},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24943},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 24956},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24965},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24965},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24975},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24986},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25003}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -118978,8 +119872,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24951, FpModule: 0},
-	{FzName: ts + 24961, FpModule: 0},
+	{FzName: ts + 25021, FpModule: 0},
+	{FzName: ts + 25031, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -119232,11 +120126,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24971, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25041, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24979, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25049, iNode, 0,
 			pRtree+72)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -119447,7 +120341,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24984,
+		ts+25054,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -120150,7 +121044,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25066)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25136)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -121491,7 +122385,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25080, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25150, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -121503,12 +122397,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25100, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25170, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25132, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25202, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -121734,7 +122628,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25169, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25239, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -121757,14 +122651,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(20)
 	defer tls.Free(20)
 
-	var zFmt uintptr = ts + 25314
+	var zFmt uintptr = ts + 25384
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11279, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11341, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -121805,7 +122699,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25370, ts + 5053, ts + 16244,
+	ts + 25440, ts + 5053, ts + 16260,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -121848,19 +122742,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25375,
+			ts+25445,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25437, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25507, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25442,
+			ts+25512,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25506,
+			ts+25576,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25576,
+			ts+25646,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -121889,7 +122783,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25625
+			zFormat = ts + 25695
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -121901,7 +122795,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25733,
+			ts+25803,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -121909,18 +122803,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25778, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25848, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12750, 1)
+					Xsqlite3_str_append(tls, p, ts+12760, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25805, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25875, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25827, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25897, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25835, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25905, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -121935,14 +122829,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25851,
-	ts + 25904,
-	ts + 25949,
-	ts + 26001,
-	ts + 26055,
-	ts + 26100,
-	ts + 26158,
-	ts + 26213,
+	ts + 25921,
+	ts + 25974,
+	ts + 26019,
+	ts + 26071,
+	ts + 26125,
+	ts + 26170,
+	ts + 26228,
+	ts + 26283,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -121971,7 +122865,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26260, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26330, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -121983,7 +122877,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26280,
+			ts+26350,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+16)
 		if rc != SQLITE_OK {
@@ -121991,7 +122885,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26337,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26407,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122033,10 +122927,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26372,
-		ts + 26415,
-		ts + 26450,
-		ts + 26486,
+		ts + 26442,
+		ts + 26485,
+		ts + 26520,
+		ts + 26556,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -122067,7 +122961,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*4)), uint32(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26523,
+	Xsqlite3_str_appendf(tls, pSql, ts+26593,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))), *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	ii = 4
 __3:
@@ -122079,7 +122973,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26547, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26617, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -122102,7 +122996,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26553, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -122198,7 +123092,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26556, ts + 26567}
+var azFormat = [2]uintptr{ts + 26626, ts + 26637}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(592)
@@ -122236,13 +123130,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+44, bp+16, ii, bp+544)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10851, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10913, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26577, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+544)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26647, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+544)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+44)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26583, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 544 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26653, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 544 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26587, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26657, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -122253,7 +123147,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26589, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26659, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -122329,7 +123223,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26622,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26692,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4055
@@ -122353,7 +123247,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26629,
+			ts+26699,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -122372,7 +123266,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26674, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26744, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -122386,8 +123280,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26706,
-		ts + 26760,
+		ts + 26776,
+		ts + 26830,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 24 + uintptr(bLeaf)*4)) == uintptr(0) {
@@ -122402,23 +123296,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26808,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26878,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26853
+					return ts + 26923
 				}
-				return ts + 26861
+				return ts + 26931
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26870,
+				ts+26940,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26853
+						return ts + 26923
 					}
-					return ts + 26861
+					return ts + 26931
 				}(), iKey, iVal))
 		}
 	}
@@ -122442,7 +123336,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26928, libc.VaList(bp, i, iCell, iNode))
+				ts+26998, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -122462,7 +123356,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26976, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27046, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -122479,14 +123373,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27043, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27113, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27077, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27147, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -122494,7 +123388,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27107,
+					ts+27177,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -122523,14 +123417,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27162,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27232,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27193, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27263, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -122552,12 +123446,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14486, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14496, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27260, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27330, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -122566,12 +123460,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25080, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25150, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27288, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27358, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -122585,8 +123479,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27319, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27326, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27389, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -122594,7 +123488,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 24 + 1*4)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27334, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27404, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -122609,7 +123503,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27338, -1)
+			ts+27408, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -122617,7 +123511,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6374
+			zDb = ts + 6434
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*4)))
 		}
@@ -122627,7 +123521,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17962
+				return ts + 18005
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -122921,7 +123815,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint32(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint32(4)+uint32(6)*uint32(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint32(4)+uint32(6)*uint32(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -122979,6 +123873,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -122991,15 +123886,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27389, 1)
+		Xsqlite3_str_append(tls, x, ts+27459, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27391, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27461, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27402, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27472, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123019,19 +123915,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep int8 = int8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27413, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27483, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27431, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27501, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = int8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27439, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27509, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4)))
 			if z != 0 && *(*int8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27447, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27517, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27451, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27521, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123050,6 +123946,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -123081,6 +123978,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -123089,6 +123987,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -123147,6 +124046,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -123315,6 +124215,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123336,6 +124237,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -123420,6 +124322,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -123448,6 +124352,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -123884,6 +124789,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -123897,6 +124803,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -123911,6 +124820,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -123935,7 +124845,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*4)), uint32(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27464, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27534, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -123944,7 +124854,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27486, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
 	goto __3
 __3:
 	ii++
@@ -123952,7 +124862,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26553, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124031,6 +124941,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 36)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 12)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -124159,6 +125070,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -124177,7 +125089,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16244
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16260
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -124187,7 +125099,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27490
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27560
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -124195,7 +125107,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27496
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27566
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -124307,7 +125219,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27505, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27575, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -124437,14 +125349,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27545) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27615) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27561) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27631) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -124481,8 +125395,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint32(i) < uint32(unsafe.Sizeof(aFunc))/uint32(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); i < uint32(unsafe.Sizeof(aFunc))/uint32(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -124499,7 +125413,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint32(i) < uint32(unsafe.Sizeof(aAgg))/uint32(unsafe.Sizeof(struct {
+	for i = uint32(0); i < uint32(unsafe.Sizeof(aAgg))/uint32(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -124509,7 +125423,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27576, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27646, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -124521,25 +125435,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [2]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27584},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27597},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27610},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27623},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27561},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27635},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27545},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27658},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27672},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27685},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27699},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27715},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27654},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27667},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27680},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27693},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27631},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27705},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27615},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27728},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27742},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27755},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27769},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27785},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27727},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27797},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -124549,26 +125463,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27746, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27816, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27756, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27826, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27767, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27837, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27490, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27560, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27778, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27848, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -124622,7 +125536,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25066, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25136, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -124937,7 +125851,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27788, -1)
+		Xsqlite3_result_error(tls, context, ts+27858, -1)
 		return
 	}
 
@@ -124948,7 +125862,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27788, -1)
+			Xsqlite3_result_error(tls, context, ts+27858, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125049,7 +125963,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27809, uintptr(0), uintptr(0), p+36)
+				ts+27879, uintptr(0), uintptr(0), p+36)
 		}
 
 		if rc == SQLITE_OK {
@@ -125113,7 +126027,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+24979, zIn, uint32(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+25049, zIn, uint32(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -125134,16 +126048,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+27980, libc.VaList(bp, func() uintptr {
+			ts+28050, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28130
+					return ts + 28200
 				}
 				return ts + 1547
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+4, p+36,
-			ts+28171)
+			ts+28241)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -125259,7 +126173,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28296, libc.VaList(bp, zTab)))
+			ts+28366, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -125277,7 +126191,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*4, p+36,
-		Xsqlite3_mprintf(tls, ts+28415, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28485, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -125295,7 +126209,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*4, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28436, libc.VaList(bp+16, zIdx)))
+			ts+28506, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -125318,7 +126232,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*4, p+36,
-		Xsqlite3_mprintf(tls, ts+28487, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28557, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -125364,7 +126278,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint32(unsafe.Sizeof(U8(0)))*uint32((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+36,
-			Xsqlite3_mprintf(tls, ts+28508, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -125379,7 +126293,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint32(unsafe.Sizeof(U8(0)))*uint32((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+20, p+36,
-			Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 20))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 20)), 1)
 			if iCid >= 0 {
@@ -125419,7 +126333,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+36, bp+56, pIter+60)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19389, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19482, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -125429,18 +126343,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+60, p+36,
-			Xsqlite3_mprintf(tls, ts+28565, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28635, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 60)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), i)
-			if Xsqlite3_strnicmp(tls, ts+28584, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28654, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+32)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*4)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28589, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28659, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -125452,18 +126366,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28599, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28669, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28628
+							return ts + 28698
 						}
-						return ts + 28641
+						return ts + 28711
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+60, p+36,
-				Xsqlite3_mprintf(tls, ts+28650, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28720, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 60))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 1)
@@ -125477,7 +126391,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28672,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28742,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 5)
@@ -125524,8 +126438,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-		zList = rbuMPrintf(tls, p, ts+28699, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14597
+		zList = rbuMPrintf(tls, p, ts+28769, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14607
 	}
 	return zList
 }
@@ -125542,7 +126456,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zRet = rbuMPrintf(tls, p, ts+28708, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28778, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -125564,25 +126478,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+36,
 			Xsqlite3_mprintf(tls,
-				ts+28721, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28791, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28753, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28823, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+28776)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28782, ts+28789, ts+4950)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+1547)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+28846)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28852, ts+28859, ts+4950)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+36,
 				Xsqlite3_mprintf(tls,
-					ts+28797,
+					ts+28867,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28839, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28909, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -125624,7 +126538,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+36,
-		Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -125659,7 +126573,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 	goto __7
 __6:
-	zCol = ts + 28859
+	zCol = ts + 28929
 __7:
 	;
 	goto __5
@@ -125667,13 +126581,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28867,
+	zLhs = rbuMPrintf(tls, p, ts+28937,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28888,
+	zOrder = rbuMPrintf(tls, p, ts+28958,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28924,
+	zSelect = rbuMPrintf(tls, p, ts+28994,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14597
+	zSep = ts + 14607
 	iCol++
 	goto __1
 __2:
@@ -125691,7 +126605,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 180)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+180, p+36,
-		Xsqlite3_mprintf(tls, ts+28951,
+		Xsqlite3_mprintf(tls, ts+29021,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 180)))) {
 		goto __13
@@ -125718,8 +126632,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+28999, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14597
+	zVector = rbuMPrintf(tls, p, ts+29069, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14607
 	goto __15
 __15:
 	iCol++
@@ -125730,7 +126644,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29006, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -125763,7 +126677,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+36,
-			Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -125775,7 +126689,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29018, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29088, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*8)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*8)).FzSpan, zCollate))
 			zType = ts + 1547
 		} else {
@@ -125787,37 +126701,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28859
+					zCol = ts + 28929
 				} else {
-					zCol = ts + 28589
+					zCol = ts + 28659
 				}
 				zType = ts + 1112
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29040, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29110, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28776
+					return ts + 28846
 				}
 				return ts + 1547
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29060,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29130,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29081,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29151,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29114, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29184, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14597
-		zAnd = ts + 21457
+		zCom = ts + 14607
+		zAnd = ts + 21518
 		nBind++
 	}
 
@@ -125856,11 +126770,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = Xsqlite3_mprintf(tls, ts+29138, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29208, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29150, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29220, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14597
+			zS = ts + 14607
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -125868,7 +126782,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29159, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29229, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -125880,18 +126794,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29174, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29244, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1547
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29188, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21457
+				zList = rbuMPrintf(tls, p, ts+29258, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21518
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29200, libc.VaList(bp+40, zList))
+			ts+29270, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1547
@@ -125899,8 +126813,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = rbuMPrintf(tls, p, ts+29250, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21457
+				zList = rbuMPrintf(tls, p, ts+29320, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21518
 			}
 		}
 	}
@@ -125909,7 +126823,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29263, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29333, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -125927,17 +126841,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c int8 = *(*int8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29250,
+					zList = rbuMPrintf(tls, p, ts+29320,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29289,
+					zList = rbuMPrintf(tls, p, ts+29359,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29319,
+					zList = rbuMPrintf(tls, p, ts+29389,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				}
 			}
 		}
@@ -125972,19 +126886,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29356
+		var zSep uintptr = ts + 29426
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 60)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+36,
-			Xsqlite3_mprintf(tls, ts+28508, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16132) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16148) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+60, p+36,
-						Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -125996,15 +126910,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 3) != 0 {
-					zDesc = ts + 28776
+					zDesc = ts + 28846
 				} else {
 					zDesc = ts + 1547
 				}
-				z = rbuMPrintf(tls, p, ts+29369, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14597
+				z = rbuMPrintf(tls, p, ts+29439, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14607
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29380, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29450, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 60)))
 	}
 	return z
@@ -126024,7 +126938,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+36,
-			ts+29384)
+			ts+29454)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -126033,7 +126947,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+172, p+36,
-				Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -126043,25 +126957,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29434, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29504, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29456, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28776
+						return ts + 28846
 					}
 					return ts + 1547
 				}()))
-				zComma = ts + 14597
+				zComma = ts + 14607
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29466, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29536, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 172)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29481,
+			ts+29551,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 	}
 }
 
@@ -126074,7 +126988,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1547
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1547
@@ -126082,39 +126996,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29543
+				zPk = ts + 29613
 			}
-			zSql = rbuMPrintf(tls, p, ts+29556,
+			zSql = rbuMPrintf(tls, p, ts+29626,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*4)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29583
+							return ts + 29653
 						}
 						return ts + 1547
 					}()))
-			zComma = ts + 14597
+			zComma = ts + 14607
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29593, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29663, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29600,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29670,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29632
+						return ts + 29702
 					}
 					return ts + 1547
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 	}
 }
 
@@ -126127,7 +127041,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+88, p+36, Xsqlite3_mprintf(tls,
-				ts+29647,
+				ts+29717,
 				libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -126164,7 +127078,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 4)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+36,
-			ts+29704)
+			ts+29774)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		var rc2 int32
@@ -126269,7 +127183,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29770, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29840, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -126289,24 +127203,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+604, bp+608, bp+612)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 612)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29790,
+				ts+29860,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 604))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 612))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+80, p+36,
-					Xsqlite3_mprintf(tls, ts+29855, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29925, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+84, p+36,
-					Xsqlite3_mprintf(tls, ts+29891, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
+					Xsqlite3_mprintf(tls, ts+29961, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -126322,7 +127236,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29925,
+						ts+29995,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -126330,9 +127244,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29986
+											return ts + 30056
 										}
-										return ts + 29990
+										return ts + 30060
 									}()
 								}
 								return ts + 1547
@@ -126341,20 +127255,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29996,
+						ts+30066,
 						libc.VaList(bp+216, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30057,
+						ts+30127,
 						libc.VaList(bp+264, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29986
+									return ts + 30056
 								}
-								return ts + 29990
+								return ts + 30060
 							}(),
 							zCollist, zLimit))
 				}
@@ -126379,8 +127293,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6385)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6381)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6445)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6441)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -126391,16 +127305,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1547
 				}
-				return ts + 30216
+				return ts + 30286
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+80, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30225,
+						ts+30295,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30261
+								return ts + 30331
 							}
 							return ts + 1547
 						}(), zBindings)))
@@ -126409,32 +127323,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+84, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30271, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30341, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1547
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30299
+					zRbuRowid = ts + 30369
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30311, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30381, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30387
+							return ts + 30457
 						}
 						return ts + 1547
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30404,
+					ts+30474,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30703,
+						ts+30773,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -126447,9 +127361,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30802
+						zRbuRowid = ts + 30872
 					} else {
-						zRbuRowid = ts + 30812
+						zRbuRowid = ts + 30882
 					}
 				}
 
@@ -126462,20 +127376,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28859, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28929, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+76, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30823,
+							ts+30893,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30871
+										return ts + 30941
 									}
 									return ts + 1547
 								}(),
@@ -126488,7 +127402,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19743
+										return ts + 22852
 									}
 									return ts + 1547
 								}(), zOrder,
@@ -126556,9 +127470,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1547
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30216
+				zPrefix = ts + 30286
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30877,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30947,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+4, p+36, zUpdate)
@@ -126617,7 +127531,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+36,
-		Xsqlite3_mprintf(tls, ts+30907, libc.VaList(bp, p+24)))
+		Xsqlite3_mprintf(tls, ts+30977, libc.VaList(bp, p+24)))
 	for *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -126687,28 +127601,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30937, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31007, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30965, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31035, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+24, ts+3279, uint32(4))
 	} else {
-		libc.Xmemcpy(tls, p+24, ts+6374, uint32(4))
+		libc.Xmemcpy(tls, p+24, ts+6434, uint32(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30983, libc.VaList(bp+24, p+24))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31053, libc.VaList(bp+24, p+24))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -126741,11 +127655,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31049, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31119, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24129, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24199, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*int8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -126757,13 +127671,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31081,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374),
+			zTarget = Xsqlite3_mprintf(tls, ts+31151,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
 						}
-						return ts + 31113
+						return ts + 31183
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
@@ -126782,37 +127696,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31115, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31185, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31130, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31200, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31147, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31217, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31163, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31191, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31261, 0)
 	}
 }
 
@@ -126841,15 +127755,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31163, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31209, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31279, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -126897,7 +127811,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -126957,7 +127871,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6374, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -126974,23 +127888,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31244, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31314, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31269, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31276, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31339, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -127107,7 +128021,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23767, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23837, 0)
 			return
 		}
 
@@ -127200,7 +128114,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+36,
-			ts+31283)
+			ts+31353)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -127208,7 +128122,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31305, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31375, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -127229,7 +128143,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+36,
 			Xsqlite3_mprintf(tls,
-				ts+31332,
+				ts+31402,
 				libc.VaList(bp, p+24,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -127259,9 +128173,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+36,
-			Xsqlite3_mprintf(tls, ts+31490, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31560, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31505,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31575,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -127275,10 +128189,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 4)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31525, uintptr(0), uintptr(0), p+36)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31595, uintptr(0), uintptr(0), p+36)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-			ts+31550)
+			ts+31620)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127292,12 +128206,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-			ts+31658)
+			ts+31728)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+4, p+36,
-			ts+31723)
+			ts+31793)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127309,7 +128223,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 4)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31767, uintptr(0), uintptr(0), p+36)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31837, uintptr(0), uintptr(0), p+36)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -127329,15 +128243,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17217)
-					rbuCopyPragma(tls, p, ts+16328)
+					rbuCopyPragma(tls, p, ts+17233)
+					rbuCopyPragma(tls, p, ts+16344)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31792, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31862, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -127361,10 +128275,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), p+36)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), p+36)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -127459,7 +128373,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31820, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31890, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -127472,16 +128386,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(12)
+	defer tls.Free(12)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31269, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31339, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -127491,7 +128406,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31845, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31915, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -127525,7 +128440,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+12,
 		Xsqlite3_mprintf(tls,
-			ts+31856, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31926, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 12)), -1)
 	} else {
@@ -127555,13 +128470,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31928, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31998, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-				ts+31942)
+				ts+32012)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -127572,7 +128487,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-				ts+31999)
+				ts+32069)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -127646,7 +128561,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32073, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32143, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -127664,12 +128579,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32105,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32175,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32137
+							return ts + 32207
 						}
-						return ts + 32144
+						return ts + 32214
 					}()))
 			}
 		}
@@ -127677,7 +128592,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14486, uintptr(0), uintptr(0), p+36)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14496, uintptr(0), uintptr(0), p+36)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+48)
@@ -127688,19 +128603,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16931)
-						rbuCopyPragma(tls, p, ts+16343)
+						rbuCopyPragma(tls, p, ts+16947)
+						rbuCopyPragma(tls, p, ts+16359)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32151, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32221, uintptr(0), uintptr(0), p+36)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6374, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32167, uintptr(0), uintptr(0), p+36)
+								db, ts+32237, uintptr(0), uintptr(0), p+36)
 						}
 					}
 
@@ -127754,7 +128669,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32191, zState+uintptr(n-7), uint32(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32261, zState+uintptr(n-7), uint32(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -127781,7 +128696,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); i < nErrmsg-Size_t(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30216, uint32(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30286, uint32(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -127798,7 +128713,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), p+36)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -127811,13 +128726,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), p+36)
 		}
 
 		rbuObjIterFinalize(tls, p+48)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32199, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32269, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -127912,7 +128827,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -127929,19 +128844,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14486
+				zBegin = ts + 14496
 			} else {
-				zBegin = ts + 32151
+				zBegin = ts + 32221
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32151, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32221, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128064,11 +128979,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -128207,7 +129125,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -128284,7 +129202,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32226, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32296, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -128309,7 +129227,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32249, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32319, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -128454,7 +129372,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6374)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6434)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -128469,7 +129387,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32260, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32330, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -128480,7 +129398,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -128510,6 +129434,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -129269,11 +130208,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11279, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11341, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32271, 0)
+				ts+32341, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
 		} else {
@@ -129286,7 +130225,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32392, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32462, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -129384,7 +130323,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11279, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11341, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -129851,6 +130790,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -129932,6 +130874,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -129961,9 +130904,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32421,
+			zRet = Xsqlite3_mprintf(tls, ts+32491,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4))))
-			zSep = ts + 21457
+			zSep = ts + 21518
 			if zRet == uintptr(0) {
 				break
 			}
@@ -129986,9 +130929,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32455,
+				ts+32525,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4))))
-			zSep = ts + 32496
+			zSep = ts + 32566
 			if zRet == uintptr(0) {
 				break
 			}
@@ -129996,18 +130939,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7463, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7523, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32501,
+		ts+32571,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130017,7 +130960,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(4)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -130050,7 +130993,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32579,
+			ts+32649,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130177,7 +131120,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32632, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32702, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -130651,9 +131594,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11279, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11341, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32659, libc.VaList(bp, zDb))
+			ts+32729, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_NOMEM
 		}
@@ -130662,18 +131605,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1547
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32769, bp+20)
+		sessionAppendStr(tls, bp+8, ts+32839, bp+20)
 		sessionAppendIdent(tls, bp+8, zDb, bp+20)
 		sessionAppendStr(tls, bp+8, ts+1560, bp+20)
 		sessionAppendIdent(tls, bp+8, zTab, bp+20)
-		sessionAppendStr(tls, bp+8, ts+32784, bp+20)
+		sessionAppendStr(tls, bp+8, ts+32854, bp+20)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+20)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), bp+20)
-				sessionAppendStr(tls, bp+8, ts+32792, bp+20)
+				sessionAppendStr(tls, bp+8, ts+32862, bp+20)
 				sessionAppendInteger(tls, bp+8, i+1, bp+20)
-				zSep = ts + 21457
+				zSep = ts + 21518
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -130782,7 +131725,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32798, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32868, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 24))
 	}
@@ -130874,7 +131817,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+12)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32818, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32888, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 24))
 }
@@ -131137,7 +132080,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -131160,7 +132103,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -131202,7 +132145,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -131263,7 +132206,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+44, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -131337,13 +132280,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -131405,7 +132348,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*4)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*4)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4)) = uintptr(0)
 				}
@@ -131778,7 +132721,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -131944,7 +132887,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint32(unsafe.Sizeof(SessionUpdate{})) * uint32(nU32) * uint32(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11279) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11341) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_NOMEM
@@ -131955,34 +132898,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*12
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint32(nU32)*uint32(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32836, bp+12)
+				sessionAppendStr(tls, bp, ts+32906, bp+12)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+12)
-				sessionAppendStr(tls, bp, ts+32849, bp+12)
+				sessionAppendStr(tls, bp, ts+32919, bp+12)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*4)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+12)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*4)), bp+12)
-						sessionAppendStr(tls, bp, ts+32855, bp+12)
+						sessionAppendStr(tls, bp, ts+32925, bp+12)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+12)
-						zSep = ts + 14597
+						zSep = ts + 14607
 					}
 				}
 
 				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+32784, bp+12)
+				sessionAppendStr(tls, bp, ts+32854, bp+12)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*4)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+12)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32860, bp+12)
+								ts+32930, bp+12)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*4)), bp+12)
-							sessionAppendStr(tls, bp, ts+32792, bp+12)
+							sessionAppendStr(tls, bp, ts+32862, bp+12)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+12)
 						}
-						zSep = ts + 21457
+						zSep = ts + 21518
 					}
 				}
 
@@ -132034,34 +132977,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32935, bp+12)
+	sessionAppendStr(tls, bp, ts+33005, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+32784, bp+12)
+	sessionAppendStr(tls, bp, ts+32854, bp+12)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+12)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
-			sessionAppendStr(tls, bp, ts+32855, bp+12)
+			sessionAppendStr(tls, bp, ts+32925, bp+12)
 			sessionAppendInteger(tls, bp, i+1, bp+12)
-			zSep = ts + 21457
+			zSep = ts + 21518
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32953, bp+12)
+		sessionAppendStr(tls, bp, ts+33023, bp+12)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+12)
-		sessionAppendStr(tls, bp, ts+32496, bp+12)
+		sessionAppendStr(tls, bp, ts+32566, bp+12)
 
 		zSep = ts + 1547
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+12)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
-				sessionAppendStr(tls, bp, ts+32792, bp+12)
+				sessionAppendStr(tls, bp, ts+32862, bp+12)
 				sessionAppendInteger(tls, bp, i+1, bp+12)
-				zSep = ts + 32961
+				zSep = ts + 33031
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4950, bp+12)
@@ -132077,7 +133020,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6374, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
+		db, ts+6434, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -132088,19 +133031,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32966, bp+12)
+	sessionAppendStr(tls, bp, ts+33036, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+21463, bp+12)
+	sessionAppendStr(tls, bp, ts+21524, bp+12)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14597, bp+12)
+			sessionAppendStr(tls, bp, ts+14607, bp+12)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
 	}
 
-	sessionAppendStr(tls, bp, ts+32984, bp+12)
+	sessionAppendStr(tls, bp, ts+33054, bp+12)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+32995, bp+12)
+		sessionAppendStr(tls, bp, ts+33065, bp+12)
 	}
 	sessionAppendStr(tls, bp, ts+4950, bp+12)
 
@@ -132116,14 +133059,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11279, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11341, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+32999)
+			ts+33069)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+4,
-			ts+33112)
+			ts+33182)
 	}
 	return rc
 }
@@ -132151,7 +133094,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -132160,7 +133103,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(12)
 	defer tls.Free(12)
 
@@ -132237,7 +133180,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+4, bp+8, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 12)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 12)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	}
@@ -132363,7 +133306,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -132404,7 +133347,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33256, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33326, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -132420,7 +133363,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33277, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33347, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -132493,10 +133436,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33296, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33366, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33322, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33392, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+124, bp+128, bp+132, uintptr(0))
@@ -132542,7 +133485,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+136, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6374, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
+					db, ts+6434, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -132555,19 +133498,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33352, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33422, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 128)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33396,
+						ts+33466,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 140)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 128))))
 				} else if *(*int32)(unsafe.Pointer(bp + 128)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 136)), uint32(*(*int32)(unsafe.Pointer(bp + 128)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33467, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33537, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 128))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11279) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11341) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -132618,14 +133561,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33527, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33597, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33557, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33581, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33557, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33651, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -133857,7 +134800,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33609, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33679, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134145,7 +135088,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33637, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33707, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134330,7 +135273,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33668, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33738, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -134398,7 +135341,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33675
+		var zErr uintptr = ts + 33745
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -134579,7 +135522,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33725
+		var zErr uintptr = ts + 33795
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -134902,13 +135845,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(48)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33773, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33843, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33781, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33851, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33791, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33861, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -135458,7 +136401,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33796, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33866, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint32(unsafe.Sizeof(int32(0))) * uint32(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -135485,14 +136428,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*int8)(unsafe.Pointer(p))) < '0' || int32(*(*int8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33803, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33873, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33834, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33904, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135503,7 +136446,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33867, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33937, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135516,7 +136459,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33904, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33974, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + Size_t(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, Sqlite3_int64(unsafe.Sizeof(uintptr(0)))*nArg)
@@ -135525,7 +136468,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33913, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33983, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -135544,7 +136487,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33946, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34016, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -135559,14 +136502,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33980, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34050, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33988, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34058, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*int8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34020, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34090, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -135574,9 +136517,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34026, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34096, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34040, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34110, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -135584,9 +136527,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34078, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34148, zCmd, nCmd) == 0 {
 		if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || int32(*(*int8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34089, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34159, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -135596,19 +136539,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5068, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 44)) = [4]Fts5Enum{
-			{FzName: ts + 7951, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17322},
-			{FzName: ts + 34124, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8019, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17338},
+			{FzName: ts + 34194, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+44, zArg, pConfig+48)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34132, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34202, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34163, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34233, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -135655,15 +136598,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22123) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16244) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34191, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22184) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16260) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34261, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34221) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34291) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34231, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34301, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -135680,13 +136623,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 28)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34262, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34332, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34267, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34337, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34274, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34344, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -135724,8 +136667,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*4)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22123) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34282, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22184) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34352, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -135757,7 +136700,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34311, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34381, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -135794,19 +136737,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33980
+			zTail = ts + 34050
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34331
+			zTail = ts + 34401
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34339, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34409, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16244, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16260, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -135850,18 +136793,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34350, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34420, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1547
 			}
-			return ts + 14597
+			return ts + 14607
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34366, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*4))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34436, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*4))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34373,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22123))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34443,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22184))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -135971,7 +136914,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34399) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34469) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -135981,7 +136924,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34404) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34474) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -135991,7 +136934,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34413) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34483) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -136004,7 +136947,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34423) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34493) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -136014,7 +136957,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34433) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34503) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -136030,7 +136973,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22123) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22184) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+4)
@@ -136053,7 +136996,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(44)
 	defer tls.Free(44)
 
-	var zSelect uintptr = ts + 34445
+	var zSelect uintptr = ts + 34515
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -136075,7 +137018,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 36))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 36)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 36)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34477) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34547) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 40)) = 0
@@ -136089,7 +137032,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34485,
+				ts+34555,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -136187,7 +137130,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34550, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34620, 0)
 					return FTS5_EOF
 				}
 			}
@@ -136200,20 +137143,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34570, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34640, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = (int32(z2) - int32(z)) / 1
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34601, uint32(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34671, uint32(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34604, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34674, uint32(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29986, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30056, uint32(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -136299,6 +137242,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*int8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -136327,7 +137281,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 1))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*int8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = int8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -137979,9 +138933,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34608, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34678, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33637, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33707, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -137997,7 +138951,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c int8 = *(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34613, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34683, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -138084,7 +139038,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20460, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20521, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -138165,7 +139119,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34642, 0)
+			ts+34712, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -138335,12 +139289,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+20)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34695,
+								ts+34765,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34745
+										return ts + 34815
 									}
-									return ts + 34608
+									return ts + 34678
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -139280,7 +140234,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34752, iRowid, 0, p+36)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34822, iRowid, 0, p+36)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -139359,7 +140313,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+40, Xsqlite3_mprintf(tls,
-			ts+34758,
+			ts+34828,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -139384,7 +140338,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34809,
+			ts+34879,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+44, zSql) != 0 {
 			return
@@ -139407,7 +140361,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+52, Xsqlite3_mprintf(tls,
-			ts+34858,
+			ts+34928,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -139646,7 +140600,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+64,
-				Xsqlite3_mprintf(tls, ts+34898, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -140845,7 +141799,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+56, Xsqlite3_mprintf(tls,
-			ts+34921,
+			ts+34991,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -142310,7 +143264,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+48, Xsqlite3_mprintf(tls,
-			ts+35005,
+			ts+35075,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -142801,10 +143755,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint32(nSeg) * uint32(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 20 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*12
+		pLvl = pNew + 20 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*12
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+32, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -143386,13 +144345,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35062, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35132, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24979, ts+35070, 0, pzErr)
+				pConfig, ts+25049, ts+35140, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11419,
-					ts+35105,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11481,
+					ts+35175,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -143645,7 +144604,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34752, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
+		ts+34822, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 4)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 4)))
@@ -143759,7 +144718,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35149,
+		ts+35219,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -143929,7 +144888,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 8)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+68+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*92, uintptr(0), bp+8)
-			sqlite3Fts5BufferAppendBlob(tls, p+32, bp+8, uint32(4), ts+35235)
+			sqlite3Fts5BufferAppendBlob(tls, p+32, bp+8, uint32(4), ts+35305)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+8)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+8)).Fn, bp+20, bp+24) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 24)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 24)) & int64(0x7FFFFFFF))
@@ -144197,7 +145156,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35240, 0)
+			ts+35310, 0)
 		return SQLITE_ERROR
 	}
 
@@ -144621,11 +145580,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35279,
+		ts+35349,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14597
+					return ts + 14607
 				}
 				return ts + 1547
 			}(),
@@ -144637,9 +145596,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35334
+					return ts + 35404
 				}
-				return ts + 35339
+				return ts + 35409
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -144685,12 +145644,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35343, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35413, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5050, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35349, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35419, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -144721,7 +145680,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35377, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35447, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 20)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -144752,7 +145711,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35387, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35457, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -144784,14 +145743,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 56)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35408, libc.VaList(bp, z))
+				ts+35478, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33791
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33861
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -144847,7 +145806,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35240, 0)
+		ts+35310, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145064,7 +146023,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35441, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35511, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -145209,28 +146168,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35477, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35547, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35488, 0)
+				ts+35558, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35568, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35576, 0)
+				ts+35646, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16911, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16927, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35632, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35702, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35708, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -145288,7 +146247,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*4))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*4)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17456, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17472, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*4)))
@@ -145301,12 +146260,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35654,
+				ts+35724,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20361
+						return ts + 20422
 					}
-					return ts + 35691
+					return ts + 35761
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -145936,7 +146895,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35703, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35773, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -146180,7 +147139,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35724, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35794, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -146199,7 +147158,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 8
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35746, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35816, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -146246,7 +147205,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35777)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35847)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -146255,7 +147214,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35790, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35860, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -146269,7 +147228,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35881, ts + 33980, ts + 24979, ts + 34331, ts + 11419,
+	ts + 35951, ts + 34050, ts + 25049, ts + 34401, ts + 11481,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -146293,7 +147252,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35888, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35958, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -146311,13 +147270,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35888, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35958, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35893, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35963, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -146372,17 +147333,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 24 + uintptr(eStmt)*4)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35908,
-			ts + 35976,
-			ts + 36045,
-			ts + 36078,
-			ts + 36117,
-			ts + 36157,
-			ts + 36196,
-			ts + 36237,
-			ts + 36276,
-			ts + 36318,
-			ts + 36358,
+			ts + 35978,
+			ts + 36046,
+			ts + 36115,
+			ts + 36148,
+			ts + 36187,
+			ts + 36227,
+			ts + 36266,
+			ts + 36307,
+			ts + 36346,
+			ts + 36388,
+			ts + 36428,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -146484,18 +147445,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36381,
+		ts+36451,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36485,
+			ts+36555,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36523,
+			ts+36593,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -146507,7 +147468,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36561,
+			ts+36631,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -146519,14 +147480,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24979, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11419, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35881, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25049, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11481, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35951, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34331, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34401, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33980, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34050, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -146538,17 +147499,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36603,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36673,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29632
+					return ts + 29702
 				}
 				return ts + 1547
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36633,
+			ts+36703,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -146585,27 +147546,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36677, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36747, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36700, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36770, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33980, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34050, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34331, ts+36706, 0, pzErr)
+				pConfig, ts+34401, ts+36776, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35881, ts+36738, 1, pzErr)
+				pConfig, ts+35951, ts+36808, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34477, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -146811,12 +147772,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36755,
+		ts+36825,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36805,
+			ts+36875,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -146824,7 +147785,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34477, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -147000,7 +147961,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36834,
+	zSql = Xsqlite3_mprintf(tls, ts+36904,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -147182,14 +148143,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 36)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33980, bp+36)
+			rc = fts5StorageCount(tls, p, ts+34050, bp+36)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 36)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 44)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34331, bp+44)
+			rc = fts5StorageCount(tls, p, ts+34401, bp+44)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 44)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -147384,9 +148345,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint32(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36866) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36936) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36877) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36947) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -147600,7 +148561,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36888
+			var zCat uintptr = ts + 36958
 			var i int32
 			libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -147612,7 +148573,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36897) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36967) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
 				}
 			}
@@ -147623,18 +148584,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36908) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36978) {
 					if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' && int32(*(*int8)(unsafe.Pointer(zArg))) != '2' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*int8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36866) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36936) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36877) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36947) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36897) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36967) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -147910,7 +148871,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36926
+	var zBase uintptr = ts + 36996
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -148050,7 +149011,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36936, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148058,11 +149019,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36939, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37009, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36944, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37014, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148070,7 +149031,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36949, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37019, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148078,7 +149039,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36952, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148086,11 +149047,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36955, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36960, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37030, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148098,19 +149059,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36965, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36969, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37039, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36975, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37045, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36980, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37050, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148118,11 +149079,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36984, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37054, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36988, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37058, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148130,7 +149091,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36991, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148138,11 +149099,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36995, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36999, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37069, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148150,7 +149111,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37003, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37073, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148158,7 +149119,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37007, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148166,7 +149127,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37011, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37081, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148182,24 +149143,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37015, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+36995, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37085, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37065, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37018, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37021, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37091, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37011, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37081, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -148214,137 +149175,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37028, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37098, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+36995, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37065, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37036, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37106, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37043, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37113, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37048, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37118, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36944, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37014, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37053, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37123, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36939, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37009, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37058, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37011, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37081, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37063, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15457, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15473, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37021, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37091, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37142, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36936, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37006, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36980, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37050, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37083, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37153, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37087, uint32(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37157, uint32(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37089, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37159, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37003, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37073, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37165, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37011, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37081, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37103, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37173, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36995, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37065, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37109, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36995, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37065, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37114, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37120, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37007, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37077, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37198, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37136, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37206, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37210, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37003, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37073, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37148, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37154, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37224, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37007, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37077, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37230, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37021, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37091, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -148359,16 +149320,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37167, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36952, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37022, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37242, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148376,21 +149337,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37177, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37247, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36952, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37183, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37253, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36952, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37136, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37206, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148398,7 +149359,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37189, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37259, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -148406,9 +149367,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37195, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37265, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -148423,12 +149384,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37201, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37271, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37205, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37275, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37208, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -148437,7 +149398,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37211, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37281, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -148593,7 +149554,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37215) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37285) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -148773,22 +149734,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(64)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36926, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 36996, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37230, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37300, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37236, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37306, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37243, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -149927,14 +150888,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37251) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37321) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37255) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37325) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37259) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37329) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37268, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37338, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -149960,19 +150921,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(20)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 4)) = [3]uintptr{
-		ts + 37302,
-		ts + 37342,
-		ts + 37377,
+		ts + 37372,
+		ts + 37412,
+		ts + 37447,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4))) == Size_t(4) && libc.Xmemcmp(tls, ts+23275, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4))) == Size_t(4) && libc.Xmemcmp(tls, ts+23345, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37420, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37490, 0)
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -150105,11 +151066,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37453, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37523, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37484,
+		ts+37554,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+68, uintptr(0))
@@ -150133,7 +151094,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 68)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37535, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37605, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -150528,7 +151489,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37561, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37631, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -150550,7 +151511,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37571
+	return ts + 37641
 }
 
 func init() {
@@ -150605,114 +151566,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1456)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1496)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1536)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1576)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1616)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1656)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1696)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1736)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1776)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1816)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1856)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1896)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1936)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1976)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2016)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2056)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2096)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2136)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1576)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1616)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1656)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1696)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1736)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1776)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1816)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1856)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1896)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1936)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1976)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2016)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2056)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2096)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2136)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2176)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2216)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2256)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2260)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2264)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2268)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2296)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2300)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2304)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2308)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2256)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2296)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2336)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2340)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2344)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2340)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2344)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2348)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2376)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2380)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2384)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2388)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2416)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2420)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2424)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2428)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2456)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2460)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2464)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2468)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2496)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2500)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2508)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2528)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2536)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2568)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2576)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2608)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2376)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2380)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2384)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2388)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2416)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2420)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2424)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2428)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2456)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2460)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2464)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2468)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2496)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2500)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2508)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2536)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2540)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2544)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2548)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2576)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2580)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2584)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2588)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2608)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2728)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2736)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2768)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2776)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2808)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2648)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2656)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2696)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2808)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2816)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2848)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2848)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2856)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2896)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2936)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2888)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2896)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2928)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2936)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3016)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3056)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3088)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3096)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3128)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3136)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3168)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3176)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3208)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3096)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3136)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3168)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3176)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3208)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3216)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3248)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3256)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3288)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3296)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3328)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3248)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3256)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3288)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3296)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3328)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3368)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3376)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3368)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3376)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3416)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3448)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3456)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3488)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3448)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3456)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3488)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3496)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3528)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3528)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3536)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3568)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3568)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3608)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3608)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3616)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3648)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3648)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3656)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3688)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3688)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3728)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3728)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3736)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3776)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3808)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3808)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3816)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3848)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3848)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3856)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3896)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3936)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3976)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4016)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3888)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3896)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3928)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3936)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3976)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4016)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4096)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 16)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 48)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -151170,6 +152133,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 56)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 60)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 64)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 4)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 12)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 20)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 28)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 36)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 44)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 4)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 12)) = rtreeBestIndex
@@ -151488,6 +152463,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1052)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1056)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1060)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1064)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 4)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = sqlite3TestExtInit
@@ -151509,5 +152485,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 68)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_freebsd_amd64.go b/vendor/modernc.org/sqlite/lib/sqlite_freebsd_amd64.go
index e7c31d8c..7f59008b 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_freebsd_amd64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_freebsd_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -412,6 +412,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -519,6 +520,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -798,6 +800,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1314,6 +1317,7 @@ const (
 	SF_SETTABLE                           = 0xffff0000
 	SF_SNAPSHOT                           = 0x00200000
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1349,6 +1353,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1467,6 +1472,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -1833,6 +1839,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -1929,11 +1936,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -1948,7 +1958,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2056,8 +2066,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2449,6 +2459,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -3719,6 +3730,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -4965,10 +4977,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -5024,12 +5034,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -5281,7 +5289,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -5402,7 +5409,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -5426,11 +5433,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -5438,11 +5447,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -6074,7 +6083,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -6212,10 +6221,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -6230,12 +6237,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -6425,10 +6430,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -6632,7 +6639,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1092))
@@ -6784,7 +6791,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -6833,8 +6839,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -6845,6 +6861,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -6961,7 +6986,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7787,14 +7812,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = int8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -7802,7 +7827,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -9613,7 +9638,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -9869,6 +9894,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -10859,6 +10886,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -10867,11 +10895,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -10883,30 +10935,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1547
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -10915,83 +10967,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -11005,17 +11057,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -11023,90 +11075,90 @@ __219:
 		}
 		return ts + 1553
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(j))) = int8(0)
 	length = int32(j)
@@ -11114,89 +11166,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -11209,32 +11261,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -11293,7 +11345,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -11309,8 +11361,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -11339,12 +11390,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -11353,7 +11405,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -12477,6 +12529,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -13082,10 +13152,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13111,6 +13184,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = int8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]int8{}))-uint64(1)-uint64(i))
+	return int32(uint64(unsafe.Sizeof([22]int8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14119,11 +14193,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -15081,7 +15156,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15304,7 +15379,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -15320,113 +15395,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -15558,7 +15633,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15849,7 +15924,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3371, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15866,14 +15941,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3659, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3659, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15893,7 +15968,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -15961,7 +16036,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -16188,7 +16263,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16216,7 +16291,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -16315,7 +16390,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3254, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -16445,7 +16520,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -16491,7 +16566,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -16730,7 +16805,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -16864,7 +16939,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+16)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16885,7 +16960,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17201,7 +17276,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3254, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -17292,7 +17367,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__error(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43337)
 		}
 		return rc
 	}
@@ -17300,9 +17375,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3781, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3781, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -17345,12 +17420,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*int8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -17369,18 +17441,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*24 + 8)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__error(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3452, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3452, zIn, 43443)
 			}
 		} else if int32((*stat)(unsafe.Pointer(bp)).Fst_mode)&0170000 == 0120000 {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls, zIn, bp+224, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2))
 			if got <= int64(0) || got >= Ssize_t(unsafe.Sizeof([1026]int8{}))-int64(2) {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3443, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3443, zIn, 43454)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 224 + uintptr(got))) = int8(0)
@@ -17420,14 +17492,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 1032)).FzOut = zOut
 	if int32(*(*int8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, bp, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3272, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3272, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+1032, bp)
 	}
 	appendAllPathElements(tls, bp+1032, zPath)
 	*(*int8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+1032)).FnUsed))) = int8(0)
 	if (*DbPath)(unsafe.Pointer(bp+1032)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+1032)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17524,7 +17596,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__error(tls))) == EINTR {
 				got = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*24 + 8)))(tls, fd, zBuf, uint64(nBuf)))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -21448,7 +21520,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -22500,7 +22572,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -22517,7 +22588,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -22583,7 +22653,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -22593,7 +22662,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22784,36 +22853,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -22985,7 +23043,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23109,7 +23167,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23148,7 +23206,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23225,7 +23283,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24137,10 +24195,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]int8{int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0)}
@@ -24226,7 +24286,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -24983,7 +25043,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25082,7 +25142,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -25668,7 +25728,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -25943,7 +26003,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -26416,7 +26476,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26921,7 +26981,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27156,8 +27216,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27165,23 +27225,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27577,7 +27639,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27714,7 +27776,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -27731,7 +27793,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -27739,7 +27801,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -27782,7 +27844,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27792,7 +27854,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -28042,7 +28104,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28089,7 +28151,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28099,7 +28161,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28112,7 +28174,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28121,14 +28183,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28138,7 +28200,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -28202,7 +28264,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -28212,7 +28274,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28234,7 +28296,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28269,7 +28331,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28282,13 +28344,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -28313,7 +28375,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -28324,7 +28386,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -28376,22 +28438,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -28401,7 +28463,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -28409,7 +28471,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -28417,10 +28479,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -28444,13 +28506,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -28458,7 +28519,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -28466,32 +28566,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -28519,11 +28608,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -28534,15 +28623,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -28570,14 +28659,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2) + 1)))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -28591,7 +28680,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28603,7 +28692,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28706,7 +28795,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28734,7 +28823,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28773,7 +28862,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29656,7 +29745,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30071,7 +30160,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30097,7 +30186,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -30106,7 +30195,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30117,7 +30206,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30133,7 +30222,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30194,7 +30283,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30229,7 +30318,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -30289,7 +30378,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -30328,7 +30417,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -30359,7 +30448,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30700,7 +30789,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -30944,14 +31033,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -30996,7 +31085,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31045,7 +31134,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -31125,7 +31214,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31216,7 +31305,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -31236,7 +31325,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -31300,18 +31389,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -31327,6 +31406,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -31448,7 +31535,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -31652,7 +31739,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31717,7 +31804,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -31765,7 +31852,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -31884,7 +31971,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32044,7 +32131,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32109,7 +32196,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32145,7 +32232,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32189,7 +32276,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -32301,7 +32388,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -32459,7 +32546,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -32516,7 +32603,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -32532,7 +32619,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -32606,7 +32693,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32618,7 +32705,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -32629,7 +32716,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32794,7 +32881,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -32818,9 +32905,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -32843,16 +32930,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -32873,9 +32958,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -33009,11 +33100,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -33066,12 +33160,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -33079,7 +33173,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33139,7 +33233,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -33228,7 +33322,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -33344,7 +33438,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -33387,8 +33481,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -33470,6 +33564,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -33662,7 +33758,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -33673,7 +33769,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -33831,7 +33927,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -33905,7 +34001,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -33931,9 +34027,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -33944,8 +34041,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -33967,7 +34064,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -33995,7 +34092,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -34256,11 +34353,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -34448,7 +34545,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -34486,7 +34583,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -34563,7 +34660,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -34575,19 +34672,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -34600,7 +34689,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34619,6 +34708,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -34654,7 +34760,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -34663,13 +34768,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -34680,7 +34784,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -34793,7 +34897,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -34807,20 +34911,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -34830,7 +34934,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -34838,100 +34948,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx) + 1)))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -34940,30 +35050,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -34986,7 +35096,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -35005,13 +35114,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, uint64(nIn))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -35028,7 +35139,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35087,9 +35198,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -35129,7 +35240,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -35137,11 +35248,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx) + 1)))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35216,7 +35327,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)) + 1)))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35226,7 +35337,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -35285,7 +35396,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -35314,7 +35425,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -35390,7 +35501,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -35404,7 +35515,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -35538,7 +35649,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35713,12 +35824,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -35726,15 +35866,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+4055, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4055, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -35758,9 +35898,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4080, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if *(*int32)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb + 432)) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -35774,7 +35911,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4105, libc.VaList(bp, iChild))
 		return
@@ -35848,7 +35985,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -35933,48 +36072,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4301
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4311, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4349, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4387, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -35989,29 +36135,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -36019,28 +36165,28 @@ __9:
 	pc = U32(int32(*(*U8)(unsafe.Pointer(pCellIdx)))<<8 | int32(*(*U8)(unsafe.Pointer(pCellIdx + 1))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4463,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4493, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -36048,97 +36194,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4517, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4541, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2) + 1))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -36148,48 +36294,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4566, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4603,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -36218,9 +36364,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -36252,19 +36398,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -36276,7 +36416,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -36284,7 +36424,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -36369,7 +36509,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -36412,22 +36552,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -36654,8 +36791,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -37154,7 +37291,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 	defer tls.Free(40)
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+8, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+8, ts+4918,
@@ -37166,6 +37303,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*int8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+8)).FnChar))) = int8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 8)).FnChar)
 	}
 }
 
@@ -37353,7 +37491,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -37527,16 +37664,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -37979,7 +38118,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38216,43 +38355,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -38637,7 +38767,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38652,14 +38782,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39029,7 +39159,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -39041,13 +39173,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -39124,6 +39258,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -40012,7 +40149,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -40021,7 +40158,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -40055,7 +40192,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -40097,7 +40233,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -40849,7 +40985,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -40957,7 +41093,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -41508,7 +41644,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -41573,7 +41709,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -41607,7 +41743,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41657,7 +41793,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -41803,7 +41939,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -41974,7 +42110,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42000,7 +42136,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42274,7 +42410,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42626,8 +42762,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -42637,15 +42776,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -42833,6 +42972,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -42885,7 +43025,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -42949,6 +43089,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -42960,9 +43109,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5350)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -43196,7 +43346,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -43220,8 +43370,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -43395,15 +43545,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5360, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5350, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -43514,14 +43664,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -43805,7 +43958,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -43949,7 +44102,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -44121,7 +44274,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*int8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5400, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5390, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -44176,21 +44329,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5404, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5394, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5401, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5424, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5414, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5427, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5417, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5432, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5422, 1)
 			}
 		}
 	}
@@ -44282,11 +44435,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity int8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -44417,8 +44570,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -44653,7 +44806,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -44754,594 +44906,598 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
-		goto __100
-	case OP_NotFound:
-		goto __101
-	case OP_Found:
-		goto __102
 
-	case OP_SeekRowid:
+	case OP_IfNoHope:
+		goto __100
+	case OP_NoConflict:
+		goto __101
+	case OP_NotFound:
+		goto __102
+	case OP_Found:
 		goto __103
 
-	case OP_NotExists:
+	case OP_SeekRowid:
 		goto __104
 
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -45350,56 +45506,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -45407,20 +45563,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -45428,124 +45585,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5434, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5455, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5424, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5445, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5462, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5452, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -45553,10 +45710,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -45567,9 +45724,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -45577,171 +45734,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint64(uintptr(0)+24))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -45749,95 +45906,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = int8(0)
@@ -45845,231 +46002,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -46078,95 +46235,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46176,189 +46333,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -46367,38 +46528,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -46406,9 +46567,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -46419,298 +46580,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -46720,144 +46882,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -46865,353 +47027,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len))
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = int8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5486,
+	Xsqlite3VdbeError(tls, p, ts+5476,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*int8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -47225,319 +47387,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*int8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -47545,467 +47696,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5527, 0)
+	Xsqlite3VdbeError(tls, p, ts+5517, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5578, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5568, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5600, 0)
+		ts+5590, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5654, 0)
+		ts+5644, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5709
+				return ts + 5699
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5757
+					return ts + 5747
 				}
-				return ts + 5800
+				return ts + 5790
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5841)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5831)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -48013,67 +48175,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -48084,24 +48246,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -48109,30 +48271,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -48148,22 +48310,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -48177,133 +48339,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1547
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -48311,18 +48473,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48333,92 +48495,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -48436,106 +48598,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -48544,108 +48706,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48653,14 +48815,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -48670,108 +48832,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, int8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -48790,35 +48952,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -48826,123 +48988,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -48952,52 +49114,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -49009,15 +49171,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -49025,13 +49188,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -49044,11 +49207,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -49059,38 +49222,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -49102,47 +49265,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -49151,35 +49314,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49188,51 +49351,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -49242,72 +49405,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49315,43 +49478,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49359,84 +49522,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49446,34 +49614,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -49482,10 +49650,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -49502,14 +49670,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49522,21 +49690,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49548,62 +49716,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5869)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5859)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -49616,56 +49784,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -49676,54 +49844,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -49731,72 +49899,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -49805,55 +49973,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5886
+	goto __799
+__798:
+	zSchema = ts + 5876
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5900,
+		ts+5890,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -49863,66 +50031,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -49931,151 +50099,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5943, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5933, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -50083,10 +50252,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -50106,26 +50275,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -50137,7 +50306,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -50148,170 +50317,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -50328,146 +50497,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -50475,70 +50644,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5980,
+		ts+5970,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6032
+				return ts + 6022
 			}
-			return ts + 6037
+			return ts + 6027
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -50546,17 +50715,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -50566,14 +50735,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -50583,197 +50752,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6044, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6034, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5350, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6063, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -50787,27 +50956,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -50815,72 +50984,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.Xmemset(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -50890,192 +51059,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -51084,63 +51253,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= int8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -51150,104 +51319,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -51255,52 +51424,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6079,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -51419,8 +51592,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -51440,7 +51613,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -51460,8 +51633,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -51492,8 +51665,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -51526,8 +51699,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51607,8 +51780,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51677,7 +51850,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -51705,12 +51878,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 3656
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51754,7 +51927,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51837,7 +52010,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -54376,6 +54549,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6374, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6382+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6401+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5876+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -54395,7 +54596,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -54450,7 +54650,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6374, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6434, zDb) == 0) {
 		goto __8
 	}
 
@@ -54571,7 +54771,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6379) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6439) != 0) {
 		goto __33
 	}
 	goto __14
@@ -54579,73 +54779,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -54657,28 +54875,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -54689,160 +54907,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6381, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6441, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6385, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6445, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6389, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6449, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -54851,8 +55070,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -54860,19 +55079,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -54880,81 +55099,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6398, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6458, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6429, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6489, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -54967,141 +55186,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6484, libc.VaList(bp+16, zCol))
+		ts+6544, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6519
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6579
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6528
+		zErr = ts + 6588
 	} else {
-		zErr = ts + 6543
+		zErr = ts + 6603
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6565, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6625, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6578, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6588, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -55145,15 +55364,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6595
+	var zIn uintptr = ts + 6655
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6623
+		zIn = ts + 6683
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6641
+		zIn = ts + 6701
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6659
+		zIn = ts + 6719
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6677, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6737, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55232,10 +55451,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6697
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6757
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6702
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -55282,7 +55501,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6708, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6768, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -55346,7 +55565,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6725, libc.VaList(bp, pExpr))
+								ts+6785, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -55362,7 +55581,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6789,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6849,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -55376,7 +55595,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6825, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6885, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -55399,30 +55618,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6853, libc.VaList(bp+16, pExpr))
+						ts+6913, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6896
+						zType = ts + 6956
 					} else {
-						zType = ts + 6903
+						zType = ts + 6963
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6913, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6973, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6941, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7001, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6963,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7023,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7007,
+						ts+7067,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -55494,7 +55713,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7055, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7115, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -55510,7 +55729,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7066, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7126, pExpr, pExpr)
 			}
 
 			break
@@ -55566,7 +55785,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55641,7 +55860,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7077, libc.VaList(bp, i, zType, mx))
+		ts+7137, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55661,7 +55880,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7133, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7193, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55696,7 +55915,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7167, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7227, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55753,7 +55972,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7173, libc.VaList(bp, i+1))
+				ts+7233, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -55781,7 +56000,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7234, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7294, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -55995,7 +56214,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7265, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7325, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56035,7 +56254,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7167) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7227) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56046,7 +56265,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7304) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7364) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56058,7 +56277,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7310, 0)
+						ts+7370, 0)
 					return WRC_Abort
 				}
 
@@ -56158,12 +56377,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -56199,12 +56418,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -56314,33 +56533,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) int8 {
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) int8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -56410,7 +56730,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -56745,7 +57066,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 		return
 	}
 
@@ -56820,7 +57141,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7369, libc.VaList(bp, mxHeight))
+			ts+7429, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57069,10 +57390,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7417,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7477,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7461
+						return ts + 7521
 					}
 					return ts + 1547
 				}(), nElem))
@@ -57113,7 +57434,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57139,7 +57460,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7465, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7525, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57167,7 +57488,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7499, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7559, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57214,7 +57535,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7519,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7579,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57239,7 +57560,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7562, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7622, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -57814,7 +58135,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7585,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -57937,7 +58258,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7615, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7675, libc.VaList(bp, zObject))
 	}
 }
 
@@ -57993,10 +58314,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6697) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6757) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6702) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6762) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -58427,13 +58748,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff int8) int32
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7638) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7698) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7646) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7706) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7652) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7712) == 0 {
 		return 1
 	}
 	return 0
@@ -58637,7 +58958,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7656, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7716, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -58715,7 +59036,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7703, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7763, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -58809,7 +59130,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7734
+		var zFmt uintptr = ts + 7794
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -58827,7 +59148,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	}
 }
 
@@ -58868,7 +59189,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7778, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7838, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -58898,11 +59219,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7801, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7861, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1547
 			}
-			return ts + 7820
+			return ts + 7880
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59029,7 +59350,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7832, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7892, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -59044,12 +59365,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7850, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7910, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1547
 		}
-		return ts + 7820
+		return ts + 7880
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -59070,7 +59392,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59079,7 +59401,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7871)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7931)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -59465,8 +59787,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7873, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7876,
+			if Xsqlite3_strnicmp(tls, z, ts+7933, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7936,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4925
@@ -59542,7 +59864,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7903,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7963,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -59628,8 +59950,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -59715,14 +60037,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 7933, ts + 7938, ts + 7943, ts + 6184, ts + 6179}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 7993, ts + 7998, ts + 8003, ts + 6184,
+				ts + 6179, ts + 8011}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7951
+						return ts + 8019
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -59736,7 +60060,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -59759,10 +60083,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -59862,7 +60186,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -59992,12 +60316,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -60006,110 +60331,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7903,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7963,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -60152,13 +60490,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -60168,11 +60506,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -60195,11 +60533,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -60208,15 +60546,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -60243,20 +60581,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -60265,9 +60603,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -60305,14 +60643,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7956, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8024, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -60323,17 +60663,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -60345,128 +60685,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7983, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8051, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -60474,42 +60814,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7585,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -60532,23 +60872,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -60565,42 +60905,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -60621,15 +60963,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60639,22 +60981,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -60663,21 +61005,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -60687,27 +61029,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8007, 0)
+		ts+8075, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -60716,7 +61058,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -60727,7 +61069,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]int8)(unsafe.Pointer(ts + 8057))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8125))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62102,18 +62444,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -62143,7 +62485,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -62156,12 +62498,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -62169,6 +62609,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -62183,81 +62663,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -62279,34 +62686,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -62396,7 +62802,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -62404,7 +62810,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -62455,11 +62861,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8073, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8135, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -62471,13 +62877,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8101,
+		ts+8163,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8276,
+			ts+8338,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -62487,10 +62893,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8450, libc.VaList(bp, zDb, zDb))
+		ts+8512, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8597, 0)
+			ts+8659, 0)
 	}
 }
 
@@ -62554,7 +62960,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8748, libc.VaList(bp, zName))
+		ts+8810, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -62564,7 +62970,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8807, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8869, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -62573,7 +62979,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8813, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8875, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -62614,19 +63020,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8840, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8902, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9024,
+		ts+9086,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9329, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9391, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9345,
+		ts+9407,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -62634,7 +63040,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9403, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9465, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -62646,7 +63052,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9668, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9730, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -62658,7 +63064,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9681,
+		ts+9743,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -62704,12 +63110,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9719, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9781, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9751, 0)
+			ts+9813, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -62719,11 +63125,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9778)
+				ts+9840)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9837)
+				ts+9899)
 		}
 
 		if pDflt != 0 {
@@ -62736,12 +63142,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9890)
+					ts+9952)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9936)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9998)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -62752,7 +63158,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9963,
+			ts+10025,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -62774,7 +63180,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10109,
+				ts+10171,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -62822,14 +63228,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10339, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10401, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10373, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10435, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -62857,7 +63263,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10403, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10465, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -62897,18 +63303,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10422
+		zType = ts + 10484
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10427
+		zType = ts + 10489
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10441,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10503,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10459
+					return ts + 10521
 				}
-				return ts + 10476
+				return ts + 10538
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -62992,7 +63398,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10494, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -63009,17 +63415,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10515,
+		ts+10577,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10697,
+		ts+10759,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9668, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9730, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63214,7 +63620,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -63277,10 +63683,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10828,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10890,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10851
+				return ts + 10913
 			}
 			return ts + 1547
 		}(), zWhen,
@@ -63322,8 +63728,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10853, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10915, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63340,7 +63746,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63362,7 +63768,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10861, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10923, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -63402,10 +63808,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))
 				*(*int8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = int8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10867, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10929, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*int8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10851
+							return ts + 10913
 						}
 						return ts + 1547
 					}()))
@@ -63581,8 +63987,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -63665,15 +64071,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -63701,7 +64107,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -63734,13 +64140,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63753,7 +64159,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63768,7 +64174,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -63824,8 +64230,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -63873,7 +64279,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -63941,8 +64347,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -63984,11 +64390,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.Xmemset(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.Xmemset(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -64081,8 +64487,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64100,16 +64506,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -64124,31 +64530,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -64166,8 +64572,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64193,9 +64599,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -64223,8 +64629,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -64261,7 +64667,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -64285,7 +64691,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10872, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10934, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -64366,17 +64772,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10494, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10879,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10941,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10907
+				return ts + 10969
 			}
 			return ts + 6120
 		}(),
@@ -64387,7 +64793,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10919, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10981, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -64404,10 +64810,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10967, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11029, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11088, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11150, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -64525,11 +64931,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11106},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11127},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11147},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11166},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11185}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11168},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11189},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11209},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11228},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11247}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -64563,7 +64969,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11208, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11270, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -64572,10 +64978,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11231,
+					ts+11293,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11261, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11323, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -64593,9 +64999,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11279, FzCols: ts + 11292},
-	{FzName: ts + 11305, FzCols: ts + 11318},
-	{FzName: ts + 11346},
+	{FzName: ts + 11341, FzCols: ts + 11354},
+	{FzName: ts + 11367, FzCols: ts + 11380},
+	{FzName: ts + 11408},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -64614,7 +65020,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -64693,7 +65098,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -64739,13 +65144,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -64758,11 +65163,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -64786,17 +65191,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11359}
+	FzName:     ts + 11421}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -64807,8 +65212,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -64851,7 +65256,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -64879,7 +65284,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -64946,7 +65351,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -64962,8 +65367,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -64980,9 +65385,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -64990,14 +65395,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -65005,31 +65410,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -65037,7 +65442,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11369}
+	FzName:     ts + 11431}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -65051,20 +65456,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11379,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11441,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11384, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11446, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65106,7 +65511,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+11390, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11452, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -65120,7 +65525,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11396}
+	FzName:     ts + 11458}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -65164,7 +65569,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11405, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11467, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65181,7 +65586,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11279, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11341, uint64(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -65337,7 +65742,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11415, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11477, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -65394,7 +65799,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11415, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11477, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -65441,9 +65846,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11419)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11481)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11423)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11485)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -65529,16 +65934,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1547
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*int8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -65548,15 +65953,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*int8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11427, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11489, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11438, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11500, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11448, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11510, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -65636,7 +66041,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -65650,42 +66055,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -65759,15 +66164,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -65832,11 +66237,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11305, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11367, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11460,
-			ts+11514,
+			ts+11522,
+			ts+11576,
 			zDb)
 	}
 	return rc
@@ -65883,10 +66288,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11279, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11341, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11566, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11628, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -65944,12 +66349,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6374, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6434, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -65960,13 +66365,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -65987,128 +66395,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3828)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3828)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11669, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11607, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11610,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11647, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11672,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11709, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.Xmemset(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11677, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11739, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+11706, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+11768, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -66118,89 +66549,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11774, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11836, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66254,14 +66685,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11802, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11864, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11823, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11885, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66269,7 +66700,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11849, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11911, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66311,42 +66742,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -66355,13 +66792,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -66380,7 +66817,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11871}
+	FzName:     ts + 11933}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -66393,7 +66830,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11885}
+	FzName:     ts + 11947}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -66407,7 +66844,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11899, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11961, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -66439,7 +66876,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11923,
+						ts+11985,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -66614,7 +67051,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11969, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12031, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -66640,11 +67077,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11992, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+11998, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12060, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12004, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12066, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -66691,7 +67128,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 7646
+		zCol = ts + 7706
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -66715,7 +67152,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12031, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12093, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -66940,6 +67377,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -66952,13 +67392,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -66983,25 +67423,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6374) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6434) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12046+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+12079)
+						ts+6382)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5886)
+						ts+5876)
 				}
 			}
 		}
@@ -67022,12 +67462,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5886)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12046+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5876)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+12079)
+					ts+6382)
 			}
 		}
 	}
@@ -67058,7 +67498,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12098, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12108, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67076,14 +67516,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12106
+			zMsg = ts + 12116
 		} else {
-			zMsg = ts + 12119
+			zMsg = ts + 12129
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6578, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6588, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67113,12 +67553,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
-			return ts + 12065
+	if Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
+			return ts + 6420
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12079+7) == 0 {
-			return ts + 12046
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6382+7) == 0 {
+			return ts + 6401
 		}
 	}
 	return zName
@@ -67476,7 +67916,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5886)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5876)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -67502,7 +67942,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6374, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6434, zName) {
 				goto __3
 			}
 
@@ -67555,13 +67995,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12133, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12143, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12150, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12160, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -67603,9 +68043,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8065, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6374, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12170,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12180,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -67765,9 +68205,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -67783,7 +68223,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12212, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12222, 0)
 	return
 __4:
 	;
@@ -67811,9 +68251,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10422
+			return ts + 10484
 		}
-		return ts + 8807
+		return ts + 8869
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -67829,9 +68269,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -67862,12 +68302,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12253,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12263,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10422
+				return ts + 10484
 			}
-			return ts + 8807
+			return ts + 8869
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -67882,7 +68322,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12274, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12284, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -67969,7 +68409,7 @@ var nullRow = [6]int8{int8(6), int8(0), int8(0), int8(0), int8(0), int8(0)}
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+12309, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12319, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -67993,7 +68433,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12326, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12336, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68013,7 +68453,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12309
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12319
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -68025,7 +68465,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12309, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12319, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68059,7 +68499,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12360, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68067,13 +68507,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12383, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12393, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12390, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12400, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -68110,7 +68550,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12400, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12410, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68274,10 +68714,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12426,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12436,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12471, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12481, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -68308,7 +68748,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12512, 0)
+			ts+12522, 0)
 	}
 }
 
@@ -68353,7 +68793,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12564, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12574, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -68442,7 +68882,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12605, 0)
+		ts+12615, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -68537,7 +68977,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12661, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12671, 0)
 	goto generated_done
 __2:
 	;
@@ -68550,13 +68990,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12704, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12714, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12712, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12722, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -68583,13 +69023,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12719,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12729,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -68711,12 +69158,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1547
-		zSep2 = ts + 12750
+		zSep2 = ts + 12760
 		zEnd = ts + 4950
 	} else {
-		zSep = ts + 12752
-		zSep2 = ts + 12756
-		zEnd = ts + 12761
+		zSep = ts + 12762
+		zSep2 = ts + 12766
+		zEnd = ts + 12771
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -68724,7 +69171,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12764, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12774, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*int8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = int8('(')
@@ -68762,11 +69209,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1547,
-	ts + 12778,
-	ts + 12784,
-	ts + 12789,
+	ts + 12788,
+	ts + 12794,
+	ts + 12799,
+	ts + 12804,
 	ts + 12794,
 }
 
@@ -69174,10 +69622,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12800,
+						ts+12810,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12833,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12843,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69196,11 +69644,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12860, 0)
+				ts+12870, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12910, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12920, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69234,7 +69682,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12942, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12952, 0)
 			return
 		}
 	}
@@ -69259,11 +69707,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8807
-			zType2 = ts + 12986
+			zType = ts + 8869
+			zType2 = ts + 12996
 		} else {
-			zType = ts + 10422
-			zType2 = ts + 12992
+			zType = ts + 10484
+			zType2 = ts + 13002
 		}
 
 		if pSelect != 0 {
@@ -69325,7 +69773,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -69334,11 +69782,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+12997, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13007, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13012,
+			ts+13022,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69354,13 +69802,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13110,
+					ts+13120,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13152, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13162, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -69375,7 +69823,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9329) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9391) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -69405,7 +69853,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13186, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13196, 0)
 	goto create_view_fail
 __1:
 	;
@@ -69421,7 +69869,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10422, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10484, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -69503,7 +69951,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13222, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13232, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -69531,8 +69979,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, int8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -69629,13 +70076,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13252, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13262, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13267,
+		ts+13277,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -69676,10 +70123,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13334, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13344, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11231,
+				ts+11293,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -69711,12 +70158,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13348,
+			ts+13358,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13393,
+		ts+13403,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -69744,11 +70191,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7066, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7126, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -69826,9 +70273,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -69887,21 +70334,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13460, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13470, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13488, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13498, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13522, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13532, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -69913,7 +70360,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11423, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11485, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -69977,7 +70424,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13554,
+		ts+13564,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -69989,7 +70436,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13617, 0)
+		ts+13627, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70074,7 +70521,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13711,
+		ts+13721,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -70301,12 +70748,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13757,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13767,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13785
+							return ts + 13795
 						}
-						return ts + 13791
+						return ts + 13801
 					}()))
 				return 1
 			}
@@ -70427,7 +70874,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13796, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13806, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -70446,7 +70893,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13802,
+		ts+13812,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -70472,26 +70919,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13852, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13880, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13890, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13905, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13915, 0)
 	goto exit_create_index
 __17:
 	;
@@ -70505,7 +70952,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13796, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13806, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -70520,7 +70967,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13939, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13949, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -70532,7 +70979,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13973, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13983, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -70561,7 +71008,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+13997, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14007, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -70582,9 +71029,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -70623,7 +71070,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13796)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13806)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -70724,7 +71171,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14020, 0)
+		ts+14030, 0)
 	goto exit_create_index
 __56:
 	;
@@ -70941,7 +71388,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14081, libc.VaList(bp+48, 0))
+		ts+14091, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -70993,8 +71440,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14123, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14133, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -71040,12 +71487,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14140,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14150,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1547
 			}
-			return ts + 14160
+			return ts + 14170
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71053,7 +71500,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14168,
+		ts+14178,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -71067,7 +71514,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14227, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14237, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71228,7 +71675,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14254, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14264, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71243,7 +71690,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14272, libc.VaList(bp+8, 0))
+		ts+14282, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71254,9 +71701,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71282,9 +71729,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14345,
+		ts+14355,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11419, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11481, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -71419,7 +71866,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14405,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14415,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -71627,12 +72074,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14441,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14451,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14477
+				return ts + 14487
 			}
-			return ts + 14480
+			return ts + 14490
 		}()))
 	goto append_from_error
 __1:
@@ -71801,7 +72248,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14486, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14496, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -71837,9 +72284,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14492
+				return ts + 14502
 			}
-			return ts + 14501
+			return ts + 14511
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -71864,7 +72311,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14486, ts + 14508, ts + 14492}
+var az = [3]uintptr{ts + 14496, ts + 14518, ts + 14502}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -71879,7 +72326,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14516, 0)
+				ts+14526, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72016,14 +72463,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14586, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14596, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14597, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14607, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
@@ -72049,11 +72496,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14600, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14610, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72183,7 +72630,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14609, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14619, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72279,7 +72726,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14655, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14665, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -72472,7 +72919,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14685, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14695, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -72752,7 +73199,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14716,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14726,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -72784,11 +73231,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14749, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14759, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14778, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14788, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -73292,7 +73739,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14816)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14826)
 __62:
 	;
 delete_from_cleanup:
@@ -73407,7 +73854,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11279) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11341) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -73637,7 +74084,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6184, ts + 6179, ts + 7938, ts + 7933, ts + 6174}
+var azType2 = [5]uintptr{ts + 6184, ts + 6179, ts + 7998, ts + 7993, ts + 6174}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -73696,7 +74143,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14829, -1)
+					Xsqlite3_result_error(tls, context, ts+14839, -1)
 					return
 				}
 				iVal = -iVal
@@ -74000,7 +74447,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14846, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14856, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74346,7 +74793,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14851, -1)
+		Xsqlite3_result_error(tls, context, ts+14861, -1)
 		return
 	}
 	if argc == 3 {
@@ -74356,7 +74803,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14884, -1)
+				ts+14894, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -74455,7 +74902,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14929, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14939, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -74470,21 +74917,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = int8('\'')
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = int8(0)
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = int8('\'')
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = int8(0)
 				*(*int8)(unsafe.Pointer(zText)) = int8('X')
 				*(*int8)(unsafe.Pointer(zText + 1)) = int8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -74492,7 +74939,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14936, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14946, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -74606,6 +75053,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1547
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -74808,7 +75368,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10851}
+var azOne = [1]uintptr{ts + 10913}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -74844,7 +75404,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(j))) = int8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14939, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14949, 4, uintptr(0))
 	}
 }
 
@@ -74869,7 +75429,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12031, -1)
+		Xsqlite3_result_error(tls, context, ts+12093, -1)
 		return
 	}
 
@@ -74947,7 +75507,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14829, -1)
+			Xsqlite3_result_error(tls, context, ts+14839, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75209,7 +75769,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14944, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14954, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75229,14 +75789,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14950, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14960, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14950, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14960, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14950, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14950, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14960, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14960, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -75366,17 +75926,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -75435,6 +75995,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -75475,108 +76036,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14955},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14975},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14988},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15006},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15015},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15023},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15023},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15038},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15064},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15089},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15098},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15109},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15116},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15130},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15130},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15136},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15136},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15142},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15142},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15147},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15147},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15147},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15151},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15151},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15151},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15155},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15162},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15170},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15177},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15183},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15190},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15197},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15205},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15210},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14965},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14985},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14998},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15016},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15025},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15033},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15033},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15048},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15074},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15099},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15108},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15119},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15126},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15140},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15140},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15146},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15146},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15152},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15152},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15157},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15157},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15157},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15161},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15161},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15161},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15165},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15180},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15187},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15193},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15200},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15207},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15215},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15220},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15226},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15232},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15236},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15261},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15268},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15283},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15300},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15311},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15317},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15335},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15343},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15357},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15365},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15374},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15374},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15391},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15395},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15401},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15405},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15405},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15224},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15224},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15230},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15236},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15242},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15252},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15259},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15266},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15277},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15284},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15299},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15316},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15327},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15333},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15351},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15359},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15373},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15390},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15390},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15407},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15411},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15411},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15424},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14950},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14950},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6519},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15429},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15434},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15442},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15448},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15454},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15457},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15461},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15467},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15457},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15472},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15476},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15480},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15486},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15490},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15495},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15500},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15505},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15417},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15421},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15421},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15427},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15427},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15440},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14960},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14960},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6579},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6579},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15445},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15450},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15458},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15464},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15470},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15473},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15483},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15473},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15488},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15492},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15496},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15506},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15511},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15515},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15523},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15528},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15533},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15538},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15516},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15521},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15527},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15531},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15539},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15544},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15550},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15556},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15561},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15569},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15577},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15580},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6519},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15585}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15549},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15554},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15560},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15566},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15572},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15577},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15585},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15593},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15596},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6579},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15601}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -75697,7 +76260,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15589,
+				ts+15605,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -76357,8 +76920,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6385, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6381, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6445, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6441, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -76858,7 +77421,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7903, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77326,7 +77889,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15634,
+		ts+15650,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77351,7 +77914,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15675,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15691,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -77500,7 +78063,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15707,
+		ts+15723,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -77510,7 +78073,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15759, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15775, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -77562,7 +78125,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15784,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15800,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -77570,7 +78133,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15830, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15846, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -77982,7 +78545,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15851)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15867)
 __125:
 	;
 insert_cleanup:
@@ -78298,8 +78861,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 							onError, iReg)
 						Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -79388,7 +79952,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -79834,6 +80398,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -79872,7 +80437,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12031, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12093, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -79881,7 +80446,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15865
+		zEntry = ts + 15881
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -79896,7 +80461,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11992, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -79932,7 +80497,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15888, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15904, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -79946,7 +80511,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15897, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15913, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -79970,7 +80535,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15901, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15917, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -79988,7 +80553,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15907, libc.VaList(bp+16, zEntry, zFile))
+		ts+15923, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80015,7 +80580,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15950, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15966, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80053,7 +80618,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15982, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+15998, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80063,7 +80628,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16019,
+	ts + 16035,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80219,7 +80784,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16022, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16038, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80228,62 +80793,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5050,
-	ts + 16061,
-	ts + 8807,
-	ts + 16065,
-	ts + 16070,
-	ts + 16073,
-	ts + 16083,
-	ts + 16093,
+	ts + 16077,
+	ts + 8869,
+	ts + 16081,
+	ts + 16086,
+	ts + 16089,
 	ts + 16099,
-	ts + 16103,
-	ts + 16108,
-	ts + 16113,
-	ts + 16121,
-	ts + 16132,
-	ts + 16135,
-	ts + 16142,
-	ts + 16103,
-	ts + 16108,
-	ts + 16149,
-	ts + 16154,
-	ts + 16157,
-	ts + 16164,
-	ts + 16099,
-	ts + 16103,
+	ts + 16109,
+	ts + 16115,
+	ts + 16119,
+	ts + 16124,
+	ts + 16129,
+	ts + 16137,
+	ts + 16148,
+	ts + 16151,
+	ts + 16158,
+	ts + 16119,
+	ts + 16124,
+	ts + 16165,
 	ts + 16170,
-	ts + 16175,
+	ts + 16173,
 	ts + 16180,
-	ts + 16103,
-	ts + 16184,
-	ts + 16108,
-	ts + 16192,
+	ts + 16115,
+	ts + 16119,
+	ts + 16186,
+	ts + 16191,
 	ts + 16196,
-	ts + 16201,
-	ts + 11423,
-	ts + 11419,
-	ts + 16207,
+	ts + 16119,
+	ts + 16200,
+	ts + 16124,
+	ts + 16208,
 	ts + 16212,
 	ts + 16217,
-	ts + 16061,
-	ts + 16103,
-	ts + 16222,
-	ts + 16229,
-	ts + 16236,
-	ts + 8807,
-	ts + 16244,
-	ts + 5053,
-	ts + 16250,
-	ts + 16061,
-	ts + 16103,
-	ts + 16255,
+	ts + 11485,
+	ts + 11481,
+	ts + 16223,
+	ts + 16228,
+	ts + 16233,
+	ts + 16077,
+	ts + 16119,
+	ts + 16238,
+	ts + 16245,
+	ts + 16252,
+	ts + 8869,
 	ts + 16260,
-	ts + 15457,
-	ts + 16265,
-	ts + 16278,
-	ts + 16287,
+	ts + 5053,
+	ts + 16266,
+	ts + 16077,
+	ts + 16119,
+	ts + 16271,
+	ts + 16276,
+	ts + 15473,
+	ts + 16281,
 	ts + 16294,
-	ts + 16305,
+	ts + 16303,
+	ts + 16310,
+	ts + 16321,
 }
 
 // Definitions of all built-in pragmas
@@ -80301,238 +80866,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16313,
+	{FzName: ts + 16329,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16328,
+	{FzName: ts + 16344,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16343,
+	{FzName: ts + 16359,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16355,
+	{FzName: ts + 16371,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16371,
+	{FzName: ts + 16387,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16294,
+	{FzName: ts + 16310,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16384,
+	{FzName: ts + 16400,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16396,
+	{FzName: ts + 16412,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16416,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16432,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16448,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16453,
+	{FzName: ts + 16469,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16468,
+	{FzName: ts + 16484,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16484,
+	{FzName: ts + 16500,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16498,
+	{FzName: ts + 16514,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16511,
+	{FzName: ts + 16527,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16525,
+	{FzName: ts + 16541,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16544,
+	{FzName: ts + 16560,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16563,
+	{FzName: ts + 16579,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16586,
+	{FzName: ts + 16602,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16595,
+	{FzName: ts + 16611,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16613,
+	{FzName: ts + 16629,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16630,
+	{FzName: ts + 16646,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16643,
+	{FzName: ts + 16659,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16658,
+	{FzName: ts + 16674,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16676,
+	{FzName: ts + 16692,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16686,
+	{FzName: ts + 16702,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16700,
+	{FzName: ts + 16716,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16716,
+	{FzName: ts + 16732,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16741,
+	{FzName: ts + 16757,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16760,
+	{FzName: ts + 16776,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16771,
+	{FzName: ts + 16787,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16782,
+	{FzName: ts + 16798,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16794,
+	{FzName: ts + 16810,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16810,
+	{FzName: ts + 16826,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16823,
+	{FzName: ts + 16839,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16842,
+	{FzName: ts + 16858,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16861,
+	{FzName: ts + 16877,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16874,
+	{FzName: ts + 16890,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16889,
+	{FzName: ts + 16905,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16899,
+	{FzName: ts + 16915,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16911,
+	{FzName: ts + 16927,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16920,
+	{FzName: ts + 16936,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16931,
+	{FzName: ts + 16947,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16941,
+	{FzName: ts + 16957,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16953,
+	{FzName: ts + 16969,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16964,
+	{FzName: ts + 16980,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16992,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 16993,
+	{FzName: ts + 17009,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17012,
+	{FzName: ts + 17028,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17038,
+	{FzName: ts + 17054,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17053,
+	{FzName: ts + 17069,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17067,
+	{FzName: ts + 17083,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17086,
+	{FzName: ts + 17102,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17100,
+	{FzName: ts + 17116,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17116,
+	{FzName: ts + 17132,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17128,
+	{FzName: ts + 17144,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17139,
+	{FzName: ts + 17155,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17150,
+	{FzName: ts + 17166,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17162,
+	{FzName: ts + 17178,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17189,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17194,
+	{FzName: ts + 17210,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17202,
+	{FzName: ts + 17218,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17217,
+	{FzName: ts + 17233,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17230,
+	{FzName: ts + 17246,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17249,
+	{FzName: ts + 17265,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17264,
+	{FzName: ts + 17280,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -80554,7 +81119,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17280))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17296))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -80566,10 +81131,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17305) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17321) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17315) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17331) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -80578,13 +81143,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7951) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8019) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17327) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17343) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -80599,9 +81164,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*int8)(unsafe.Pointer(z))) >= '0' && int32(*(*int8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*int8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16255) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16271) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17339) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17355) == 0 {
 		return 2
 	} else {
 		return 0
@@ -80615,7 +81180,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17346, 0)
+				ts+17362, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -80706,19 +81271,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17408
+		zName = ts + 17424
 		break
 	case OE_SetDflt:
-		zName = ts + 17417
+		zName = ts + 17433
 		break
 	case OE_Cascade:
-		zName = ts + 17429
+		zName = ts + 17445
 		break
 	case OE_Restrict:
-		zName = ts + 17437
+		zName = ts + 17453
 		break
 	default:
-		zName = ts + 17446
+		zName = ts + 17462
 		break
 	}
 	return zName
@@ -80735,7 +81300,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17456, ts + 17463, ts + 17471, ts + 17475, ts + 17339, ts + 17484,
+	ts + 17472, ts + 17479, ts + 17487, ts + 17491, ts + 17355, ts + 17500,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -80782,13 +81347,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17488
+			zType = ts + 17504
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17490
+			zType = ts + 17506
 		} else {
-			zType = ts + 7461
+			zType = ts + 7521
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17492,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17508,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -80796,7 +81361,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17499, ts + 17504, ts + 17512}
+var azEnc = [4]uintptr{uintptr(0), ts + 17515, ts + 17520, ts + 17528}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -80947,14 +81512,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -81041,7 +81608,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17520, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17536, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81302,7 +81869,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17524) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17540) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81374,7 +81941,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17315
+	zRet = ts + 17331
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -81412,7 +81979,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17305
+	zRet = ts + 17321
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -81699,7 +82266,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17529, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17545, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -81740,7 +82307,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17554, 0)
+		ts+17570, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -81794,7 +82361,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17607) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17623) == 0) {
 		goto __142
 	}
 
@@ -81891,9 +82458,9 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17613
+			return ts + 17629
 		}
-		return ts + 17621
+		return ts + 17637
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -81962,7 +82529,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17628, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17644, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82008,29 +82575,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10422
+	zType = ts + 10484
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12704
+	zType = ts + 12714
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17644
+	zType = ts + 17660
 	goto __183
 __182:
-	zType = ts + 8807
+	zType = ts + 8869
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17651,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17667,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82096,7 +82663,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82106,7 +82673,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17663,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17679,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -82143,8 +82710,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17668, ts + 17670, ts + 16132}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17672,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17684, ts + 17686, ts + 16148}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17688,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82177,7 +82744,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17678,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17694,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -82199,7 +82766,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17682, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17698, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82263,7 +82830,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7461, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82279,7 +82846,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7461, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -82314,7 +82881,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82322,7 +82889,7 @@ __226:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+17694))
+			ts+17710))
 	goto __227
 __227:
 	j2++
@@ -82511,7 +83078,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17699, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17715, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 600)))
@@ -82728,7 +83295,7 @@ __284:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17703, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17719, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -82789,262 +83356,284 @@ __299:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 612)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__300:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __301
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __300
+	}
+	mxCol = -1
+	j4 = 0
+__302:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __304
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __305
+	}
+	mxCol++
+__305:
+	;
+	goto __303
+__303:
+	j4++
+	goto __302
+	goto __304
+__304:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __306
 	}
 	mxCol--
-	goto __300
+__306:
+	;
+	goto __301
+__300:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __301:
 	;
 	if !(mxCol >= 0) {
-		goto __302
+		goto __307
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__302:
+__307:
 	;
 	if !!(isQuick != 0) {
-		goto __303
+		goto __308
 	}
 	if !(pPk1 != 0) {
-		goto __304
+		goto __309
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 612)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17727,
+		ts+17743,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__305:
+__310:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __307
+		goto __312
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 612)), j4, r2+j4)
-	goto __306
-__306:
+	goto __311
+__311:
 	j4++
-	goto __305
-	goto __307
-__307:
+	goto __310
+	goto __312
+__312:
 	;
-__304:
+__309:
 	;
-__303:
+__308:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__308:
+__313:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __310
+		goto __315
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __311
+		goto __316
 	}
-	goto __309
-__311:
+	goto __314
+__316:
 	;
 	if !(bStrict != 0) {
-		goto __312
+		goto __317
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __313
-__312:
+	goto __318
+__317:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__313:
+__318:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __314
+		goto __319
 	}
-	goto __309
-__314:
+	goto __314
+__319:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __316
-__315:
+	goto __321
+__320:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __317
+		goto __322
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 624)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		uint8((*Column)(unsafe.Pointer(pCol1)).Faffinity), bp+624)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 624)) != 0) {
-		goto __318
+		goto __323
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
-__318:
+__323:
 	;
-__317:
+__322:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 612))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __319
+		goto __324
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __320
-__319:
+	goto __325
+__324:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__320:
+__325:
 	;
-__316:
+__321:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __321
+		goto __326
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17763, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17779, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __323
-__322:
+	goto __328
+__327:
 	;
-__323:
+__328:
 	;
-__321:
+__326:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __324
+		goto __329
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17783,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17799,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __325
-__324:
+	goto __330
+__329:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __326
+		goto __331
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17805,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17821,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __327
-__326:
+	goto __332
+__331:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __328
+		goto __333
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
-__329:
+__334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17828, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17844, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17830,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17846,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__328:
+__333:
 	;
-__327:
+__332:
 	;
-__325:
+__330:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __309
-__309:
+	goto __314
+__314:
 	j4++
-	goto __308
-	goto __310
-__310:
+	goto __313
+	goto __315
+__315:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __330
+		goto __335
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __331
+		goto __336
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 612)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__332:
+__337:
 	if !(k3 > 0) {
-		goto __334
+		goto __339
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __333
-__333:
+	goto __338
+__338:
 	k3--
-	goto __332
-	goto __334
-__334:
+	goto __337
+	goto __339
+__339:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17850,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17866,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__331:
+__336:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__330:
+__335:
 	;
 	if !!(isQuick != 0) {
-		goto __335
+		goto __340
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__336:
+__341:
 	if !(pIdx5 != 0) {
-		goto __338
+		goto __343
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __339
+		goto __344
 	}
-	goto __337
-__339:
+	goto __342
+__344:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 612)), 0, 0, bp+632,
 		pPrior, r1)
@@ -83053,80 +83642,119 @@ __339:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 616))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17880)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17885)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17901)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__345:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __347
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __348
+	}
+	goto __346
+__348:
+	;
+	if !(label6 == 0) {
+		goto __349
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__349:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 616))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	if !(label6 != 0) {
+		goto __350
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17922)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__350:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __340
+		goto __351
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__341:
+__352:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __343
+		goto __354
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __344
+		goto __355
 	}
-	goto __342
-__344:
+	goto __353
+__355:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17949)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__351:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
 	goto __342
 __342:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __341
 	goto __343
 __343:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17906)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __340:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
-	goto __337
-__337:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __336
-	goto __338
-__338:
-	;
-__335:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __345
+		goto __356
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17933)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17976)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__346:
+__357:
 	if !(pIdx5 != 0) {
-		goto __348
+		goto __359
 	}
 	if !(pPk1 == pIdx5) {
-		goto __349
+		goto __360
 	}
-	goto __347
-__349:
+	goto __358
+__360:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83135,21 +83763,21 @@ __349:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __347
-__347:
+	goto __358
+__358:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __346
-	goto __348
-__348:
+	goto __357
+	goto __359
+__359:
 	;
 	if !(pPk1 != 0) {
-		goto __350
+		goto __361
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__350:
+__361:
 	;
-__345:
+__356:
 	;
 	goto __291
 __291:
@@ -83167,14 +83795,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __351
+		goto __362
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 608))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 17962
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18005
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__351:
+__362:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83182,27 +83810,27 @@ __351:
 
 __45:
 	if !!(zRight != 0) {
-		goto __352
+		goto __363
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __354
+		goto __365
 	}
 	goto pragma_out
-__354:
+__365:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __353
-__352:
+	goto __364
+__363:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __355
+		goto __366
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__356:
+__367:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __358
+		goto __369
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __359
+		goto __370
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83211,25 +83839,25 @@ __356:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __358
-__359:
+	goto __369
+__370:
 	;
-	goto __357
-__357:
+	goto __368
+__368:
 	pEnc += 16
-	goto __356
-	goto __358
-__358:
+	goto __367
+	goto __369
+__369:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __360
+		goto __371
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17965, libc.VaList(bp+456, zRight))
-__360:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18008, libc.VaList(bp+456, zRight))
+__371:
 	;
-__355:
+__366:
 	;
-__353:
+__364:
 	;
 	goto __15
 
@@ -83237,15 +83865,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __361
+		goto __372
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __363
+		goto __374
 	}
 	goto __15
-__363:
+__374:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -83253,41 +83881,41 @@ __363:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __364
+		goto __375
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__364:
+__375:
 	;
-	goto __362
-__361:
+	goto __373
+__372:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __365
+		goto __376
 	}
 	goto __15
-__365:
+__376:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__362:
+__373:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__366:
+__377:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __366
-__367:
+	goto __377
+__378:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83302,31 +83930,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17322) == 0) {
-		goto __369
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17338) == 0) {
+		goto __380
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __370
-__369:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17990) == 0) {
-		goto __371
+	goto __381
+__380:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18033) == 0) {
+		goto __382
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __372
-__371:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17475) == 0) {
-		goto __373
+	goto __383
+__382:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17491) == 0) {
+		goto __384
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__373:
+__384:
 	;
-__372:
+__383:
 	;
-__370:
+__381:
 	;
-__368:
+__379:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83336,10 +83964,10 @@ __368:
 
 __49:
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__374:
+__385:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83359,19 +83987,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __377
+		goto __388
 	}
 	goto __15
-__377:
+__388:
 	;
-	goto __376
-__375:
+	goto __387
+__386:
 	opMask = U32(0xfffe)
-__376:
+__387:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -83380,86 +84008,86 @@ __376:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__378:
+__389:
 	if !(iDb <= iDbLast) {
-		goto __380
+		goto __391
 	}
 	if !(iDb == 1) {
-		goto __381
+		goto __392
 	}
-	goto __379
-__381:
+	goto __390
+__392:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__382:
+__393:
 	if !(k4 != 0) {
-		goto __384
+		goto __395
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __385
+		goto __396
 	}
-	goto __383
-__385:
+	goto __394
+__396:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__386:
+__397:
 	if !(pIdx6 != 0) {
-		goto __388
+		goto __399
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __389
+		goto __400
 	}
 	szThreshold = int16(0)
-	goto __388
-__389:
+	goto __399
+__400:
 	;
-	goto __387
-__387:
+	goto __398
+__398:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __386
-	goto __388
-__388:
+	goto __397
+	goto __399
+__399:
 	;
 	if !(szThreshold != 0) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__390:
+__401:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+17998,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18041,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __391
+		goto __402
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __392
-__391:
+	goto __403
+__402:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__392:
+__403:
 	;
-	goto __383
-__383:
+	goto __394
+__394:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __382
-	goto __384
-__384:
+	goto __393
+	goto __395
+__395:
 	;
-	goto __379
-__379:
+	goto __390
+__390:
 	iDb++
-	goto __378
-	goto __380
-__380:
+	goto __389
+	goto __391
+__391:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -83467,36 +84095,36 @@ __380:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __393
+		goto __404
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__393:
+__404:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __394
+		goto __405
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__394:
+__405:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __395
+		goto __406
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 648)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__396:
+__407:
 	;
-__395:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -83505,10 +84133,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__397:
+__408:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -83517,10 +84145,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __398
+		goto __409
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__398:
+__409:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -83528,10 +84156,10 @@ __398:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __399
+		goto __410
 	}
 
-__399:
+__410:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -83583,14 +84211,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18016, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18021, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18027, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18036, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18045, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18053, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18061},
-	{FzName: ts + 18068},
+	{FzName: ts + 18059, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18064, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18070, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18079, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18088, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18096, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18104},
+	{FzName: ts + 18111},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -83642,7 +84270,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18074)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18117)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -83650,7 +84278,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18089, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18132, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -83663,16 +84291,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18096, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18102)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18145)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18114)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18157)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4950, 1)
@@ -83855,13 +84483,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18129)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18172)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18137, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18180, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18141, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18184, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -83938,12 +84566,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18145, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18188, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -83952,19 +84580,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5001
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18173, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18216, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18204, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18247, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18212,
-	ts + 18219,
-	ts + 18231,
+	ts + 18255,
+	ts + 18262,
+	ts + 18274,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84024,7 +84652,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14123)
+				corruptSchema(tls, pData, argv, ts+14133)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -84056,13 +84684,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18242)
+			corruptSchema(tls, pData, argv, ts+18285)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14123)
+				corruptSchema(tls, pData, argv, ts+14133)
 			}
 		}
 	}
@@ -84095,16 +84723,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8807
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8869
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7871
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18255
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7931
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18298
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -84182,17 +84810,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11706)
+		ts+11768)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -84201,44 +84838,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18327)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18370)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18351,
+		ts+18394,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -84249,57 +84886,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -84388,8 +85025,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -84502,8 +85141,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -84514,8 +85153,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -84527,8 +85166,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -84568,7 +85207,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18385, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18428, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -84598,7 +85237,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18415, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18458, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -84694,7 +85333,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -84793,7 +85432,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85111,8 +85750,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10851
-		var zSp2 uintptr = ts + 10851
+		var zSp1 uintptr = ts + 10913
+		var zSp2 uintptr = ts + 10913
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85120,13 +85759,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18434, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18477, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18464))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18507))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85301,7 +85940,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18498, libc.VaList(bp, 0))
+					ts+18541, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85346,7 +85985,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18548, libc.VaList(bp+8, zName))
+						ts+18591, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85357,7 +85996,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18612,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18655,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -85401,7 +86040,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6519, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6579, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -85748,9 +86387,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -85988,16 +86624,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18649
+		z = ts + 18692
 		break
 	case TK_INTERSECT:
-		z = ts + 18659
+		z = ts + 18702
 		break
 	case TK_EXCEPT:
-		z = ts + 18669
+		z = ts + 18712
 		break
 	default:
-		z = ts + 18676
+		z = ts + 18719
 		break
 	}
 	return z
@@ -86007,10 +86643,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18682, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18725, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -86030,6 +86669,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18748, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18779
+		}
+		return ts + 1547
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -86096,6 +86742,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -86160,6 +86807,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -86214,7 +86862,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16244
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16260
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -86353,13 +87001,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16244
+				zCol = ts + 16260
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -86367,7 +87015,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18705, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -86432,7 +87080,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -86457,7 +87105,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16244
+					zName = ts + 16260
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -86467,7 +87115,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18705, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -86483,7 +87131,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18714, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18803, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -86508,45 +87157,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -86556,14 +87208,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18811
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -86573,9 +87257,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -86619,7 +87300,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -86770,7 +87451,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18722, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18815, 0)
 	return
 __1:
 	;
@@ -86861,7 +87542,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18771, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18864, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -86881,7 +87562,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18813, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18906, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -86918,7 +87599,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18819, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18912, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -86952,11 +87633,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18834, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18927, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1547
 		}
-		return ts + 18857
+		return ts + 18950
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87057,8 +87738,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18859, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18874, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18952, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18967, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87105,7 +87786,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18649, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18692, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87172,7 +87853,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18893, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18986, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -87234,7 +87915,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18893, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18986, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -87387,10 +88068,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18914, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19007, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18960,
+			ts+19053,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -87644,8 +88325,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7167)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7167)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7227)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7227)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -87672,13 +88353,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19042, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19135, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19053, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19146, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -87690,7 +88371,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19058, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19151, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88105,6 +88786,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff int8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -88224,15 +88924,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff int8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -88608,16 +89301,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -88677,12 +89387,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15147) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15157) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15151) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15161) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -88748,7 +89458,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19064, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19157, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -88831,7 +89541,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19082, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19175, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -88960,15 +89670,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19105, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19198, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -88986,7 +89693,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19125, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19218, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89002,7 +89709,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19168
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19261
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -89028,7 +89735,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19191,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19284,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -89039,9 +89746,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19229
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19322
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19263
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19356
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89088,7 +89795,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19301, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19394, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89200,7 +89907,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19305,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19398,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89219,7 +89926,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19344,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19437,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -89227,7 +89934,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14716,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14726,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -89328,7 +90035,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6379
+							zSchemaName = ts + 6439
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -89343,7 +90050,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19375, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19468, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -89408,7 +90115,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19380,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19473,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -89420,7 +90127,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -89439,9 +90146,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19389, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19482, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19407, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19500, 0)
 					}
 				}
 			}
@@ -89451,7 +90158,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19427, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19520, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -89510,11 +90217,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, int8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -89573,6 +90276,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -89588,7 +90366,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -89601,13 +90380,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19458, 0)
+					ts+19551, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19509, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19602, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -89615,7 +90394,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -89635,19 +90414,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -89661,6 +90443,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -89735,7 +90520,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -89747,7 +90534,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -89765,13 +90552,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -89788,11 +90575,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19542,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19635,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19554
+						return ts + 19647
 					}
 					return ts + 1547
 				}(),
@@ -89813,7 +90600,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7871)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7931)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -89845,14 +90632,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -89906,6 +90694,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -89970,7 +90809,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -90069,7 +90907,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19577,
+		ts+19670,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90130,7 +90968,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19631,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19724,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -90244,7 +91082,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -90261,11 +91099,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -90276,7 +91110,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19671, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19764, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -90302,7 +91136,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -90334,11 +91168,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19686, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19779, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -90372,7 +91204,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -90681,12 +91513,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -90715,39 +91546,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -90758,24 +91565,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -90808,27 +91615,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19702
+				return ts + 19795
 			}
-			return ts + 19711
+			return ts + 19804
 		}())
 
 	groupBySort = 1
@@ -90836,47 +91650,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -90892,45 +91706,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -90949,16 +91769,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -90989,16 +91809,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -91011,98 +91831,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -91111,79 +91934,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19702)
-__148:
+	explainTempTable(tls, pParse, ts+19795)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19720
-			}
-			return ts + 19743
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -91280,7 +92098,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19752, 0)
+		ts+19813, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -91513,7 +92331,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19817, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19878, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -91557,7 +92375,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19863, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19924, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -91575,7 +92393,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19932, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -91587,7 +92405,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19863, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19924, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -91602,7 +92420,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19912, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19973, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -91614,22 +92432,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19938, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19999, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19976,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20037,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20013
+				return ts + 20074
 			}
-			return ts + 20020
+			return ts + 20081
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -91638,7 +92456,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20026, libc.VaList(bp+24, pTableName+8))
+		ts+20087, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -91667,9 +92485,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -91787,7 +92605,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19863, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19924, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -91820,7 +92638,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20072,
+		ts+20133,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -91845,13 +92663,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20120,
+		ts+20181,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20195, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20256, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92107,7 +92925,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20224, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20285, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92146,9 +92964,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12079
+				return ts + 6382
 			}
-			return ts + 5886
+			return ts + 5876
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92160,7 +92978,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20244,
+			ts+20305,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -92274,12 +93092,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20306,
+		ts+20367,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20354
+				return ts + 20415
 			}
-			return ts + 20361
+			return ts + 20422
 		}()))
 __15:
 	;
@@ -92393,7 +93211,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20368, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20429, 0)
 	return 1
 }
 
@@ -92576,8 +93394,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -92610,8 +93428,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -92623,13 +93441,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20410, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20471, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -92945,7 +93763,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -93215,7 +94034,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20424,
+		ts+20485,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -93247,7 +94066,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20460, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20521, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -93257,7 +94076,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7646
+				return ts + 7706
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -94127,7 +94946,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20479)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20540)
 __169:
 	;
 update_cleanup:
@@ -94433,10 +95252,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*int8)(unsafe.Pointer(bp + 216)) = int8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20492, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20553, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20496, libc.VaList(bp+8, bp+216))
+				ts+20557, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -94527,7 +95346,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12133, -1)
+				ts+12143, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -94559,7 +95378,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20569, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20573, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20630, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20634, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -94707,14 +95526,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20577)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20638)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20617)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20678)
 	return SQLITE_ERROR
 __2:
 	;
@@ -94725,7 +95544,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20660)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20721)
 	return SQLITE_ERROR
 __5:
 	;
@@ -94753,7 +95572,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20678, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20739, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -94773,7 +95592,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20701)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20762)
 	goto end_of_vacuum
 __8:
 	;
@@ -94788,7 +95607,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14486)
+	rc = execSql(tls, db, pzErrMsg, ts+14496)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -94833,7 +95652,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20728,
+		ts+20789,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -94842,7 +95661,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20836,
+		ts+20897,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -94853,7 +95672,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20890,
+		ts+20951,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -94864,7 +95683,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21041,
+		ts+21102,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95086,12 +95905,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -95209,7 +96028,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12360, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -95293,11 +96112,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21171, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21232, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21195,
+			ts+21256,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -95307,7 +96126,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21294, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21355, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -95341,7 +96160,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -95368,7 +96187,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21313, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21374, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -95406,7 +96225,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21355, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21416, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -95418,7 +96237,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21385
+			var zFormat uintptr = ts + 21446
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -95435,7 +96254,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16135, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16151, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -95492,7 +96311,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21431, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21492, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -95550,7 +96369,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21431, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21492, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -95570,8 +96389,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -95584,7 +96403,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96037,7 +96856,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -96064,7 +96883,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -96295,10 +97114,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21450
+		return ts + 21511
 	}
 	if i == -1 {
-		return ts + 16244
+		return ts + 16260
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -96307,15 +97126,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21457, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21518, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21463, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12750, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -96326,11 +97145,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21463, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12750, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5001, 1)
 	}
@@ -96352,27 +97171,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21465, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21526, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21457, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21518, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21468
+				return ts + 21529
 			}
-			return ts + 21473
+			return ts + 21534
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21481)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21542)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21483)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21544)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4950, 1)
 }
@@ -96415,11 +97234,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21485, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21546, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21491
+				return ts + 21552
 			}
-			return ts + 21498
+			return ts + 21559
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -96429,43 +97248,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10907
+					zFmt = ts + 10969
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21503
+				zFmt = ts + 21564
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21536
+				zFmt = ts + 21597
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21561
+				zFmt = ts + 21622
 			} else {
-				zFmt = ts + 21579
+				zFmt = ts + 21640
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21588, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21649, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp int8
-			var zRowid uintptr = ts + 16244
-			Xsqlite3_str_appendf(tls, bp+64, ts+21596, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16260
+			Xsqlite3_str_appendf(tls, bp+64, ts+21657, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = int8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21627, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21688, libc.VaList(bp+32, zRowid))
 				cRangeOp = int8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = int8('>')
 			} else {
 				cRangeOp = int8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21637, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21698, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21642,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21703,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21669, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21730, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -96497,28 +97316,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21680, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21741, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21468, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21701, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21762, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21457, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21518, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21468, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4950, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -96579,52 +97399,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -98102,7 +98928,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21709, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21770, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98130,7 +98956,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21724, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21785, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -98648,7 +99474,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21733, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21794, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99006,10 +99832,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16093, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15424, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14950, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21747, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16109, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15440, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14960, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21808, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -99386,49 +100212,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -99436,13 +100251,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -99507,12 +100325,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21754, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21754, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -99536,7 +100354,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -99546,7 +100364,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -99591,7 +100409,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6702
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -99685,7 +100503,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21795
+				return ts + 21856
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -99696,7 +100514,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -99704,6 +100521,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -99737,7 +100555,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -99890,6 +100708,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -100058,7 +100879,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21802,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21863,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100792,7 +101613,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21838, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21899, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -100863,7 +101684,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21864
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21925
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101370,7 +102191,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -101390,7 +102211,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -101401,10 +102222,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -101415,29 +102236,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -101539,8 +102360,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -101552,7 +102373,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -101562,17 +102383,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -101592,19 +102413,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -101616,19 +102437,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -101638,10 +102459,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -101655,9 +102476,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -101682,8 +102503,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -101695,7 +102516,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -101709,23 +102530,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -101736,7 +102557,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -102058,6 +102879,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -102151,8 +102973,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -102176,8 +102998,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -102329,7 +103152,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -102348,7 +103171,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -102362,7 +103185,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -102371,9 +103194,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -102392,6 +103219,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -102519,30 +103349,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -102550,20 +103399,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -102572,9 +103426,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -102615,7 +103475,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -102655,7 +103515,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -102721,19 +103582,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -102914,7 +103780,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21875, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21936, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -102972,7 +103838,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21875, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21936, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -103370,7 +104236,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21901, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21962, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -103581,8 +104447,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -103701,14 +104567,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -103860,7 +104735,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -103968,7 +104843,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21936, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+21997, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104230,19 +105105,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -104254,9 +105131,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -104289,13 +105166,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -104447,7 +105324,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21954, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22015, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -104511,7 +105388,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21982, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22043, 0)
 	goto __5
 __4:
 	ii = 0
@@ -105212,7 +106089,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -105393,7 +106270,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22000, -1)
+		pCtx, ts+22061, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -105526,7 +106403,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22056, -1)
+					pCtx, ts+22117, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -105616,17 +106493,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22101))
-var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22112))
-var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22123))
-var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22128))
-var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22141))
-var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22151))
-var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22157))
-var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22168))
-var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22178))
-var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22190))
-var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22195))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22162))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22173))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22184))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22189))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22202))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22212))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22218))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22229))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22239))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22251))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22256))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -105672,7 +106549,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22199, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22260, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -105716,12 +106593,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22218, 0)
+			ts+22279, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22289, 0)
+				ts+22350, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -105744,7 +106621,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7871)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7931)
 					}
 					break
 				}
@@ -105948,7 +106825,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22352, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22413, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106064,7 +106941,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106075,6 +106952,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, int8(SQLITE_AFF_NONE))
@@ -106178,7 +107056,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22378, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22439, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -106243,15 +107121,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22410
+				zErr = ts + 22471
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22427
+				zErr = ts + 22488
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22443
+				zErr = ts + 22504
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22463, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22524, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -106272,7 +107150,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22496, 0)
+				ts+22557, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -106428,11 +107306,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22543,
-	ts + 22596,
-	ts + 22000,
-	ts + 22647,
-	ts + 22699,
+	ts + 22604,
+	ts + 22657,
+	ts + 22061,
+	ts + 22708,
+	ts + 22760,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -107629,8 +108507,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -107641,13 +108518,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -107831,19 +108705,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22749,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22810,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19743
+							return ts + 22852
 						}
-						return ts + 22791
+						return ts + 22861
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22797, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22867, 0)
 		}
 	}
 
@@ -107911,7 +108785,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22831,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22901,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109008,7 +109882,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22869, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22939, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -109983,21 +110857,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16244, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16260, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22891, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16157, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16173, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22891, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -110740,7 +111614,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22918)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22988)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -110904,7 +111778,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22927, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+22997, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -111121,9 +111995,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 6697
+							return ts + 6757
 						}
-						return ts + 6702
+						return ts + 6762
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -111135,6 +112009,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -111402,19 +112281,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22951, 0)
+					ts+23021, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23046, 0)
+					ts+23116, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23130, 0)
+					ts+23200, 0)
 			}
 			break
 		case uint32(273):
@@ -111793,9 +112672,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22927, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22997, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23215, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23285, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -112563,7 +113442,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23232, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23302, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -112586,7 +113465,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23257, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23327, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -112759,7 +113638,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23268, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23338, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -112772,11 +113651,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19863, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19924, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23275, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23280, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23350, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -112789,9 +113668,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23290, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23360, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23294, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23364, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113025,7 +113904,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -113600,7 +114479,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -113615,7 +114494,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23302, 0)
+			ts+23372, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -113806,23 +114685,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23370
+	var zErr uintptr = ts + 23440
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23384
+			zErr = ts + 23454
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23406
+			zErr = ts + 23476
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23428
+			zErr = ts + 23498
 			break
 
 		}
@@ -113840,35 +114719,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23451,
-	ts + 23464,
+	ts + 23521,
+	ts + 23534,
 	uintptr(0),
-	ts + 23480,
-	ts + 23505,
-	ts + 23519,
-	ts + 23538,
+	ts + 23550,
+	ts + 23575,
+	ts + 23589,
+	ts + 23608,
 	ts + 1483,
-	ts + 23563,
-	ts + 23600,
-	ts + 23612,
-	ts + 23627,
-	ts + 23660,
-	ts + 23678,
-	ts + 23703,
-	ts + 23732,
+	ts + 23633,
+	ts + 23670,
+	ts + 23682,
+	ts + 23697,
+	ts + 23730,
+	ts + 23748,
+	ts + 23773,
+	ts + 23802,
 	uintptr(0),
-	ts + 5841,
+	ts + 5831,
 	ts + 5327,
-	ts + 23749,
-	ts + 23767,
-	ts + 23785,
-	uintptr(0),
 	ts + 23819,
+	ts + 23837,
+	ts + 23855,
 	uintptr(0),
-	ts + 23840,
-	ts + 23866,
 	ts + 23889,
+	uintptr(0),
 	ts + 23910,
+	ts + 23936,
+	ts + 23959,
+	ts + 23980,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -113969,6 +114848,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	*(*int32)(unsafe.Pointer(db + 432)) = 1
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(*(*int32)(unsafe.Pointer(db + 432)) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -113983,7 +114868,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114028,7 +114913,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23926, 0)
+				ts+23996, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114145,7 +115030,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23989, libc.VaList(bp, zName))
+		ts+24059, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -114381,7 +115266,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24040, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24110, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -114474,7 +115359,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -114544,7 +115429,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114554,7 +115439,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114586,14 +115471,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24061, 0)
+				ts+24131, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -114723,7 +115608,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24129, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24199, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -114768,10 +115653,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24135, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24205, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24145,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -114876,7 +115761,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24173, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24243, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -114887,17 +115772,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24177, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24247, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24177
+	zModeType = ts + 24247
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24183, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24253, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -114935,7 +115820,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24188, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24258, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -114943,7 +115828,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24208,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24278,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -114983,7 +115868,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24232, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24302, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115007,15 +115892,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24248, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24255, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24318, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24325, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24263, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24266, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24269, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17339, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24333, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24336, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24339, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17355, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115161,10 +116046,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21795, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21856, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24273, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24343, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -115178,7 +116063,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -115229,9 +116114,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6374
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6434
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23275
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23345
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -115336,7 +116221,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24279
+		zFilename = ts + 24349
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -115439,21 +116324,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24282,
+	Xsqlite3_log(tls, iErr, ts+24352,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24307)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24377)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24327)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24397)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24334)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24404)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -115611,7 +116496,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24351, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24421, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -116267,7 +117152,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24379, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24449, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -116385,7 +117270,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24387
+			return ts + 24457
 		}
 		return uintptr(0)
 	}(), 0)
@@ -116563,7 +117448,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6174, ts + 6697, ts + 6702, ts + 6184, ts + 6179, ts + 7938, ts + 24410, ts + 24416,
+	ts + 6174, ts + 6757, ts + 6762, ts + 6184, ts + 6179, ts + 7998, ts + 24480, ts + 24486,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -116716,7 +117601,7 @@ __10:
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0' + int32(c)>>4)
-	c = uint8(*(*int8)(unsafe.Pointer(ts + 24423 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24493 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -116771,7 +117656,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24440, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24510, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -116835,13 +117720,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6697, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6757, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6702, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6762, uint32(5))
 			break
 
 		}
@@ -117391,12 +118276,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6697, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6757, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6702, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6762, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(5)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -117497,7 +118382,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24469, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24539, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -117803,7 +118688,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*int8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24484, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24554, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -117818,7 +118703,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24488, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24558, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -117872,7 +118757,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24514,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24584,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -117977,11 +118862,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*int8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zPath)))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24557, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24627, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4991, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24560, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24630, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -118138,14 +119023,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24563, -1)
+			ts+24633, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, int8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24614, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24684, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -118240,7 +119125,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15357)
+	jsonWrongNumArgs(tls, ctx, ts+15373)
 	return
 __2:
 	;
@@ -118315,9 +119200,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24648
+			return ts + 24718
 		}
-		return ts + 24652
+		return ts + 24722
 	}())
 	return
 __2:
@@ -118450,7 +119335,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24659, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24729, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118547,7 +119432,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24662, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24732, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118591,7 +119476,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24665)
+		ts+24735)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -118722,7 +119607,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24748, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24818, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -118741,7 +119626,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24754, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24824, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -118837,7 +119722,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, int8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24754, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24824, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -118861,7 +119746,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24759
+				zRoot = ts + 24829
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -118926,6 +119811,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -118977,7 +119868,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24469, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24539, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119072,25 +119963,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24761},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24766},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24777},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24777},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24795},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24808},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24811},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24815},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24827},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24839},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24850},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24861},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24873},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24886},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24895},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24895},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24905},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24916},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24933}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24831},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24836},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24847},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24847},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24865},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24878},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24881},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24885},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24897},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24909},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24920},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24931},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24943},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24956},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24965},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24965},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24975},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24986},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25003}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119109,8 +120000,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24951, FpModule: 0},
-	{FzName: ts + 24961, FpModule: 0},
+	{FzName: ts + 25021, FpModule: 0},
+	{FzName: ts + 25031, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -119370,11 +120261,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24971, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25041, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24979, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25049, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -119585,7 +120476,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24984,
+		ts+25054,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -120288,7 +121179,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25066)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25136)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -121629,7 +122520,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25080, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25150, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -121641,12 +122532,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25100, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25170, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25132, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25202, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -121872,7 +122763,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25169, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25239, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -121895,14 +122786,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25314
+	var zFmt uintptr = ts + 25384
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11279, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11341, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -121943,7 +122834,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25370, ts + 5053, ts + 16244,
+	ts + 25440, ts + 5053, ts + 16260,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -121986,19 +122877,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25375,
+			ts+25445,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25437, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25507, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25442,
+			ts+25512,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25506,
+			ts+25576,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25576,
+			ts+25646,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122027,7 +122918,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25625
+			zFormat = ts + 25695
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122039,7 +122930,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25733,
+			ts+25803,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122047,18 +122938,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25778, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25848, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12750, 1)
+					Xsqlite3_str_append(tls, p, ts+12760, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25805, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25875, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25827, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25897, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25835, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25905, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122073,14 +122964,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25851,
-	ts + 25904,
-	ts + 25949,
-	ts + 26001,
-	ts + 26055,
-	ts + 26100,
-	ts + 26158,
-	ts + 26213,
+	ts + 25921,
+	ts + 25974,
+	ts + 26019,
+	ts + 26071,
+	ts + 26125,
+	ts + 26170,
+	ts + 26228,
+	ts + 26283,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122109,7 +123000,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26260, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26330, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -122121,7 +123012,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26280,
+			ts+26350,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -122129,7 +123020,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26337,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26407,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122171,10 +123062,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26372,
-		ts + 26415,
-		ts + 26450,
-		ts + 26486,
+		ts + 26442,
+		ts + 26485,
+		ts + 26520,
+		ts + 26556,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -122205,7 +123096,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26523,
+	Xsqlite3_str_appendf(tls, pSql, ts+26593,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -122217,7 +123108,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26547, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26617, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -122240,7 +123131,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26553, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -122336,7 +123227,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26556, ts + 26567}
+var azFormat = [2]uintptr{ts + 26626, ts + 26637}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -122374,13 +123265,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10851, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10913, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26577, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26647, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26583, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26653, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26587, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26657, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -122391,7 +123282,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26589, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26659, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -122469,7 +123360,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26622,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26692,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4055
@@ -122493,7 +123384,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26629,
+			ts+26699,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -122512,7 +123403,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26674, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26744, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -122526,8 +123417,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26706,
-		ts + 26760,
+		ts + 26776,
+		ts + 26830,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -122542,23 +123433,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26808,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26878,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26853
+					return ts + 26923
 				}
-				return ts + 26861
+				return ts + 26931
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26870,
+				ts+26940,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26853
+						return ts + 26923
 					}
-					return ts + 26861
+					return ts + 26931
 				}(), iKey, iVal))
 		}
 	}
@@ -122582,7 +123473,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26928, libc.VaList(bp, i, iCell, iNode))
+				ts+26998, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -122602,7 +123493,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26976, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27046, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -122619,14 +123510,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27043, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27113, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27077, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27147, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -122634,7 +123525,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27107,
+					ts+27177,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -122663,14 +123554,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27162,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27232,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27193, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27263, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -122692,12 +123583,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14486, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14496, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27260, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27330, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -122706,12 +123597,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25080, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25150, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27288, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27358, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -122725,8 +123616,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27319, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27326, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27389, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -122734,7 +123625,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27334, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27404, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -122749,7 +123640,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27338, -1)
+			ts+27408, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -122757,7 +123648,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6374
+			zDb = ts + 6434
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -122767,7 +123658,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17962
+				return ts + 18005
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123062,7 +123953,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -123120,6 +124011,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123132,15 +124024,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27389, 1)
+		Xsqlite3_str_append(tls, x, ts+27459, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27391, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27461, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27402, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27472, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123160,19 +124053,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep int8 = int8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27413, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27483, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27431, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27501, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = int8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27439, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27509, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*int8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27447, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27517, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27451, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27521, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123191,6 +124084,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -123222,6 +124116,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -123230,6 +124125,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -123288,6 +124184,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -123456,6 +124353,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123477,6 +124375,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -123561,6 +124460,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -123589,6 +124490,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124027,6 +124929,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124040,6 +124943,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -124054,6 +124960,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -124078,7 +124985,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27464, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27534, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124087,7 +124994,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27486, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -124095,7 +125002,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26553, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124174,6 +125081,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -124302,6 +125210,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -124320,7 +125229,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16244
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16260
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -124330,7 +125239,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27490
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27560
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -124338,7 +125247,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27496
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27566
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -124450,7 +125359,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27505, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27575, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -124580,14 +125489,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27545) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27615) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27561) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27631) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -124624,8 +125535,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -124642,7 +125553,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -124652,7 +125563,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27576, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27646, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -124664,25 +125575,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27584},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27597},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27610},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27623},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27561},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27635},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27545},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27658},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27672},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27685},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27699},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27715},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27654},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27667},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27680},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27693},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27631},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27705},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27615},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27728},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27742},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27755},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27769},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27785},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27727},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27797},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -124692,26 +125603,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27746, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27816, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27756, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27826, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27767, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27837, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27490, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27560, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27778, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27848, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -124765,7 +125676,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25066, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25136, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125092,7 +126003,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27788, -1)
+		Xsqlite3_result_error(tls, context, ts+27858, -1)
 		return
 	}
 
@@ -125103,7 +126014,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27788, -1)
+			Xsqlite3_result_error(tls, context, ts+27858, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125204,7 +126115,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27809, uintptr(0), uintptr(0), p+64)
+				ts+27879, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -125268,7 +126179,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+24979, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25049, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -125289,16 +126200,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+27980, libc.VaList(bp, func() uintptr {
+			ts+28050, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28130
+					return ts + 28200
 				}
 				return ts + 1547
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28171)
+			ts+28241)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -125414,7 +126325,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28296, libc.VaList(bp, zTab)))
+			ts+28366, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -125432,7 +126343,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28415, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28485, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -125450,7 +126361,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28436, libc.VaList(bp+16, zIdx)))
+			ts+28506, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -125473,7 +126384,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28487, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28557, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -125519,7 +126430,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+28508, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -125534,7 +126445,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -125574,7 +126485,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19389, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19482, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -125584,18 +126495,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+28565, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28635, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+28584, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28654, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28589, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28659, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -125607,18 +126518,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28599, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28669, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28628
+							return ts + 28698
 						}
-						return ts + 28641
+						return ts + 28711
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+28650, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28720, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -125632,7 +126543,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28672,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28742,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -125679,8 +126590,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+28699, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14597
+		zList = rbuMPrintf(tls, p, ts+28769, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14607
 	}
 	return zList
 }
@@ -125697,7 +126608,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+28708, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28778, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -125719,25 +126630,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+28721, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28791, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28753, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28823, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+28776)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28782, ts+28789, ts+4950)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+1547)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+28846)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28852, ts+28859, ts+4950)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+28797,
+					ts+28867,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28839, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28909, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -125779,7 +126690,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -125814,7 +126725,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28859
+	zCol = ts + 28929
 __7:
 	;
 	goto __5
@@ -125822,13 +126733,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28867,
+	zLhs = rbuMPrintf(tls, p, ts+28937,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28888,
+	zOrder = rbuMPrintf(tls, p, ts+28958,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28924,
+	zSelect = rbuMPrintf(tls, p, ts+28994,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14597
+	zSep = ts + 14607
 	iCol++
 	goto __1
 __2:
@@ -125846,7 +126757,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+28951,
+		Xsqlite3_mprintf(tls, ts+29021,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -125873,8 +126784,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+28999, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14597
+	zVector = rbuMPrintf(tls, p, ts+29069, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14607
 	goto __15
 __15:
 	iCol++
@@ -125885,7 +126796,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29006, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -125918,7 +126829,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -125930,7 +126841,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29018, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29088, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1547
 		} else {
@@ -125942,37 +126853,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28859
+					zCol = ts + 28929
 				} else {
-					zCol = ts + 28589
+					zCol = ts + 28659
 				}
 				zType = ts + 1112
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29040, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29110, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28776
+					return ts + 28846
 				}
 				return ts + 1547
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29060,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29130,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29081,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29151,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29114, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29184, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14597
-		zAnd = ts + 21457
+		zCom = ts + 14607
+		zAnd = ts + 21518
 		nBind++
 	}
 
@@ -126011,11 +126922,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+29138, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29208, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29150, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29220, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14597
+			zS = ts + 14607
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126023,7 +126934,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29159, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29229, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126035,18 +126946,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29174, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29244, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1547
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29188, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21457
+				zList = rbuMPrintf(tls, p, ts+29258, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21518
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29200, libc.VaList(bp+40, zList))
+			ts+29270, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1547
@@ -126054,8 +126965,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29250, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21457
+				zList = rbuMPrintf(tls, p, ts+29320, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21518
 			}
 		}
 	}
@@ -126064,7 +126975,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29263, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29333, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126082,17 +126993,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c int8 = *(*int8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29250,
+					zList = rbuMPrintf(tls, p, ts+29320,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29289,
+					zList = rbuMPrintf(tls, p, ts+29359,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29319,
+					zList = rbuMPrintf(tls, p, ts+29389,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				}
 			}
 		}
@@ -126127,19 +127038,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29356
+		var zSep uintptr = ts + 29426
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+28508, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16132) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16148) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126151,15 +127062,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 28776
+					zDesc = ts + 28846
 				} else {
 					zDesc = ts + 1547
 				}
-				z = rbuMPrintf(tls, p, ts+29369, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14597
+				z = rbuMPrintf(tls, p, ts+29439, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14607
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29380, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29450, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -126179,7 +127090,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29384)
+			ts+29454)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -126188,7 +127099,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -126198,25 +127109,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29434, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29504, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29456, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28776
+						return ts + 28846
 					}
 					return ts + 1547
 				}()))
-				zComma = ts + 14597
+				zComma = ts + 14607
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29466, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29536, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29481,
+			ts+29551,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 	}
 }
 
@@ -126229,7 +127140,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1547
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1547
@@ -126237,39 +127148,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29543
+				zPk = ts + 29613
 			}
-			zSql = rbuMPrintf(tls, p, ts+29556,
+			zSql = rbuMPrintf(tls, p, ts+29626,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29583
+							return ts + 29653
 						}
 						return ts + 1547
 					}()))
-			zComma = ts + 14597
+			zComma = ts + 14607
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29593, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29663, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29600,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29670,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29632
+						return ts + 29702
 					}
 					return ts + 1547
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 	}
 }
 
@@ -126282,7 +127193,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+29647,
+				ts+29717,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -126319,7 +127230,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+29704)
+			ts+29774)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -126424,7 +127335,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29770, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29840, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -126444,24 +127355,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29790,
+				ts+29860,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+29855, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29925, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+29891, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+29961, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -126477,7 +127388,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29925,
+						ts+29995,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -126485,9 +127396,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29986
+											return ts + 30056
 										}
-										return ts + 29990
+										return ts + 30060
 									}()
 								}
 								return ts + 1547
@@ -126496,20 +127407,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29996,
+						ts+30066,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30057,
+						ts+30127,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29986
+									return ts + 30056
 								}
-								return ts + 29990
+								return ts + 30060
 							}(),
 							zCollist, zLimit))
 				}
@@ -126534,8 +127445,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6385)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6381)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6445)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6441)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -126546,16 +127457,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1547
 				}
-				return ts + 30216
+				return ts + 30286
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30225,
+						ts+30295,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30261
+								return ts + 30331
 							}
 							return ts + 1547
 						}(), zBindings)))
@@ -126564,32 +127475,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30271, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30341, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1547
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30299
+					zRbuRowid = ts + 30369
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30311, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30381, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30387
+							return ts + 30457
 						}
 						return ts + 1547
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30404,
+					ts+30474,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30703,
+						ts+30773,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -126602,9 +127513,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30802
+						zRbuRowid = ts + 30872
 					} else {
-						zRbuRowid = ts + 30812
+						zRbuRowid = ts + 30882
 					}
 				}
 
@@ -126617,20 +127528,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28859, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28929, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30823,
+							ts+30893,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30871
+										return ts + 30941
 									}
 									return ts + 1547
 								}(),
@@ -126643,7 +127554,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19743
+										return ts + 22852
 									}
 									return ts + 1547
 								}(), zOrder,
@@ -126711,9 +127622,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1547
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30216
+				zPrefix = ts + 30286
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30877,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30947,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -126772,7 +127683,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+30907, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+30977, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -126842,28 +127753,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30937, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31007, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30965, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31035, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+48, ts+3279, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6374, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6434, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30983, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31053, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -126896,11 +127807,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31049, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31119, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24129, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24199, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*int8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -126912,13 +127823,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31081,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374),
+			zTarget = Xsqlite3_mprintf(tls, ts+31151,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
 						}
-						return ts + 31113
+						return ts + 31183
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
@@ -126937,37 +127848,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31115, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31185, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31130, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31200, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31147, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31217, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31163, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31191, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31261, 0)
 	}
 }
 
@@ -126996,15 +127907,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31163, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31209, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31279, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -127052,7 +127963,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -127112,7 +128023,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6374, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127129,23 +128040,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31244, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31314, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31269, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31276, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31339, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -127262,7 +128173,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23767, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23837, 0)
 			return
 		}
 
@@ -127355,7 +128266,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+31283)
+			ts+31353)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -127363,7 +128274,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31305, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31375, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -127384,7 +128295,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+31332,
+				ts+31402,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -127414,9 +128325,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+31490, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31560, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31505,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31575,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -127430,10 +128341,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31525, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31595, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31550)
+			ts+31620)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127447,12 +128358,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31658)
+			ts+31728)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+31723)
+			ts+31793)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127464,7 +128375,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31767, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31837, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -127484,15 +128395,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17217)
-					rbuCopyPragma(tls, p, ts+16328)
+					rbuCopyPragma(tls, p, ts+17233)
+					rbuCopyPragma(tls, p, ts+16344)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31792, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31862, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -127516,10 +128427,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -127614,7 +128525,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31820, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31890, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -127627,16 +128538,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31269, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31339, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -127646,7 +128558,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31845, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31915, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -127680,7 +128592,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31856, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31926, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -127710,13 +128622,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31928, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31998, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31942)
+				ts+32012)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -127727,7 +128639,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31999)
+				ts+32069)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -127801,7 +128713,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32073, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32143, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -127819,12 +128731,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32105,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32175,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32137
+							return ts + 32207
 						}
-						return ts + 32144
+						return ts + 32214
 					}()))
 			}
 		}
@@ -127832,7 +128744,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14486, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14496, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -127843,19 +128755,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16931)
-						rbuCopyPragma(tls, p, ts+16343)
+						rbuCopyPragma(tls, p, ts+16947)
+						rbuCopyPragma(tls, p, ts+16359)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32151, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32221, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6374, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32167, uintptr(0), uintptr(0), p+64)
+								db, ts+32237, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -127909,7 +128821,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32191, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32261, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -127936,7 +128848,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30216, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30286, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -127953,7 +128865,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -127966,13 +128878,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32199, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32269, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128067,7 +128979,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128084,19 +128996,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14486
+				zBegin = ts + 14496
 			} else {
-				zBegin = ts + 32151
+				zBegin = ts + 32221
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32151, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32221, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128219,11 +129131,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -128362,7 +129277,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -128439,7 +129354,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32226, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32296, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -128464,7 +129379,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32249, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32319, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -128609,7 +129524,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6374)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6434)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -128624,7 +129539,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32260, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32330, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -128635,7 +129550,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -128665,6 +129586,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -129428,11 +130364,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11279, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11341, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32271, 0)
+				ts+32341, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
 		} else {
@@ -129445,7 +130381,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32392, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32462, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -129543,7 +130479,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11279, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11341, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130010,6 +130946,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -130092,6 +131031,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -130121,9 +131061,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32421,
+			zRet = Xsqlite3_mprintf(tls, ts+32491,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 21457
+			zSep = ts + 21518
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130146,9 +131086,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32455,
+				ts+32525,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 32496
+			zSep = ts + 32566
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130156,18 +131096,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7463, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7523, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32501,
+		ts+32571,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130177,7 +131117,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -130210,7 +131150,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32579,
+			ts+32649,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130337,7 +131277,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32632, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32702, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -130811,9 +131751,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11279, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11341, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32659, libc.VaList(bp, zDb))
+			ts+32729, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -130822,18 +131762,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1547
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32769, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32839, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1560, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32784, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32854, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+32792, bp+24)
+				sessionAppendStr(tls, bp+8, ts+32862, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21457
+				zSep = ts + 21518
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -130942,7 +131882,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32798, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32868, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -131034,7 +131974,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32818, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32888, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -131297,7 +132237,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -131320,7 +132260,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -131362,7 +132302,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -131423,7 +132363,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -131497,13 +132437,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -131565,7 +132505,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -131938,7 +132878,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -132106,7 +133046,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11279) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11341) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -132117,34 +133057,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32836, bp+16)
+				sessionAppendStr(tls, bp, ts+32906, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32849, bp+16)
+				sessionAppendStr(tls, bp, ts+32919, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+32855, bp+16)
+						sessionAppendStr(tls, bp, ts+32925, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14597
+						zSep = ts + 14607
 					}
 				}
 
 				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+32784, bp+16)
+				sessionAppendStr(tls, bp, ts+32854, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32860, bp+16)
+								ts+32930, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32792, bp+16)
+							sessionAppendStr(tls, bp, ts+32862, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21457
+						zSep = ts + 21518
 					}
 				}
 
@@ -132196,34 +133136,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32935, bp+16)
+	sessionAppendStr(tls, bp, ts+33005, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32784, bp+16)
+	sessionAppendStr(tls, bp, ts+32854, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+32855, bp+16)
+			sessionAppendStr(tls, bp, ts+32925, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21457
+			zSep = ts + 21518
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32953, bp+16)
+		sessionAppendStr(tls, bp, ts+33023, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32496, bp+16)
+		sessionAppendStr(tls, bp, ts+32566, bp+16)
 
 		zSep = ts + 1547
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+32792, bp+16)
+				sessionAppendStr(tls, bp, ts+32862, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 32961
+				zSep = ts + 33031
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4950, bp+16)
@@ -132239,7 +133179,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6374, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6434, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -132250,19 +133190,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32966, bp+16)
+	sessionAppendStr(tls, bp, ts+33036, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21463, bp+16)
+	sessionAppendStr(tls, bp, ts+21524, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14597, bp+16)
+			sessionAppendStr(tls, bp, ts+14607, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+32984, bp+16)
+	sessionAppendStr(tls, bp, ts+33054, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+32995, bp+16)
+		sessionAppendStr(tls, bp, ts+33065, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+4950, bp+16)
 
@@ -132278,14 +133218,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11279, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11341, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+32999)
+			ts+33069)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33112)
+			ts+33182)
 	}
 	return rc
 }
@@ -132313,7 +133253,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -132322,7 +133262,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -132399,7 +133339,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -132525,7 +133465,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -132566,7 +133506,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33256, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33326, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -132582,7 +133522,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33277, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33347, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -132655,10 +133595,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33296, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33366, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33322, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33392, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -132704,7 +133644,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6374, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6434, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -132717,19 +133657,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33352, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33422, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33396,
+						ts+33466,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33467, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33537, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11279) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11341) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -132780,14 +133720,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33527, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33597, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33557, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33581, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33557, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33651, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134035,7 +134975,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33609, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33679, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134323,7 +135263,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33637, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33707, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134510,7 +135450,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33668, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33738, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -134578,7 +135518,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33675
+		var zErr uintptr = ts + 33745
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -134760,7 +135700,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33725
+		var zErr uintptr = ts + 33795
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135084,13 +136024,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33773, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33843, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33781, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33851, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33791, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33861, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -135641,7 +136581,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33796, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33866, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -135668,14 +136608,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*int8)(unsafe.Pointer(p))) < '0' || int32(*(*int8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33803, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33873, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33834, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33904, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135686,7 +136626,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33867, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33937, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135699,7 +136639,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33904, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33974, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -135708,7 +136648,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33913, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33983, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -135727,7 +136667,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33946, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34016, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -135742,14 +136682,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33980, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34050, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33988, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34058, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*int8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34020, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34090, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -135757,9 +136697,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34026, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34096, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34040, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34110, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -135767,9 +136707,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34078, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34148, zCmd, nCmd) == 0 {
 		if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || int32(*(*int8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34089, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34159, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -135779,19 +136719,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5068, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 7951, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17322},
-			{FzName: ts + 34124, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8019, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17338},
+			{FzName: ts + 34194, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34132, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34202, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34163, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34233, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -135838,15 +136778,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22123) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16244) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34191, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22184) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16260) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34261, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34221) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34291) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34231, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34301, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -135863,13 +136803,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34262, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34332, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34267, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34337, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34274, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34344, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -135907,8 +136847,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22123) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34282, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22184) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34352, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -135940,7 +136880,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34311, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34381, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -135977,19 +136917,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33980
+			zTail = ts + 34050
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34331
+			zTail = ts + 34401
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34339, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34409, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16244, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16260, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136033,18 +136973,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34350, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34420, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1547
 			}
-			return ts + 14597
+			return ts + 14607
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34366, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34436, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34373,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22123))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34443,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22184))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136154,7 +137094,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34399) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34469) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136164,7 +137104,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34404) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34474) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136174,7 +137114,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34413) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34483) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -136187,7 +137127,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34423) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34493) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -136197,7 +137137,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34433) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34503) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -136213,7 +137153,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22123) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22184) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -136236,7 +137176,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34445
+	var zSelect uintptr = ts + 34515
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -136258,7 +137198,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34477) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34547) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -136272,7 +137212,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34485,
+				ts+34555,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -136370,7 +137310,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34550, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34620, 0)
 					return FTS5_EOF
 				}
 			}
@@ -136383,20 +137323,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34570, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34640, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34601, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34671, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34604, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34674, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29986, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30056, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -136482,6 +137422,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*int8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -136510,7 +137461,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 1))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*int8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = int8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -138163,9 +139114,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34608, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34678, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33637, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33707, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -138181,7 +139132,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c int8 = *(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34613, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34683, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -138268,7 +139219,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20460, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20521, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -138349,7 +139300,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34642, 0)
+			ts+34712, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -138519,12 +139470,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34695,
+								ts+34765,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34745
+										return ts + 34815
 									}
-									return ts + 34608
+									return ts + 34678
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -139467,7 +140418,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34752, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34822, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -139546,7 +140497,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+34758,
+			ts+34828,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -139571,7 +140522,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34809,
+			ts+34879,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -139594,7 +140545,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+34858,
+			ts+34928,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -139833,7 +140784,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+34898, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141032,7 +141983,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+34921,
+			ts+34991,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -142498,7 +143449,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+35005,
+			ts+35075,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -142989,10 +143940,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -143575,13 +144531,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35062, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35132, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24979, ts+35070, 0, pzErr)
+				pConfig, ts+25049, ts+35140, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11419,
-					ts+35105,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11481,
+					ts+35175,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -143834,7 +144790,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34752, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+34822, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -143948,7 +144904,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35149,
+		ts+35219,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -144118,7 +145074,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35235)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35305)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -144389,7 +145345,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35240, 0)
+			ts+35310, 0)
 		return SQLITE_ERROR
 	}
 
@@ -144813,11 +145769,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35279,
+		ts+35349,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14597
+					return ts + 14607
 				}
 				return ts + 1547
 			}(),
@@ -144829,9 +145785,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35334
+					return ts + 35404
 				}
-				return ts + 35339
+				return ts + 35409
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -144877,12 +145833,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35343, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35413, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5050, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35349, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35419, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -144913,7 +145869,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35377, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35447, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -144944,7 +145900,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35387, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35457, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -144976,14 +145932,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35408, libc.VaList(bp, z))
+				ts+35478, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33791
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33861
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145039,7 +145995,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35240, 0)
+		ts+35310, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145256,7 +146212,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35441, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35511, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -145401,28 +146357,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35477, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35547, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35488, 0)
+				ts+35558, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35568, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35576, 0)
+				ts+35646, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16911, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16927, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35632, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35702, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35708, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -145480,7 +146436,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17456, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17472, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -145493,12 +146449,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35654,
+				ts+35724,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20361
+						return ts + 20422
 					}
-					return ts + 35691
+					return ts + 35761
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146128,7 +147084,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35703, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35773, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -146372,7 +147328,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35724, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35794, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -146391,7 +147347,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35746, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35816, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -146438,7 +147394,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35777)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35847)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -146447,7 +147403,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35790, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35860, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -146461,7 +147417,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35881, ts + 33980, ts + 24979, ts + 34331, ts + 11419,
+	ts + 35951, ts + 34050, ts + 25049, ts + 34401, ts + 11481,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -146485,7 +147441,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35888, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35958, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -146503,13 +147459,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35888, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35958, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35893, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35963, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -146564,17 +147522,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35908,
-			ts + 35976,
-			ts + 36045,
-			ts + 36078,
-			ts + 36117,
-			ts + 36157,
-			ts + 36196,
-			ts + 36237,
-			ts + 36276,
-			ts + 36318,
-			ts + 36358,
+			ts + 35978,
+			ts + 36046,
+			ts + 36115,
+			ts + 36148,
+			ts + 36187,
+			ts + 36227,
+			ts + 36266,
+			ts + 36307,
+			ts + 36346,
+			ts + 36388,
+			ts + 36428,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -146676,18 +147634,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36381,
+		ts+36451,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36485,
+			ts+36555,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36523,
+			ts+36593,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -146699,7 +147657,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36561,
+			ts+36631,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -146711,14 +147669,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24979, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11419, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35881, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25049, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11481, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35951, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34331, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34401, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33980, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34050, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -146730,17 +147688,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36603,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36673,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29632
+					return ts + 29702
 				}
 				return ts + 1547
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36633,
+			ts+36703,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -146777,27 +147735,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36677, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36747, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36700, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36770, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33980, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34050, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34331, ts+36706, 0, pzErr)
+				pConfig, ts+34401, ts+36776, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35881, ts+36738, 1, pzErr)
+				pConfig, ts+35951, ts+36808, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34477, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147003,12 +147961,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36755,
+		ts+36825,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36805,
+			ts+36875,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147016,7 +147974,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34477, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -147192,7 +148150,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36834,
+	zSql = Xsqlite3_mprintf(tls, ts+36904,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -147374,14 +148332,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33980, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34050, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34331, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34401, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -147576,9 +148534,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36866) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36936) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36877) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36947) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -147793,7 +148751,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36888
+			var zCat uintptr = ts + 36958
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -147805,7 +148763,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36897) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36967) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -147816,18 +148774,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36908) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36978) {
 					if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' && int32(*(*int8)(unsafe.Pointer(zArg))) != '2' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*int8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36866) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36936) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36877) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36947) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36897) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36967) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148103,7 +149061,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36926
+	var zBase uintptr = ts + 36996
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -148245,7 +149203,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36936, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148253,11 +149211,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36939, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37009, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36944, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37014, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148265,7 +149223,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36949, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37019, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148273,7 +149231,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36952, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148281,11 +149239,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36955, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36960, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37030, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148293,19 +149251,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36965, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36969, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37039, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36975, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37045, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36980, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37050, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148313,11 +149271,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36984, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37054, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36988, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37058, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148325,7 +149283,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36991, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148333,11 +149291,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36995, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36999, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37069, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148345,7 +149303,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37003, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37073, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148353,7 +149311,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37007, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148361,7 +149319,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37011, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37081, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148377,24 +149335,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37015, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+36995, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37085, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37065, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37018, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37021, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37091, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37011, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37081, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -148409,137 +149367,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37028, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37098, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+36995, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37065, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37036, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37106, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37043, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37113, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37048, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37118, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36944, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37014, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37053, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37123, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36939, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37009, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37058, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37011, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37081, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37063, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15457, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15473, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37021, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37091, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37142, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36936, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37006, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36980, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37050, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37083, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37153, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37087, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37157, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37089, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37159, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37003, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37073, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37165, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37011, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37081, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37103, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37173, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36995, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37065, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37109, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36995, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37065, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37114, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37120, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37007, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37077, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37198, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37136, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37206, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37210, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37003, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37073, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37148, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37154, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37224, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37007, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37077, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37230, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37021, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37091, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -148554,16 +149512,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37167, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36952, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37022, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37242, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148571,21 +149529,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37177, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37247, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36952, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37183, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37253, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36952, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37136, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37206, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148593,7 +149551,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37189, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37259, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -148601,9 +149559,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37195, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37265, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -148618,12 +149576,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37201, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37271, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37205, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37275, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37208, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -148632,7 +149590,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37211, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37281, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -148788,7 +149746,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37215) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37285) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -148968,22 +149926,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36926, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 36996, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37230, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37300, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37236, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37306, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37243, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -150126,14 +151084,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37251) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37321) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37255) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37325) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37259) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37329) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37268, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37338, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150159,19 +151117,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 37302,
-		ts + 37342,
-		ts + 37377,
+		ts + 37372,
+		ts + 37412,
+		ts + 37447,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23275, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23345, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37420, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37490, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -150304,11 +151262,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37453, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37523, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37484,
+		ts+37554,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -150332,7 +151290,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37535, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37605, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -150727,7 +151685,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37561, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37631, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -150749,7 +151707,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37571
+	return ts + 37641
 }
 
 func init() {
@@ -150804,114 +151762,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -151369,6 +152329,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -151687,6 +152659,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -151708,5 +152681,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_freebsd_arm.go b/vendor/modernc.org/sqlite/lib/sqlite_freebsd_arm.go
index 2837204c..c565308b 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_freebsd_arm.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_freebsd_arm.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_arm.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_arm.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -412,6 +412,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -519,6 +520,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -797,6 +799,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1313,6 +1316,7 @@ const (
 	SF_SETTABLE                           = 0xffff0000
 	SF_SNAPSHOT                           = 0x00200000
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1348,6 +1352,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1466,6 +1471,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -1832,6 +1838,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -1928,11 +1935,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -1947,7 +1957,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2055,8 +2065,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2448,6 +2458,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -3714,6 +3725,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -4940,10 +4952,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -4998,12 +5008,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -5250,7 +5258,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -5366,7 +5373,7 @@ type Parse1 = struct {
 	FnLabelAlloc      int32
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -5385,6 +5392,7 @@ type Parse1 = struct {
 	FnQueryLoop       U32
 	Foldmask          U32
 	Fnewmask          U32
+	FnProgressSteps   U32
 	FeTriggerOp       U8
 	FbReturning       U8
 	FeOrconf          U8
@@ -6031,7 +6039,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	F__ccgo_pad3        [4]byte
@@ -6160,7 +6168,6 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
 }
@@ -6179,7 +6186,6 @@ type AggInfo_col = struct {
 type AggInfo_func = struct {
 	FpFExpr    uintptr
 	FpFunc     uintptr
-	FiMem      int32
 	FiDistinct int32
 	FiDistAddr int32
 }
@@ -6362,9 +6368,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
-	FpIdx    uintptr
-	FiTabCur int32
+type CoveringIndexCheck1 = struct {
+	FpIdx        uintptr
+	FiTabCur     int32
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -6568,7 +6577,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1092))
@@ -6718,11 +6727,11 @@ type VdbeFrame1 = struct {
 	Fv           uintptr
 	FpParent     uintptr
 	FaOp         uintptr
-	FanExec      uintptr
 	FaMem        uintptr
 	FapCsr       uintptr
 	FaOnce       uintptr
 	Ftoken       uintptr
+	F__ccgo_pad1 [4]byte
 	FlastRowid   I64
 	FpAuxData    uintptr
 	FnCursor     int32
@@ -6731,7 +6740,7 @@ type VdbeFrame1 = struct {
 	FnMem        int32
 	FnChildMem   int32
 	FnChildCsr   int32
-	F__ccgo_pad1 [4]byte
+	F__ccgo_pad2 [4]byte
 	FnChange     I64
 	FnDbChange   I64
 }
@@ -6768,8 +6777,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -6780,6 +6799,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -6896,7 +6924,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint32(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint32(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7724,14 +7752,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = uint8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -7739,7 +7767,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -9551,7 +9579,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = (int32(zEnd) - int32(zStart)) / 1
-	for n > 0 && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -9807,6 +9835,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -10797,6 +10827,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -10805,11 +10836,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -10821,30 +10876,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1547
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -10853,83 +10908,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 21)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = (int32(z) - int32(bufpt)) / 1
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = (int32(z) - int32(bufpt)) / 1
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -10943,17 +10998,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -10961,90 +11016,90 @@ __219:
 		}
 		return ts + 1553
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(j))) = uint8(0)
 	length = int32(j)
@@ -11052,89 +11107,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -11147,32 +11202,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -11231,7 +11286,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -11247,8 +11302,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -11277,12 +11331,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -11291,7 +11346,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint32(N))
 		*(*U32)(unsafe.Pointer(p + 16)) += U32(N)
@@ -12415,6 +12470,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 312)) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -13020,10 +13093,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13049,6 +13125,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = uint8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint32(unsafe.Sizeof([22]uint8{}))-uint32(1)-uint32(i))
+	return int32(uint32(unsafe.Sizeof([22]uint8{})) - uint32(2) - uint32(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14057,11 +14134,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -15031,7 +15109,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15254,7 +15332,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -15270,113 +15348,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -15508,7 +15586,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15799,7 +15877,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3371, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15816,14 +15894,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3659, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3659, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*12 + 4)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15843,7 +15921,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -15911,7 +15989,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -16138,7 +16216,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16166,7 +16244,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -16265,7 +16343,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3254, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -16395,7 +16473,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -16441,7 +16519,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -16680,7 +16758,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -16814,7 +16892,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+8)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16835,7 +16913,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17151,7 +17229,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3254, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -17242,7 +17320,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__error(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43337)
 		}
 		return rc
 	}
@@ -17250,9 +17328,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*12 + 4)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3781, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3781, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -17295,12 +17373,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*uint8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -17319,18 +17394,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*12 + 4)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__error(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3452, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3452, zIn, 43443)
 			}
 		} else if int32((*stat)(unsafe.Pointer(bp)).Fst_mode)&0170000 == 0120000 {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*12 + 4)))(tls, zIn, bp+224, uint32(unsafe.Sizeof([1026]uint8{}))-uint32(2))
 			if got <= 0 || got >= Ssize_t(unsafe.Sizeof([1026]uint8{}))-2 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3443, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3443, zIn, 43454)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 224 + uintptr(got))) = uint8(0)
@@ -17370,14 +17445,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 1028)).FzOut = zOut
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*12 + 4)))(tls, bp, uint32(unsafe.Sizeof([1026]uint8{}))-uint32(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3272, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3272, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+1028, bp)
 	}
 	appendAllPathElements(tls, bp+1028, zPath)
 	*(*uint8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+1028)).FnUsed))) = uint8(0)
 	if (*DbPath)(unsafe.Pointer(bp+1028)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+1028)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1028)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17472,7 +17547,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__error(tls))) == EINTR {
 				got = (*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*12 + 4)))(tls, fd, zBuf, uint32(nBuf))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -21391,7 +21466,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint32(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint32(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -22443,7 +22518,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -22460,7 +22534,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 8)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -22526,7 +22599,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + Size_t(1))
 	z += uintptr(libc.Xstrlen(tls, z) + Size_t(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -22536,7 +22608,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22727,36 +22799,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -22928,7 +22989,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23052,7 +23113,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23091,7 +23152,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23168,7 +23229,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24080,10 +24141,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0)}
@@ -24169,7 +24232,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 28)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -24923,7 +24986,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25022,7 +25085,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -25607,7 +25670,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -25882,7 +25945,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -26355,7 +26418,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26860,7 +26923,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27095,8 +27158,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27104,23 +27167,24 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt    uintptr
+	FpPager uintptr
+	FaPgRef uintptr
+	FnPage  Pgno
+	FmxErr  int32
+	FnErr   int32
+	Frc     int32
+	FnStep  U32
+	FzPfx   uintptr
+	Fv1     Pgno
+	Fv2     int32
+	FerrMsg StrAccum
+	Fheap   uintptr
+	Fdb     uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27516,7 +27580,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27653,7 +27717,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -27670,7 +27734,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -27678,7 +27742,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -27721,7 +27785,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27731,7 +27795,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -27981,7 +28045,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28028,7 +28092,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28038,7 +28102,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28051,7 +28115,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28060,14 +28124,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint32(iFree2-(iFree+sz)))
@@ -28077,7 +28141,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -28141,7 +28205,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -28151,7 +28215,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28173,7 +28237,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28208,7 +28272,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28221,13 +28285,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -28252,7 +28316,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -28263,7 +28327,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, (int32(pSpace)-int32(data))/1)
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -28315,22 +28379,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -28340,7 +28404,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -28348,7 +28412,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -28356,10 +28420,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -28383,13 +28447,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -28397,7 +28460,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -28405,32 +28507,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -28458,11 +28549,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -28473,15 +28564,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -28509,14 +28600,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2) + 1)))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -28530,7 +28621,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28542,7 +28633,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28645,7 +28736,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28673,7 +28764,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28712,7 +28803,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29595,7 +29686,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30010,7 +30101,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30036,7 +30127,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -30045,7 +30136,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30056,7 +30147,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30072,7 +30163,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30133,7 +30224,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30168,7 +30259,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 20)))
 				if *(*Pgno)(unsafe.Pointer(bp + 24)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -30228,7 +30319,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -30267,7 +30358,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -30298,7 +30389,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30639,7 +30730,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -30883,14 +30974,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int32(aPayload)-int32((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > (*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -30935,7 +31026,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -30984,7 +31075,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -31064,7 +31155,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31155,7 +31246,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -31175,7 +31266,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -31239,18 +31330,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -31266,6 +31347,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -31387,7 +31476,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -31591,7 +31680,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31656,7 +31745,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -31704,7 +31793,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -31823,7 +31912,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -31983,7 +32072,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32048,7 +32137,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+4, 0)
@@ -32084,7 +32173,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32128,7 +32217,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -32240,7 +32329,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -32398,7 +32487,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -32455,7 +32544,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -32471,7 +32560,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -32545,7 +32634,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32557,7 +32646,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 4)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+4)
@@ -32568,7 +32657,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32733,7 +32822,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -32757,9 +32846,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -32782,16 +32871,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -32812,9 +32899,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -32947,11 +33040,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*4)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*4)))
 		} else {
 		}
 		idx++
@@ -33004,12 +33100,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int32(pCell)-int32(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -33017,7 +33113,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int32(pData) - int32(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint32(sz))
 
@@ -33077,7 +33173,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4)), uint32(sz))
@@ -33166,7 +33262,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint32(nCell*2))
@@ -33282,7 +33378,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 80)) = allocateBtreePage(tls, pBt, bp, bp+4, uint32(0), uint8(0))
@@ -33325,8 +33421,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 80)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, (int32(pOut)-int32(pSpace))/1,
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+80)
+			*(*int32)(unsafe.Pointer(bp + 80)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, (int32(pOut)-int32(pSpace))/1,
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 4)))
@@ -33408,6 +33504,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -33600,7 +33698,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 72)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -33611,7 +33709,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -33769,7 +33867,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -33843,7 +33941,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -33869,9 +33967,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -33882,8 +33981,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 136 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -33905,7 +34004,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -33933,7 +34032,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 112)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != 0) {
@@ -34194,11 +34293,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+112)
+	*(*int32)(unsafe.Pointer(bp + 112)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != SQLITE_OK) {
 		goto __122
 	}
@@ -34386,7 +34485,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -34424,7 +34523,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 120 + uintptr(iPage-1)*4))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 72 + uintptr(iPage-1)*2)))
@@ -34501,7 +34600,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(4)
 	defer tls.Free(4)
 
@@ -34513,19 +34612,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -34538,7 +34629,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34557,6 +34648,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -34592,7 +34700,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -34601,13 +34708,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 108)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 104)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 104)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 104)) != 0) {
 		goto __2
 	}
@@ -34618,7 +34724,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -34731,7 +34837,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 104)) = btreeComputeFreeSpace(tls, pPage)
@@ -34745,20 +34851,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 104)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 108)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 108)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 108)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 108)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 108)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 108)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -34768,7 +34874,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 108))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+104)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+104)
+	if !(*(*int32)(unsafe.Pointer(bp + 104)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -34776,100 +34888,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 104)) = fillInCell(tls, pPage, newCell, pX, bp+108)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 104)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 104)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx) + 1)))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint32(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+112)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+112)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 104)) = clearCellOverflow(tls, pPage, oldCell, bp+112)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 104)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 104)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) == *(*int32)(unsafe.Pointer(bp + 108)) && U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+112)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 108)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 108)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 108))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 108))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint32(*(*int32)(unsafe.Pointer(bp + 108))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize), bp+104)
 	if !(*(*int32)(unsafe.Pointer(bp + 104)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 108)), uintptr(0), uint32(0), bp+104)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 104)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 108)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -34878,30 +34990,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 104)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 104)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint32((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint32((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 104))
@@ -34924,7 +35036,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -34943,13 +35054,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, nIn)
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(nIn + U32((int32(aOut)-int32((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1))
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -34966,7 +35079,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35025,9 +35138,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 12))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 12))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -35067,7 +35180,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -35075,11 +35188,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx) + 1)))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35154,7 +35267,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)) + 1)))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35164,7 +35277,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -35223,7 +35336,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -35252,7 +35365,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 24)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+16, bp+20)
 			if int32(*(*U8)(unsafe.Pointer(bp + 16))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 16))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 12)))
@@ -35328,7 +35441,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -35342,7 +35455,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -35476,7 +35589,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35651,12 +35764,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 312)) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -35664,15 +35806,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+40, ts+4055, 1)
+		Xsqlite3_str_append(tls, pCheck+44, ts+4055, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+40, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+44, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+40, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+44, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -35696,9 +35838,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4080, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if *(*int32)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb + 312)) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -35712,7 +35851,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4105, libc.VaList(bp, iChild))
 		return
@@ -35786,7 +35925,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -35871,48 +36012,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4301
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4311, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4349, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4387, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -35927,29 +36075,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -35957,28 +36105,28 @@ __9:
 	pc = U32(int32(*(*U8)(unsafe.Pointer(pCellIdx)))<<8 | int32(*(*U8)(unsafe.Pointer(pCellIdx + 1))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4463,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4493, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -35986,97 +36134,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4517, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4541, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2) + 1))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -36086,48 +36234,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4566, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4603,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -36156,7 +36304,7 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
 	bp := tls.Alloc(216)
 	defer tls.Free(216)
 
@@ -36190,19 +36338,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint32(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+40, uintptr(0), bp+104, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+44, uintptr(0), bp+108, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -36214,7 +36356,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -36222,7 +36364,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -36350,22 +36492,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+40)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+40)
+	Xsqlite3_str_reset(tls, bp+32+44)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+44)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+40)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -36592,8 +36731,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(292)
-	defer tls.Free(292)
+	bp := tls.Alloc(296)
+	defer tls.Free(296)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -37092,7 +37231,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 	defer tls.Free(32)
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+8, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+8, ts+4918,
@@ -37104,6 +37243,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*uint8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+8)).FnChar))) = uint8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 8)).FnChar)
 	}
 }
 
@@ -37291,7 +37431,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & Size_t(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 16)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -37465,16 +37604,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -37917,7 +38058,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38153,43 +38294,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*4)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -38574,7 +38706,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38589,14 +38721,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -38966,7 +39098,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -38978,13 +39112,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -39061,6 +39197,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -39992,7 +40131,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -40034,7 +40172,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*40, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -40787,7 +40925,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -40895,7 +41033,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -41446,7 +41584,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -41511,7 +41649,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -41545,7 +41683,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 48)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41595,7 +41733,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 48)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -41741,7 +41879,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -41912,7 +42050,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -41938,7 +42076,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42212,7 +42350,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42564,8 +42702,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -42575,15 +42716,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -42771,6 +42912,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -42823,7 +42965,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -42887,6 +43029,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
@@ -42898,9 +43049,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5350)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -43134,7 +43286,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -43158,8 +43310,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*40
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*40
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -43333,15 +43485,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5360, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5350, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -43452,14 +43604,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -43743,7 +43898,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -43887,7 +44042,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -44059,7 +44214,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*uint8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5400, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5390, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, (int32(zRawSql)-int32(zStart))/1)
 		}
@@ -44114,21 +44269,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 80
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5404, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5394, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+80)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5401, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5424, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5414, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5427, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5417, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5432, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5422, 1)
 			}
 		}
 	}
@@ -44220,11 +44375,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity uint8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -44591,7 +44746,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -44692,594 +44846,598 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 164 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(*(*int32)(unsafe.Pointer(db + 312)) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*20
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
-		goto __100
-	case OP_NotFound:
-		goto __101
-	case OP_Found:
-		goto __102
 
-	case OP_SeekRowid:
+	case OP_IfNoHope:
+		goto __100
+	case OP_NoConflict:
+		goto __101
+	case OP_NotFound:
+		goto __102
+	case OP_Found:
 		goto __103
 
-	case OP_NotExists:
+	case OP_SeekRowid:
 		goto __104
 
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
 
 check_for_interrupt:
 	if !(*(*int32)(unsafe.Pointer(db + 312)) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
@@ -45288,56 +45446,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*20
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -45345,20 +45503,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64((int32(pOp) - int32(aOp)) / 20)
 
 	pOp = aOp + uintptr(pcDest)*20
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -45366,124 +45525,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*20)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*20
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5434, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5455, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5424, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5445, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = (int32(pOp) - int32(aOp)) / 20
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5462, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5452, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 120))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -45491,10 +45650,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -45505,9 +45664,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 40
 
@@ -45515,171 +45674,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*40
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*40
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint32(uintptr(0)+20))
 	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*40
 	pOut = aMem + uintptr(p2)*40
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 40
 	pOut += 40
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 40
 	pIn1 += 40
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 216))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp)-int32(aOp))/20 + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
@@ -45687,95 +45846,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 120)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint32((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint32((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = uint8(0)
@@ -45783,231 +45942,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -46016,95 +46175,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint32(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint32(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
@@ -46114,189 +46273,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -46305,38 +46468,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*20 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -46344,9 +46507,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -46357,298 +46520,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*40, aMem+uintptr(U32(p21)+idx)*40, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*40)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*40)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*20
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*20
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*20
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*20
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32((int32(pOp) - int32((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 20)
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 80 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -46658,144 +46822,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*40
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+76, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 36))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 12)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 12)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+76)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint32(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -46803,353 +46967,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+80+uintptr(i1)*4, libc.AssignPtrUint32(bp+272, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 272)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+272))
 	*(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 272))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 272))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int32(zHdr) - int32(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 272)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int32(zHdr) - int32(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 272)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 272)) = *(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 272)) = *(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 272)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 272)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 272))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 120))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint32(len))
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = uint8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 272))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 272)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 272))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 272))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 272)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 120))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 272)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*20
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 40
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 40
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*16 + 4)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 40
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5486,
+	Xsqlite3VdbeError(tls, p, ts+5476,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*16 + 4))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*uint8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 40
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -47163,319 +47327,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*uint8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 40
 
-	goto __455
-__455:
-	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 16)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 40
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 120)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+280, pRec, uint32(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 280)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 280)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 280)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 280)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 280)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint32((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -47483,467 +47636,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint32((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 40
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 40
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)) + 36))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 288)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 288)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+288)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 288))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5527, 0)
+	Xsqlite3VdbeError(tls, p, ts+5517, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(unsafe.Sizeof(Savepoint{}))+uint32(nName)+uint32(1)))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint32(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5578, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5568, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5600, 0)
+		ts+5590, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*16)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*16)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5654, 0)
+		ts+5644, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5709
+				return ts + 5699
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5757
+					return ts + 5747
 				}
-				return ts + 5800
+				return ts + 5790
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 296)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+296)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 152))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 296)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5841)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5831)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 296))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+152, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -47951,67 +48115,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt, iCookie, bp+300)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 300)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 36)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 152))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -48022,24 +48186,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*40
@@ -48047,30 +48211,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -48086,22 +48250,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 36)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*4))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -48115,133 +48279,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 12)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 36)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fz = ts + 1547
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+12,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+40, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), pCx1+48,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 36)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 36)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -48249,18 +48413,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 36)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -48271,92 +48435,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), bp+304)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), int64(U64(iKey)), 0, bp+304)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -48374,106 +48538,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 312)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), bp+312, bp+304)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+312)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 304)) < 0 || *(*int32)(unsafe.Pointer(bp + 304)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 304)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 304)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 304)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 304)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 304)) > 0 || *(*int32)(unsafe.Pointer(bp + 304)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 304)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 304)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 304)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 20
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*20)).Fp1)*4))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 36))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -48482,108 +48646,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 344)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 344)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*20)).Fp3)*40
 	*(*int32)(unsafe.Pointer(bp + 376)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+344, bp+376)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 376)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 20
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 376)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 376)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 36)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -48591,14 +48755,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 384)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+384)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 384)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 384)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 36)), bp+384, pC9+28)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+384)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -48608,108 +48772,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+384)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+384)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 36)), pIdxKey, pC9+28)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+384)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+384)).FaMem+uintptr(ii1)*40)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 416)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+416, uint8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+416)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 416)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -48728,35 +48892,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 456))
 	if !(*(*int32)(unsafe.Pointer(bp + 456)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 464)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 460)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -48764,123 +48928,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)), bp+460)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 460)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 464)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 460)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 464)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 464)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)))
 	if !(*(*I64)(unsafe.Pointer(bp + 464)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 464))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 464))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 464)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 464)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 464)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 464)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 464))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+464)
 	*(*I64)(unsafe.Pointer(bp + 464)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 464))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)), int64(U64(*(*I64)(unsafe.Pointer(bp + 464)))),
 		0, bp+460)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 460)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 460)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 460)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 464))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -48890,52 +49054,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 472)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*16)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+472)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 472)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 472)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -48947,15 +49111,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 472)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 472)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 472)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 472)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 36)), bp+472,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -48963,13 +49128,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -48982,11 +49147,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+472)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*4))
@@ -48997,38 +49162,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 36)), *(*uintptr)(unsafe.Pointer(pSrc + 36)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*16)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 36)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -49040,47 +49205,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 36)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
@@ -49089,35 +49254,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+512)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -49126,51 +49291,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 120)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 520)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 36)))).FpVtab
@@ -49180,72 +49345,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)), bp+520)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 36)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 36)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49253,43 +49418,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 528)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+528)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 528)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 528)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49297,84 +49462,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+532)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 532)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 532)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 532)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 532)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 532)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 164 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	*(*int32)(unsafe.Pointer(bp + 536)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+536)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 36))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+536)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 536)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 536)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 536)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 536)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 36)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49384,34 +49554,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 164 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -49420,10 +49590,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 544)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 544)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -49440,14 +49610,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49460,21 +49630,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49486,62 +49656,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 584)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+584, bp+616)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 616)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5869)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5859)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 624)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 36)), bp+624)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
@@ -49554,56 +49724,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 12)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 624))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 672)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 672)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 672)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 672)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 672)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
@@ -49614,54 +49784,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+632, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+632)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+632)).Fn, (*Mem)(unsafe.Pointer(bp+632)).Fz, bp+672, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+632)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 704)) = 0
@@ -49669,72 +49839,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 704)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 704)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 704))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 712)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*16)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+712)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 40)) += *(*I64)(unsafe.Pointer(bp + 712))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)) += *(*I64)(unsafe.Pointer(bp + 712))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 36)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 36)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 720)) = Pgno(0)
@@ -49743,55 +49913,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+720, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 720)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+124, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5886
+	goto __799
+__798:
+	zSchema = ts + 5876
 	(*InitData)(unsafe.Pointer(bp + 724)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 724)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 724)).FpzErrMsg = p + 124
 	(*InitData)(unsafe.Pointer(bp + 724)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 724)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5900,
+		ts+5890,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 724)).Frc = SQLITE_OK
@@ -49801,66 +49971,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+724, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 724)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+724)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -49869,151 +50039,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*16)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+752)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*16)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+752, bp+756)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 752)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 756)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 752)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 756)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
 		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+760) == 0) {
-		goto __811
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40, *(*I64)(unsafe.Pointer(bp + 760)))
-__812:
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 120 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5943, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 120 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5933, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint32(unsafe.Sizeof(VdbeFrame{}))+uint32(7))&libc.Uint32FromInt32(libc.CplInt32(7)) +
 		uint32(nMem)*uint32(unsafe.Sizeof(Mem{})) +
@@ -50021,10 +50192,10 @@ __826:
 		uint32(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -50046,24 +50217,24 @@ __827:
 
 	pEnd = pFrame2 + 88 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*40
 	pMem1 = pFrame2 + 88
-__828:
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 40
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -50086,103 +50257,103 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*20
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*20)).Fp1)*40
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 536)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 528)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 64)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 536)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 528)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 64)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pOut = out2Prerelease(tls, p, pOp)
@@ -50194,62 +50365,62 @@ __155:
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
+	goto __849
+__848:
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 768))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(n4)*uint32(unsafe.Sizeof(uintptr(0)))+(uint32(unsafe.Sizeof(Sqlite3_context{}))+uint32(unsafe.Sizeof(Mem{}))-uint32(unsafe.Sizeof(uintptr(0))))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 28 + uintptr(n4)*4
@@ -50266,146 +50437,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 28 + uintptr(i5)*4)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*40
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+28)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+28)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*20)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*40, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
 	*(*int32)(unsafe.Pointer(bp + 776)) = 0
 	*(*int32)(unsafe.Pointer(bp + 776 + 1*4)) = libc.AssignPtrInt32(bp+776+2*4, -1)
 
 	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+776+1*4, bp+776+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 776)) = 1
-__867:
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
 	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 776 + uintptr(i6)*4))))
-	goto __870
-__870:
+	goto __872
+__872:
 	i6++
 	pMem4 += 40
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -50413,70 +50584,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5980,
+		ts+5970,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6032
+				return ts + 6022
 			}
-			return ts + 6037
+			return ts + 6027
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -50484,17 +50655,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -50504,14 +50675,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+124, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -50521,103 +50692,103 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+152, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+152, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 36)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 36)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*16)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6044, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6034, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
+		goto __895
 	}
 	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
+__895:
 	;
 	if !(rc != 0) {
-		goto __894
+		goto __896
 	}
 	goto abort_due_to_error
-__894:
+__896:
 	;
-	goto __8
+	goto __9
 
-__172:
+__173:
 	libc.Xmemset(tls, bp+792, 0, uint32(unsafe.Sizeof(Mem{})))
 	(*Mem)(unsafe.Pointer(bp + 792)).Fdb = db
 
@@ -50626,44 +50797,44 @@ __172:
 	zTab = Xsqlite3_value_text(tls, bp+792)
 
 	if !(zTab != 0) {
-		goto __895
+		goto __897
 	}
 	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+124)
-__895:
+__897:
 	;
 	Xsqlite3VdbeMemRelease(tls, bp+792)
 	if !(rc != 0) {
-		goto __896
+		goto __898
 	}
 	goto abort_due_to_error
-__896:
+__898:
 	;
-	goto __8
+	goto __9
 
-__173:
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
 	if !(rc != 0) {
-		goto __897
+		goto __899
 	}
 	goto abort_due_to_error
-__897:
+__899:
 	;
-	goto __8
+	goto __9
 
-__174:
+__175:
 	;
 	pCur3 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 832)) = uintptr(0)
 	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
+		goto __900
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__898:
+__900:
 	;
 	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
 	rc = (*struct {
@@ -50671,47 +50842,47 @@ __898:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+832)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
-		goto __899
+		goto __901
 	}
 	goto abort_due_to_error
-__899:
+__901:
 	;
 	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 832)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
 	*(*uintptr)(unsafe.Pointer(pCur3 + 36)) = *(*uintptr)(unsafe.Pointer(bp + 832))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 832)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 36))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5350, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6063, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pArgc = pQuery + 1*40
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -50725,27 +50896,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*4)) = pArgc + uintptr(i7+1)*40
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -50753,24 +50924,24 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 36)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
@@ -50780,45 +50951,45 @@ __908:
 	(*Sqlite3_context)(unsafe.Pointer(bp + 836)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 36)), bp+836, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
 	if !((*Sqlite3_context)(unsafe.Pointer(bp+836)).FisError > 0) {
-		goto __911
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 836)).FisError
-__911:
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 36)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -50828,96 +50999,96 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 36)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 36)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 32)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 32)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
+		goto __919
+	}
+	*(*U64)(unsafe.Pointer(db + 32)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
+__919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
 
-__180:
+__181:
 	*(*Sqlite_int64)(unsafe.Pointer(bp + 872)) = int64(0)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __919
+		goto __921
 	}
 	goto no_mem
-__919:
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*4)) = pX1
 	pX1 += 40
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
@@ -50926,94 +51097,94 @@ __924:
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 872))
-__925:
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 28 + uintptr(i9)*4)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*40
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -51022,63 +51193,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+28)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+228, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= uint8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 164 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 164 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -51088,104 +51259,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 216))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 216))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 216))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*20)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*20)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 164 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 20
-	goto __5
 	goto __7
 __7:
+	pOp += 20
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -51193,52 +51364,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6079,
 		libc.VaList(bp+184, (int32(pOp)-int32(aOp))/20, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 32)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 32)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 164 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -51357,8 +51532,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(328)
-	defer tls.Free(328)
+	bp := tls.Alloc(332)
+	defer tls.Free(332)
 
 	var nAttempt int32
 	var iCol int32
@@ -51378,7 +51553,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -51398,8 +51573,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -51430,8 +51605,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -51464,8 +51639,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51545,8 +51720,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51615,7 +51790,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+324)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+328)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -51643,12 +51818,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 324)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 328)) != 0 {
 			return ts + 3656
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 324))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 328))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51692,7 +51867,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51775,7 +51950,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -54312,6 +54487,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6374, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6382+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6401+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5876+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(100)
 	defer tls.Free(100)
@@ -54331,7 +54534,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -54386,7 +54588,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6374, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6434, zDb) == 0) {
 		goto __8
 	}
 
@@ -54507,7 +54709,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6379) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6439) != 0) {
 		goto __33
 	}
 	goto __14
@@ -54515,73 +54717,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+44)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 48)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -54593,28 +54813,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 16
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -54625,160 +54845,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6381, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6441, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6385, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6445, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6389, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6449, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 16
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 8)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 8)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 144)) |= func() uint32 {
@@ -54787,8 +55008,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 148)) |= func() uint32 {
 		if iCol >= 32 {
@@ -54796,19 +55017,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -54816,81 +55037,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 8))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*20)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*20 + 8 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*20)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6398, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6458, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6429, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6489, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -54903,144 +55124,144 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6484, libc.VaList(bp+16, zCol))
+		ts+6544, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+44, 0, uint32(unsafe.Sizeof(struct {
 		FpTab        uintptr
 		F__ccgo_pad1 [4]byte
 	}{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6519
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6579
 	*(*uintptr)(unsafe.Pointer(pExpr + 20)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6528
+		zErr = ts + 6588
 	} else {
-		zErr = ts + 6543
+		zErr = ts + 6603
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6565, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6625, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6578, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6588, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 56)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -55084,15 +55305,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6595
+	var zIn uintptr = ts + 6655
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6623
+		zIn = ts + 6683
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6641
+		zIn = ts + 6701
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6659
+		zIn = ts + 6719
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6677, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6737, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55171,10 +55392,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6697
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6757
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6702
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -55221,7 +55442,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6708, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6768, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -55285,7 +55506,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*20)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6725, libc.VaList(bp, pExpr))
+								ts+6785, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -55301,7 +55522,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6789,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6849,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -55315,7 +55536,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6825, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6885, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -55338,30 +55559,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6853, libc.VaList(bp+16, pExpr))
+						ts+6913, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6896
+						zType = ts + 6956
 					} else {
-						zType = ts + 6903
+						zType = ts + 6963
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6913, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6973, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6941, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7001, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6963,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7023,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7007,
+						ts+7067,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -55433,7 +55654,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7055, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7115, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
 				}
@@ -55449,7 +55670,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7066, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7126, pExpr, pExpr)
 			}
 
 			break
@@ -55505,7 +55726,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55580,7 +55801,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7077, libc.VaList(bp, i, zType, mx))
+		ts+7137, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55600,7 +55821,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 120 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7133, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7193, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55635,7 +55856,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7167, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7227, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55692,7 +55913,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 8 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7173, libc.VaList(bp, i+1))
+				ts+7233, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -55720,7 +55941,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 120 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7234, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7294, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -55934,7 +56155,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 24)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7265, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7325, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -55974,7 +56195,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7167) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7227) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -55985,7 +56206,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7304) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7364) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -55997,7 +56218,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7310, 0)
+						ts+7370, 0)
 					return WRC_Abort
 				}
 
@@ -56097,12 +56318,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 24)) |= savedHasAgg
@@ -56138,12 +56359,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -56253,33 +56474,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) uint8
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) uint8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 20)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*20)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 44)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 20)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*20)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 20))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*20)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -56349,7 +56671,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 44)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -56684,7 +57007,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 		return
 	}
 
@@ -56759,7 +57082,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 120 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7369, libc.VaList(bp, mxHeight))
+			ts+7429, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57008,10 +57331,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7417,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7477,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7461
+						return ts + 7521
 					}
 					return ts + 1547
 				}(), nElem))
@@ -57052,7 +57375,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57078,7 +57401,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 120 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7465, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7525, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 20)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57106,7 +57429,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7499, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7559, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57153,7 +57476,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 120 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7519,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7579,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 120 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57178,7 +57501,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 120 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7562, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7622, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -57753,7 +58076,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7585,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -57876,7 +58199,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 120 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7615, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7675, libc.VaList(bp, zObject))
 	}
 }
 
@@ -57932,10 +58255,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6697) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6757) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6702) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6762) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -58366,13 +58689,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff uint8) int3
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7638) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7698) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7646) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7706) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7652) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7712) == 0 {
 		return 1
 	}
 	return 0
@@ -58576,7 +58899,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7656, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7716, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -58654,7 +58977,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7703, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7763, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -58748,7 +59071,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7734
+		var zFmt uintptr = ts + 7794
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -58766,7 +59089,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	}
 }
 
@@ -58807,7 +59130,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7778, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7838, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
@@ -58837,11 +59160,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7801, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7861, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1547
 			}
-			return ts + 7820
+			return ts + 7880
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -58968,7 +59291,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7832, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7892, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 44)))
@@ -58983,12 +59306,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7850, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7910, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1547
 		}
-		return ts + 7820
+		return ts + 7880
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -59009,7 +59333,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59018,7 +59342,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7871)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7931)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -59404,8 +59728,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7873, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7876,
+			if Xsqlite3_strnicmp(tls, z, ts+7933, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7936,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4925
@@ -59481,7 +59805,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7903,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7963,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -59567,8 +59891,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(76)
+	defer tls.Free(76)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -59654,14 +59978,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 52)) = [5]uintptr{ts + 7933, ts + 7938, ts + 7943, ts + 6184, ts + 6179}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 7993, ts + 7998, ts + 8003, ts + 6184,
+				ts + 6179, ts + 8011}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7951
+						return ts + 8019
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 52 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*4))
 				}())
@@ -59675,7 +60001,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -59698,10 +60024,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -59801,7 +60127,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -59931,12 +60257,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -59945,110 +60272,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*16)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*16)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 44)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 44))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*16
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7903,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7963,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 12)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 12)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 44)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -60091,13 +60431,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*uint8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -60107,11 +60447,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -60134,11 +60474,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -60147,15 +60487,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -60182,20 +60522,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -60204,9 +60544,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -60244,14 +60584,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7956, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8024, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -60262,17 +60604,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 	if pFarg != 0 {
@@ -60284,128 +60626,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7983, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8051, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*20)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*20)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 44)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*20)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*20)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -60413,42 +60755,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7585,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -60471,23 +60813,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -60504,42 +60846,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*16)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -60560,15 +60904,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60578,22 +60922,22 @@ __128:
 	pTest = bp + 100
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 100)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -60602,21 +60946,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*20)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*20)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -60626,27 +60970,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8007, 0)
+		ts+8075, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -60655,7 +60999,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -60666,7 +61010,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]uint8)(unsafe.Pointer(ts + 8057))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8125))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62041,18 +62385,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*20)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*16)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*20)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*16)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*20)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*16)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*20)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*16)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -62082,7 +62426,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+32,
+		pInfo+24,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -62095,12 +62439,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+44,
+		pInfo+36,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 16
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*16
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 44))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 20
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 24))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -62108,6 +62550,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 8))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*16)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -62122,81 +62604,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 20
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*20
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 44))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 20
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -62218,34 +62627,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 20
-				goto __10
-				goto __12
-			__12:
+				pItem += 16
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*20
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*16
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -62335,7 +62743,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 156 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 160 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -62343,7 +62751,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint32(unsafe.Sizeof([8]int32{}))/uint32(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 156 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 160 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -62394,11 +62802,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8073, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8135, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -62410,13 +62818,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8101,
+		ts+8163,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8276,
+			ts+8338,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -62426,10 +62834,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8450, libc.VaList(bp, zDb, zDb))
+		ts+8512, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8597, 0)
+			ts+8659, 0)
 	}
 }
 
@@ -62493,7 +62901,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8748, libc.VaList(bp, zName))
+		ts+8810, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -62503,7 +62911,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8807, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8869, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -62512,7 +62920,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8813, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8875, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -62553,19 +62961,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8840, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8902, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9024,
+		ts+9086,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9329, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9391, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9345,
+		ts+9407,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -62573,7 +62981,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9403, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9465, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -62585,7 +62993,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9668, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9730, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -62597,7 +63005,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9681,
+		ts+9743,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -62643,12 +63051,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9719, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9781, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9751, 0)
+			ts+9813, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -62658,11 +63066,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 44 + 4)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9778)
+				ts+9840)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9837)
+				ts+9899)
 		}
 
 		if pDflt != 0 {
@@ -62675,12 +63083,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9890)
+					ts+9952)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9936)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9998)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -62691,7 +63099,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9963,
+			ts+10025,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 44)), zCol, *(*int32)(unsafe.Pointer(pNew + 44)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -62713,7 +63121,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10109,
+				ts+10171,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -62761,14 +63169,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10339, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10401, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10373, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10435, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -62796,7 +63204,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(uint32(unsafe.Sizeof(Column{}))*uint32(nAlloc)))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10403, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10465, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -62836,18 +63244,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10422
+		zType = ts + 10484
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10427
+		zType = ts + 10489
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10441,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10503,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10459
+					return ts + 10521
 				}
-				return ts + 10476
+				return ts + 10538
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -62931,7 +63339,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10494, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -62948,17 +63356,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10515,
+		ts+10577,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10697,
+		ts+10759,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9668, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9730, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63153,7 +63561,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 272; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 12 {
+	for pp = pParse + 276; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 12 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -63216,10 +63624,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10828,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10890,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10851
+				return ts + 10913
 			}
 			return ts + 1547
 		}(), zWhen,
@@ -63261,8 +63669,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10853, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10915, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63279,7 +63687,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63301,7 +63709,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10861, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10923, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -63341,10 +63749,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)
 				*(*uint8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = uint8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10867, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10929, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*uint8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10851
+							return ts + 10913
 						}
 						return ts + 1547
 					}()))
@@ -63520,8 +63928,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(324)
-	defer tls.Free(324)
+	bp := tls.Alloc(328)
+	defer tls.Free(328)
 
 	var db uintptr
 
@@ -63604,15 +64012,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+20, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+296, 0, uint32(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 296)).FpParse = bp + 20
-	(*Walker)(unsafe.Pointer(bp + 296)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+300, 0, uint32(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 300)).FpParse = bp + 20
+	(*Walker)(unsafe.Pointer(bp + 300)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 296)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 300)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 296 + 24)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 300 + 24)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -63640,7 +64048,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+296, pSelect)
+	Xsqlite3WalkSelect(tls, bp+300, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -63673,13 +64081,13 @@ __15:
 	renameTokenFind(tls, bp+20, bp, (*Parse)(unsafe.Pointer(bp+20)).FpNewTable+32)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+296, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+300, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 20)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63692,7 +64100,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63707,7 +64115,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+20)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FaCol+uintptr(i)*16)
-	Xsqlite3WalkExpr(tls, bp+296, pExpr)
+	Xsqlite3WalkExpr(tls, bp+300, pExpr)
 	goto __24
 __24:
 	i++
@@ -63763,8 +64171,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+20)
@@ -63812,7 +64220,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+20, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+296, (*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+300, (*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -63880,8 +64288,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(356)
-	defer tls.Free(356)
+	bp := tls.Alloc(360)
+	defer tls.Free(360)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -63923,11 +64331,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 44))
 
-						libc.Xmemset(tls, bp+324, 0, uint32(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 324)).FpParse = bp + 48
+						libc.Xmemset(tls, bp+328, 0, uint32(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 328)).FpParse = bp + 48
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+48, *(*uintptr)(unsafe.Pointer(pTab + 44)), bp+324)
+						Xsqlite3SelectPrep(tls, bp+48, *(*uintptr)(unsafe.Pointer(pTab + 44)), bp+328)
 						if (*Parse)(unsafe.Pointer(bp+48)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 48)).Frc
 						} else {
@@ -64020,8 +64428,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(324)
-	defer tls.Free(324)
+	bp := tls.Alloc(328)
+	defer tls.Free(328)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64039,16 +64447,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+276, 0, uint32(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+296, 0, uint32(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 296)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 296)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+280, 0, uint32(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+300, 0, uint32(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 300)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 300)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 296)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 300)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 296 + 24)) = bp + 276
+			*(*uintptr)(unsafe.Pointer(bp + 300 + 24)) = bp + 280
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -64063,31 +64471,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+296, pSelect)
+						Xsqlite3WalkSelect(tls, bp+300, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+296, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+300, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+296,
+						Xsqlite3WalkExpr(tls, bp+300,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*16))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+296, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+300, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+276, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+280, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+276)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+280)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -64105,8 +64513,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(308)
-	defer tls.Free(308)
+	bp := tls.Alloc(312)
+	defer tls.Free(312)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64132,9 +64540,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 32)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+276, 0, uint32(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 276)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 44)), bp+276)
+				libc.Xmemset(tls, bp+280, 0, uint32(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 280)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 44)), bp+280)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -64162,8 +64570,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(300)
-	defer tls.Free(300)
+	bp := tls.Alloc(304)
+	defer tls.Free(304)
 
 	var db uintptr
 	var iSchema int32
@@ -64200,7 +64608,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -64224,7 +64632,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10872, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10934, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -64305,17 +64713,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10494, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10879,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10941,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10907
+				return ts + 10969
 			}
 			return ts + 6120
 		}(),
@@ -64326,7 +64734,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10919, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10981, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -64343,10 +64751,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10967, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11029, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11088, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11150, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -64464,11 +64872,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11106},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11127},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11147},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11166},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11185}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11168},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11189},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11209},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11228},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11247}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -64502,7 +64910,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11208, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11270, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -64511,10 +64919,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11231,
+					ts+11293,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11261, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11323, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -64532,9 +64940,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11279, FzCols: ts + 11292},
-	{FzName: ts + 11305, FzCols: ts + 11318},
-	{FzName: ts + 11346},
+	{FzName: ts + 11341, FzCols: ts + 11354},
+	{FzName: ts + 11367, FzCols: ts + 11380},
+	{FzName: ts + 11408},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -64542,13 +64950,14 @@ var aTable = [3]struct {
 // information.
 type StatAccum1 = struct {
 	Fdb          uintptr
+	F__ccgo_pad1 [4]byte
 	FnEst        TRowcnt
 	FnRow        TRowcnt
 	FnLimit      int32
 	FnCol        int32
 	FnKeyCol     int32
 	FnSkipAhead  U8
-	F__ccgo_pad1 [7]byte
+	F__ccgo_pad2 [3]byte
 	Fcurrent     StatSample
 	FnPSample    TRowcnt
 	FmxSample    int32
@@ -64559,7 +64968,6 @@ type StatAccum1 = struct {
 	FnMaxEqZero  int32
 	FiGet        int32
 	Fa           uintptr
-	F__ccgo_pad2 [4]byte
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -64633,7 +65041,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*40)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -64679,13 +65087,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*112
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*120
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -64698,11 +65106,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*40
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*40
 		for i = 0; i < mxSample+nCol; i++ {
@@ -64726,17 +65134,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11359}
+	FzName:     ts + 11421}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -64747,8 +65155,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -64791,7 +65199,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*40
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -64819,7 +65227,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -64886,7 +65294,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*40
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*40) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -64902,8 +65310,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*40)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*40)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*40)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*40)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -64920,9 +65328,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -64930,14 +65338,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -64945,31 +65353,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+80, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+92, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*40) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*40, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*40) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*40, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -64977,7 +65385,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11369}
+	FzName:     ts + 11431}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(72)
@@ -64991,20 +65399,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11379,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11441,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11384, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11446, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65046,7 +65454,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+48, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+48, ts+11390, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+48, ts+11452, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+48)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+48)).FnChar--
@@ -65060,7 +65468,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11396}
+	FzName:     ts + 11458}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -65104,7 +65512,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11405, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11467, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65121,7 +65529,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*64
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11279, uint32(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11341, uint32(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -65277,7 +65685,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11415, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11477, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -65334,7 +65742,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11415, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11477, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -65381,9 +65789,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 40)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11419)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11481)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11423)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11485)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -65469,16 +65877,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1547
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*uint8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -65488,15 +65896,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(0), 6, 0x40)
 		for *(*uint8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11427, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11489, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11438, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11500, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11448, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11510, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 6, 0x40)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -65576,7 +65984,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -65590,42 +65998,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*20)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*20)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -65699,15 +66107,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*20
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 28)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -65772,11 +66180,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11305, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11367, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11460,
-			ts+11514,
+			ts+11522,
+			ts+11576,
 			zDb)
 	}
 	return rc
@@ -65823,10 +66231,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11279, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11341, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11566, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11628, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -65884,12 +66292,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6374, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6434, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(44)
-	defer tls.Free(44)
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
 
 	var i int32
 	var rc int32
@@ -65900,13 +66308,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -65927,128 +66338,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 28)) = Xsqlite3_vfs_find(tls, ts+3828)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 28)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3828)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*16
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11669, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*16
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 28)), ts+11607, db, pNew+4, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 120 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11610,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 120 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11647, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11672,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 120 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11709, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+476) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(unsafe.Sizeof(Db{}))*uint32(3)))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint32(unsafe.Sizeof(Db{}))*uint32(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(uint32(unsafe.Sizeof(Db{}))*uint32((*Sqlite3)(unsafe.Pointer(db)).FnDb+1)))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*16
 	libc.Xmemset(tls, pNew, 0, uint32(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+28, bp+32, bp+36)
+	*(*uint32)(unsafe.Pointer(bp + 28)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+28, bp+32, bp+36, bp+40)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 36)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 36)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 40)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 28)), *(*uintptr)(unsafe.Pointer(bp + 32)), db, pNew+4, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 28)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 36)), db, pNew+4, 0, int32(*(*uint32)(unsafe.Pointer(bp + 28))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11677, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11739, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db,
-		ts+11706, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db,
+		ts+11768, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -66058,89 +66492,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 36)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 172 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+40)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+44)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 172 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 40)))
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11774, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11836, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 40)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 40)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 44)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66194,14 +66628,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11802, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11864, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11823, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11885, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66209,7 +66643,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11849, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11911, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66251,42 +66685,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -66295,13 +66735,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -66320,7 +66760,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11871}
+	FzName:     ts + 11933}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -66333,7 +66773,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11885}
+	FzName:     ts + 11947}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -66347,7 +66787,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11899, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11961, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -66379,7 +66819,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11923,
+						ts+11985,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -66554,7 +66994,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11969, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12031, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -66580,11 +67020,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11992, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+11998, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12060, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12004, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12066, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -66631,7 +67071,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName
 	} else {
-		zCol = ts + 7646
+		zCol = ts + 7706
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -66655,7 +67095,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12031, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12093, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -66880,6 +67320,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -66892,13 +67335,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint32(uintptr(0)+200)), uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint32(uintptr(0)+204)), uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint32(uintptr(0)+200)), bp, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemcpy(tls, pParse+uintptr(uint32(uintptr(0)+204)), bp, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -66923,25 +67366,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6374) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6434) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12046+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-						ts+12079)
+						ts+6382)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8,
-						ts+5886)
+						ts+5876)
 				}
 			}
 		}
@@ -66962,12 +67405,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5886)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12046+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5876)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-					ts+12079)
+					ts+6382)
 			}
 		}
 	}
@@ -66998,7 +67441,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+404, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12098, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12108, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67016,14 +67459,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12106
+			zMsg = ts + 12116
 		} else {
-			zMsg = ts + 12119
+			zMsg = ts + 12129
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6578, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6588, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67053,12 +67496,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
-			return ts + 12065
+	if Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
+			return ts + 6420
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12079+7) == 0 {
-			return ts + 12046
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6382+7) == 0 {
+			return ts + 6401
 		}
 	}
 	return zName
@@ -67416,7 +67859,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5886)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5876)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -67442,7 +67885,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6374, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6434, zName) {
 				goto __3
 			}
 
@@ -67495,13 +67938,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12133, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12143, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12150, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12160, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -67543,9 +67986,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8065, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6374, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12170,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12180,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -67705,9 +68148,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -67723,7 +68166,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12212, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12222, 0)
 	return
 __4:
 	;
@@ -67751,9 +68194,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10422
+			return ts + 10484
 		}
-		return ts + 8807
+		return ts + 8869
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -67769,9 +68212,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -67802,12 +68245,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12253,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12263,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10422
+				return ts + 10484
 			}
-			return ts + 8807
+			return ts + 8869
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -67822,7 +68265,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12274, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12284, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -67909,7 +68352,7 @@ var nullRow = [6]uint8{uint8(6), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema + 40
-	Xsqlite3HashInsert(tls, pHash, ts+12309, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12319, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -67933,7 +68376,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12326, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12336, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -67953,7 +68396,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12309
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12319
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -67965,7 +68408,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema + 40
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12309, pRet+8) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12319, pRet+8) ==
 		pRet+8 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -67999,7 +68442,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 120 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12360, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68007,13 +68450,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+24)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12383, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12393, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 24 + 4)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+24)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+24)).Fz + uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(1))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+24)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+24)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12390, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12400, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 24 + 4)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+24)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+24)).Fz + uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(1))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+24)).Fn--
@@ -68050,7 +68493,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*16)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*16)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12400, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12410, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68214,10 +68657,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*16
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12426,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12436,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12471, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12481, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint32(unsafe.Sizeof(Expr{})))
@@ -68248,7 +68691,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 12)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12512, 0)
+			ts+12522, 0)
 	}
 }
 
@@ -68293,7 +68736,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12564, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12574, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -68382,7 +68825,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12605, 0)
+		ts+12615, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -68477,7 +68920,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12661, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12671, 0)
 	goto generated_done
 __2:
 	;
@@ -68490,13 +68933,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12704, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12714, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12712, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12722, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -68523,13 +68966,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12719,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12729,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -68651,12 +69101,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1547
-		zSep2 = ts + 12750
+		zSep2 = ts + 12760
 		zEnd = ts + 4950
 	} else {
-		zSep = ts + 12752
-		zSep2 = ts + 12756
-		zEnd = ts + 12761
+		zSep = ts + 12762
+		zSep2 = ts + 12766
+		zEnd = ts + 12771
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -68664,7 +69114,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12764, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12774, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*uint8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = uint8('(')
@@ -68702,11 +69152,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1547,
-	ts + 12778,
-	ts + 12784,
-	ts + 12789,
+	ts + 12788,
+	ts + 12794,
+	ts + 12799,
+	ts + 12804,
 	ts + 12794,
 }
 
@@ -69114,10 +69565,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12800,
+						ts+12810,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12833,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12843,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69136,11 +69587,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12860, 0)
+				ts+12870, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12910, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12920, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 28)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69174,7 +69625,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12942, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12952, 0)
 			return
 		}
 	}
@@ -69199,11 +69650,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8807
-			zType2 = ts + 12986
+			zType = ts + 8869
+			zType2 = ts + 12996
 		} else {
-			zType = ts + 10422
-			zType2 = ts + 12992
+			zType = ts + 10484
+			zType2 = ts + 13002
 		}
 
 		if pSelect != 0 {
@@ -69265,7 +69716,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 200
+				pEnd2 = pParse + 204
 			} else {
 				pEnd2 = pEnd
 			}
@@ -69274,11 +69725,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+12997, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13007, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13012,
+			ts+13022,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69294,13 +69745,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13110,
+					ts+13120,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13152, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13162, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -69315,7 +69766,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9329) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9391) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -69345,7 +69796,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13186, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13196, 0)
 	goto create_view_fail
 __1:
 	;
@@ -69361,7 +69812,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10422, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10484, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+4, pSelect) != 0) {
 		goto __3
 	}
@@ -69443,7 +69894,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13222, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13232, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -69471,8 +69922,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+34, pTable+4)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -69569,13 +70019,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13252, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13262, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13267,
+		ts+13277,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*16)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -69616,10 +70066,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*16)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13334, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13344, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11231,
+				ts+11293,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -69651,12 +70101,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13348,
+			ts+13358,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13393,
+		ts+13403,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -69684,11 +70134,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7066, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7126, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -69766,9 +70216,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zArg2 = uintptr(0)
@@ -69827,21 +70277,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13460, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13470, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13488, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13498, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13522, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13532, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -69853,7 +70303,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11423, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11485, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -69917,7 +70367,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13554,
+		ts+13564,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*16)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -69929,7 +70379,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13617, 0)
+		ts+13627, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70014,7 +70464,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13711,
+		ts+13721,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*20)).FzEName))
 	goto fk_end
 __23:
@@ -70241,12 +70691,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*20 + 8 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*20)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13757,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13767,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13785
+							return ts + 13795
 						}
-						return ts + 13791
+						return ts + 13801
 					}()))
 				return 1
 			}
@@ -70367,7 +70817,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13796, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13806, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+132, pTblName) != 0) {
 		goto __10
 	}
@@ -70386,7 +70836,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13802,
+		ts+13812,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -70412,26 +70862,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13852, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13880, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13890, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13905, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13915, 0)
 	goto exit_create_index
 __17:
 	;
@@ -70445,7 +70895,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13796, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13806, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -70460,7 +70910,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13939, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13949, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -70472,7 +70922,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13973, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13983, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -70501,7 +70951,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+13997, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14007, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -70522,9 +70972,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -70563,7 +71013,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13796)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13806)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -70664,7 +71114,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14020, 0)
+		ts+14030, 0)
 	goto exit_create_index
 __56:
 	;
@@ -70881,7 +71331,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14081, libc.VaList(bp+48, 0))
+		ts+14091, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -70933,8 +71383,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14123, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14133, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -70980,12 +71430,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14140,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14150,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1547
 			}
-			return ts + 14160
+			return ts + 14170
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -70993,7 +71443,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14168,
+		ts+14178,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -71007,7 +71457,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14227, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14237, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71168,7 +71618,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14254, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14264, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71183,7 +71633,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14272, libc.VaList(bp+8, 0))
+		ts+14282, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71194,9 +71644,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71222,9 +71672,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14345,
+		ts+14355,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11419, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11481, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -71359,7 +71809,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14405,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14415,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -71567,12 +72017,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14441,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14451,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14477
+				return ts + 14487
 			}
-			return ts + 14480
+			return ts + 14490
 		}()))
 	goto append_from_error
 __1:
@@ -71741,7 +72191,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14486, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14496, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -71777,9 +72227,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14492
+				return ts + 14502
 			}
-			return ts + 14501
+			return ts + 14511
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -71804,7 +72254,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14486, ts + 14508, ts + 14492}
+var az = [3]uintptr{ts + 14496, ts + 14518, ts + 14502}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -71819,7 +72269,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14516, 0)
+				ts+14526, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -71956,14 +72406,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 120)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14586, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14596, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*16)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14597, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14607, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
@@ -71989,11 +72439,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14600, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14610, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72123,7 +72573,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14609, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14619, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72219,7 +72669,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+12+uintptr(i)*24)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14655, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14665, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -72412,7 +72862,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14685, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14695, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -72692,7 +73142,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14716,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14726,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -72724,11 +73174,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14749, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14759, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14778, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14788, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -73232,7 +73682,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14816)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14826)
 __62:
 	;
 delete_from_cleanup:
@@ -73347,7 +73797,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11279) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11341) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -73577,7 +74027,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6184, ts + 6179, ts + 7938, ts + 7933, ts + 6174}
+var azType2 = [5]uintptr{ts + 6184, ts + 6179, ts + 7998, ts + 7993, ts + 6174}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -73636,7 +74086,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14829, -1)
+					Xsqlite3_result_error(tls, context, ts+14839, -1)
 					return
 				}
 				iVal = -iVal
@@ -73940,7 +74390,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14846, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14856, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74286,7 +74736,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 120 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14851, -1)
+		Xsqlite3_result_error(tls, context, ts+14861, -1)
 		return
 	}
 	if argc == 3 {
@@ -74296,7 +74746,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14884, -1)
+				ts+14894, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -74395,7 +74845,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14929, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14939, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -74410,21 +74860,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = uint8('\'')
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = uint8(0)
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = uint8('\'')
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = uint8(0)
 				*(*uint8)(unsafe.Pointer(zText)) = uint8('X')
 				*(*uint8)(unsafe.Pointer(zText + 1)) = uint8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -74432,7 +74882,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14936, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14946, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -74546,6 +74996,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1547
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, (int32(p)-int32(pBlob))/1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -74748,7 +75311,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10851}
+var azOne = [1]uintptr{ts + 10913}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -74784,7 +75347,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(j))) = uint8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14939, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14949, 4, uintptr(0))
 	}
 }
 
@@ -74809,7 +75372,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12031, -1)
+		Xsqlite3_result_error(tls, context, ts+12093, -1)
 		return
 	}
 
@@ -74887,7 +75450,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14829, -1)
+			Xsqlite3_result_error(tls, context, ts+14839, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75149,7 +75712,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14944, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14954, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75169,14 +75732,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14950, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14960, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14950, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14960, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14950, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14950, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14960, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14960, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -75306,17 +75869,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -75375,6 +75938,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -75415,108 +75979,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_implies_nonnull_row), FxSFunc: 0, FzName: ts + 14955},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_compare), FxSFunc: 0, FzName: ts + 14975},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_implies_expr), FxSFunc: 0, FzName: ts + 14988},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_affinity), FxSFunc: 0, FzName: ts + 15006},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15015},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15023},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15023},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15038},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15064},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15089},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15098},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15109},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_sqlite_offset), FxSFunc: 0, FzName: ts + 15116},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15130},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15130},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15136},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15136},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15142},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15142},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15147},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15147},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15147},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15151},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15151},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(1), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15151},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15155},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15162},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15170},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15177},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15183},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15190},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15197},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15205},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15210},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_implies_nonnull_row), FxSFunc: 0, FzName: ts + 14965},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_compare), FxSFunc: 0, FzName: ts + 14985},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_implies_expr), FxSFunc: 0, FzName: ts + 14998},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_affinity), FxSFunc: 0, FzName: ts + 15016},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15025},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15033},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15033},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15048},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15074},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15099},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15108},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15119},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_sqlite_offset), FxSFunc: 0, FzName: ts + 15126},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15140},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15140},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15146},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15146},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15152},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15152},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15157},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15157},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15157},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15161},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15161},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(1), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15161},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15165},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15180},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15187},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15193},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15200},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15207},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15215},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15220},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15226},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15232},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15236},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15261},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15268},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15283},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15300},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15311},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15317},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15335},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15343},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15357},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15365},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15374},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15374},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15391},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15395},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15401},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15405},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15405},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15224},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15224},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15230},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15236},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15242},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15252},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15259},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15266},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15277},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15284},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15299},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15316},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15327},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15333},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15351},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15359},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15373},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15390},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15390},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15407},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15411},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15411},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15424},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14950},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14950},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6519},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15429},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15434},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15442},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15448},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15454},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15457},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15461},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15467},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15457},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15472},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15476},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15480},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15486},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15490},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15495},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15500},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15505},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15417},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15421},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15421},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15427},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15427},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15440},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14960},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14960},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6579},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6579},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15445},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15450},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15458},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15464},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15470},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15473},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15483},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15473},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15488},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15492},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15496},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15506},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15511},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15515},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15523},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15528},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15533},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15538},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15516},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15521},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15527},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15531},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15539},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15544},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15550},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15556},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15561},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15569},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15577},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15580},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6519},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_iif), FxSFunc: 0, FzName: ts + 15585}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15549},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15554},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15560},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15566},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15572},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15577},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15585},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15593},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15596},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6579},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_iif), FxSFunc: 0, FzName: ts + 15601}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -75637,7 +76203,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15589,
+				ts+15605,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -76297,8 +76863,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6385, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6381, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6445, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6441, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -76798,7 +77364,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7903, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77266,7 +77832,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15634,
+		ts+15650,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77291,7 +77857,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15675,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15691,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*8)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -77440,7 +78006,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15707,
+		ts+15723,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -77450,7 +78016,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15759, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15775, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -77502,7 +78068,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15784,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15800,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -77510,7 +78076,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15830, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15846, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -77922,7 +78488,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15851)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15867)
 __125:
 	;
 insert_cleanup:
@@ -78237,8 +78803,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 							onError, iReg)
 						Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -79327,7 +79894,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -79773,6 +80340,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -79811,7 +80379,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12031, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12093, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -79820,7 +80388,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15865
+		zEntry = ts + 15881
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -79835,7 +80403,7 @@ __5:
 	if !(ii < int32(uint32(unsafe.Sizeof(azEndings))/uint32(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11992, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -79871,7 +80439,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15888, uint32(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15904, uint32(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -79885,7 +80453,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15897, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15913, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -79909,7 +80477,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15901, uint32(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15917, uint32(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -79927,7 +80495,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15907, libc.VaList(bp+16, zEntry, zFile))
+		ts+15923, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -79954,7 +80522,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15950, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15966, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -79992,7 +80560,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15982, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+15998, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80002,7 +80570,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16019,
+	ts + 16035,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80157,7 +80725,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16022, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16038, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80166,62 +80734,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5050,
-	ts + 16061,
-	ts + 8807,
-	ts + 16065,
-	ts + 16070,
-	ts + 16073,
-	ts + 16083,
-	ts + 16093,
+	ts + 16077,
+	ts + 8869,
+	ts + 16081,
+	ts + 16086,
+	ts + 16089,
 	ts + 16099,
-	ts + 16103,
-	ts + 16108,
-	ts + 16113,
-	ts + 16121,
-	ts + 16132,
-	ts + 16135,
-	ts + 16142,
-	ts + 16103,
-	ts + 16108,
-	ts + 16149,
-	ts + 16154,
-	ts + 16157,
-	ts + 16164,
-	ts + 16099,
-	ts + 16103,
+	ts + 16109,
+	ts + 16115,
+	ts + 16119,
+	ts + 16124,
+	ts + 16129,
+	ts + 16137,
+	ts + 16148,
+	ts + 16151,
+	ts + 16158,
+	ts + 16119,
+	ts + 16124,
+	ts + 16165,
 	ts + 16170,
-	ts + 16175,
+	ts + 16173,
 	ts + 16180,
-	ts + 16103,
-	ts + 16184,
-	ts + 16108,
-	ts + 16192,
+	ts + 16115,
+	ts + 16119,
+	ts + 16186,
+	ts + 16191,
 	ts + 16196,
-	ts + 16201,
-	ts + 11423,
-	ts + 11419,
-	ts + 16207,
+	ts + 16119,
+	ts + 16200,
+	ts + 16124,
+	ts + 16208,
 	ts + 16212,
 	ts + 16217,
-	ts + 16061,
-	ts + 16103,
-	ts + 16222,
-	ts + 16229,
-	ts + 16236,
-	ts + 8807,
-	ts + 16244,
-	ts + 5053,
-	ts + 16250,
-	ts + 16061,
-	ts + 16103,
-	ts + 16255,
+	ts + 11485,
+	ts + 11481,
+	ts + 16223,
+	ts + 16228,
+	ts + 16233,
+	ts + 16077,
+	ts + 16119,
+	ts + 16238,
+	ts + 16245,
+	ts + 16252,
+	ts + 8869,
 	ts + 16260,
-	ts + 15457,
-	ts + 16265,
-	ts + 16278,
-	ts + 16287,
+	ts + 5053,
+	ts + 16266,
+	ts + 16077,
+	ts + 16119,
+	ts + 16271,
+	ts + 16276,
+	ts + 15473,
+	ts + 16281,
 	ts + 16294,
-	ts + 16305,
+	ts + 16303,
+	ts + 16310,
+	ts + 16321,
 }
 
 // Definitions of all built-in pragmas
@@ -80238,238 +80806,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16313,
+	{FzName: ts + 16329,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16328,
+	{FzName: ts + 16344,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16343,
+	{FzName: ts + 16359,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16355,
+	{FzName: ts + 16371,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16371,
+	{FzName: ts + 16387,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16294,
+	{FzName: ts + 16310,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16384,
+	{FzName: ts + 16400,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16396,
+	{FzName: ts + 16412,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16416,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16432,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16448,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16453,
+	{FzName: ts + 16469,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16468,
+	{FzName: ts + 16484,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16484,
+	{FzName: ts + 16500,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16498,
+	{FzName: ts + 16514,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16511,
+	{FzName: ts + 16527,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16525,
+	{FzName: ts + 16541,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16544,
+	{FzName: ts + 16560,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16563,
+	{FzName: ts + 16579,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16586,
+	{FzName: ts + 16602,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16595,
+	{FzName: ts + 16611,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16613,
+	{FzName: ts + 16629,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16630,
+	{FzName: ts + 16646,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16643,
+	{FzName: ts + 16659,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16658,
+	{FzName: ts + 16674,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16676,
+	{FzName: ts + 16692,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16686,
+	{FzName: ts + 16702,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16700,
+	{FzName: ts + 16716,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16716,
+	{FzName: ts + 16732,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16741,
+	{FzName: ts + 16757,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16760,
+	{FzName: ts + 16776,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16771,
+	{FzName: ts + 16787,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16782,
+	{FzName: ts + 16798,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16794,
+	{FzName: ts + 16810,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16810,
+	{FzName: ts + 16826,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16823,
+	{FzName: ts + 16839,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16842,
+	{FzName: ts + 16858,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16861,
+	{FzName: ts + 16877,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16874,
+	{FzName: ts + 16890,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16889,
+	{FzName: ts + 16905,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16899,
+	{FzName: ts + 16915,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16911,
+	{FzName: ts + 16927,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16920,
+	{FzName: ts + 16936,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16931,
+	{FzName: ts + 16947,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16941,
+	{FzName: ts + 16957,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16953,
+	{FzName: ts + 16969,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16964,
+	{FzName: ts + 16980,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16992,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 16993,
+	{FzName: ts + 17009,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17012,
+	{FzName: ts + 17028,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17038,
+	{FzName: ts + 17054,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17053,
+	{FzName: ts + 17069,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17067,
+	{FzName: ts + 17083,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17086,
+	{FzName: ts + 17102,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17100,
+	{FzName: ts + 17116,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17116,
+	{FzName: ts + 17132,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17128,
+	{FzName: ts + 17144,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17139,
+	{FzName: ts + 17155,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17150,
+	{FzName: ts + 17166,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17162,
+	{FzName: ts + 17178,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17189,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17194,
+	{FzName: ts + 17210,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17202,
+	{FzName: ts + 17218,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17217,
+	{FzName: ts + 17233,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17230,
+	{FzName: ts + 17246,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17249,
+	{FzName: ts + 17265,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17264,
+	{FzName: ts + 17280,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -80491,7 +81059,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17280))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17296))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -80503,10 +81071,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17305) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17321) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17315) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17331) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -80515,13 +81083,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7951) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8019) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17327) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17343) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -80536,9 +81104,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*uint8)(unsafe.Pointer(z))) >= '0' && int32(*(*uint8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*uint8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16255) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16271) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17339) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17355) == 0 {
 		return 2
 	} else {
 		return 0
@@ -80552,7 +81120,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17346, 0)
+				ts+17362, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt)
@@ -80643,19 +81211,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17408
+		zName = ts + 17424
 		break
 	case OE_SetDflt:
-		zName = ts + 17417
+		zName = ts + 17433
 		break
 	case OE_Cascade:
-		zName = ts + 17429
+		zName = ts + 17445
 		break
 	case OE_Restrict:
-		zName = ts + 17437
+		zName = ts + 17453
 		break
 	default:
-		zName = ts + 17446
+		zName = ts + 17462
 		break
 	}
 	return zName
@@ -80672,7 +81240,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17456, ts + 17463, ts + 17471, ts + 17475, ts + 17339, ts + 17484,
+	ts + 17472, ts + 17479, ts + 17487, ts + 17491, ts + 17355, ts + 17500,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -80719,13 +81287,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17488
+			zType = ts + 17504
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17490
+			zType = ts + 17506
 		} else {
-			zType = ts + 7461
+			zType = ts + 7521
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17492,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17508,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -80733,7 +81301,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17499, ts + 17504, ts + 17512}
+var azEnc = [4]uintptr{uintptr(0), ts + 17515, ts + 17520, ts + 17528}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -80884,14 +81452,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -80978,7 +81548,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17520, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17536, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81239,7 +81809,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17524) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17540) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81311,7 +81881,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17315
+	zRet = ts + 17331
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -81349,7 +81919,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17305
+	zRet = ts + 17321
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -81636,7 +82206,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 536)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17529, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17545, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -81677,7 +82247,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17554, 0)
+		ts+17570, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -81731,7 +82301,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17607) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17623) == 0) {
 		goto __142
 	}
 
@@ -81828,9 +82398,9 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17613
+			return ts + 17629
 		}
-		return ts + 17621
+		return ts + 17637
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -81899,7 +82469,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17628, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17644, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -81945,29 +82515,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10422
+	zType = ts + 10484
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12704
+	zType = ts + 12714
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17644
+	zType = ts + 17660
 	goto __183
 __182:
-	zType = ts + 8807
+	zType = ts + 8869
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17651,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17667,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*16)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82033,7 +82603,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82043,7 +82613,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17663,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17679,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*4)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -82080,8 +82650,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 544)) = [3]uintptr{ts + 17668, ts + 17670, ts + 16132}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17672,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 544)) = [3]uintptr{ts + 17684, ts + 17686, ts + 16148}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17688,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82114,7 +82684,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17678,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17694,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*16)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*16)).FpBt)))
@@ -82136,7 +82706,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17682, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17698, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82200,7 +82770,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7461, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82216,7 +82786,7 @@ __218:
 	if !(i6 < int32(uint32(unsafe.Sizeof(aPragmaName))/uint32(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7461, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -82251,7 +82821,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82259,7 +82829,7 @@ __226:
 			(*sColMap)(unsafe.Pointer(pFK+36+uintptr(j2)*8)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 25 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 25))),
-			ts+17694))
+			ts+17710))
 	goto __227
 __227:
 	j2++
@@ -82448,7 +83018,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17699, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17715, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 560)))
@@ -82665,7 +83235,7 @@ __284:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17703, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17719, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -82726,262 +83296,284 @@ __299:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 568)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__300:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __301
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __300
+	}
+	mxCol = -1
+	j4 = 0
+__302:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __304
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __305
+	}
+	mxCol++
+__305:
+	;
+	goto __303
+__303:
+	j4++
+	goto __302
+	goto __304
+__304:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __306
 	}
 	mxCol--
-	goto __300
+__306:
+	;
+	goto __301
+__300:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __301:
 	;
 	if !(mxCol >= 0) {
-		goto __302
+		goto __307
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 568)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 568)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__302:
+__307:
 	;
 	if !!(isQuick != 0) {
-		goto __303
+		goto __308
 	}
 	if !(pPk1 != 0) {
-		goto __304
+		goto __309
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 568)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17727,
+		ts+17743,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__305:
+__310:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __307
+		goto __312
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 568)), j4, r2+j4)
-	goto __306
-__306:
+	goto __311
+__311:
 	j4++
-	goto __305
-	goto __307
-__307:
+	goto __310
+	goto __312
+__312:
 	;
-__304:
+__309:
 	;
-__303:
+__308:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__308:
+__313:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __310
+		goto __315
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*16
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __311
+		goto __316
 	}
-	goto __309
-__311:
+	goto __314
+__316:
 	;
 	if !(bStrict != 0) {
-		goto __312
+		goto __317
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4) > COLTYPE_ANY)
-	goto __313
-__312:
+	goto __318
+__317:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__313:
+__318:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __314
+		goto __319
 	}
-	goto __309
-__314:
+	goto __314
+__319:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 568)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __316
-__315:
+	goto __321
+__320:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __317
+		goto __322
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 576)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		(*Column)(unsafe.Pointer(pCol1)).Faffinity, bp+576)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 576)) != 0) {
-		goto __318
+		goto __323
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 576)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 576)))
-__318:
+__323:
 	;
-__317:
+__322:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 568))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __319
+		goto __324
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __320
-__319:
+	goto __325
+__324:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__320:
+__325:
 	;
-__316:
+__321:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf>>0)) != 0) {
-		goto __321
+		goto __326
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17763, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17779, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __323
-__322:
+	goto __328
+__327:
 	;
-__323:
+__328:
 	;
-__321:
+__326:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __324
+		goto __329
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17783,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17799,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __325
-__324:
+	goto __330
+__329:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __326
+		goto __331
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17805,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17821,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __327
-__326:
+	goto __332
+__331:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __328
+		goto __333
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 568)), j4, 3)
-__329:
+__334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17828, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17844, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17830,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17846,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__328:
+__333:
 	;
-__327:
+__332:
 	;
-__325:
+__330:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __309
-__309:
+	goto __314
+__314:
 	j4++
-	goto __308
-	goto __310
-__310:
+	goto __313
+	goto __315
+__315:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __330
+		goto __335
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __331
+		goto __336
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 568)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__332:
+__337:
 	if !(k3 > 0) {
-		goto __334
+		goto __339
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*20)).FpExpr, addrCkFault, 0)
-	goto __333
-__333:
+	goto __338
+__338:
 	k3--
-	goto __332
-	goto __334
-__334:
+	goto __337
+	goto __339
+__339:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17850,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17866,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__331:
+__336:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__330:
+__335:
 	;
 	if !!(isQuick != 0) {
-		goto __335
+		goto __340
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__336:
+__341:
 	if !(pIdx5 != 0) {
-		goto __338
+		goto __343
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __339
+		goto __344
 	}
-	goto __337
-__339:
+	goto __342
+__344:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 568)), 0, 0, bp+580,
 		pPrior, r1)
@@ -82990,80 +83582,119 @@ __339:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 572))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17880)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17885)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17901)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__345:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __347
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*4)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __348
+	}
+	goto __346
+__348:
+	;
+	if !(label6 == 0) {
+		goto __349
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__349:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 572))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	if !(label6 != 0) {
+		goto __350
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17922)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__350:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __340
+		goto __351
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__341:
+__352:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __343
+		goto __354
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*16 + 4))&0xf>>0)) != 0) {
-		goto __344
+		goto __355
 	}
-	goto __342
-__344:
+	goto __353
+__355:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 572))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 572))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17949)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__351:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 580)))
 	goto __342
 __342:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __341
 	goto __343
 __343:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 572))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 572))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17906)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __340:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 580)))
-	goto __337
-__337:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __336
-	goto __338
-__338:
-	;
-__335:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 568)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __345
+		goto __356
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17933)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17976)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__346:
+__357:
 	if !(pIdx5 != 0) {
-		goto __348
+		goto __359
 	}
 	if !(pPk1 == pIdx5) {
-		goto __349
+		goto __360
 	}
-	goto __347
-__349:
+	goto __358
+__360:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 572))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83072,21 +83703,21 @@ __349:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __347
-__347:
+	goto __358
+__358:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __346
-	goto __348
-__348:
+	goto __357
+	goto __359
+__359:
 	;
 	if !(pPk1 != 0) {
-		goto __350
+		goto __361
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__350:
+__361:
 	;
-__345:
+__356:
 	;
 	goto __291
 __291:
@@ -83104,14 +83735,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(endCode))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __351
+		goto __362
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 564))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*20)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 17962
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 18005
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*20)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*20 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__351:
+__362:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83119,27 +83750,27 @@ __351:
 
 __45:
 	if !!(zRight != 0) {
-		goto __352
+		goto __363
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __354
+		goto __365
 	}
 	goto pragma_out
-__354:
+__365:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __353
-__352:
+	goto __364
+__363:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __355
+		goto __366
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__356:
+__367:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __358
+		goto __369
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __359
+		goto __370
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83148,25 +83779,25 @@ __356:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __358
-__359:
+	goto __369
+__370:
 	;
-	goto __357
-__357:
+	goto __368
+__368:
 	pEnc += 8
-	goto __356
-	goto __358
-__358:
+	goto __367
+	goto __369
+__369:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __360
+		goto __371
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17965, libc.VaList(bp+456, zRight))
-__360:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18008, libc.VaList(bp+456, zRight))
+__371:
 	;
-__355:
+__366:
 	;
-__353:
+__364:
 	;
 	goto __15
 
@@ -83174,15 +83805,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __361
+		goto __372
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(setCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __363
+		goto __374
 	}
 	goto __15
-__363:
+__374:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp1 = iDb
@@ -83190,41 +83821,41 @@ __363:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __364
+		goto __375
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fopcode = U8(OP_Noop)
-__364:
+__375:
 	;
-	goto __362
-__361:
+	goto __373
+__372:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(readCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __365
+		goto __376
 	}
 	goto __15
-__365:
+__376:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*20)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*20)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__362:
+__373:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__366:
+__377:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __366
-__367:
+	goto __377
+__378:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83239,31 +83870,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17322) == 0) {
-		goto __369
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17338) == 0) {
+		goto __380
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __370
-__369:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17990) == 0) {
-		goto __371
+	goto __381
+__380:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18033) == 0) {
+		goto __382
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __372
-__371:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17475) == 0) {
-		goto __373
+	goto __383
+__382:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17491) == 0) {
+		goto __384
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__373:
+__384:
 	;
-__372:
+__383:
 	;
-__370:
+__381:
 	;
-__368:
+__379:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83273,10 +83904,10 @@ __368:
 
 __49:
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__374:
+__385:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83296,19 +83927,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __377
+		goto __388
 	}
 	goto __15
-__377:
+__388:
 	;
-	goto __376
-__375:
+	goto __387
+__386:
 	opMask = U32(0xfffe)
-__376:
+__387:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -83317,86 +83948,86 @@ __376:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__378:
+__389:
 	if !(iDb <= iDbLast) {
-		goto __380
+		goto __391
 	}
 	if !(iDb == 1) {
-		goto __381
+		goto __392
 	}
-	goto __379
-__381:
+	goto __390
+__392:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__382:
+__393:
 	if !(k4 != 0) {
-		goto __384
+		goto __395
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __385
+		goto __396
 	}
-	goto __383
-__385:
+	goto __394
+__396:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__386:
+__397:
 	if !(pIdx6 != 0) {
-		goto __388
+		goto __399
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
-		goto __389
+		goto __400
 	}
 	szThreshold = int16(0)
-	goto __388
-__389:
+	goto __399
+__400:
 	;
-	goto __387
-__387:
+	goto __398
+__398:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __386
-	goto __388
-__388:
+	goto __397
+	goto __399
+__399:
 	;
 	if !(szThreshold != 0) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__390:
+__401:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+17998,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18041,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __391
+		goto __402
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __392
-__391:
+	goto __403
+__402:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__392:
+__403:
 	;
-	goto __383
-__383:
+	goto __394
+__394:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __382
-	goto __384
-__384:
+	goto __393
+	goto __395
+__395:
 	;
-	goto __379
-__379:
+	goto __390
+__390:
 	iDb++
-	goto __378
-	goto __380
-__380:
+	goto __389
+	goto __391
+__391:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -83404,36 +84035,36 @@ __380:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __393
+		goto __404
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__393:
+__404:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+584) == SQLITE_OK) {
-		goto __394
+		goto __405
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 584)))
-__394:
+__405:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+592) == SQLITE_OK) {
-		goto __395
+		goto __406
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 592)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 592)))) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 592)))
-__396:
+__407:
 	;
-__395:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -83442,10 +84073,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+600) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 600)) >= int64(0)) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 600))&int64(0x7fffffff)))
-__397:
+__408:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -83454,10 +84085,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+608) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 608)) >= int64(0)) {
-		goto __398
+		goto __409
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 608)) & int64(0x7fffffff))
-__398:
+__409:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -83465,10 +84096,10 @@ __398:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __399
+		goto __410
 	}
 
-__399:
+__410:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -83520,14 +84151,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18016, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18021, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18027, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18036, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18045, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18053, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18061},
-	{FzName: ts + 18068},
+	{FzName: ts + 18059, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18064, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18070, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18079, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18088, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18096, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18104},
+	{FzName: ts + 18111},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -83579,7 +84210,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+56, int32(unsafe.Sizeof([200]uint8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18074)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18117)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -83587,7 +84218,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18089, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18132, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -83600,16 +84231,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18096, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18102)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18145)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18114)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18157)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4950, 1)
@@ -83792,13 +84423,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 120 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18129)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18172)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18137, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18180, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18141, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18184, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -83875,12 +84506,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18145, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
+			ts+18188, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -83889,19 +84520,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5001
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18173, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18216, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18204, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18247, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18212,
-	ts + 18219,
-	ts + 18231,
+	ts + 18255,
+	ts + 18262,
+	ts + 18274,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -83961,7 +84592,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)), db+172) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14123)
+				corruptSchema(tls, pData, argv, ts+14133)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+172+8, uint32(0), 0, 0x1)
@@ -83993,13 +84624,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*4)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18242)
+			corruptSchema(tls, pData, argv, ts+18285)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)), pIndex+44) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14123)
+				corruptSchema(tls, pData, argv, ts+14133)
 			}
 		}
 	}
@@ -84032,16 +84663,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8807
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8869
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*4)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*4)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*4))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7871
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18255
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7931
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18298
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*4)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 40)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 40)).FiDb = iDb
@@ -84119,17 +84750,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 68 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11706)
+		ts+11768)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -84138,44 +84778,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 68 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 68 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18327)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 68 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 32)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18370)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 68 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 32)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 40)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18351,
+		ts+18394,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -84186,57 +84826,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 40)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema + 78)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -84325,8 +84965,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -84439,8 +85081,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+156)-uint32(uintptr(0)+4))
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+160)-uint32(uintptr(0)+4))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -84451,8 +85093,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(292)
-	defer tls.Free(292)
+	bp := tls.Alloc(296)
+	defer tls.Free(296)
 
 	var rc int32
 	var i int32
@@ -84464,8 +85106,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+156)-uint32(uintptr(0)+4))
-	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+160)-uint32(uintptr(0)+4))
+	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -84505,7 +85147,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*16)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18385, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18428, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -84535,7 +85177,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18415, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18458, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -84631,7 +85273,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -84730,7 +85372,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85048,8 +85690,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10851
-		var zSp2 uintptr = ts + 10851
+		var zSp1 uintptr = ts + 10913
+		var zSp2 uintptr = ts + 10913
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85057,13 +85699,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18434, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18477, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18464))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18507))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85238,7 +85880,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 48)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18498, libc.VaList(bp, 0))
+					ts+18541, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85283,7 +85925,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18548, libc.VaList(bp+8, zName))
+						ts+18591, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85294,7 +85936,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*72 + 36 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*72 + 48)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18612,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18655,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -85338,7 +85980,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6519, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6579, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -85685,9 +86327,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -85925,16 +86564,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18649
+		z = ts + 18692
 		break
 	case TK_INTERSECT:
-		z = ts + 18659
+		z = ts + 18702
 		break
 	case TK_EXCEPT:
-		z = ts + 18669
+		z = ts + 18712
 		break
 	default:
-		z = ts + 18676
+		z = ts + 18719
 		break
 	}
 	return z
@@ -85944,10 +86583,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18682, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18725, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -85967,6 +86609,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18748, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18779
+		}
+		return ts + 1547
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -86033,6 +86682,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -86097,6 +86747,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -86151,7 +86802,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16244
+					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16260
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 40)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, uintptr(0))
@@ -86290,13 +86941,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16244
+				zCol = ts + 16260
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -86304,7 +86955,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*20)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18705, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -86369,7 +87020,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -86394,7 +87045,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 				} else {
-					zName = ts + 16244
+					zName = ts + 16260
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -86404,7 +87055,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18705, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 48)) = U32(0)
@@ -86420,7 +87071,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18714, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18803, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 48)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+48)
 			}
@@ -86445,45 +87097,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*16)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -86493,14 +87148,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*20)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*20)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18811
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -86510,9 +87197,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 12)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -86556,7 +87240,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+34, pTab+4)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -86707,7 +87391,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18722, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18815, 0)
 	return
 __1:
 	;
@@ -86798,7 +87482,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18771, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18864, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -86818,7 +87502,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18813, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18906, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -86855,7 +87539,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18819, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18912, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -86889,11 +87573,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18834, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18927, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1547
 		}
-		return ts + 18857
+		return ts + 18950
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -86994,8 +87678,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18859, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18874, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18952, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18967, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87042,7 +87726,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18649, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18692, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87109,7 +87793,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 48)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18893, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18986, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+48)
 
@@ -87171,7 +87855,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 76)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18893, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18986, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+76)
 
@@ -87324,10 +88008,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18914, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19007, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18960,
+			ts+19053,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -87581,8 +88265,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7167)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7167)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7227)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7227)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -87609,13 +88293,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+36, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19042, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19135, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19053, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19146, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -87627,7 +88311,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19058, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19151, 0)
 	Xsqlite3Select(tls, pParse, p, bp+36)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88041,6 +88725,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff uint8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*20)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
@@ -88160,15 +88863,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff uint8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*20)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*20)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -88544,16 +89240,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -88613,12 +89326,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15147) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15157) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15151) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15161) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -88684,7 +89397,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19064, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19157, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -88767,7 +89480,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19082, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19175, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -88896,15 +89609,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19105, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 64))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19198, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 64))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+36+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 68)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -88922,7 +89632,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+36+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19125, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19218, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -88938,7 +89648,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19168
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19261
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -88964,7 +89674,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19191,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19284,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -88975,9 +89685,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+34, pTab+4)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19229
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19322
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19263
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19356
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89024,7 +89734,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19301, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19394, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89136,7 +89846,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19305,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19398,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89155,7 +89865,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19344,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19437,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 44)), 0)
@@ -89163,7 +89873,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14716,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14726,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -89264,7 +89974,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 						} else {
-							zSchemaName = ts + 6379
+							zSchemaName = ts + 6439
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -89279,7 +89989,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*20
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19375, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19468, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 7, 0x80)
 							}
@@ -89344,7 +90054,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*20)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19380,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19473,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -89356,7 +90066,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -89375,9 +90085,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19389, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19482, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19407, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19500, 0)
 					}
 				}
 			}
@@ -89387,7 +90097,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 120 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19427, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19520, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -89446,11 +90156,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -89509,6 +90215,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*16)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 24)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*16)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(28)
+	defer tls.Free(28)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 44)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -89524,7 +90305,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -89537,13 +90319,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 20)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 20)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19458, 0)
+					ts+19551, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 20)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19509, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19602, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -89551,7 +90333,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 20
+	pFunc += 16
 	goto __1
 	goto __3
 __3:
@@ -89571,19 +90353,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 20))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 20
+	pF += 16
 	goto __1
 	goto __3
 __3:
@@ -89597,6 +90382,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -89671,7 +90459,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -89683,7 +90473,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 20
+	pF += 16
 	goto __1
 	goto __3
 __3:
@@ -89701,13 +90491,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 20
+	pC += 16
 	goto __7
 	goto __9
 __9:
@@ -89724,11 +90514,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19542,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19635,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19554
+						return ts + 19647
 					}
 					return ts + 1547
 				}(),
@@ -89749,7 +90539,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7871)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7931)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -89781,14 +90571,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 72 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*72
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -89842,6 +90633,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*72
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 68))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*72)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 72
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -89906,7 +90748,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -90005,7 +90846,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19577,
+		ts+19670,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90066,7 +90907,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19631,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19724,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -90180,7 +91021,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 220)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 224)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 36 + 4))&0x100>>8) == 0 ||
@@ -90197,11 +91038,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*72)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 36 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 68)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -90212,7 +91049,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19671, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19764, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+36+4, uint32(1), 5, 0x20)
@@ -90238,7 +91075,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -90270,11 +91107,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19686, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 88)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19779, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+88)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 88)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -90308,7 +91143,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 220)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 224)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -90617,12 +91452,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 128)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 128 + 8)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+128, pEList)
@@ -90651,39 +91485,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*20)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 128 + 24)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+128, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+128, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 128 + 24)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+128)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -90694,24 +91504,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -90744,27 +91554,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+128)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+116)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19702
+				return ts + 19795
 			}
-			return ts + 19711
+			return ts + 19804
 		}())
 
 	groupBySort = 1
@@ -90772,47 +91589,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*20)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*16)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*20
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*16
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -90828,45 +91645,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*20)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -90885,16 +91708,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -90925,16 +91748,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -90947,98 +91770,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 36 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*20)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*20)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20))
@@ -91047,79 +91873,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 160)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+116)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19702)
-__148:
+	explainTempTable(tls, pParse, ts+19795)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19720
-			}
-			return ts + 19743
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -91215,7 +92036,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19752, 0)
+		ts+19813, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -91448,7 +92269,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19817, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19878, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -91492,7 +92313,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19863, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19924, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+36, pTableName) != 0) {
 		goto __9
 	}
@@ -91510,7 +92331,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19932, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -91522,7 +92343,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19863, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19924, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -91537,7 +92358,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19912, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19973, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -91549,22 +92370,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19938, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19999, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19976,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20037,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20013
+				return ts + 20074
 			}
-			return ts + 20020
+			return ts + 20081
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -91573,7 +92394,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20026, libc.VaList(bp+24, pTableName+8))
+		ts+20087, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -91602,9 +92423,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -91722,7 +92543,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19863, bp+56)
+	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19924, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+64, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+64, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -91755,7 +92576,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20072,
+		ts+20133,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -91780,13 +92601,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20120,
+		ts+20181,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20195, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20256, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92042,7 +92863,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20224, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20285, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92081,9 +92902,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12079
+				return ts + 6382
 			}
-			return ts + 5886
+			return ts + 5876
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92095,7 +92916,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20244,
+			ts+20305,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -92209,12 +93030,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20306,
+		ts+20367,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20354
+				return ts + 20415
 			}
-			return ts + 20361
+			return ts + 20422
 		}()))
 __15:
 	;
@@ -92328,7 +93149,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20368, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20429, 0)
 	return 1
 }
 
@@ -92511,8 +93332,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(316)
-	defer tls.Free(316)
+	bp := tls.Alloc(320)
+	defer tls.Free(320)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -92545,8 +93366,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 16 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+284, 0, uint32(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 284)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+288, 0, uint32(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 288)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -92558,13 +93379,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20410, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20471, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+284, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+288, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -92880,7 +93701,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -93150,7 +93972,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20424,
+		ts+20485,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto update_cleanup
 __27:
@@ -93182,7 +94004,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20460, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20521, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -93192,7 +94014,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7646
+				return ts + 7706
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*16)).FzCnName
 		}(),
@@ -94062,7 +94884,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20479)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20540)
 __169:
 	;
 update_cleanup:
@@ -94368,10 +95190,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*uint8)(unsafe.Pointer(bp + 152)) = uint8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+152, ts+20492, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+152, ts+20553, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20496, libc.VaList(bp+8, bp+152))
+				ts+20557, libc.VaList(bp+8, bp+152))
 			return SQLITE_ERROR
 		}
 
@@ -94462,7 +95284,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12133, -1)
+				ts+12143, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -94494,7 +95316,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20569, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20573, uint32(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20630, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20634, uint32(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -94642,14 +95464,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20577)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20638)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20617)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20678)
 	return SQLITE_ERROR
 __2:
 	;
@@ -94660,7 +95482,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20660)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20721)
 	return SQLITE_ERROR
 __5:
 	;
@@ -94688,7 +95510,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20678, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20739, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -94708,7 +95530,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20701)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20762)
 	goto end_of_vacuum
 __8:
 	;
@@ -94723,7 +95545,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14486)
+	rc = execSql(tls, db, pzErrMsg, ts+14496)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -94768,7 +95590,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20728,
+		ts+20789,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -94777,7 +95599,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20836,
+		ts+20897,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -94788,7 +95610,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20890,
+		ts+20951,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -94799,7 +95621,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21041,
+		ts+21102,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95021,12 +95843,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -95144,7 +95966,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint32(unsafe.Sizeof(uintptr(0))) * uint32(2+*(*int32)(unsafe.Pointer(pTable + 44))))
 	if *(*int32)(unsafe.Pointer(pTable + 44))+3 >= *(*int32)(unsafe.Pointer(db + 120 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12360, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 44 + 4)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -95228,11 +96050,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32((int32((*Token)(unsafe.Pointer(pEnd)).Fz)-int32((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21171, libc.VaList(bp, pParse+192))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21232, libc.VaList(bp, pParse+196))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21195,
+			ts+21256,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -95242,7 +96064,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21294, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21355, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -95276,7 +96098,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 256
+	var pArg uintptr = pParse + 260
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -95303,7 +96125,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21313, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21374, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -95341,7 +96163,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21355, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21416, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
@@ -95353,7 +96175,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21385
+			var zFormat uintptr = ts + 21446
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -95370,7 +96192,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16135, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16151, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -95427,7 +96249,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 4))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21431, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21492, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -95485,7 +96307,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+404, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21431, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21492, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -95505,8 +96327,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(284)
-	defer tls.Free(284)
+	bp := tls.Alloc(288)
+	defer tls.Free(288)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -95519,7 +96341,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -95972,7 +96794,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -95999,7 +96821,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -96231,10 +97053,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21450
+		return ts + 21511
 	}
 	if i == -1 {
-		return ts + 16244
+		return ts + 16260
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*16)).FzCnName
 }
@@ -96243,15 +97065,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21457, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21518, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21463, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12750, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -96262,11 +97084,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21463, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12750, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5001, 1)
 	}
@@ -96288,27 +97110,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21465, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21526, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21457, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21518, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21468
+				return ts + 21529
 			}
-			return ts + 21473
+			return ts + 21534
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21481)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21542)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21483)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21544)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4950, 1)
 }
@@ -96351,11 +97173,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+88, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21485, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21546, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21491
+				return ts + 21552
 			}
-			return ts + 21498
+			return ts + 21559
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -96365,43 +97187,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10907
+					zFmt = ts + 10969
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21503
+				zFmt = ts + 21564
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21536
+				zFmt = ts + 21597
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21561
+				zFmt = ts + 21622
 			} else {
-				zFmt = ts + 21579
+				zFmt = ts + 21640
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21588, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21649, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp uint8
-			var zRowid uintptr = ts + 16244
-			Xsqlite3_str_appendf(tls, bp+64, ts+21596, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16260
+			Xsqlite3_str_appendf(tls, bp+64, ts+21657, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = uint8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21627, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21688, libc.VaList(bp+32, zRowid))
 				cRangeOp = uint8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = uint8('>')
 			} else {
 				cRangeOp = uint8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21637, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21698, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21642,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21703,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 12))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21669, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21730, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -96433,28 +97255,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+48, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21680, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21741, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21468, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21701, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21762, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21457, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21518, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21468, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4950, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -96515,52 +97338,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 20)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 20)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 20)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)) + 24 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)) + 24 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*20)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*20)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 20)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 20))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 16)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 16)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -98038,7 +98867,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21709, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21770, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98066,7 +98895,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21724, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21785, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -98584,7 +99413,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21733, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21794, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -98942,10 +99771,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16093, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15424, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14950, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21747, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16109, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15440, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14960, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21808, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -99322,49 +100151,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*72)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*72)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*72)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*72)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -99372,13 +100190,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*72)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -99443,12 +100264,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21754, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21754, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -99472,7 +100293,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 20)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 24 + 4))-1)*20)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 24)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -99482,7 +100303,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 10)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -99527,7 +100348,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6702
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -99621,7 +100442,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
-				return ts + 21795
+				return ts + 21856
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -99632,7 +100453,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -99640,6 +100460,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*48
 		if *(*int32)(unsafe.Pointer(bp + 12)) != 0 {
@@ -99673,7 +100494,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 24 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -99826,6 +100647,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FleftCursor != iCsr {
 				return
 			}
@@ -99994,7 +100818,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21802,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21863,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100727,7 +101551,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21838, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21899, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*16)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -100798,7 +101622,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21864
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21925
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101305,7 +102129,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -101325,7 +102149,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*20)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*20)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -101336,10 +102160,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -101350,29 +102174,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -101474,8 +102298,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(24)
-	defer tls.Free(24)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -101487,7 +102311,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -101497,17 +102321,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -101527,19 +102351,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+12)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 12)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+20)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 12)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -101551,19 +102375,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -101573,10 +102397,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -101590,9 +102414,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 20)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+20)
-			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 28)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+28)
+			if *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 				return rc
 			}
 		}
@@ -101617,8 +102441,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(16)
-	defer tls.Free(16)
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -101630,7 +102454,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -101646,21 +102470,21 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 
 	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+8)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 8 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 8 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -101671,7 +102495,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -101993,6 +102817,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*72)).Ffg.Fjointype)&
@@ -102086,8 +102911,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(100)
-	defer tls.Free(100)
+	bp := tls.Alloc(104)
+	defer tls.Free(104)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -102111,8 +102936,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -102264,7 +103090,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 96)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 96)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -102283,7 +103109,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 96)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 96))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 96)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 10)) |= U16(TERM_HIGHTRUTH)
@@ -102297,7 +103123,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 96)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 96)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -102306,9 +103132,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -102327,6 +103157,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -102454,51 +103287,75 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 24))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
-	bp := tls.Alloc(36)
-	defer tls.Free(36)
+	bp := tls.Alloc(40)
+	defer tls.Free(40)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 28)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 28)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -102507,9 +103364,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = bp + 28
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+28)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+28)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -102550,7 +103413,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 98
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+56, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 98)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 98 + 1*2)) = int16(0)
@@ -102590,7 +103453,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -102656,19 +103520,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 44)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -102848,7 +103717,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*4)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21875, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21936, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -102906,7 +103775,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*4)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21875, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21936, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -103304,7 +104173,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21901, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21962, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -103515,8 +104384,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*20)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*20)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -103635,14 +104504,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -103794,7 +104672,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -103902,7 +104780,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21936, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+21997, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104164,19 +105042,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 760)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 760 + uintptr(i)*88)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*72
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*72
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 44)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 44)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -104188,9 +105068,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -104223,13 +105103,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -104381,7 +105261,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21954, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22015, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
 	return uintptr(0)
 __2:
 	;
@@ -104445,7 +105325,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21982, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22043, 0)
 	goto __5
 __4:
 	ii = 0
@@ -105146,7 +106026,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -105328,7 +106208,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22000, -1)
+		pCtx, ts+22061, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -105461,7 +106341,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22056, -1)
+					pCtx, ts+22117, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -105550,17 +106430,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22101))
-var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22112))
-var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22123))
-var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22128))
-var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22141))
-var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22151))
-var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22157))
-var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22168))
-var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22178))
-var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22190))
-var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22195))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22162))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22173))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22184))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22189))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22202))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22212))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22218))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22229))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22239))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22251))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22256))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -105606,7 +106486,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22199, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22260, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -105650,12 +106530,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22218, 0)
+			ts+22279, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22289, 0)
+				ts+22350, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -105678,7 +106558,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*16)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7871)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7931)
 					}
 					break
 				}
@@ -105881,7 +106761,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22352, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22413, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -105997,7 +106877,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 28)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 28)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106008,6 +106888,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+36+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, uint8(SQLITE_AFF_NONE))
@@ -106111,7 +106992,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22378, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22439, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -106176,15 +107057,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22410
+				zErr = ts + 22471
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22427
+				zErr = ts + 22488
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22443
+				zErr = ts + 22504
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22463, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22524, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -106205,7 +107086,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22496, 0)
+				ts+22557, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -106361,11 +107242,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22543,
-	ts + 22596,
-	ts + 22000,
-	ts + 22647,
-	ts + 22699,
+	ts + 22604,
+	ts + 22657,
+	ts + 22061,
+	ts + 22708,
+	ts + 22760,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -107561,8 +108442,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -107573,13 +108453,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -107761,19 +108638,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22749,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22810,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19743
+							return ts + 22852
 						}
-						return ts + 22791
+						return ts + 22861
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 120 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22797, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22867, 0)
 		}
 	}
 
@@ -107844,7 +108721,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22831,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22901,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -108939,7 +109816,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22869, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22939, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -109914,21 +110791,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16244, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16260, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22891, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16157, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16173, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22891, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 4)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -110671,7 +111548,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*12 + 4)), yymsp+libc.UintptrFromInt32(-4)*12+4)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+22918)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+22988)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -110835,7 +111712,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 92)) = *(*Token)(unsafe.Pointer(yymsp + 4))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22927, libc.VaList(bp+32, bp+92))
+						Xsqlite3ErrorMsg(tls, pParse, ts+22997, libc.VaList(bp+32, bp+92))
 						*(*uintptr)(unsafe.Pointer(yymsp + 4)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 4)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -111052,9 +111929,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*12 + 4)) != 0 {
-							return ts + 6697
+							return ts + 6757
 						}
-						return ts + 6702
+						return ts + 6762
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
@@ -111066,6 +111943,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), *(*uintptr)(unsafe.Pointer(pRHS + 20)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 20)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) == uintptr(0) {
@@ -111333,19 +112215,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)) = *(*Token)(unsafe.Pointer(yymsp + 4))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22951, 0)
+					ts+23021, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23046, 0)
+					ts+23116, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23130, 0)
+					ts+23200, 0)
 			}
 			break
 		case uint32(273):
@@ -111724,9 +112606,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22927, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22997, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23215, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23285, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -112494,7 +113376,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 1248)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 1248)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23232, libc.VaList(bp, bp+1248))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23302, libc.VaList(bp, bp+1248))
 				break
 			}
 		}
@@ -112517,7 +113399,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23257, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23327, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -112690,7 +113572,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23268, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23338, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -112703,11 +113585,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19863, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19924, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23275, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23280, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23350, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -112720,9 +113602,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23290, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23360, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23294, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23364, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -112956,7 +113838,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -113531,7 +114413,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -113546,7 +114428,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23302, 0)
+			ts+23372, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -113737,23 +114619,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23370
+	var zErr uintptr = ts + 23440
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23384
+			zErr = ts + 23454
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23406
+			zErr = ts + 23476
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23428
+			zErr = ts + 23498
 			break
 
 		}
@@ -113771,35 +114653,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23451,
-	ts + 23464,
+	ts + 23521,
+	ts + 23534,
 	uintptr(0),
-	ts + 23480,
-	ts + 23505,
-	ts + 23519,
-	ts + 23538,
+	ts + 23550,
+	ts + 23575,
+	ts + 23589,
+	ts + 23608,
 	ts + 1483,
-	ts + 23563,
-	ts + 23600,
-	ts + 23612,
-	ts + 23627,
-	ts + 23660,
-	ts + 23678,
-	ts + 23703,
-	ts + 23732,
+	ts + 23633,
+	ts + 23670,
+	ts + 23682,
+	ts + 23697,
+	ts + 23730,
+	ts + 23748,
+	ts + 23773,
+	ts + 23802,
 	uintptr(0),
-	ts + 5841,
+	ts + 5831,
 	ts + 5327,
-	ts + 23749,
-	ts + 23767,
-	ts + 23785,
-	uintptr(0),
 	ts + 23819,
+	ts + 23837,
+	ts + 23855,
 	uintptr(0),
-	ts + 23840,
-	ts + 23866,
 	ts + 23889,
+	uintptr(0),
 	ts + 23910,
+	ts + 23936,
+	ts + 23959,
+	ts + 23980,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -113900,6 +114782,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	*(*int32)(unsafe.Pointer(db + 312)) = 1
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(*(*int32)(unsafe.Pointer(db + 312)) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -113914,7 +114802,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -113959,7 +114847,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23926, 0)
+				ts+23996, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114076,7 +114964,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23989, libc.VaList(bp, zName))
+		ts+24059, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -114312,7 +115200,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24040, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24110, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -114405,7 +115293,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -114475,7 +115363,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114485,7 +115373,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114517,14 +115405,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24061, 0)
+				ts+24131, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -114654,7 +115542,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24129, uint32(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24199, uint32(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -114699,10 +115587,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24135, zUri+7, uint32(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24205, zUri+7, uint32(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24145,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -114807,7 +115695,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24173, zOpt, uint32(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24243, zOpt, uint32(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -114818,17 +115706,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24177, zOpt, uint32(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24247, zOpt, uint32(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24177
+	zModeType = ts + 24247
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24183, zOpt, uint32(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24253, zOpt, uint32(4)) == 0) {
 		goto __32
 	}
 
@@ -114866,7 +115754,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24188, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24258, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -114874,7 +115762,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24208,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24278,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -114914,7 +115802,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24232, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24302, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -114937,15 +115825,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24248, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24255, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24318, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24325, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24263, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24266, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24269, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17339, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24333, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24336, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24339, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17355, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115091,10 +115979,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21795, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21856, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24273, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24343, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -115108,7 +115996,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+12, bp+16)
@@ -115159,9 +116047,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6374
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6434
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23275
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23345
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -115266,7 +116154,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24279
+		zFilename = ts + 24349
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -115369,21 +116257,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24282,
+	Xsqlite3_log(tls, iErr, ts+24352,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24307)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24377)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24327)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24397)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24334)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24404)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -115541,7 +116429,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24351, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24421, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -116197,7 +117085,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24379, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24449, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -116315,7 +117203,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24387
+			return ts + 24457
 		}
 		return uintptr(0)
 	}(), 0)
@@ -116492,7 +117380,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6174, ts + 6697, ts + 6702, ts + 6184, ts + 6179, ts + 7938, ts + 24410, ts + 24416,
+	ts + 6174, ts + 6757, ts + 6762, ts + 6184, ts + 6179, ts + 7998, ts + 24480, ts + 24486,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -116645,7 +117533,7 @@ __10:
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0' + int32(c)>>4)
-	c = *(*uint8)(unsafe.Pointer(ts + 24423 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24493 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -116700,7 +117588,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24440, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24510, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -116764,13 +117652,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6697, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6757, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6702, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6762, uint32(5))
 			break
 
 		}
@@ -117320,12 +118208,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6697, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6757, uint32(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6702, uint32(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6762, uint32(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(5))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -117426,7 +118314,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24469, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24539, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -117732,7 +118620,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24484, uint32(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24554, uint32(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -117747,7 +118635,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24488, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24558, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -117801,7 +118689,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24514,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24584,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -117906,11 +118794,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*uint8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zPath))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24557, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24627, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4991, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24560, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24630, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -118067,14 +118955,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24563, -1)
+			ts+24633, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, uint8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24614, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24684, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -118169,7 +119057,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15357)
+	jsonWrongNumArgs(tls, ctx, ts+15373)
 	return
 __2:
 	;
@@ -118244,9 +119132,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24648
+			return ts + 24718
 		}
-		return ts + 24652
+		return ts + 24722
 	}())
 	return
 __2:
@@ -118379,7 +119267,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24659, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24729, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118476,7 +119364,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24662, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24732, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118520,7 +119408,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24665)
+		ts+24735)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -118651,7 +119539,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24748, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24818, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -118670,7 +119558,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*12
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*12
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24754, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24824, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 12
@@ -118766,7 +119654,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, uint8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24754, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24824, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -118790,7 +119678,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24759
+				zRoot = ts + 24829
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -118855,6 +119743,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -118906,7 +119800,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24469, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24539, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119001,25 +119895,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24761},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24766},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24777},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24777},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24795},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24808},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24811},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24815},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24827},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24839},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24850},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24861},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24873},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 24886},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24895},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24895},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24905},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24916},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24933}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24831},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24836},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24847},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24847},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24865},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24878},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24881},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24885},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24897},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24909},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24920},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24931},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24943},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 24956},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24965},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24965},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24975},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24986},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25003}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119038,8 +119932,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24951, FpModule: 0},
-	{FzName: ts + 24961, FpModule: 0},
+	{FzName: ts + 25021, FpModule: 0},
+	{FzName: ts + 25031, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -119296,11 +120190,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24971, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25041, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24979, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25049, iNode, 0,
 			pRtree+76)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -119511,7 +120405,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24984,
+		ts+25054,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -120214,7 +121108,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25066)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25136)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -121555,7 +122449,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25080, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25150, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -121567,12 +122461,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25100, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25170, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25132, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25202, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -121798,7 +122692,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25169, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25239, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -121821,14 +122715,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(20)
 	defer tls.Free(20)
 
-	var zFmt uintptr = ts + 25314
+	var zFmt uintptr = ts + 25384
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11279, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11341, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -121869,7 +122763,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25370, ts + 5053, ts + 16244,
+	ts + 25440, ts + 5053, ts + 16260,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -121912,19 +122806,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25375,
+			ts+25445,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25437, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25507, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25442,
+			ts+25512,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25506,
+			ts+25576,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25576,
+			ts+25646,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -121953,7 +122847,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25625
+			zFormat = ts + 25695
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -121965,7 +122859,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25733,
+			ts+25803,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -121973,18 +122867,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25778, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25848, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12750, 1)
+					Xsqlite3_str_append(tls, p, ts+12760, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25805, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25875, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25827, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25897, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25835, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25905, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -121999,14 +122893,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25851,
-	ts + 25904,
-	ts + 25949,
-	ts + 26001,
-	ts + 26055,
-	ts + 26100,
-	ts + 26158,
-	ts + 26213,
+	ts + 25921,
+	ts + 25974,
+	ts + 26019,
+	ts + 26071,
+	ts + 26125,
+	ts + 26170,
+	ts + 26228,
+	ts + 26283,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122035,7 +122929,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26260, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26330, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -122047,7 +122941,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26280,
+			ts+26350,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+16)
 		if rc != SQLITE_OK {
@@ -122055,7 +122949,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26337,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26407,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122097,10 +122991,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26372,
-		ts + 26415,
-		ts + 26450,
-		ts + 26486,
+		ts + 26442,
+		ts + 26485,
+		ts + 26520,
+		ts + 26556,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -122131,7 +123025,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*4)), uint32(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26523,
+	Xsqlite3_str_appendf(tls, pSql, ts+26593,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))), *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	ii = 4
 __3:
@@ -122143,7 +123037,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26547, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26617, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -122166,7 +123060,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26553, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -122262,7 +123156,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26556, ts + 26567}
+var azFormat = [2]uintptr{ts + 26626, ts + 26637}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(600)
@@ -122300,13 +123194,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+48, bp+16, ii, bp+552)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10851, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10913, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26577, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+552)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26647, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+552)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+48)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26583, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 552 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26653, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 552 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26587, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26657, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -122317,7 +123211,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26589, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26659, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -122393,7 +123287,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26622,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26692,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4055
@@ -122417,7 +123311,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26629,
+			ts+26699,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -122436,7 +123330,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26674, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26744, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -122450,8 +123344,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26706,
-		ts + 26760,
+		ts + 26776,
+		ts + 26830,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 24 + uintptr(bLeaf)*4)) == uintptr(0) {
@@ -122466,23 +123360,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26808,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26878,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26853
+					return ts + 26923
 				}
-				return ts + 26861
+				return ts + 26931
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26870,
+				ts+26940,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26853
+						return ts + 26923
 					}
-					return ts + 26861
+					return ts + 26931
 				}(), iKey, iVal))
 		}
 	}
@@ -122506,7 +123400,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26928, libc.VaList(bp, i, iCell, iNode))
+				ts+26998, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -122526,7 +123420,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26976, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27046, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -122543,14 +123437,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27043, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27113, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27077, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27147, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -122558,7 +123452,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27107,
+					ts+27177,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -122587,14 +123481,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27162,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27232,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27193, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27263, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -122616,12 +123510,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14486, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14496, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27260, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27330, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -122630,12 +123524,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25080, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25150, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27288, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27358, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -122649,8 +123543,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27319, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27326, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27389, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -122658,7 +123552,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 24 + 1*4)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27334, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27404, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -122673,7 +123567,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27338, -1)
+			ts+27408, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -122681,7 +123575,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6374
+			zDb = ts + 6434
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*4)))
 		}
@@ -122691,7 +123585,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17962
+				return ts + 18005
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -122985,7 +123879,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint32(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint32(4)+uint32(6)*uint32(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint32(4)+uint32(6)*uint32(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -123043,6 +123937,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123055,15 +123950,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27389, 1)
+		Xsqlite3_str_append(tls, x, ts+27459, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27391, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27461, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27402, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27472, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123083,19 +123979,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep uint8 = uint8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27413, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27483, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27431, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27501, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = uint8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27439, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27509, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4)))
 			if z != 0 && *(*uint8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27447, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27517, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27451, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27521, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123114,6 +124010,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -123145,6 +124042,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -123153,6 +124051,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -123211,6 +124110,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -123379,6 +124279,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123400,6 +124301,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -123484,6 +124386,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -123512,6 +124416,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -123949,6 +124854,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -123962,6 +124868,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -123976,6 +124885,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -124000,7 +124910,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*4)), uint32(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27464, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27534, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124009,7 +124919,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27486, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
 	goto __3
 __3:
 	ii++
@@ -124017,7 +124927,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26553, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124096,6 +125006,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 20)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -124224,6 +125135,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -124242,7 +125154,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16244
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16260
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -124252,7 +125164,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27490
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27560
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -124260,7 +125172,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27496
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27566
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -124372,7 +125284,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27505, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27575, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -124502,14 +125414,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27545) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27615) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27561) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27631) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -124546,8 +125460,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint32(i) < uint32(unsafe.Sizeof(aFunc))/uint32(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); i < uint32(unsafe.Sizeof(aFunc))/uint32(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -124564,7 +125478,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint32(i) < uint32(unsafe.Sizeof(aAgg))/uint32(unsafe.Sizeof(struct {
+	for i = uint32(0); i < uint32(unsafe.Sizeof(aAgg))/uint32(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -124574,7 +125488,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27576, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27646, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -124586,25 +125500,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [2]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27584},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27597},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27610},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27623},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27561},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27635},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27545},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27658},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27672},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27685},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27699},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27715},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27654},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27667},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27680},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27693},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27631},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27705},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27615},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27728},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27742},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27755},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27769},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27785},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27727},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27797},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -124614,26 +125528,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27746, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27816, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27756, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27826, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27767, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27837, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27490, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27560, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27778, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27848, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -124687,7 +125601,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25066, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25136, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125005,7 +125919,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27788, -1)
+		Xsqlite3_result_error(tls, context, ts+27858, -1)
 		return
 	}
 
@@ -125016,7 +125930,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27788, -1)
+			Xsqlite3_result_error(tls, context, ts+27858, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125117,7 +126031,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27809, uintptr(0), uintptr(0), p+36)
+				ts+27879, uintptr(0), uintptr(0), p+36)
 		}
 
 		if rc == SQLITE_OK {
@@ -125181,7 +126095,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+24979, zIn, uint32(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+25049, zIn, uint32(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -125202,16 +126116,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+27980, libc.VaList(bp, func() uintptr {
+			ts+28050, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28130
+					return ts + 28200
 				}
 				return ts + 1547
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+4, p+36,
-			ts+28171)
+			ts+28241)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -125327,7 +126241,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28296, libc.VaList(bp, zTab)))
+			ts+28366, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -125345,7 +126259,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*4, p+36,
-		Xsqlite3_mprintf(tls, ts+28415, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28485, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -125363,7 +126277,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*4, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28436, libc.VaList(bp+16, zIdx)))
+			ts+28506, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -125386,7 +126300,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*4, p+36,
-		Xsqlite3_mprintf(tls, ts+28487, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28557, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -125432,7 +126346,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint32(unsafe.Sizeof(U8(0)))*uint32((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+36,
-			Xsqlite3_mprintf(tls, ts+28508, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -125447,7 +126361,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint32(unsafe.Sizeof(U8(0)))*uint32((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+20, p+36,
-			Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 20))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 20)), 1)
 			if iCid >= 0 {
@@ -125487,7 +126401,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+36, bp+56, pIter+60)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19389, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19482, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -125497,18 +126411,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+60, p+36,
-			Xsqlite3_mprintf(tls, ts+28565, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28635, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 60)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), i)
-			if Xsqlite3_strnicmp(tls, ts+28584, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28654, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+32)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*4)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28589, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28659, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -125520,18 +126434,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28599, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28669, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28628
+							return ts + 28698
 						}
-						return ts + 28641
+						return ts + 28711
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+60, p+36,
-				Xsqlite3_mprintf(tls, ts+28650, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28720, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 60))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 1)
@@ -125545,7 +126459,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28672,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28742,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 5)
@@ -125592,8 +126506,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-		zList = rbuMPrintf(tls, p, ts+28699, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14597
+		zList = rbuMPrintf(tls, p, ts+28769, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14607
 	}
 	return zList
 }
@@ -125610,7 +126524,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zRet = rbuMPrintf(tls, p, ts+28708, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28778, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -125632,25 +126546,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+36,
 			Xsqlite3_mprintf(tls,
-				ts+28721, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28791, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28753, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28823, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+28776)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28782, ts+28789, ts+4950)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+1547)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+28846)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28852, ts+28859, ts+4950)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+36,
 				Xsqlite3_mprintf(tls,
-					ts+28797,
+					ts+28867,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28839, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28909, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -125692,7 +126606,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+36,
-		Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -125727,7 +126641,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 	goto __7
 __6:
-	zCol = ts + 28859
+	zCol = ts + 28929
 __7:
 	;
 	goto __5
@@ -125735,13 +126649,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28867,
+	zLhs = rbuMPrintf(tls, p, ts+28937,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28888,
+	zOrder = rbuMPrintf(tls, p, ts+28958,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28924,
+	zSelect = rbuMPrintf(tls, p, ts+28994,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14597
+	zSep = ts + 14607
 	iCol++
 	goto __1
 __2:
@@ -125759,7 +126673,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 180)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+180, p+36,
-		Xsqlite3_mprintf(tls, ts+28951,
+		Xsqlite3_mprintf(tls, ts+29021,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 180)))) {
 		goto __13
@@ -125786,8 +126700,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+28999, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14597
+	zVector = rbuMPrintf(tls, p, ts+29069, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14607
 	goto __15
 __15:
 	iCol++
@@ -125798,7 +126712,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29006, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -125831,7 +126745,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+36,
-			Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -125843,7 +126757,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29018, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29088, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*8)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*8)).FzSpan, zCollate))
 			zType = ts + 1547
 		} else {
@@ -125855,37 +126769,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28859
+					zCol = ts + 28929
 				} else {
-					zCol = ts + 28589
+					zCol = ts + 28659
 				}
 				zType = ts + 1112
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29040, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29110, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28776
+					return ts + 28846
 				}
 				return ts + 1547
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29060,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29130,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29081,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29151,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29114, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29184, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14597
-		zAnd = ts + 21457
+		zCom = ts + 14607
+		zAnd = ts + 21518
 		nBind++
 	}
 
@@ -125924,11 +126838,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = Xsqlite3_mprintf(tls, ts+29138, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29208, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29150, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29220, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14597
+			zS = ts + 14607
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -125936,7 +126850,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29159, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29229, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -125948,18 +126862,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29174, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29244, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1547
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29188, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21457
+				zList = rbuMPrintf(tls, p, ts+29258, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21518
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29200, libc.VaList(bp+40, zList))
+			ts+29270, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1547
@@ -125967,8 +126881,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = rbuMPrintf(tls, p, ts+29250, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21457
+				zList = rbuMPrintf(tls, p, ts+29320, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21518
 			}
 		}
 	}
@@ -125977,7 +126891,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29263, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29333, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -125995,17 +126909,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c uint8 = *(*uint8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29250,
+					zList = rbuMPrintf(tls, p, ts+29320,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29289,
+					zList = rbuMPrintf(tls, p, ts+29359,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29319,
+					zList = rbuMPrintf(tls, p, ts+29389,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				}
 			}
 		}
@@ -126040,19 +126954,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29356
+		var zSep uintptr = ts + 29426
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 60)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+36,
-			Xsqlite3_mprintf(tls, ts+28508, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16132) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16148) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+60, p+36,
-						Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126064,15 +126978,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 3) != 0 {
-					zDesc = ts + 28776
+					zDesc = ts + 28846
 				} else {
 					zDesc = ts + 1547
 				}
-				z = rbuMPrintf(tls, p, ts+29369, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14597
+				z = rbuMPrintf(tls, p, ts+29439, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14607
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29380, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29450, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 60)))
 	}
 	return z
@@ -126092,7 +127006,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+36,
-			ts+29384)
+			ts+29454)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -126101,7 +127015,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+172, p+36,
-				Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -126111,25 +127025,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29434, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29504, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29456, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28776
+						return ts + 28846
 					}
 					return ts + 1547
 				}()))
-				zComma = ts + 14597
+				zComma = ts + 14607
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29466, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29536, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 172)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29481,
+			ts+29551,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 	}
 }
 
@@ -126142,7 +127056,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1547
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1547
@@ -126150,39 +127064,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29543
+				zPk = ts + 29613
 			}
-			zSql = rbuMPrintf(tls, p, ts+29556,
+			zSql = rbuMPrintf(tls, p, ts+29626,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*4)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29583
+							return ts + 29653
 						}
 						return ts + 1547
 					}()))
-			zComma = ts + 14597
+			zComma = ts + 14607
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29593, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29663, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29600,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29670,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29632
+						return ts + 29702
 					}
 					return ts + 1547
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 	}
 }
 
@@ -126195,7 +127109,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+88, p+36, Xsqlite3_mprintf(tls,
-				ts+29647,
+				ts+29717,
 				libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -126232,7 +127146,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 4)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+36,
-			ts+29704)
+			ts+29774)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		var rc2 int32
@@ -126337,7 +127251,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29770, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29840, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -126357,24 +127271,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+604, bp+608, bp+612)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 612)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29790,
+				ts+29860,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 604))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 612))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+80, p+36,
-					Xsqlite3_mprintf(tls, ts+29855, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29925, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+84, p+36,
-					Xsqlite3_mprintf(tls, ts+29891, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
+					Xsqlite3_mprintf(tls, ts+29961, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -126390,7 +127304,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29925,
+						ts+29995,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -126398,9 +127312,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29986
+											return ts + 30056
 										}
-										return ts + 29990
+										return ts + 30060
 									}()
 								}
 								return ts + 1547
@@ -126409,20 +127323,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29996,
+						ts+30066,
 						libc.VaList(bp+216, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30057,
+						ts+30127,
 						libc.VaList(bp+264, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29986
+									return ts + 30056
 								}
-								return ts + 29990
+								return ts + 30060
 							}(),
 							zCollist, zLimit))
 				}
@@ -126447,8 +127361,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6385)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6381)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6445)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6441)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -126459,16 +127373,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1547
 				}
-				return ts + 30216
+				return ts + 30286
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+80, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30225,
+						ts+30295,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30261
+								return ts + 30331
 							}
 							return ts + 1547
 						}(), zBindings)))
@@ -126477,32 +127391,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+84, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30271, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30341, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1547
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30299
+					zRbuRowid = ts + 30369
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30311, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30381, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30387
+							return ts + 30457
 						}
 						return ts + 1547
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30404,
+					ts+30474,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30703,
+						ts+30773,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -126515,9 +127429,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30802
+						zRbuRowid = ts + 30872
 					} else {
-						zRbuRowid = ts + 30812
+						zRbuRowid = ts + 30882
 					}
 				}
 
@@ -126530,20 +127444,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28859, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28929, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+76, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30823,
+							ts+30893,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30871
+										return ts + 30941
 									}
 									return ts + 1547
 								}(),
@@ -126556,7 +127470,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19743
+										return ts + 22852
 									}
 									return ts + 1547
 								}(), zOrder,
@@ -126624,9 +127538,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1547
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30216
+				zPrefix = ts + 30286
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30877,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30947,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+4, p+36, zUpdate)
@@ -126685,7 +127599,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+36,
-		Xsqlite3_mprintf(tls, ts+30907, libc.VaList(bp, p+24)))
+		Xsqlite3_mprintf(tls, ts+30977, libc.VaList(bp, p+24)))
 	for *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -126755,28 +127669,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30937, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31007, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30965, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31035, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+24, ts+3279, uint32(4))
 	} else {
-		libc.Xmemcpy(tls, p+24, ts+6374, uint32(4))
+		libc.Xmemcpy(tls, p+24, ts+6434, uint32(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30983, libc.VaList(bp+24, p+24))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31053, libc.VaList(bp+24, p+24))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -126809,11 +127723,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31049, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31119, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24129, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24199, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -126825,13 +127739,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31081,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374),
+			zTarget = Xsqlite3_mprintf(tls, ts+31151,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
 						}
-						return ts + 31113
+						return ts + 31183
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
@@ -126850,37 +127764,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31115, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31185, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31130, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31200, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31147, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31217, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31163, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31191, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31261, 0)
 	}
 }
 
@@ -126909,15 +127823,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31163, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31209, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31279, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -126965,7 +127879,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -127025,7 +127939,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6374, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127042,23 +127956,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31244, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31314, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31269, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31276, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31339, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -127175,7 +128089,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23767, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23837, 0)
 			return
 		}
 
@@ -127268,7 +128182,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+36,
-			ts+31283)
+			ts+31353)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -127276,7 +128190,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31305, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31375, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -127297,7 +128211,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+36,
 			Xsqlite3_mprintf(tls,
-				ts+31332,
+				ts+31402,
 				libc.VaList(bp, p+24,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -127327,9 +128241,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+36,
-			Xsqlite3_mprintf(tls, ts+31490, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31560, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31505,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31575,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -127343,10 +128257,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 4)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31525, uintptr(0), uintptr(0), p+36)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31595, uintptr(0), uintptr(0), p+36)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-			ts+31550)
+			ts+31620)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127360,12 +128274,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-			ts+31658)
+			ts+31728)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+4, p+36,
-			ts+31723)
+			ts+31793)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127377,7 +128291,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 4)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31767, uintptr(0), uintptr(0), p+36)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31837, uintptr(0), uintptr(0), p+36)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -127397,15 +128311,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17217)
-					rbuCopyPragma(tls, p, ts+16328)
+					rbuCopyPragma(tls, p, ts+17233)
+					rbuCopyPragma(tls, p, ts+16344)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31792, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31862, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -127429,10 +128343,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), p+36)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), p+36)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -127527,7 +128441,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31820, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31890, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -127540,16 +128454,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(12)
+	defer tls.Free(12)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31269, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31339, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -127559,7 +128474,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31845, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31915, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -127593,7 +128508,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+12,
 		Xsqlite3_mprintf(tls,
-			ts+31856, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31926, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 12)), -1)
 	} else {
@@ -127623,13 +128538,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31928, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31998, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-				ts+31942)
+				ts+32012)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -127640,7 +128555,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-				ts+31999)
+				ts+32069)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -127714,7 +128629,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32073, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32143, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -127732,12 +128647,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32105,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32175,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32137
+							return ts + 32207
 						}
-						return ts + 32144
+						return ts + 32214
 					}()))
 			}
 		}
@@ -127745,7 +128660,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14486, uintptr(0), uintptr(0), p+36)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14496, uintptr(0), uintptr(0), p+36)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+48)
@@ -127756,19 +128671,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16931)
-						rbuCopyPragma(tls, p, ts+16343)
+						rbuCopyPragma(tls, p, ts+16947)
+						rbuCopyPragma(tls, p, ts+16359)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32151, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32221, uintptr(0), uintptr(0), p+36)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6374, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32167, uintptr(0), uintptr(0), p+36)
+								db, ts+32237, uintptr(0), uintptr(0), p+36)
 						}
 					}
 
@@ -127822,7 +128737,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32191, zState+uintptr(n-7), uint32(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32261, zState+uintptr(n-7), uint32(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -127849,7 +128764,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); i < nErrmsg-Size_t(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30216, uint32(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30286, uint32(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -127866,7 +128781,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), p+36)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -127879,13 +128794,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), p+36)
 		}
 
 		rbuObjIterFinalize(tls, p+48)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32199, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32269, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -127980,7 +128895,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -127997,19 +128912,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14486
+				zBegin = ts + 14496
 			} else {
-				zBegin = ts + 32151
+				zBegin = ts + 32221
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32151, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32221, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128132,11 +129047,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -128275,7 +129193,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -128352,7 +129270,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32226, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32296, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -128377,7 +129295,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32249, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32319, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -128522,7 +129440,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6374)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6434)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -128537,7 +129455,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32260, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32330, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -128548,7 +129466,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -128578,6 +129502,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -129337,11 +130276,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11279, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11341, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32271, 0)
+				ts+32341, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
 		} else {
@@ -129354,7 +130293,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32392, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32462, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -129452,7 +130391,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11279, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11341, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -129919,6 +130858,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -130000,6 +130942,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -130029,9 +130972,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32421,
+			zRet = Xsqlite3_mprintf(tls, ts+32491,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4))))
-			zSep = ts + 21457
+			zSep = ts + 21518
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130054,9 +130997,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32455,
+				ts+32525,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4))))
-			zSep = ts + 32496
+			zSep = ts + 32566
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130064,18 +131007,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7463, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7523, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32501,
+		ts+32571,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130085,7 +131028,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(4)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -130118,7 +131061,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32579,
+			ts+32649,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130245,7 +131188,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32632, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32702, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -130719,9 +131662,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11279, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11341, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32659, libc.VaList(bp, zDb))
+			ts+32729, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_NOMEM
 		}
@@ -130730,18 +131673,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1547
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32769, bp+20)
+		sessionAppendStr(tls, bp+8, ts+32839, bp+20)
 		sessionAppendIdent(tls, bp+8, zDb, bp+20)
 		sessionAppendStr(tls, bp+8, ts+1560, bp+20)
 		sessionAppendIdent(tls, bp+8, zTab, bp+20)
-		sessionAppendStr(tls, bp+8, ts+32784, bp+20)
+		sessionAppendStr(tls, bp+8, ts+32854, bp+20)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+20)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), bp+20)
-				sessionAppendStr(tls, bp+8, ts+32792, bp+20)
+				sessionAppendStr(tls, bp+8, ts+32862, bp+20)
 				sessionAppendInteger(tls, bp+8, i+1, bp+20)
-				zSep = ts + 21457
+				zSep = ts + 21518
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -130850,7 +131793,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32798, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32868, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 24))
 	}
@@ -130942,7 +131885,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+12)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32818, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32888, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 24))
 }
@@ -131205,7 +132148,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -131228,7 +132171,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -131270,7 +132213,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -131331,7 +132274,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+44, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -131405,13 +132348,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -131473,7 +132416,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*4)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*4)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4)) = uintptr(0)
 				}
@@ -131846,7 +132789,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -132012,7 +132955,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint32(unsafe.Sizeof(SessionUpdate{})) * uint32(nU32) * uint32(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11279) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11341) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_NOMEM
@@ -132023,34 +132966,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*12
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint32(nU32)*uint32(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32836, bp+12)
+				sessionAppendStr(tls, bp, ts+32906, bp+12)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+12)
-				sessionAppendStr(tls, bp, ts+32849, bp+12)
+				sessionAppendStr(tls, bp, ts+32919, bp+12)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*4)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+12)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*4)), bp+12)
-						sessionAppendStr(tls, bp, ts+32855, bp+12)
+						sessionAppendStr(tls, bp, ts+32925, bp+12)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+12)
-						zSep = ts + 14597
+						zSep = ts + 14607
 					}
 				}
 
 				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+32784, bp+12)
+				sessionAppendStr(tls, bp, ts+32854, bp+12)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*4)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+12)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32860, bp+12)
+								ts+32930, bp+12)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*4)), bp+12)
-							sessionAppendStr(tls, bp, ts+32792, bp+12)
+							sessionAppendStr(tls, bp, ts+32862, bp+12)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+12)
 						}
-						zSep = ts + 21457
+						zSep = ts + 21518
 					}
 				}
 
@@ -132102,34 +133045,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32935, bp+12)
+	sessionAppendStr(tls, bp, ts+33005, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+32784, bp+12)
+	sessionAppendStr(tls, bp, ts+32854, bp+12)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+12)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
-			sessionAppendStr(tls, bp, ts+32855, bp+12)
+			sessionAppendStr(tls, bp, ts+32925, bp+12)
 			sessionAppendInteger(tls, bp, i+1, bp+12)
-			zSep = ts + 21457
+			zSep = ts + 21518
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32953, bp+12)
+		sessionAppendStr(tls, bp, ts+33023, bp+12)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+12)
-		sessionAppendStr(tls, bp, ts+32496, bp+12)
+		sessionAppendStr(tls, bp, ts+32566, bp+12)
 
 		zSep = ts + 1547
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+12)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
-				sessionAppendStr(tls, bp, ts+32792, bp+12)
+				sessionAppendStr(tls, bp, ts+32862, bp+12)
 				sessionAppendInteger(tls, bp, i+1, bp+12)
-				zSep = ts + 32961
+				zSep = ts + 33031
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4950, bp+12)
@@ -132145,7 +133088,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6374, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
+		db, ts+6434, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -132156,19 +133099,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32966, bp+12)
+	sessionAppendStr(tls, bp, ts+33036, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+21463, bp+12)
+	sessionAppendStr(tls, bp, ts+21524, bp+12)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14597, bp+12)
+			sessionAppendStr(tls, bp, ts+14607, bp+12)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
 	}
 
-	sessionAppendStr(tls, bp, ts+32984, bp+12)
+	sessionAppendStr(tls, bp, ts+33054, bp+12)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+32995, bp+12)
+		sessionAppendStr(tls, bp, ts+33065, bp+12)
 	}
 	sessionAppendStr(tls, bp, ts+4950, bp+12)
 
@@ -132184,14 +133127,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11279, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11341, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+32999)
+			ts+33069)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+4,
-			ts+33112)
+			ts+33182)
 	}
 	return rc
 }
@@ -132219,7 +133162,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -132228,7 +133171,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(12)
 	defer tls.Free(12)
 
@@ -132305,7 +133248,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+4, bp+8, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 12)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 12)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	}
@@ -132431,7 +133374,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -132472,7 +133415,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33256, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33326, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -132488,7 +133431,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33277, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33347, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -132561,10 +133504,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33296, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33366, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33322, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33392, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+124, bp+128, bp+132, uintptr(0))
@@ -132610,7 +133553,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+136, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6374, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
+					db, ts+6434, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -132623,19 +133566,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33352, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33422, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 128)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33396,
+						ts+33466,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 140)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 128))))
 				} else if *(*int32)(unsafe.Pointer(bp + 128)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 136)), uint32(*(*int32)(unsafe.Pointer(bp + 128)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33467, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33537, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 128))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11279) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11341) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -132686,14 +133629,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33527, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33597, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33557, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33581, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33557, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33651, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -133930,7 +134873,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33609, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33679, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134218,7 +135161,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33637, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33707, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134403,7 +135346,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33668, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33738, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -134471,7 +135414,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33675
+		var zErr uintptr = ts + 33745
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -134652,7 +135595,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33725
+		var zErr uintptr = ts + 33795
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -134976,13 +135919,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(48)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33773, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33843, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33781, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33851, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33791, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33861, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -135532,7 +136475,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33796, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33866, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint32(unsafe.Sizeof(int32(0))) * uint32(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -135559,14 +136502,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*uint8)(unsafe.Pointer(p))) < '0' || int32(*(*uint8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33803, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33873, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33834, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33904, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135577,7 +136520,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33867, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33937, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135590,7 +136533,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33904, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33974, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + Size_t(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, Sqlite3_int64(unsafe.Sizeof(uintptr(0)))*nArg)
@@ -135599,7 +136542,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33913, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33983, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -135618,7 +136561,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33946, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34016, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -135633,14 +136576,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33980, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34050, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33988, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34058, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*uint8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34020, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34090, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -135648,9 +136591,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34026, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34096, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34040, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34110, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -135658,9 +136601,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34078, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34148, zCmd, nCmd) == 0 {
 		if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || int32(*(*uint8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34089, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34159, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -135670,19 +136613,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5068, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 44)) = [4]Fts5Enum{
-			{FzName: ts + 7951, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17322},
-			{FzName: ts + 34124, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8019, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17338},
+			{FzName: ts + 34194, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+44, zArg, pConfig+48)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34132, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34202, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34163, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34233, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -135729,15 +136672,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22123) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16244) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34191, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22184) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16260) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34261, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34221) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34291) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34231, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34301, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -135754,13 +136697,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 28)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34262, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34332, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34267, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34337, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34274, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34344, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -135798,8 +136741,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*4)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22123) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34282, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22184) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34352, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -135831,7 +136774,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34311, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34381, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -135868,19 +136811,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33980
+			zTail = ts + 34050
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34331
+			zTail = ts + 34401
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34339, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34409, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16244, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16260, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -135924,18 +136867,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34350, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34420, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1547
 			}
-			return ts + 14597
+			return ts + 14607
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34366, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*4))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34436, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*4))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34373,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22123))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34443,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22184))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136045,7 +136988,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34399) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34469) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136055,7 +136998,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34404) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34474) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136065,7 +137008,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34413) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34483) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -136078,7 +137021,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34423) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34493) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -136088,7 +137031,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34433) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34503) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -136104,7 +137047,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22123) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22184) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+4)
@@ -136127,7 +137070,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(44)
 	defer tls.Free(44)
 
-	var zSelect uintptr = ts + 34445
+	var zSelect uintptr = ts + 34515
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -136149,7 +137092,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 36))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 36)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 36)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34477) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34547) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 40)) = 0
@@ -136163,7 +137106,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34485,
+				ts+34555,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -136261,7 +137204,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34550, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34620, 0)
 					return FTS5_EOF
 				}
 			}
@@ -136274,20 +137217,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34570, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34640, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = (int32(z2) - int32(z)) / 1
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34601, uint32(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34671, uint32(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34604, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34674, uint32(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29986, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30056, uint32(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -136373,6 +137316,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*uint8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -136401,7 +137355,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 1))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*uint8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = uint8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -138055,9 +139009,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34608, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34678, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33637, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33707, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -138073,7 +139027,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c uint8 = *(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34613, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34683, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -138160,7 +139114,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20460, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20521, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -138241,7 +139195,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34642, 0)
+			ts+34712, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -138411,12 +139365,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+20)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34695,
+								ts+34765,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34745
+										return ts + 34815
 									}
-									return ts + 34608
+									return ts + 34678
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -139365,7 +140319,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34752, iRowid, 0, p+40)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34822, iRowid, 0, p+40)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -139444,7 +140398,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+44, Xsqlite3_mprintf(tls,
-			ts+34758,
+			ts+34828,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -139469,7 +140423,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34809,
+			ts+34879,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+48, zSql) != 0 {
 			return
@@ -139492,7 +140446,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+56, Xsqlite3_mprintf(tls,
-			ts+34858,
+			ts+34928,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -139731,7 +140685,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+68,
-				Xsqlite3_mprintf(tls, ts+34898, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -140930,7 +141884,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+60, Xsqlite3_mprintf(tls,
-			ts+34921,
+			ts+34991,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -142395,7 +143349,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+52, Xsqlite3_mprintf(tls,
-			ts+35005,
+			ts+35075,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -142887,10 +143841,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint32(nSeg) * uint32(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*12
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*12
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+36, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -143473,13 +144432,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35062, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35132, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24979, ts+35070, 0, pzErr)
+				pConfig, ts+25049, ts+35140, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11419,
-					ts+35105,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11481,
+					ts+35175,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -143732,7 +144691,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34752, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
+		ts+34822, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 4)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 4)))
@@ -143846,7 +144805,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35149,
+		ts+35219,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -144016,7 +144975,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 8)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+80+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*96, uintptr(0), bp+8)
-			sqlite3Fts5BufferAppendBlob(tls, p+36, bp+8, uint32(4), ts+35235)
+			sqlite3Fts5BufferAppendBlob(tls, p+36, bp+8, uint32(4), ts+35305)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+8)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+8)).Fn, bp+20, bp+24) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 24)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 24)) & int64(0x7FFFFFFF))
@@ -144287,7 +145246,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35240, 0)
+			ts+35310, 0)
 		return SQLITE_ERROR
 	}
 
@@ -144711,11 +145670,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35279,
+		ts+35349,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14597
+					return ts + 14607
 				}
 				return ts + 1547
 			}(),
@@ -144727,9 +145686,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35334
+					return ts + 35404
 				}
-				return ts + 35339
+				return ts + 35409
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -144775,12 +145734,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35343, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35413, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5050, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35349, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35419, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -144811,7 +145770,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35377, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35447, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 20)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -144842,7 +145801,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35387, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35457, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -144874,14 +145833,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 60)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35408, libc.VaList(bp, z))
+				ts+35478, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33791
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33861
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -144937,7 +145896,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35240, 0)
+		ts+35310, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145154,7 +146113,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35441, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35511, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -145299,28 +146258,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35477, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35547, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35488, 0)
+				ts+35558, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35568, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35576, 0)
+				ts+35646, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16911, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16927, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35632, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35702, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35708, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -145378,7 +146337,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*4))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*4)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17456, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17472, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*4)))
@@ -145391,12 +146350,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35654,
+				ts+35724,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20361
+						return ts + 20422
 					}
-					return ts + 35691
+					return ts + 35761
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146026,7 +146985,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35703, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35773, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -146270,7 +147229,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35724, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35794, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -146289,7 +147248,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 8
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35746, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35816, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -146336,7 +147295,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35777)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35847)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -146345,7 +147304,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35790, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35860, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -146359,7 +147318,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35881, ts + 33980, ts + 24979, ts + 34331, ts + 11419,
+	ts + 35951, ts + 34050, ts + 25049, ts + 34401, ts + 11481,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -146383,7 +147342,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35888, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35958, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -146401,13 +147360,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35888, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35958, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35893, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35963, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -146462,17 +147423,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 28 + uintptr(eStmt)*4)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35908,
-			ts + 35976,
-			ts + 36045,
-			ts + 36078,
-			ts + 36117,
-			ts + 36157,
-			ts + 36196,
-			ts + 36237,
-			ts + 36276,
-			ts + 36318,
-			ts + 36358,
+			ts + 35978,
+			ts + 36046,
+			ts + 36115,
+			ts + 36148,
+			ts + 36187,
+			ts + 36227,
+			ts + 36266,
+			ts + 36307,
+			ts + 36346,
+			ts + 36388,
+			ts + 36428,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -146574,18 +147535,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36381,
+		ts+36451,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36485,
+			ts+36555,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36523,
+			ts+36593,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -146597,7 +147558,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36561,
+			ts+36631,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -146609,14 +147570,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24979, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11419, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35881, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25049, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11481, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35951, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34331, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34401, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33980, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34050, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -146628,17 +147589,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36603,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36673,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29632
+					return ts + 29702
 				}
 				return ts + 1547
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36633,
+			ts+36703,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -146675,27 +147636,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36677, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36747, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36700, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36770, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33980, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34050, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34331, ts+36706, 0, pzErr)
+				pConfig, ts+34401, ts+36776, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35881, ts+36738, 1, pzErr)
+				pConfig, ts+35951, ts+36808, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34477, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -146901,12 +147862,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36755,
+		ts+36825,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36805,
+			ts+36875,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -146914,7 +147875,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34477, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -147090,7 +148051,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36834,
+	zSql = Xsqlite3_mprintf(tls, ts+36904,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -147272,14 +148233,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 40)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33980, bp+40)
+			rc = fts5StorageCount(tls, p, ts+34050, bp+40)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 40)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34331, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34401, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -147474,9 +148435,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint32(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36866) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36936) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36877) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36947) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -147690,7 +148651,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36888
+			var zCat uintptr = ts + 36958
 			var i int32
 			libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -147702,7 +148663,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36897) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36967) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
 				}
 			}
@@ -147713,18 +148674,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36908) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36978) {
 					if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '2' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*uint8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36866) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36936) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36877) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36947) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36897) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36967) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148000,7 +148961,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36926
+	var zBase uintptr = ts + 36996
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -148140,7 +149101,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36936, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148148,11 +149109,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36939, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37009, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36944, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37014, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148160,7 +149121,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36949, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37019, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148168,7 +149129,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36952, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148176,11 +149137,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36955, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36960, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37030, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148188,19 +149149,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36965, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36969, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37039, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36975, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37045, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36980, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37050, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148208,11 +149169,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36984, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37054, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36988, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37058, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148220,7 +149181,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36991, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148228,11 +149189,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36995, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36999, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37069, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148240,7 +149201,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37003, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37073, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148248,7 +149209,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37007, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148256,7 +149217,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37011, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37081, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148272,24 +149233,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37015, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+36995, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37085, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37065, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37018, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37021, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37091, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37011, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37081, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -148304,137 +149265,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37028, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37098, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+36995, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37065, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37036, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37106, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37043, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37113, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37048, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37118, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36944, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37014, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37053, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37123, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36939, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37009, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37058, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37011, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37081, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37063, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15457, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15473, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37021, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37091, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37142, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36936, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37006, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36980, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37050, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37083, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37153, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37087, uint32(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37157, uint32(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37089, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37159, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37003, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37073, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37165, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37011, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37081, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37103, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37173, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36995, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37065, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37109, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36995, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37065, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37114, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37120, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37007, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37077, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37198, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37136, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37206, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37210, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37003, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37073, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37148, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37154, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37224, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37007, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37077, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37230, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37021, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37091, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -148449,16 +149410,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37167, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36952, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37022, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37242, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148466,21 +149427,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37177, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37247, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36952, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37183, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37253, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36952, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37136, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37206, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148488,7 +149449,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37189, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37259, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -148496,9 +149457,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37195, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37265, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -148513,12 +149474,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37201, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37271, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37205, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37275, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37208, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -148527,7 +149488,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37211, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37281, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -148683,7 +149644,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37215) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37285) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -148863,22 +149824,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(64)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36926, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 36996, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37230, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37300, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37236, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37306, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37243, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -150020,14 +150981,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37251) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37321) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37255) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37325) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37259) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37329) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37268, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37338, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150053,19 +151014,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(20)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 4)) = [3]uintptr{
-		ts + 37302,
-		ts + 37342,
-		ts + 37377,
+		ts + 37372,
+		ts + 37412,
+		ts + 37447,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4))) == Size_t(4) && libc.Xmemcmp(tls, ts+23275, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4))) == Size_t(4) && libc.Xmemcmp(tls, ts+23345, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37420, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37490, 0)
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -150198,11 +151159,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37453, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37523, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37484,
+		ts+37554,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+68, uintptr(0))
@@ -150226,7 +151187,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 68)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37535, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37605, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -150621,7 +151582,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37561, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37631, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -150643,7 +151604,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37571
+	return ts + 37641
 }
 
 func init() {
@@ -150698,114 +151659,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1456)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1496)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1536)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1576)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1616)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1656)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1696)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1736)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1776)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1816)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1856)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1896)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1936)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1976)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2016)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2056)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2096)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2136)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1576)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1616)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1656)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1696)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1736)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1776)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1816)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1856)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1896)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1936)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1976)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2016)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2056)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2096)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2136)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2176)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2216)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2256)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2260)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2264)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2268)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2296)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2300)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2304)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2308)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2256)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2296)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2336)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2340)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2344)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2340)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2344)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2348)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2376)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2380)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2384)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2388)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2416)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2420)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2424)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2428)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2456)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2460)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2464)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2468)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2496)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2500)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2508)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2528)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2536)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2568)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2576)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2608)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2376)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2380)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2384)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2388)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2416)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2420)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2424)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2428)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2456)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2460)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2464)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2468)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2496)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2500)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2508)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2536)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2540)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2544)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2548)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2576)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2580)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2584)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2588)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2608)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2728)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2736)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2768)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2776)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2808)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2648)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2656)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2696)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2808)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2816)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2848)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2848)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2856)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2896)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2936)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2888)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2896)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2928)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2936)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3016)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3056)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3088)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3096)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3128)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3136)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3168)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3176)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3208)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3096)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3136)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3168)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3176)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3208)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3216)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3248)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3256)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3288)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3296)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3328)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3248)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3256)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3288)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3296)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3328)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3368)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3376)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3368)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3376)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3416)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3448)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3456)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3488)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3448)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3456)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3488)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3496)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3528)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3528)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3536)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3568)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3568)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3608)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3608)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3616)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3648)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3648)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3656)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3688)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3688)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3728)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3728)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3736)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3776)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3808)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3808)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3816)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3848)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3848)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3856)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3896)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3936)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3976)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4016)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3888)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3896)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3928)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3936)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3976)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4016)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4096)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 16)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 48)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -151263,6 +152226,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 56)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 60)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 64)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 4)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 12)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 20)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 28)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 36)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 44)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 4)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 12)) = rtreeBestIndex
@@ -151581,6 +152556,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1052)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1056)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1060)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1064)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 4)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = sqlite3TestExtInit
@@ -151602,5 +152578,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 68)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_freebsd_arm64.go b/vendor/modernc.org/sqlite/lib/sqlite_freebsd_arm64.go
index e7c31d8c..7f59008b 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_freebsd_arm64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_freebsd_arm64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_freebsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -412,6 +412,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -519,6 +520,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -798,6 +800,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1314,6 +1317,7 @@ const (
 	SF_SETTABLE                           = 0xffff0000
 	SF_SNAPSHOT                           = 0x00200000
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1349,6 +1353,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1467,6 +1472,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -1833,6 +1839,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -1929,11 +1936,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -1948,7 +1958,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2056,8 +2066,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2449,6 +2459,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -3719,6 +3730,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -4965,10 +4977,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -5024,12 +5034,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -5281,7 +5289,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -5402,7 +5409,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -5426,11 +5433,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -5438,11 +5447,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -6074,7 +6083,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -6212,10 +6221,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -6230,12 +6237,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -6425,10 +6430,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -6632,7 +6639,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1092))
@@ -6784,7 +6791,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -6833,8 +6839,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -6845,6 +6861,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -6961,7 +6986,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7787,14 +7812,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = int8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -7802,7 +7827,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -9613,7 +9638,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -9869,6 +9894,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -10859,6 +10886,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -10867,11 +10895,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -10883,30 +10935,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1547
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -10915,83 +10967,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -11005,17 +11057,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -11023,90 +11075,90 @@ __219:
 		}
 		return ts + 1553
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(j))) = int8(0)
 	length = int32(j)
@@ -11114,89 +11166,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1560, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1562, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1572, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -11209,32 +11261,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -11293,7 +11345,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -11309,8 +11361,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -11339,12 +11390,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -11353,7 +11405,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -12477,6 +12529,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -13082,10 +13152,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13111,6 +13184,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = int8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]int8{}))-uint64(1)-uint64(i))
+	return int32(uint64(unsafe.Sizeof([22]int8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14119,11 +14193,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -15081,7 +15156,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15304,7 +15379,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -15320,113 +15395,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__error(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -15558,7 +15633,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15849,7 +15924,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3371, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3371, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15866,14 +15941,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3659, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3659, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15893,7 +15968,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -15961,7 +16036,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__error(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3290, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -16188,7 +16263,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16216,7 +16291,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3290, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -16315,7 +16390,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3254, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3254, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -16445,7 +16520,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3325, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -16491,7 +16566,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3412, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -16730,7 +16805,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -16864,7 +16939,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+16)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16885,7 +16960,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17201,7 +17276,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3254, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3254, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -17292,7 +17367,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__error(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3364, zPath, 43337)
 		}
 		return rc
 	}
@@ -17300,9 +17375,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3781, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3781, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -17345,12 +17420,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*int8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -17369,18 +17441,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*24 + 8)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__error(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3452, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3452, zIn, 43443)
 			}
 		} else if int32((*stat)(unsafe.Pointer(bp)).Fst_mode)&0170000 == 0120000 {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls, zIn, bp+224, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2))
 			if got <= int64(0) || got >= Ssize_t(unsafe.Sizeof([1026]int8{}))-int64(2) {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3443, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3443, zIn, 43454)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 224 + uintptr(got))) = int8(0)
@@ -17420,14 +17492,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 1032)).FzOut = zOut
 	if int32(*(*int8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, bp, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3272, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3272, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+1032, bp)
 	}
 	appendAllPathElements(tls, bp+1032, zPath)
 	*(*int8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+1032)).FnUsed))) = int8(0)
 	if (*DbPath)(unsafe.Pointer(bp+1032)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+1032)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17524,7 +17596,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__error(tls))) == EINTR {
 				got = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*24 + 8)))(tls, fd, zBuf, uint64(nBuf)))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -21448,7 +21520,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -22500,7 +22572,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -22517,7 +22588,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -22583,7 +22653,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -22593,7 +22662,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22784,36 +22853,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -22985,7 +23043,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23109,7 +23167,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23148,7 +23206,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23225,7 +23283,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24137,10 +24195,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]int8{int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0)}
@@ -24226,7 +24286,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -24983,7 +25043,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25082,7 +25142,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -25668,7 +25728,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -25943,7 +26003,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -26416,7 +26476,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26921,7 +26981,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27156,8 +27216,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27165,23 +27225,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27577,7 +27639,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27714,7 +27776,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -27731,7 +27793,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -27739,7 +27801,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -27782,7 +27844,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27792,7 +27854,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -28042,7 +28104,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28089,7 +28151,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28099,7 +28161,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28112,7 +28174,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28121,14 +28183,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28138,7 +28200,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -28202,7 +28264,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -28212,7 +28274,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28234,7 +28296,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28269,7 +28331,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28282,13 +28344,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -28313,7 +28375,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -28324,7 +28386,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -28376,22 +28438,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -28401,7 +28463,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -28409,7 +28471,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -28417,10 +28479,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -28444,13 +28506,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -28458,7 +28519,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -28466,32 +28566,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -28519,11 +28608,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -28534,15 +28623,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -28570,14 +28659,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2) + 1)))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -28591,7 +28680,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28603,7 +28692,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28706,7 +28795,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28734,7 +28823,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28773,7 +28862,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29656,7 +29745,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30071,7 +30160,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30097,7 +30186,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -30106,7 +30195,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30117,7 +30206,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30133,7 +30222,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30194,7 +30283,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30229,7 +30318,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -30289,7 +30378,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -30328,7 +30417,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -30359,7 +30448,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30700,7 +30789,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -30944,14 +31033,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -30996,7 +31085,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31045,7 +31134,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -31125,7 +31214,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31216,7 +31305,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -31236,7 +31325,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -31300,18 +31389,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -31327,6 +31406,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -31448,7 +31535,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -31652,7 +31739,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31717,7 +31804,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -31765,7 +31852,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -31884,7 +31971,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32044,7 +32131,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32109,7 +32196,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32145,7 +32232,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32189,7 +32276,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -32301,7 +32388,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -32459,7 +32546,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -32516,7 +32603,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -32532,7 +32619,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -32606,7 +32693,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32618,7 +32705,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -32629,7 +32716,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32794,7 +32881,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -32818,9 +32905,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -32843,16 +32930,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -32873,9 +32958,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -33009,11 +33100,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -33066,12 +33160,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -33079,7 +33173,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33139,7 +33233,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -33228,7 +33322,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -33344,7 +33438,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -33387,8 +33481,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -33470,6 +33564,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -33662,7 +33758,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -33673,7 +33769,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -33831,7 +33927,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -33905,7 +34001,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -33931,9 +34027,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -33944,8 +34041,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -33967,7 +34064,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -33995,7 +34092,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -34256,11 +34353,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -34448,7 +34545,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -34486,7 +34583,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -34563,7 +34660,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -34575,19 +34672,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -34600,7 +34689,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34619,6 +34708,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -34654,7 +34760,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -34663,13 +34768,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -34680,7 +34784,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -34793,7 +34897,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -34807,20 +34911,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -34830,7 +34934,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -34838,100 +34948,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx) + 1)))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -34940,30 +35050,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -34986,7 +35096,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -35005,13 +35114,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, uint64(nIn))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -35028,7 +35139,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35087,9 +35198,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -35129,7 +35240,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -35137,11 +35248,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx) + 1)))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35216,7 +35327,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)) + 1)))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35226,7 +35337,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -35285,7 +35396,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -35314,7 +35425,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -35390,7 +35501,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -35404,7 +35515,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -35538,7 +35649,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35713,12 +35824,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -35726,15 +35866,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+4055, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4055, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -35758,9 +35898,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4080, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if *(*int32)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb + 432)) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -35774,7 +35911,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4105, libc.VaList(bp, iChild))
 		return
@@ -35848,7 +35985,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -35933,48 +36072,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4301
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4311, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4349, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4387, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -35989,29 +36135,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4435
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -36019,28 +36165,28 @@ __9:
 	pc = U32(int32(*(*U8)(unsafe.Pointer(pCellIdx)))<<8 | int32(*(*U8)(unsafe.Pointer(pCellIdx + 1))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4463,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4493, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -36048,97 +36194,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4517, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4541, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2) + 1))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -36148,48 +36294,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4566, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4603,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -36218,9 +36364,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -36252,19 +36398,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -36276,7 +36416,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -36284,7 +36424,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -36369,7 +36509,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -36412,22 +36552,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -36654,8 +36791,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -37154,7 +37291,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 	defer tls.Free(40)
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+8, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+8, ts+4918,
@@ -37166,6 +37303,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*int8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+8)).FnChar))) = int8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 8)).FnChar)
 	}
 }
 
@@ -37353,7 +37491,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -37527,16 +37664,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -37979,7 +38118,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38216,43 +38355,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -38637,7 +38767,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38652,14 +38782,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39029,7 +39159,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -39041,13 +39173,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -39124,6 +39258,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -40012,7 +40149,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -40021,7 +40158,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -40055,7 +40192,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -40097,7 +40233,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -40849,7 +40985,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -40957,7 +41093,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -41508,7 +41644,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -41573,7 +41709,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -41607,7 +41743,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41657,7 +41793,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -41803,7 +41939,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -41974,7 +42110,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42000,7 +42136,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42274,7 +42410,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42626,8 +42762,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -42637,15 +42776,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -42833,6 +42972,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -42885,7 +43025,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -42949,6 +43089,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -42960,9 +43109,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5350)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -43196,7 +43346,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -43220,8 +43370,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -43395,15 +43545,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5360, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5350, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -43514,14 +43664,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -43805,7 +43958,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -43949,7 +44102,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -44121,7 +44274,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*int8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5400, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5390, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -44176,21 +44329,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5404, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5394, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5401, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5424, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5414, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5427, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5417, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5432, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5422, 1)
 			}
 		}
 	}
@@ -44282,11 +44435,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity int8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -44417,8 +44570,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -44653,7 +44806,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -44754,594 +44906,598 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
-		goto __100
-	case OP_NotFound:
-		goto __101
-	case OP_Found:
-		goto __102
 
-	case OP_SeekRowid:
+	case OP_IfNoHope:
+		goto __100
+	case OP_NoConflict:
+		goto __101
+	case OP_NotFound:
+		goto __102
+	case OP_Found:
 		goto __103
 
-	case OP_NotExists:
+	case OP_SeekRowid:
 		goto __104
 
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -45350,56 +45506,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -45407,20 +45563,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -45428,124 +45585,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5434, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5455, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5424, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5445, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5462, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5452, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -45553,10 +45710,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -45567,9 +45724,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -45577,171 +45734,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint64(uintptr(0)+24))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -45749,95 +45906,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = int8(0)
@@ -45845,231 +46002,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -46078,95 +46235,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46176,189 +46333,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -46367,38 +46528,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -46406,9 +46567,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -46419,298 +46580,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -46720,144 +46882,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -46865,353 +47027,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len))
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = int8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5486,
+	Xsqlite3VdbeError(tls, p, ts+5476,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*int8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -47225,319 +47387,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*int8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -47545,467 +47696,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5527, 0)
+	Xsqlite3VdbeError(tls, p, ts+5517, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5578, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5568, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5600, 0)
+		ts+5590, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5654, 0)
+		ts+5644, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5709
+				return ts + 5699
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5757
+					return ts + 5747
 				}
-				return ts + 5800
+				return ts + 5790
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5841)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5831)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -48013,67 +48175,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -48084,24 +48246,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -48109,30 +48271,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -48148,22 +48310,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -48177,133 +48339,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1547
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -48311,18 +48473,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48333,92 +48495,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -48436,106 +48598,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -48544,108 +48706,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48653,14 +48815,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -48670,108 +48832,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, int8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -48790,35 +48952,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -48826,123 +48988,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -48952,52 +49114,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -49009,15 +49171,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -49025,13 +49188,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -49044,11 +49207,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -49059,38 +49222,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -49102,47 +49265,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -49151,35 +49314,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49188,51 +49351,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -49242,72 +49405,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49315,43 +49478,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49359,84 +49522,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49446,34 +49614,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -49482,10 +49650,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -49502,14 +49670,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49522,21 +49690,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49548,62 +49716,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5869)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5859)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -49616,56 +49784,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -49676,54 +49844,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -49731,72 +49899,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -49805,55 +49973,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5886
+	goto __799
+__798:
+	zSchema = ts + 5876
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5900,
+		ts+5890,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -49863,66 +50031,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -49931,151 +50099,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5943, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5933, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -50083,10 +50252,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -50106,26 +50275,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -50137,7 +50306,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -50148,170 +50317,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -50328,146 +50497,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -50475,70 +50644,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5980,
+		ts+5970,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6032
+				return ts + 6022
 			}
-			return ts + 6037
+			return ts + 6027
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -50546,17 +50715,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -50566,14 +50735,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -50583,197 +50752,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6044, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6034, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5350, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6063, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -50787,27 +50956,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -50815,72 +50984,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.Xmemset(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -50890,192 +51059,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -51084,63 +51253,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= int8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -51150,104 +51319,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6073, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3656, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -51255,52 +51424,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6079,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -51419,8 +51592,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -51440,7 +51613,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -51460,8 +51633,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -51492,8 +51665,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -51526,8 +51699,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6299, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51607,8 +51780,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6340, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51677,7 +51850,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -51705,12 +51878,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 3656
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51754,7 +51927,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51837,7 +52010,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -54376,6 +54549,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6374, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6382+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6401+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5876+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6420+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -54395,7 +54596,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -54450,7 +54650,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6374, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6434, zDb) == 0) {
 		goto __8
 	}
 
@@ -54571,7 +54771,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6379) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6439) != 0) {
 		goto __33
 	}
 	goto __14
@@ -54579,73 +54779,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -54657,28 +54875,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -54689,160 +54907,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6381, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6441, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6385, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6445, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6389, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6449, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -54851,8 +55070,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -54860,19 +55079,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -54880,81 +55099,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6398, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6458, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6429, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6489, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -54967,141 +55186,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6484, libc.VaList(bp+16, zCol))
+		ts+6544, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6519
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6579
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6528
+		zErr = ts + 6588
 	} else {
-		zErr = ts + 6543
+		zErr = ts + 6603
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6565, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6625, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6578, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6588, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -55145,15 +55364,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6595
+	var zIn uintptr = ts + 6655
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6623
+		zIn = ts + 6683
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6641
+		zIn = ts + 6701
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6659
+		zIn = ts + 6719
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6677, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6737, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55232,10 +55451,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6697
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6757
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6702
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -55282,7 +55501,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6708, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6768, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -55346,7 +55565,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6725, libc.VaList(bp, pExpr))
+								ts+6785, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -55362,7 +55581,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6789,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6849,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -55376,7 +55595,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6825, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6885, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -55399,30 +55618,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6853, libc.VaList(bp+16, pExpr))
+						ts+6913, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6896
+						zType = ts + 6956
 					} else {
-						zType = ts + 6903
+						zType = ts + 6963
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6913, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6973, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6941, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7001, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6963,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7023,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7007,
+						ts+7067,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -55494,7 +55713,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7055, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7115, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -55510,7 +55729,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7066, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7126, pExpr, pExpr)
 			}
 
 			break
@@ -55566,7 +55785,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55641,7 +55860,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7077, libc.VaList(bp, i, zType, mx))
+		ts+7137, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55661,7 +55880,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7133, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7193, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55696,7 +55915,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7167, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7227, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55753,7 +55972,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7173, libc.VaList(bp, i+1))
+				ts+7233, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -55781,7 +56000,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7234, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7294, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -55995,7 +56214,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7265, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7325, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56035,7 +56254,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7167) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7227) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56046,7 +56265,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7304) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7364) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56058,7 +56277,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7310, 0)
+						ts+7370, 0)
 					return WRC_Abort
 				}
 
@@ -56158,12 +56377,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -56199,12 +56418,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -56314,33 +56533,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) int8 {
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) int8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -56410,7 +56730,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -56745,7 +57066,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 		return
 	}
 
@@ -56820,7 +57141,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7369, libc.VaList(bp, mxHeight))
+			ts+7429, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57069,10 +57390,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7417,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7477,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7461
+						return ts + 7521
 					}
 					return ts + 1547
 				}(), nElem))
@@ -57113,7 +57434,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57139,7 +57460,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7465, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7525, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57167,7 +57488,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7499, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7559, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57214,7 +57535,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7519,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7579,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57239,7 +57560,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7562, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7622, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -57814,7 +58135,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7585,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -57937,7 +58258,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7615, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7675, libc.VaList(bp, zObject))
 	}
 }
 
@@ -57993,10 +58314,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6697) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6757) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6702) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6762) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -58427,13 +58748,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff int8) int32
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7638) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7698) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7646) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7706) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7652) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7712) == 0 {
 		return 1
 	}
 	return 0
@@ -58637,7 +58958,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7656, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7716, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -58715,7 +59036,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7703, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7763, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -58809,7 +59130,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7734
+		var zFmt uintptr = ts + 7794
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -58827,7 +59148,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	}
 }
 
@@ -58868,7 +59189,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7778, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7838, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -58898,11 +59219,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7801, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7861, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1547
 			}
-			return ts + 7820
+			return ts + 7880
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59029,7 +59350,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7832, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7892, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -59044,12 +59365,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7850, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7910, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1547
 		}
-		return ts + 7820
+		return ts + 7880
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -59070,7 +59392,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59079,7 +59401,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7871)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7931)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -59465,8 +59787,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7873, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7876,
+			if Xsqlite3_strnicmp(tls, z, ts+7933, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7936,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4925
@@ -59542,7 +59864,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7903,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7963,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -59628,8 +59950,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -59715,14 +60037,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 7933, ts + 7938, ts + 7943, ts + 6184, ts + 6179}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 7993, ts + 7998, ts + 8003, ts + 6184,
+				ts + 6179, ts + 8011}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7951
+						return ts + 8019
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -59736,7 +60060,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -59759,10 +60083,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -59862,7 +60186,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -59992,12 +60316,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -60006,110 +60331,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7903,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7963,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -60152,13 +60490,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -60168,11 +60506,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -60195,11 +60533,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -60208,15 +60546,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -60243,20 +60581,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -60265,9 +60603,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -60305,14 +60643,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7956, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8024, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -60323,17 +60663,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -60345,128 +60685,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7983, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8051, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -60474,42 +60814,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7585,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7645,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -60532,23 +60872,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -60565,42 +60905,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6466, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6526, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -60621,15 +60963,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60639,22 +60981,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -60663,21 +61005,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -60687,27 +61029,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8007, 0)
+		ts+8075, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -60716,7 +61058,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -60727,7 +61069,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]int8)(unsafe.Pointer(ts + 8057))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8125))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62102,18 +62444,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -62143,7 +62485,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -62156,12 +62498,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -62169,6 +62609,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -62183,81 +62663,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -62279,34 +62686,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -62396,7 +62802,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -62404,7 +62810,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -62455,11 +62861,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8073, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8135, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -62471,13 +62877,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8101,
+		ts+8163,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8276,
+			ts+8338,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -62487,10 +62893,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8450, libc.VaList(bp, zDb, zDb))
+		ts+8512, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8597, 0)
+			ts+8659, 0)
 	}
 }
 
@@ -62554,7 +62960,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8748, libc.VaList(bp, zName))
+		ts+8810, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -62564,7 +62970,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8807, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8869, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -62573,7 +62979,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8813, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8875, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -62614,19 +63020,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8840, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8902, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9024,
+		ts+9086,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9329, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9391, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9345,
+		ts+9407,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -62634,7 +63040,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9403, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9465, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -62646,7 +63052,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9668, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9730, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -62658,7 +63064,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9681,
+		ts+9743,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -62704,12 +63110,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9719, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9781, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9751, 0)
+			ts+9813, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -62719,11 +63125,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9778)
+				ts+9840)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9837)
+				ts+9899)
 		}
 
 		if pDflt != 0 {
@@ -62736,12 +63142,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9890)
+					ts+9952)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9936)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9998)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -62752,7 +63158,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9963,
+			ts+10025,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -62774,7 +63180,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10109,
+				ts+10171,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -62822,14 +63228,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10339, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10401, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10373, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10435, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -62857,7 +63263,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10403, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10465, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -62897,18 +63303,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10422
+		zType = ts + 10484
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10427
+		zType = ts + 10489
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10441,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10503,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10459
+					return ts + 10521
 				}
-				return ts + 10476
+				return ts + 10538
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -62992,7 +63398,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10494, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -63009,17 +63415,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10515,
+		ts+10577,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10697,
+		ts+10759,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9668, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9730, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63214,7 +63620,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -63277,10 +63683,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10828,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10890,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10851
+				return ts + 10913
 			}
 			return ts + 1547
 		}(), zWhen,
@@ -63322,8 +63728,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10853, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10915, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63340,7 +63746,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63362,7 +63768,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10861, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10923, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -63402,10 +63808,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))
 				*(*int8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = int8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10867, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10929, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*int8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10851
+							return ts + 10913
 						}
 						return ts + 1547
 					}()))
@@ -63581,8 +63987,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -63665,15 +64071,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -63701,7 +64107,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -63734,13 +64140,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63753,7 +64159,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63768,7 +64174,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -63824,8 +64230,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -63873,7 +64279,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -63941,8 +64347,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -63984,11 +64390,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.Xmemset(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.Xmemset(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -64081,8 +64487,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64100,16 +64506,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -64124,31 +64530,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -64166,8 +64572,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64193,9 +64599,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -64223,8 +64629,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -64261,7 +64667,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -64285,7 +64691,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10872, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10934, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -64366,17 +64772,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10494, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10556, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10879,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10941,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10907
+				return ts + 10969
 			}
 			return ts + 6120
 		}(),
@@ -64387,7 +64793,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10919, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10981, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -64404,10 +64810,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1547, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10967, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11029, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11088, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11150, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -64525,11 +64931,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11106},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11127},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11147},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11166},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11185}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11168},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11189},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11209},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11228},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11247}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -64563,7 +64969,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11208, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11270, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -64572,10 +64978,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11231,
+					ts+11293,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11261, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11323, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -64593,9 +64999,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11279, FzCols: ts + 11292},
-	{FzName: ts + 11305, FzCols: ts + 11318},
-	{FzName: ts + 11346},
+	{FzName: ts + 11341, FzCols: ts + 11354},
+	{FzName: ts + 11367, FzCols: ts + 11380},
+	{FzName: ts + 11408},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -64614,7 +65020,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -64693,7 +65098,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -64739,13 +65144,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -64758,11 +65163,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -64786,17 +65191,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11359}
+	FzName:     ts + 11421}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -64807,8 +65212,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -64851,7 +65256,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -64879,7 +65284,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -64946,7 +65351,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -64962,8 +65367,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -64980,9 +65385,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -64990,14 +65395,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -65005,31 +65410,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -65037,7 +65442,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11369}
+	FzName:     ts + 11431}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -65051,20 +65456,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11379,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11441,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11384, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11446, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65106,7 +65511,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+11390, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11452, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -65120,7 +65525,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11396}
+	FzName:     ts + 11458}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -65164,7 +65569,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11405, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11467, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65181,7 +65586,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11279, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11341, uint64(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -65337,7 +65742,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11415, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11477, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -65394,7 +65799,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11415, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11477, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -65441,9 +65846,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11419)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11481)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11423)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11485)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -65529,16 +65934,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1547
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*int8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -65548,15 +65953,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*int8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11427, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11489, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11438, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11500, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11448, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11510, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -65636,7 +66041,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -65650,42 +66055,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -65759,15 +66164,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -65832,11 +66237,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11305, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11367, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11460,
-			ts+11514,
+			ts+11522,
+			ts+11576,
 			zDb)
 	}
 	return rc
@@ -65883,10 +66288,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11279, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11341, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11566, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11628, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -65944,12 +66349,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6374, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6434, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -65960,13 +66365,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -65987,128 +66395,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3828)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3828)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11669, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11607, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11610,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11647, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11672,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11709, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.Xmemset(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11677, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11739, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+11706, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+11768, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -66118,89 +66549,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1483, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11774, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11836, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66254,14 +66685,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11802, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11864, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11823, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11885, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66269,7 +66700,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11849, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11911, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66311,42 +66742,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -66355,13 +66792,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -66380,7 +66817,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11871}
+	FzName:     ts + 11933}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -66393,7 +66830,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11885}
+	FzName:     ts + 11947}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -66407,7 +66844,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11899, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11961, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -66439,7 +66876,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11923,
+						ts+11985,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -66614,7 +67051,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11969, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12031, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -66640,11 +67077,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11992, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+11998, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12060, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12004, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12066, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -66691,7 +67128,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 7646
+		zCol = ts + 7706
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -66715,7 +67152,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12031, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12093, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -66940,6 +67377,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -66952,13 +67392,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -66983,25 +67423,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6374) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6434) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12046+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+12079)
+						ts+6382)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5886)
+						ts+5876)
 				}
 			}
 		}
@@ -67022,12 +67462,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12065+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5886)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12046+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6420+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5876)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6401+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+12079)
+					ts+6382)
 			}
 		}
 	}
@@ -67058,7 +67498,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12098, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12108, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67076,14 +67516,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12106
+			zMsg = ts + 12116
 		} else {
-			zMsg = ts + 12119
+			zMsg = ts + 12129
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6578, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6638, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6588, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6648, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67113,12 +67553,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8065, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5886+7) == 0 {
-			return ts + 12065
+	if Xsqlite3_strnicmp(tls, zName, ts+6374, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5876+7) == 0 {
+			return ts + 6420
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12079+7) == 0 {
-			return ts + 12046
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6382+7) == 0 {
+			return ts + 6401
 		}
 	}
 	return zName
@@ -67476,7 +67916,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5886)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5876)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -67502,7 +67942,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6374, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6434, zName) {
 				goto __3
 			}
 
@@ -67555,13 +67995,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12133, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12143, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12150, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12160, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -67603,9 +68043,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8065, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6374, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12170,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12180,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -67765,9 +68205,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -67783,7 +68223,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12212, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12222, 0)
 	return
 __4:
 	;
@@ -67811,9 +68251,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10422
+			return ts + 10484
 		}
-		return ts + 8807
+		return ts + 8869
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -67829,9 +68269,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -67862,12 +68302,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12253,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12263,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10422
+				return ts + 10484
 			}
-			return ts + 8807
+			return ts + 8869
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -67882,7 +68322,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12274, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12284, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -67969,7 +68409,7 @@ var nullRow = [6]int8{int8(6), int8(0), int8(0), int8(0), int8(0), int8(0)}
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+12309, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12319, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -67993,7 +68433,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12326, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12336, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68013,7 +68453,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12309
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12319
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -68025,7 +68465,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12309, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12319, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68059,7 +68499,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12360, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68067,13 +68507,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12383, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12393, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12390, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12400, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -68110,7 +68550,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12400, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12410, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68274,10 +68714,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12426,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12436,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12471, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12481, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -68308,7 +68748,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12512, 0)
+			ts+12522, 0)
 	}
 }
 
@@ -68353,7 +68793,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12564, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12574, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -68442,7 +68882,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12605, 0)
+		ts+12615, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -68537,7 +68977,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12661, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12671, 0)
 	goto generated_done
 __2:
 	;
@@ -68550,13 +68990,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12704, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12714, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12712, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12722, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -68583,13 +69023,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12719,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12729,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -68711,12 +69158,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1547
-		zSep2 = ts + 12750
+		zSep2 = ts + 12760
 		zEnd = ts + 4950
 	} else {
-		zSep = ts + 12752
-		zSep2 = ts + 12756
-		zEnd = ts + 12761
+		zSep = ts + 12762
+		zSep2 = ts + 12766
+		zEnd = ts + 12771
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -68724,7 +69171,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12764, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12774, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*int8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = int8('(')
@@ -68762,11 +69209,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1547,
-	ts + 12778,
-	ts + 12784,
-	ts + 12789,
+	ts + 12788,
+	ts + 12794,
+	ts + 12799,
+	ts + 12804,
 	ts + 12794,
 }
 
@@ -69174,10 +69622,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12800,
+						ts+12810,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1547)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12833,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12843,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69196,11 +69644,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12860, 0)
+				ts+12870, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12910, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12920, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69234,7 +69682,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12942, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12952, 0)
 			return
 		}
 	}
@@ -69259,11 +69707,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8807
-			zType2 = ts + 12986
+			zType = ts + 8869
+			zType2 = ts + 12996
 		} else {
-			zType = ts + 10422
-			zType2 = ts + 12992
+			zType = ts + 10484
+			zType2 = ts + 13002
 		}
 
 		if pSelect != 0 {
@@ -69325,7 +69773,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -69334,11 +69782,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+12997, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13007, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13012,
+			ts+13022,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69354,13 +69802,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13110,
+					ts+13120,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13152, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13162, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -69375,7 +69823,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9329) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9391) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -69405,7 +69853,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13186, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13196, 0)
 	goto create_view_fail
 __1:
 	;
@@ -69421,7 +69869,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10422, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10484, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -69503,7 +69951,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13222, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13232, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -69531,8 +69979,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, int8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -69629,13 +70076,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13252, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13262, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13267,
+		ts+13277,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -69676,10 +70123,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13334, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13344, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11231,
+				ts+11293,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -69711,12 +70158,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13348,
+			ts+13358,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13393,
+		ts+13403,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -69744,11 +70191,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3279, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7066, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7126, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -69826,9 +70273,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -69887,21 +70334,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13460, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13470, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13488, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13498, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13522, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13532, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -69913,7 +70360,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11423, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11485, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -69977,7 +70424,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13554,
+		ts+13564,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -69989,7 +70436,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13617, 0)
+		ts+13627, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70074,7 +70521,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13711,
+		ts+13721,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -70301,12 +70748,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13757,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13767,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13785
+							return ts + 13795
 						}
-						return ts + 13791
+						return ts + 13801
 					}()))
 				return 1
 			}
@@ -70427,7 +70874,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13796, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13806, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -70446,7 +70893,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13802,
+		ts+13812,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -70472,26 +70919,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13852, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13880, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13890, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13905, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13915, 0)
 	goto exit_create_index
 __17:
 	;
@@ -70505,7 +70952,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13796, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13806, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -70520,7 +70967,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13939, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13949, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -70532,7 +70979,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13973, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13983, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -70561,7 +71008,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+13997, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14007, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -70582,9 +71029,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -70623,7 +71070,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13796)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13806)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -70724,7 +71171,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14020, 0)
+		ts+14030, 0)
 	goto exit_create_index
 __56:
 	;
@@ -70941,7 +71388,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14081, libc.VaList(bp+48, 0))
+		ts+14091, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -70993,8 +71440,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14123, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14133, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -71040,12 +71487,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14140,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14150,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1547
 			}
-			return ts + 14160
+			return ts + 14170
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71053,7 +71500,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14168,
+		ts+14178,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -71067,7 +71514,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14227, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14237, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71228,7 +71675,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14254, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14264, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71243,7 +71690,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14272, libc.VaList(bp+8, 0))
+		ts+14282, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71254,9 +71701,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71282,9 +71729,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14345,
+		ts+14355,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11419, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11481, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -71419,7 +71866,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14405,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14415,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -71627,12 +72074,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14441,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14451,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14477
+				return ts + 14487
 			}
-			return ts + 14480
+			return ts + 14490
 		}()))
 	goto append_from_error
 __1:
@@ -71801,7 +72248,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14486, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14496, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -71837,9 +72284,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14492
+				return ts + 14502
 			}
-			return ts + 14501
+			return ts + 14511
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -71864,7 +72311,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14486, ts + 14508, ts + 14492}
+var az = [3]uintptr{ts + 14496, ts + 14518, ts + 14502}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -71879,7 +72326,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14516, 0)
+				ts+14526, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72016,14 +72463,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14586, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14596, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14597, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14607, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1560, 1)
@@ -72049,11 +72496,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14600, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14610, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72183,7 +72630,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14609, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14619, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72279,7 +72726,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14655, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14665, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -72472,7 +72919,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14685, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14695, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -72752,7 +73199,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14716,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14726,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -72784,11 +73231,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14749, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14759, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14778, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14788, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -73292,7 +73739,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14816)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14826)
 __62:
 	;
 delete_from_cleanup:
@@ -73407,7 +73854,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11279) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11341) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -73637,7 +74084,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6184, ts + 6179, ts + 7938, ts + 7933, ts + 6174}
+var azType2 = [5]uintptr{ts + 6184, ts + 6179, ts + 7998, ts + 7993, ts + 6174}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -73696,7 +74143,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14829, -1)
+					Xsqlite3_result_error(tls, context, ts+14839, -1)
 					return
 				}
 				iVal = -iVal
@@ -74000,7 +74447,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14846, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14856, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74346,7 +74793,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14851, -1)
+		Xsqlite3_result_error(tls, context, ts+14861, -1)
 		return
 	}
 	if argc == 3 {
@@ -74356,7 +74803,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14884, -1)
+				ts+14894, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -74455,7 +74902,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14929, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14939, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -74470,21 +74917,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = int8('\'')
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = int8(0)
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = int8('\'')
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = int8(0)
 				*(*int8)(unsafe.Pointer(zText)) = int8('X')
 				*(*int8)(unsafe.Pointer(zText + 1)) = int8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -74492,7 +74939,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14936, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14946, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -74606,6 +75053,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1547
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -74808,7 +75368,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10851}
+var azOne = [1]uintptr{ts + 10913}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -74844,7 +75404,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(j))) = int8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14939, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14949, 4, uintptr(0))
 	}
 }
 
@@ -74869,7 +75429,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12031, -1)
+		Xsqlite3_result_error(tls, context, ts+12093, -1)
 		return
 	}
 
@@ -74947,7 +75507,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14829, -1)
+			Xsqlite3_result_error(tls, context, ts+14839, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75209,7 +75769,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14944, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14954, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75229,14 +75789,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14950, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14960, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14950, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14960, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14950, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14950, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14960, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14960, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -75366,17 +75926,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -75435,6 +75995,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -75475,108 +76036,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14955},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14975},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14988},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15006},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15015},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15023},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15023},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15038},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15064},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15089},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15098},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15109},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15116},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15130},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15130},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15136},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15136},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15142},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15142},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15147},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15147},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15147},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15151},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15151},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15151},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15155},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15162},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15170},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15177},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15183},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15190},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15197},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15205},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15210},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14965},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14985},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14998},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15016},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15025},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15033},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15033},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15048},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15074},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15099},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15108},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15119},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15126},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15140},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15140},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15146},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15146},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15152},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15152},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15157},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15157},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15157},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15161},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15161},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15161},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15165},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15180},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15187},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15193},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15200},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15207},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15215},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15220},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15226},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15232},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15236},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15261},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15268},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15283},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15300},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15311},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15317},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15335},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15343},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15357},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15365},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15374},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15374},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15391},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15395},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15401},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15405},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15405},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15224},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15224},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15230},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15236},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15242},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15246},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15252},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15259},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15266},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15277},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15284},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15299},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15316},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15327},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15333},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15351},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15359},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15373},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15390},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15390},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15407},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15411},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15411},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15424},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14950},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14950},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6519},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15429},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15434},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15442},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15448},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15454},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15457},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15461},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15467},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15457},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15472},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15476},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15480},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15486},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15490},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15495},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15500},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15505},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15417},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15421},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15421},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15427},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15427},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15440},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14960},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14960},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6579},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6579},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15445},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15450},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15458},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15464},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15470},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15473},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15483},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15473},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15488},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15492},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15496},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15506},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15511},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15515},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15523},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15528},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15533},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15538},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15516},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15521},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15527},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15531},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15539},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15544},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15550},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15556},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15561},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15569},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15577},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15580},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6519},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15585}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15549},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15554},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15560},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15566},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15572},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15577},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15585},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15593},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15596},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6579},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15601}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -75697,7 +76260,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15589,
+				ts+15605,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -76357,8 +76920,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6385, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6381, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6445, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6441, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -76858,7 +77421,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7903, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77326,7 +77889,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15634,
+		ts+15650,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77351,7 +77914,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15675,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15691,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -77500,7 +78063,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15707,
+		ts+15723,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -77510,7 +78073,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15759, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15775, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -77562,7 +78125,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15784,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15800,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -77570,7 +78133,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15830, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15846, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -77982,7 +78545,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15851)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15867)
 __125:
 	;
 insert_cleanup:
@@ -78298,8 +78861,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 							onError, iReg)
 						Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -79388,7 +79952,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -79834,6 +80398,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -79872,7 +80437,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12031, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12093, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -79881,7 +80446,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15865
+		zEntry = ts + 15881
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -79896,7 +80461,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11992, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12054, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -79932,7 +80497,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15888, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15904, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -79946,7 +80511,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15897, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15913, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -79970,7 +80535,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15901, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15917, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -79988,7 +80553,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15907, libc.VaList(bp+16, zEntry, zFile))
+		ts+15923, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80015,7 +80580,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15950, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15966, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80053,7 +80618,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15982, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+15998, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80063,7 +80628,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16019,
+	ts + 16035,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80219,7 +80784,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16022, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16038, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80228,62 +80793,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5050,
-	ts + 16061,
-	ts + 8807,
-	ts + 16065,
-	ts + 16070,
-	ts + 16073,
-	ts + 16083,
-	ts + 16093,
+	ts + 16077,
+	ts + 8869,
+	ts + 16081,
+	ts + 16086,
+	ts + 16089,
 	ts + 16099,
-	ts + 16103,
-	ts + 16108,
-	ts + 16113,
-	ts + 16121,
-	ts + 16132,
-	ts + 16135,
-	ts + 16142,
-	ts + 16103,
-	ts + 16108,
-	ts + 16149,
-	ts + 16154,
-	ts + 16157,
-	ts + 16164,
-	ts + 16099,
-	ts + 16103,
+	ts + 16109,
+	ts + 16115,
+	ts + 16119,
+	ts + 16124,
+	ts + 16129,
+	ts + 16137,
+	ts + 16148,
+	ts + 16151,
+	ts + 16158,
+	ts + 16119,
+	ts + 16124,
+	ts + 16165,
 	ts + 16170,
-	ts + 16175,
+	ts + 16173,
 	ts + 16180,
-	ts + 16103,
-	ts + 16184,
-	ts + 16108,
-	ts + 16192,
+	ts + 16115,
+	ts + 16119,
+	ts + 16186,
+	ts + 16191,
 	ts + 16196,
-	ts + 16201,
-	ts + 11423,
-	ts + 11419,
-	ts + 16207,
+	ts + 16119,
+	ts + 16200,
+	ts + 16124,
+	ts + 16208,
 	ts + 16212,
 	ts + 16217,
-	ts + 16061,
-	ts + 16103,
-	ts + 16222,
-	ts + 16229,
-	ts + 16236,
-	ts + 8807,
-	ts + 16244,
-	ts + 5053,
-	ts + 16250,
-	ts + 16061,
-	ts + 16103,
-	ts + 16255,
+	ts + 11485,
+	ts + 11481,
+	ts + 16223,
+	ts + 16228,
+	ts + 16233,
+	ts + 16077,
+	ts + 16119,
+	ts + 16238,
+	ts + 16245,
+	ts + 16252,
+	ts + 8869,
 	ts + 16260,
-	ts + 15457,
-	ts + 16265,
-	ts + 16278,
-	ts + 16287,
+	ts + 5053,
+	ts + 16266,
+	ts + 16077,
+	ts + 16119,
+	ts + 16271,
+	ts + 16276,
+	ts + 15473,
+	ts + 16281,
 	ts + 16294,
-	ts + 16305,
+	ts + 16303,
+	ts + 16310,
+	ts + 16321,
 }
 
 // Definitions of all built-in pragmas
@@ -80301,238 +80866,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16313,
+	{FzName: ts + 16329,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16328,
+	{FzName: ts + 16344,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16343,
+	{FzName: ts + 16359,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16355,
+	{FzName: ts + 16371,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16371,
+	{FzName: ts + 16387,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16294,
+	{FzName: ts + 16310,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16384,
+	{FzName: ts + 16400,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16396,
+	{FzName: ts + 16412,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16416,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16432,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16448,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16453,
+	{FzName: ts + 16469,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16468,
+	{FzName: ts + 16484,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16484,
+	{FzName: ts + 16500,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16498,
+	{FzName: ts + 16514,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16511,
+	{FzName: ts + 16527,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16525,
+	{FzName: ts + 16541,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16544,
+	{FzName: ts + 16560,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16563,
+	{FzName: ts + 16579,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16586,
+	{FzName: ts + 16602,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16595,
+	{FzName: ts + 16611,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16613,
+	{FzName: ts + 16629,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16630,
+	{FzName: ts + 16646,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16643,
+	{FzName: ts + 16659,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16658,
+	{FzName: ts + 16674,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16676,
+	{FzName: ts + 16692,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16686,
+	{FzName: ts + 16702,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16700,
+	{FzName: ts + 16716,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16716,
+	{FzName: ts + 16732,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16741,
+	{FzName: ts + 16757,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16760,
+	{FzName: ts + 16776,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16771,
+	{FzName: ts + 16787,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16782,
+	{FzName: ts + 16798,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16794,
+	{FzName: ts + 16810,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16810,
+	{FzName: ts + 16826,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16823,
+	{FzName: ts + 16839,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16842,
+	{FzName: ts + 16858,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16861,
+	{FzName: ts + 16877,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16874,
+	{FzName: ts + 16890,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16889,
+	{FzName: ts + 16905,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16899,
+	{FzName: ts + 16915,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16911,
+	{FzName: ts + 16927,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16920,
+	{FzName: ts + 16936,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16931,
+	{FzName: ts + 16947,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16941,
+	{FzName: ts + 16957,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16953,
+	{FzName: ts + 16969,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16964,
+	{FzName: ts + 16980,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16976,
+	{FzName: ts + 16992,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 16993,
+	{FzName: ts + 17009,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17012,
+	{FzName: ts + 17028,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17038,
+	{FzName: ts + 17054,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17053,
+	{FzName: ts + 17069,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17067,
+	{FzName: ts + 17083,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17086,
+	{FzName: ts + 17102,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17100,
+	{FzName: ts + 17116,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17116,
+	{FzName: ts + 17132,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17128,
+	{FzName: ts + 17144,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17139,
+	{FzName: ts + 17155,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17150,
+	{FzName: ts + 17166,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17162,
+	{FzName: ts + 17178,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17173,
+	{FzName: ts + 17189,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17194,
+	{FzName: ts + 17210,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17202,
+	{FzName: ts + 17218,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17217,
+	{FzName: ts + 17233,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17230,
+	{FzName: ts + 17246,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17249,
+	{FzName: ts + 17265,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17264,
+	{FzName: ts + 17280,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -80554,7 +81119,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17280))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17296))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -80566,10 +81131,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17305) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17321) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17315) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17331) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -80578,13 +81143,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7951) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8019) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17327) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17343) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -80599,9 +81164,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*int8)(unsafe.Pointer(z))) >= '0' && int32(*(*int8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*int8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16255) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16271) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17339) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17355) == 0 {
 		return 2
 	} else {
 		return 0
@@ -80615,7 +81180,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17346, 0)
+				ts+17362, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -80706,19 +81271,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17408
+		zName = ts + 17424
 		break
 	case OE_SetDflt:
-		zName = ts + 17417
+		zName = ts + 17433
 		break
 	case OE_Cascade:
-		zName = ts + 17429
+		zName = ts + 17445
 		break
 	case OE_Restrict:
-		zName = ts + 17437
+		zName = ts + 17453
 		break
 	default:
-		zName = ts + 17446
+		zName = ts + 17462
 		break
 	}
 	return zName
@@ -80735,7 +81300,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17456, ts + 17463, ts + 17471, ts + 17475, ts + 17339, ts + 17484,
+	ts + 17472, ts + 17479, ts + 17487, ts + 17491, ts + 17355, ts + 17500,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -80782,13 +81347,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17488
+			zType = ts + 17504
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17490
+			zType = ts + 17506
 		} else {
-			zType = ts + 7461
+			zType = ts + 7521
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17492,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17508,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -80796,7 +81361,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17499, ts + 17504, ts + 17512}
+var azEnc = [4]uintptr{uintptr(0), ts + 17515, ts + 17520, ts + 17528}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -80947,14 +81512,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -81041,7 +81608,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17520, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17536, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81302,7 +81869,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17524) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17540) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81374,7 +81941,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17315
+	zRet = ts + 17331
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -81412,7 +81979,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17305
+	zRet = ts + 17321
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -81699,7 +82266,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17529, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17545, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -81740,7 +82307,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17554, 0)
+		ts+17570, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -81794,7 +82361,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17607) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17623) == 0) {
 		goto __142
 	}
 
@@ -81891,9 +82458,9 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17613
+			return ts + 17629
 		}
-		return ts + 17621
+		return ts + 17637
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -81962,7 +82529,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17628, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17644, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82008,29 +82575,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10422
+	zType = ts + 10484
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12704
+	zType = ts + 12714
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17644
+	zType = ts + 17660
 	goto __183
 __182:
-	zType = ts + 8807
+	zType = ts + 8869
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17651,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17667,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82096,7 +82663,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82106,7 +82673,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17663,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17679,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -82143,8 +82710,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17668, ts + 17670, ts + 16132}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17672,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17684, ts + 17686, ts + 16148}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17688,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82177,7 +82744,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17678,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17694,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -82199,7 +82766,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17682, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17698, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82263,7 +82830,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7461, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82279,7 +82846,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7461, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7521, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -82314,7 +82881,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82322,7 +82889,7 @@ __226:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+17694))
+			ts+17710))
 	goto __227
 __227:
 	j2++
@@ -82511,7 +83078,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17699, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17715, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 600)))
@@ -82728,7 +83295,7 @@ __284:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17703, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17719, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -82789,262 +83356,284 @@ __299:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 612)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__300:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __301
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __300
+	}
+	mxCol = -1
+	j4 = 0
+__302:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __304
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __305
+	}
+	mxCol++
+__305:
+	;
+	goto __303
+__303:
+	j4++
+	goto __302
+	goto __304
+__304:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __306
 	}
 	mxCol--
-	goto __300
+__306:
+	;
+	goto __301
+__300:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __301:
 	;
 	if !(mxCol >= 0) {
-		goto __302
+		goto __307
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__302:
+__307:
 	;
 	if !!(isQuick != 0) {
-		goto __303
+		goto __308
 	}
 	if !(pPk1 != 0) {
-		goto __304
+		goto __309
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 612)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17727,
+		ts+17743,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__305:
+__310:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __307
+		goto __312
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 612)), j4, r2+j4)
-	goto __306
-__306:
+	goto __311
+__311:
 	j4++
-	goto __305
-	goto __307
-__307:
+	goto __310
+	goto __312
+__312:
 	;
-__304:
+__309:
 	;
-__303:
+__308:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__308:
+__313:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __310
+		goto __315
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __311
+		goto __316
 	}
-	goto __309
-__311:
+	goto __314
+__316:
 	;
 	if !(bStrict != 0) {
-		goto __312
+		goto __317
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __313
-__312:
+	goto __318
+__317:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__313:
+__318:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __314
+		goto __319
 	}
-	goto __309
-__314:
+	goto __314
+__319:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __316
-__315:
+	goto __321
+__320:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __317
+		goto __322
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 624)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		uint8((*Column)(unsafe.Pointer(pCol1)).Faffinity), bp+624)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 624)) != 0) {
-		goto __318
+		goto __323
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
-__318:
+__323:
 	;
-__317:
+__322:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 612))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __319
+		goto __324
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __320
-__319:
+	goto __325
+__324:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__320:
+__325:
 	;
-__316:
+__321:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __321
+		goto __326
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17763, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17779, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __323
-__322:
+	goto __328
+__327:
 	;
-__323:
+__328:
 	;
-__321:
+__326:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __324
+		goto __329
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17783,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17799,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __325
-__324:
+	goto __330
+__329:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __326
+		goto __331
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17805,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17821,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __327
-__326:
+	goto __332
+__331:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __328
+		goto __333
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
-__329:
+__334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17828, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17844, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17830,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17846,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__328:
+__333:
 	;
-__327:
+__332:
 	;
-__325:
+__330:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __309
-__309:
+	goto __314
+__314:
 	j4++
-	goto __308
-	goto __310
-__310:
+	goto __313
+	goto __315
+__315:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __330
+		goto __335
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __331
+		goto __336
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 612)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__332:
+__337:
 	if !(k3 > 0) {
-		goto __334
+		goto __339
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __333
-__333:
+	goto __338
+__338:
 	k3--
-	goto __332
-	goto __334
-__334:
+	goto __337
+	goto __339
+__339:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17850,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17866,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__331:
+__336:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__330:
+__335:
 	;
 	if !!(isQuick != 0) {
-		goto __335
+		goto __340
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__336:
+__341:
 	if !(pIdx5 != 0) {
-		goto __338
+		goto __343
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __339
+		goto __344
 	}
-	goto __337
-__339:
+	goto __342
+__344:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 612)), 0, 0, bp+632,
 		pPrior, r1)
@@ -83053,80 +83642,119 @@ __339:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 616))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17880)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17885)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17901)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__345:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __347
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __348
+	}
+	goto __346
+__348:
+	;
+	if !(label6 == 0) {
+		goto __349
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__349:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 616))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	if !(label6 != 0) {
+		goto __350
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17896)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17922)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__350:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __340
+		goto __351
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__341:
+__352:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __343
+		goto __354
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __344
+		goto __355
 	}
-	goto __342
-__344:
+	goto __353
+__355:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17949)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__351:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
 	goto __342
 __342:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __341
 	goto __343
 __343:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17906)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __340:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
-	goto __337
-__337:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __336
-	goto __338
-__338:
-	;
-__335:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __345
+		goto __356
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17933)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17976)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__346:
+__357:
 	if !(pIdx5 != 0) {
-		goto __348
+		goto __359
 	}
 	if !(pPk1 == pIdx5) {
-		goto __349
+		goto __360
 	}
-	goto __347
-__349:
+	goto __358
+__360:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83135,21 +83763,21 @@ __349:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __347
-__347:
+	goto __358
+__358:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __346
-	goto __348
-__348:
+	goto __357
+	goto __359
+__359:
 	;
 	if !(pPk1 != 0) {
-		goto __350
+		goto __361
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__350:
+__361:
 	;
-__345:
+__356:
 	;
 	goto __291
 __291:
@@ -83167,14 +83795,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __351
+		goto __362
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 608))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 17962
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18005
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__351:
+__362:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83182,27 +83810,27 @@ __351:
 
 __45:
 	if !!(zRight != 0) {
-		goto __352
+		goto __363
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __354
+		goto __365
 	}
 	goto pragma_out
-__354:
+__365:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __353
-__352:
+	goto __364
+__363:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __355
+		goto __366
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__356:
+__367:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __358
+		goto __369
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __359
+		goto __370
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83211,25 +83839,25 @@ __356:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __358
-__359:
+	goto __369
+__370:
 	;
-	goto __357
-__357:
+	goto __368
+__368:
 	pEnc += 16
-	goto __356
-	goto __358
-__358:
+	goto __367
+	goto __369
+__369:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __360
+		goto __371
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17965, libc.VaList(bp+456, zRight))
-__360:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18008, libc.VaList(bp+456, zRight))
+__371:
 	;
-__355:
+__366:
 	;
-__353:
+__364:
 	;
 	goto __15
 
@@ -83237,15 +83865,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __361
+		goto __372
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __363
+		goto __374
 	}
 	goto __15
-__363:
+__374:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -83253,41 +83881,41 @@ __363:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __364
+		goto __375
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__364:
+__375:
 	;
-	goto __362
-__361:
+	goto __373
+__372:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __365
+		goto __376
 	}
 	goto __15
-__365:
+__376:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__362:
+__373:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__366:
+__377:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __366
-__367:
+	goto __377
+__378:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83302,31 +83930,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17322) == 0) {
-		goto __369
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17338) == 0) {
+		goto __380
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __370
-__369:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17990) == 0) {
-		goto __371
+	goto __381
+__380:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18033) == 0) {
+		goto __382
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __372
-__371:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17475) == 0) {
-		goto __373
+	goto __383
+__382:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17491) == 0) {
+		goto __384
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__373:
+__384:
 	;
-__372:
+__383:
 	;
-__370:
+__381:
 	;
-__368:
+__379:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83336,10 +83964,10 @@ __368:
 
 __49:
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__374:
+__385:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83359,19 +83987,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __377
+		goto __388
 	}
 	goto __15
-__377:
+__388:
 	;
-	goto __376
-__375:
+	goto __387
+__386:
 	opMask = U32(0xfffe)
-__376:
+__387:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -83380,86 +84008,86 @@ __376:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__378:
+__389:
 	if !(iDb <= iDbLast) {
-		goto __380
+		goto __391
 	}
 	if !(iDb == 1) {
-		goto __381
+		goto __392
 	}
-	goto __379
-__381:
+	goto __390
+__392:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__382:
+__393:
 	if !(k4 != 0) {
-		goto __384
+		goto __395
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __385
+		goto __396
 	}
-	goto __383
-__385:
+	goto __394
+__396:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__386:
+__397:
 	if !(pIdx6 != 0) {
-		goto __388
+		goto __399
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __389
+		goto __400
 	}
 	szThreshold = int16(0)
-	goto __388
-__389:
+	goto __399
+__400:
 	;
-	goto __387
-__387:
+	goto __398
+__398:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __386
-	goto __388
-__388:
+	goto __397
+	goto __399
+__399:
 	;
 	if !(szThreshold != 0) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__390:
+__401:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+17998,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18041,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __391
+		goto __402
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __392
-__391:
+	goto __403
+__402:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__392:
+__403:
 	;
-	goto __383
-__383:
+	goto __394
+__394:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __382
-	goto __384
-__384:
+	goto __393
+	goto __395
+__395:
 	;
-	goto __379
-__379:
+	goto __390
+__390:
 	iDb++
-	goto __378
-	goto __380
-__380:
+	goto __389
+	goto __391
+__391:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -83467,36 +84095,36 @@ __380:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __393
+		goto __404
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__393:
+__404:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __394
+		goto __405
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__394:
+__405:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __395
+		goto __406
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 648)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__396:
+__407:
 	;
-__395:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -83505,10 +84133,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__397:
+__408:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -83517,10 +84145,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __398
+		goto __409
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__398:
+__409:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -83528,10 +84156,10 @@ __398:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __399
+		goto __410
 	}
 
-__399:
+__410:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -83583,14 +84211,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18016, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18021, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18027, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18036, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18045, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18053, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18061},
-	{FzName: ts + 18068},
+	{FzName: ts + 18059, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18064, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18070, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18079, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18088, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18096, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18104},
+	{FzName: ts + 18111},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -83642,7 +84270,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18074)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18117)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -83650,7 +84278,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18089, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18132, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -83663,16 +84291,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18096, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18102)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18145)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18114)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18157)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4950, 1)
@@ -83855,13 +84483,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18129)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18172)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18137, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18180, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18141, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18184, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -83938,12 +84566,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18145, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18188, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -83952,19 +84580,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5001
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18173, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18216, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18204, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18247, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18212,
-	ts + 18219,
-	ts + 18231,
+	ts + 18255,
+	ts + 18262,
+	ts + 18274,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84024,7 +84652,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14123)
+				corruptSchema(tls, pData, argv, ts+14133)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -84056,13 +84684,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18242)
+			corruptSchema(tls, pData, argv, ts+18285)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14123)
+				corruptSchema(tls, pData, argv, ts+14133)
 			}
 		}
 	}
@@ -84095,16 +84723,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8807
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8869
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7871
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18255
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7931
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18298
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -84182,17 +84810,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11706)
+		ts+11768)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -84201,44 +84838,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18327)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18370)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18351,
+		ts+18394,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -84249,57 +84886,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -84388,8 +85025,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -84502,8 +85141,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -84514,8 +85153,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -84527,8 +85166,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -84568,7 +85207,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18385, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18428, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -84598,7 +85237,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18415, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18458, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -84694,7 +85333,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -84793,7 +85432,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85111,8 +85750,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10851
-		var zSp2 uintptr = ts + 10851
+		var zSp1 uintptr = ts + 10913
+		var zSp2 uintptr = ts + 10913
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85120,13 +85759,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18434, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18477, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18464))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18507))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85301,7 +85940,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18498, libc.VaList(bp, 0))
+					ts+18541, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85346,7 +85985,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18548, libc.VaList(bp+8, zName))
+						ts+18591, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85357,7 +85996,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18612,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18655,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -85401,7 +86040,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6519, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6579, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -85748,9 +86387,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -85988,16 +86624,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18649
+		z = ts + 18692
 		break
 	case TK_INTERSECT:
-		z = ts + 18659
+		z = ts + 18702
 		break
 	case TK_EXCEPT:
-		z = ts + 18669
+		z = ts + 18712
 		break
 	default:
-		z = ts + 18676
+		z = ts + 18719
 		break
 	}
 	return z
@@ -86007,10 +86643,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18682, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18725, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -86030,6 +86669,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18748, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18779
+		}
+		return ts + 1547
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -86096,6 +86742,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -86160,6 +86807,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -86214,7 +86862,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1112
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16244
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16260
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -86353,13 +87001,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16244
+				zCol = ts + 16260
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -86367,7 +87015,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18705, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -86432,7 +87080,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -86457,7 +87105,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16244
+					zName = ts + 16260
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -86467,7 +87115,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18705, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -86483,7 +87131,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18714, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18803, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -86508,45 +87157,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -86556,14 +87208,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18811
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -86573,9 +87257,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -86619,7 +87300,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -86770,7 +87451,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18722, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18815, 0)
 	return
 __1:
 	;
@@ -86861,7 +87542,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18771, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18864, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -86881,7 +87562,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18813, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18906, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -86918,7 +87599,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18819, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18912, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -86952,11 +87633,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18834, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18927, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1547
 		}
-		return ts + 18857
+		return ts + 18950
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87057,8 +87738,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18859, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18874, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18952, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18967, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87105,7 +87786,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18649, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18692, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87172,7 +87853,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18893, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18986, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -87234,7 +87915,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18893, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18986, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -87387,10 +88068,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18914, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19007, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18960,
+			ts+19053,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -87644,8 +88325,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7167)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7167)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7227)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7227)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -87672,13 +88353,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19042, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19135, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19053, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19146, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -87690,7 +88371,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19058, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19151, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88105,6 +88786,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff int8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -88224,15 +88924,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff int8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -88608,16 +89301,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -88677,12 +89387,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15147) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15157) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15151) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15161) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -88748,7 +89458,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19064, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19157, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -88831,7 +89541,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19082, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19175, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -88960,15 +89670,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19105, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19198, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -88986,7 +89693,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19125, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19218, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89002,7 +89709,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19168
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19261
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -89028,7 +89735,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19191,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19284,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -89039,9 +89746,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19229
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19322
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19263
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19356
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89088,7 +89795,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19301, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19394, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89200,7 +89907,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19305,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19398,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89219,7 +89926,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19344,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19437,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -89227,7 +89934,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14716,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14726,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -89328,7 +90035,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6379
+							zSchemaName = ts + 6439
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -89343,7 +90050,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19375, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19468, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -89408,7 +90115,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19380,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19473,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -89420,7 +90127,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11992, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12054, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -89439,9 +90146,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19389, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19482, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19407, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19500, 0)
 					}
 				}
 			}
@@ -89451,7 +90158,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19427, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19520, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -89510,11 +90217,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, int8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -89573,6 +90276,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -89588,7 +90366,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -89601,13 +90380,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19458, 0)
+					ts+19551, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19509, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19602, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -89615,7 +90394,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -89635,19 +90414,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -89661,6 +90443,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -89735,7 +90520,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -89747,7 +90534,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -89765,13 +90552,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -89788,11 +90575,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19542,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19635,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19554
+						return ts + 19647
 					}
 					return ts + 1547
 				}(),
@@ -89813,7 +90600,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7871)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7931)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -89845,14 +90632,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -89906,6 +90694,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -89970,7 +90809,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -90069,7 +90907,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19577,
+		ts+19670,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90130,7 +90968,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19631,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19724,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -90244,7 +91082,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -90261,11 +91099,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -90276,7 +91110,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19671, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19764, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -90302,7 +91136,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -90334,11 +91168,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19686, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19779, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -90372,7 +91204,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -90681,12 +91513,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -90715,39 +91546,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -90758,24 +91565,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -90808,27 +91615,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19702
+				return ts + 19795
 			}
-			return ts + 19711
+			return ts + 19804
 		}())
 
 	groupBySort = 1
@@ -90836,47 +91650,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -90892,45 +91706,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -90949,16 +91769,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -90989,16 +91809,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -91011,98 +91831,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -91111,79 +91934,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19702)
-__148:
+	explainTempTable(tls, pParse, ts+19795)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19720
-			}
-			return ts + 19743
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -91280,7 +92098,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19752, 0)
+		ts+19813, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -91513,7 +92331,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19817, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19878, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -91557,7 +92375,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19863, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19924, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -91575,7 +92393,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19932, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -91587,7 +92405,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19863, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19924, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -91602,7 +92420,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19912, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19973, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -91614,22 +92432,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8065, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6374, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19938, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19999, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19976,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20037,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20013
+				return ts + 20074
 			}
-			return ts + 20020
+			return ts + 20081
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -91638,7 +92456,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20026, libc.VaList(bp+24, pTableName+8))
+		ts+20087, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -91667,9 +92485,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12079
+			return ts + 6382
 		}
-		return ts + 5886
+		return ts + 5876
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -91787,7 +92605,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19863, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19924, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -91820,7 +92638,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20072,
+		ts+20133,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -91845,13 +92663,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20120,
+		ts+20181,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20195, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20256, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92107,7 +92925,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20224, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20285, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92146,9 +92964,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12079
+				return ts + 6382
 			}
-			return ts + 5886
+			return ts + 5876
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92160,7 +92978,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20244,
+			ts+20305,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -92274,12 +93092,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20306,
+		ts+20367,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20354
+				return ts + 20415
 			}
-			return ts + 20361
+			return ts + 20422
 		}()))
 __15:
 	;
@@ -92393,7 +93211,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20368, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20429, 0)
 	return 1
 }
 
@@ -92576,8 +93394,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -92610,8 +93428,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -92623,13 +93441,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20410, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20471, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -92945,7 +93763,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -93215,7 +94034,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20424,
+		ts+20485,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -93247,7 +94066,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20460, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20521, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -93257,7 +94076,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7646
+				return ts + 7706
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -94127,7 +94946,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20479)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20540)
 __169:
 	;
 update_cleanup:
@@ -94433,10 +95252,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*int8)(unsafe.Pointer(bp + 216)) = int8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20492, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20553, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20496, libc.VaList(bp+8, bp+216))
+				ts+20557, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -94527,7 +95346,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12133, -1)
+				ts+12143, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -94559,7 +95378,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20569, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20573, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20630, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20634, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -94707,14 +95526,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20577)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20638)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20617)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20678)
 	return SQLITE_ERROR
 __2:
 	;
@@ -94725,7 +95544,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20660)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20721)
 	return SQLITE_ERROR
 __5:
 	;
@@ -94753,7 +95572,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20678, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20739, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -94773,7 +95592,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20701)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20762)
 	goto end_of_vacuum
 __8:
 	;
@@ -94788,7 +95607,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14486)
+	rc = execSql(tls, db, pzErrMsg, ts+14496)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -94833,7 +95652,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20728,
+		ts+20789,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -94842,7 +95661,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20836,
+		ts+20897,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -94853,7 +95672,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20890,
+		ts+20951,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -94864,7 +95683,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21041,
+		ts+21102,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95086,12 +95905,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -95209,7 +96028,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12360, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12370, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -95293,11 +96112,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21171, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21232, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21195,
+			ts+21256,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -95307,7 +96126,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21294, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21355, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -95341,7 +96160,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -95368,7 +96187,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21313, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21374, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -95406,7 +96225,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21355, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21416, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -95418,7 +96237,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21385
+			var zFormat uintptr = ts + 21446
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -95435,7 +96254,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16135, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16151, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -95492,7 +96311,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21431, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21492, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -95550,7 +96369,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21431, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21492, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -95570,8 +96389,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -95584,7 +96403,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96037,7 +96856,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -96064,7 +96883,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -96295,10 +97114,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21450
+		return ts + 21511
 	}
 	if i == -1 {
-		return ts + 16244
+		return ts + 16260
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -96307,15 +97126,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21457, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21518, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21463, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12750, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -96326,11 +97145,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21463, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21524, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12750, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12760, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5001, 1)
 	}
@@ -96352,27 +97171,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21465, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21526, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21457, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21518, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21468
+				return ts + 21529
 			}
-			return ts + 21473
+			return ts + 21534
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21481)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21542)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21483)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21544)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4950, 1)
 }
@@ -96415,11 +97234,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21485, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21546, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21491
+				return ts + 21552
 			}
-			return ts + 21498
+			return ts + 21559
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -96429,43 +97248,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10907
+					zFmt = ts + 10969
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21503
+				zFmt = ts + 21564
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21536
+				zFmt = ts + 21597
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21561
+				zFmt = ts + 21622
 			} else {
-				zFmt = ts + 21579
+				zFmt = ts + 21640
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21588, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21649, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp int8
-			var zRowid uintptr = ts + 16244
-			Xsqlite3_str_appendf(tls, bp+64, ts+21596, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16260
+			Xsqlite3_str_appendf(tls, bp+64, ts+21657, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = int8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21627, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21688, libc.VaList(bp+32, zRowid))
 				cRangeOp = int8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = int8('>')
 			} else {
 				cRangeOp = int8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21637, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21698, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21642,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21703,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21669, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21730, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -96497,28 +97316,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21680, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21741, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21468, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21701, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21762, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21457, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21518, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21468, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21529, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4950, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -96579,52 +97399,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -98102,7 +98928,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21709, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21770, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98130,7 +98956,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21724, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21785, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -98648,7 +99474,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21733, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21794, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99006,10 +99832,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16093, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15424, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14950, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21747, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16109, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15440, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14960, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21808, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -99386,49 +100212,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -99436,13 +100251,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -99507,12 +100325,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21754, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21754, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21815, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -99536,7 +100354,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -99546,7 +100364,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -99591,7 +100409,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6702
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6762
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -99685,7 +100503,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21795
+				return ts + 21856
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -99696,7 +100514,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -99704,6 +100521,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -99737,7 +100555,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -99890,6 +100708,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -100058,7 +100879,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21802,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21863,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100792,7 +101613,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21838, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21899, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -100863,7 +101684,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21864
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21925
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101370,7 +102191,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -101390,7 +102211,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -101401,10 +102222,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -101415,29 +102236,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -101539,8 +102360,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -101552,7 +102373,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -101562,17 +102383,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -101592,19 +102413,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -101616,19 +102437,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -101638,10 +102459,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -101655,9 +102476,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -101682,8 +102503,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -101695,7 +102516,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -101709,23 +102530,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -101736,7 +102557,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -102058,6 +102879,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -102151,8 +102973,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -102176,8 +102998,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -102329,7 +103152,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -102348,7 +103171,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -102362,7 +103185,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -102371,9 +103194,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -102392,6 +103219,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -102519,30 +103349,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -102550,20 +103399,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -102572,9 +103426,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -102615,7 +103475,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -102655,7 +103515,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -102721,19 +103582,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -102914,7 +103780,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21875, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21936, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -102972,7 +103838,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21875, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21936, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -103370,7 +104236,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21901, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21962, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -103581,8 +104447,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -103701,14 +104567,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -103860,7 +104735,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -103968,7 +104843,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21936, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+21997, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104230,19 +105105,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -104254,9 +105131,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -104289,13 +105166,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -104447,7 +105324,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21954, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22015, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -104511,7 +105388,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21982, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22043, 0)
 	goto __5
 __4:
 	ii = 0
@@ -105212,7 +106089,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -105393,7 +106270,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22000, -1)
+		pCtx, ts+22061, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -105526,7 +106403,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22056, -1)
+					pCtx, ts+22117, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -105616,17 +106493,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22101))
-var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22112))
-var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22123))
-var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22128))
-var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22141))
-var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22151))
-var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22157))
-var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22168))
-var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22178))
-var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22190))
-var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22195))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22162))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22173))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22184))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22189))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22202))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22212))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22218))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22229))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22239))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22251))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22256))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -105672,7 +106549,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22199, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22260, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -105716,12 +106593,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22218, 0)
+			ts+22279, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22289, 0)
+				ts+22350, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -105744,7 +106621,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7871)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7931)
 					}
 					break
 				}
@@ -105948,7 +106825,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22352, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22413, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106064,7 +106941,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7463))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7523))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106075,6 +106952,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, int8(SQLITE_AFF_NONE))
@@ -106178,7 +107056,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22378, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22439, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -106243,15 +107121,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22410
+				zErr = ts + 22471
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22427
+				zErr = ts + 22488
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22443
+				zErr = ts + 22504
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22463, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22524, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -106272,7 +107150,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22496, 0)
+				ts+22557, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -106428,11 +107306,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22543,
-	ts + 22596,
-	ts + 22000,
-	ts + 22647,
-	ts + 22699,
+	ts + 22604,
+	ts + 22657,
+	ts + 22061,
+	ts + 22708,
+	ts + 22760,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -107629,8 +108507,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -107641,13 +108518,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -107831,19 +108705,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22749,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22810,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19743
+							return ts + 22852
 						}
-						return ts + 22791
+						return ts + 22861
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22797, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22867, 0)
 		}
 	}
 
@@ -107911,7 +108785,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22831,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22901,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109008,7 +109882,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22869, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22939, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -109983,21 +110857,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16244, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16260, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22891, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16157, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16173, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22891, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22961, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -110740,7 +111614,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22918)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22988)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -110904,7 +111778,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22927, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+22997, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -111121,9 +111995,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 6697
+							return ts + 6757
 						}
-						return ts + 6702
+						return ts + 6762
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -111135,6 +112009,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -111402,19 +112281,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22951, 0)
+					ts+23021, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23046, 0)
+					ts+23116, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23130, 0)
+					ts+23200, 0)
 			}
 			break
 		case uint32(273):
@@ -111793,9 +112672,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22927, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22997, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23215, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23285, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -112563,7 +113442,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23232, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23302, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -112586,7 +113465,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3656, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23257, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23327, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -112759,7 +113638,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23268, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23338, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -112772,11 +113651,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19863, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19924, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23275, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23280, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23350, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -112789,9 +113668,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23290, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23360, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23294, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23364, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113025,7 +113904,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -113600,7 +114479,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -113615,7 +114494,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23302, 0)
+			ts+23372, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -113806,23 +114685,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23370
+	var zErr uintptr = ts + 23440
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23384
+			zErr = ts + 23454
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23406
+			zErr = ts + 23476
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23428
+			zErr = ts + 23498
 			break
 
 		}
@@ -113840,35 +114719,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23451,
-	ts + 23464,
+	ts + 23521,
+	ts + 23534,
 	uintptr(0),
-	ts + 23480,
-	ts + 23505,
-	ts + 23519,
-	ts + 23538,
+	ts + 23550,
+	ts + 23575,
+	ts + 23589,
+	ts + 23608,
 	ts + 1483,
-	ts + 23563,
-	ts + 23600,
-	ts + 23612,
-	ts + 23627,
-	ts + 23660,
-	ts + 23678,
-	ts + 23703,
-	ts + 23732,
+	ts + 23633,
+	ts + 23670,
+	ts + 23682,
+	ts + 23697,
+	ts + 23730,
+	ts + 23748,
+	ts + 23773,
+	ts + 23802,
 	uintptr(0),
-	ts + 5841,
+	ts + 5831,
 	ts + 5327,
-	ts + 23749,
-	ts + 23767,
-	ts + 23785,
-	uintptr(0),
 	ts + 23819,
+	ts + 23837,
+	ts + 23855,
 	uintptr(0),
-	ts + 23840,
-	ts + 23866,
 	ts + 23889,
+	uintptr(0),
 	ts + 23910,
+	ts + 23936,
+	ts + 23959,
+	ts + 23980,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -113969,6 +114848,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	*(*int32)(unsafe.Pointer(db + 432)) = 1
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(*(*int32)(unsafe.Pointer(db + 432)) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -113983,7 +114868,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114028,7 +114913,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23926, 0)
+				ts+23996, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114145,7 +115030,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23989, libc.VaList(bp, zName))
+		ts+24059, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -114381,7 +115266,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24040, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24110, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -114474,7 +115359,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -114544,7 +115429,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114554,7 +115439,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -114586,14 +115471,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24061, 0)
+				ts+24131, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -114723,7 +115608,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24129, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24199, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -114768,10 +115653,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24135, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24205, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24145,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -114876,7 +115761,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24173, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24243, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -114887,17 +115772,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24177, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24247, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24177
+	zModeType = ts + 24247
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24183, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24253, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -114935,7 +115820,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24188, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24258, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -114943,7 +115828,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24208,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24278,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -114983,7 +115868,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24232, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24302, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115007,15 +115892,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24248, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24255, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24318, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24325, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24263, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24266, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24269, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17339, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24333, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24336, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24339, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17355, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115161,10 +116046,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21795, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21856, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24273, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24343, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -115178,7 +116063,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -115229,9 +116114,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6374
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6434
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23275
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23345
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -115336,7 +116221,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24279
+		zFilename = ts + 24349
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -115439,21 +116324,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24282,
+	Xsqlite3_log(tls, iErr, ts+24352,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24307)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24377)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24327)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24397)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24334)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24404)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -115611,7 +116496,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24351, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24421, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -116267,7 +117152,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24379, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24449, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -116385,7 +117270,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24387
+			return ts + 24457
 		}
 		return uintptr(0)
 	}(), 0)
@@ -116563,7 +117448,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6174, ts + 6697, ts + 6702, ts + 6184, ts + 6179, ts + 7938, ts + 24410, ts + 24416,
+	ts + 6174, ts + 6757, ts + 6762, ts + 6184, ts + 6179, ts + 7998, ts + 24480, ts + 24486,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -116716,7 +117601,7 @@ __10:
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0' + int32(c)>>4)
-	c = uint8(*(*int8)(unsafe.Pointer(ts + 24423 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24493 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -116771,7 +117656,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24440, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24510, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -116835,13 +117720,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6697, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6757, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6702, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6762, uint32(5))
 			break
 
 		}
@@ -117391,12 +118276,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6697, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6757, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6702, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6762, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(5)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -117497,7 +118382,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24469, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24539, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -117803,7 +118688,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*int8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24484, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24554, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -117818,7 +118703,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24488, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24558, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -117872,7 +118757,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24514,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24584,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -117977,11 +118862,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*int8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zPath)))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24557, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24627, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4991, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24560, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24630, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -118138,14 +119023,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24563, -1)
+			ts+24633, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, int8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24614, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24684, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -118240,7 +119125,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15357)
+	jsonWrongNumArgs(tls, ctx, ts+15373)
 	return
 __2:
 	;
@@ -118315,9 +119200,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24648
+			return ts + 24718
 		}
-		return ts + 24652
+		return ts + 24722
 	}())
 	return
 __2:
@@ -118450,7 +119335,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24659, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24729, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118547,7 +119432,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24662, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24732, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -118591,7 +119476,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24665)
+		ts+24735)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -118722,7 +119607,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24748, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24818, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -118741,7 +119626,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24754, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24824, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -118837,7 +119722,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, int8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24754, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24824, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -118861,7 +119746,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24759
+				zRoot = ts + 24829
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -118926,6 +119811,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -118977,7 +119868,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24469, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24539, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119072,25 +119963,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24761},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24766},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24777},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24777},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24795},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24808},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24811},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24815},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24827},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24839},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24850},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24861},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24873},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24886},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24895},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24895},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24905},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24916},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24933}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24831},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24836},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24847},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24847},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24865},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24878},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24881},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24885},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24897},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24909},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24920},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24931},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24943},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24956},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24965},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24965},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24975},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24986},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25003}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119109,8 +120000,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24951, FpModule: 0},
-	{FzName: ts + 24961, FpModule: 0},
+	{FzName: ts + 25021, FpModule: 0},
+	{FzName: ts + 25031, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -119370,11 +120261,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24971, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25041, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24979, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25049, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -119585,7 +120476,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24984,
+		ts+25054,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -120288,7 +121179,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25066)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25136)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -121629,7 +122520,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25080, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25150, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -121641,12 +122532,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25100, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25170, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25132, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25202, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -121872,7 +122763,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25169, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25239, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -121895,14 +122786,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25314
+	var zFmt uintptr = ts + 25384
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11279, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11341, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -121943,7 +122834,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25370, ts + 5053, ts + 16244,
+	ts + 25440, ts + 5053, ts + 16260,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -121986,19 +122877,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25375,
+			ts+25445,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25437, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25507, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25442,
+			ts+25512,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25506,
+			ts+25576,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25576,
+			ts+25646,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122027,7 +122918,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25625
+			zFormat = ts + 25695
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122039,7 +122930,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25733,
+			ts+25803,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122047,18 +122938,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25778, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25848, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12750, 1)
+					Xsqlite3_str_append(tls, p, ts+12760, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25805, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25875, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25827, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25897, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25835, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25905, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122073,14 +122964,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25851,
-	ts + 25904,
-	ts + 25949,
-	ts + 26001,
-	ts + 26055,
-	ts + 26100,
-	ts + 26158,
-	ts + 26213,
+	ts + 25921,
+	ts + 25974,
+	ts + 26019,
+	ts + 26071,
+	ts + 26125,
+	ts + 26170,
+	ts + 26228,
+	ts + 26283,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122109,7 +123000,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26260, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26330, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -122121,7 +123012,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26280,
+			ts+26350,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -122129,7 +123020,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26337,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26407,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122171,10 +123062,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26372,
-		ts + 26415,
-		ts + 26450,
-		ts + 26486,
+		ts + 26442,
+		ts + 26485,
+		ts + 26520,
+		ts + 26556,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -122205,7 +123096,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26523,
+	Xsqlite3_str_appendf(tls, pSql, ts+26593,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -122217,7 +123108,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26547, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26617, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -122240,7 +123131,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26553, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -122336,7 +123227,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26556, ts + 26567}
+var azFormat = [2]uintptr{ts + 26626, ts + 26637}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -122374,13 +123265,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10851, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10913, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26577, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26647, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26583, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26653, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26587, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26657, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -122391,7 +123282,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26589, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26659, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -122469,7 +123360,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26622,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26692,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4055
@@ -122493,7 +123384,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26629,
+			ts+26699,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -122512,7 +123403,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26674, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26744, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -122526,8 +123417,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26706,
-		ts + 26760,
+		ts + 26776,
+		ts + 26830,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -122542,23 +123433,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26808,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26878,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26853
+					return ts + 26923
 				}
-				return ts + 26861
+				return ts + 26931
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26870,
+				ts+26940,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26853
+						return ts + 26923
 					}
-					return ts + 26861
+					return ts + 26931
 				}(), iKey, iVal))
 		}
 	}
@@ -122582,7 +123473,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26928, libc.VaList(bp, i, iCell, iNode))
+				ts+26998, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -122602,7 +123493,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26976, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27046, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -122619,14 +123510,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27043, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27113, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27077, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27147, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -122634,7 +123525,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27107,
+					ts+27177,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -122663,14 +123554,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27162,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27232,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27193, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27263, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -122692,12 +123583,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14486, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14496, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27260, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27330, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -122706,12 +123597,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25080, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25150, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27288, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27358, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -122725,8 +123616,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27319, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27326, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27389, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -122734,7 +123625,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27334, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27404, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -122749,7 +123640,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27338, -1)
+			ts+27408, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -122757,7 +123648,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6374
+			zDb = ts + 6434
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -122767,7 +123658,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17962
+				return ts + 18005
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123062,7 +123953,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -123120,6 +124011,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123132,15 +124024,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27389, 1)
+		Xsqlite3_str_append(tls, x, ts+27459, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27391, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27461, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27402, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27472, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123160,19 +124053,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep int8 = int8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27413, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27483, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27431, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27501, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = int8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27439, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27509, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*int8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27447, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27517, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27451, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27521, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123191,6 +124084,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -123222,6 +124116,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -123230,6 +124125,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -123288,6 +124184,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -123456,6 +124353,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123477,6 +124375,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -123561,6 +124460,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -123589,6 +124490,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124027,6 +124929,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124040,6 +124943,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -124054,6 +124960,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -124078,7 +124985,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27464, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27534, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124087,7 +124994,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27486, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -124095,7 +125002,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26553, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26623, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124174,6 +125081,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -124302,6 +125210,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -124320,7 +125229,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16244
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16260
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -124330,7 +125239,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27490
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27560
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -124338,7 +125247,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27496
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27566
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -124450,7 +125359,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27505, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27575, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -124580,14 +125489,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27545) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27615) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27561) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27631) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -124624,8 +125535,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -124642,7 +125553,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -124652,7 +125563,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27576, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27646, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -124664,25 +125575,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27584},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27597},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27610},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27623},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27561},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27635},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27545},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27658},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27672},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27685},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27699},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27715},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27654},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27667},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27680},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27693},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27631},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27705},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27615},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27728},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27742},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27755},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27769},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27785},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27727},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27797},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -124692,26 +125603,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27746, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27816, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27756, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27826, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27767, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27837, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27490, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27560, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27778, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27848, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -124765,7 +125676,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25066, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25136, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125092,7 +126003,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27788, -1)
+		Xsqlite3_result_error(tls, context, ts+27858, -1)
 		return
 	}
 
@@ -125103,7 +126014,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27788, -1)
+			Xsqlite3_result_error(tls, context, ts+27858, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125204,7 +126115,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27809, uintptr(0), uintptr(0), p+64)
+				ts+27879, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -125268,7 +126179,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+24979, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25049, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -125289,16 +126200,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+27980, libc.VaList(bp, func() uintptr {
+			ts+28050, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28130
+					return ts + 28200
 				}
 				return ts + 1547
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28171)
+			ts+28241)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -125414,7 +126325,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28296, libc.VaList(bp, zTab)))
+			ts+28366, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -125432,7 +126343,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28415, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28485, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -125450,7 +126361,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28436, libc.VaList(bp+16, zIdx)))
+			ts+28506, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -125473,7 +126384,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28487, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28557, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -125519,7 +126430,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+28508, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -125534,7 +126445,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -125574,7 +126485,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19389, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19482, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -125584,18 +126495,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+28565, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28635, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+28584, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28654, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28589, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28659, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -125607,18 +126518,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28599, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28669, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28628
+							return ts + 28698
 						}
-						return ts + 28641
+						return ts + 28711
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+28650, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28720, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -125632,7 +126543,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28672,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28742,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -125679,8 +126590,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+28699, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14597
+		zList = rbuMPrintf(tls, p, ts+28769, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14607
 	}
 	return zList
 }
@@ -125697,7 +126608,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+28708, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28778, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -125719,25 +126630,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+28721, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28791, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28753, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28823, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+28776)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28782, ts+28789, ts+4950)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+1547)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+28846)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28852, ts+28859, ts+4950)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+28797,
+					ts+28867,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28839, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28909, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -125779,7 +126690,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -125814,7 +126725,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28859
+	zCol = ts + 28929
 __7:
 	;
 	goto __5
@@ -125822,13 +126733,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28867,
+	zLhs = rbuMPrintf(tls, p, ts+28937,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28888,
+	zOrder = rbuMPrintf(tls, p, ts+28958,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28924,
+	zSelect = rbuMPrintf(tls, p, ts+28994,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14597
+	zSep = ts + 14607
 	iCol++
 	goto __1
 __2:
@@ -125846,7 +126757,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+28951,
+		Xsqlite3_mprintf(tls, ts+29021,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -125873,8 +126784,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+28999, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14597
+	zVector = rbuMPrintf(tls, p, ts+29069, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14607
 	goto __15
 __15:
 	iCol++
@@ -125885,7 +126796,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29006, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -125918,7 +126829,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -125930,7 +126841,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29018, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29088, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1547
 		} else {
@@ -125942,37 +126853,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28859
+					zCol = ts + 28929
 				} else {
-					zCol = ts + 28589
+					zCol = ts + 28659
 				}
 				zType = ts + 1112
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29040, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29110, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28776
+					return ts + 28846
 				}
 				return ts + 1547
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29060,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29130,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29081,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29151,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29114, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29184, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14597
-		zAnd = ts + 21457
+		zCom = ts + 14607
+		zAnd = ts + 21518
 		nBind++
 	}
 
@@ -126011,11 +126922,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+29138, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29208, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29150, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29220, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14597
+			zS = ts + 14607
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126023,7 +126934,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29159, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29229, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126035,18 +126946,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29174, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29244, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1547
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29188, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21457
+				zList = rbuMPrintf(tls, p, ts+29258, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21518
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29200, libc.VaList(bp+40, zList))
+			ts+29270, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1547
@@ -126054,8 +126965,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29250, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21457
+				zList = rbuMPrintf(tls, p, ts+29320, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21518
 			}
 		}
 	}
@@ -126064,7 +126975,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29263, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29333, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126082,17 +126993,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c int8 = *(*int8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29250,
+					zList = rbuMPrintf(tls, p, ts+29320,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29289,
+					zList = rbuMPrintf(tls, p, ts+29359,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29319,
+					zList = rbuMPrintf(tls, p, ts+29389,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14597
+					zSep = ts + 14607
 				}
 			}
 		}
@@ -126127,19 +127038,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29356
+		var zSep uintptr = ts + 29426
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+28508, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28578, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16132) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16148) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126151,15 +127062,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 28776
+					zDesc = ts + 28846
 				} else {
 					zDesc = ts + 1547
 				}
-				z = rbuMPrintf(tls, p, ts+29369, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14597
+				z = rbuMPrintf(tls, p, ts+29439, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14607
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29380, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29450, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -126179,7 +127090,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29384)
+			ts+29454)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -126188,7 +127099,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+28536, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28606, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -126198,25 +127109,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29434, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29504, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29456, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29526, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28776
+						return ts + 28846
 					}
 					return ts + 1547
 				}()))
-				zComma = ts + 14597
+				zComma = ts + 14607
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29466, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29536, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29481,
+			ts+29551,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 	}
 }
 
@@ -126229,7 +127140,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1547
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1547
@@ -126237,39 +127148,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29543
+				zPk = ts + 29613
 			}
-			zSql = rbuMPrintf(tls, p, ts+29556,
+			zSql = rbuMPrintf(tls, p, ts+29626,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29583
+							return ts + 29653
 						}
 						return ts + 1547
 					}()))
-			zComma = ts + 14597
+			zComma = ts + 14607
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29593, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29663, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29600,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29670,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29632
+						return ts + 29702
 					}
 					return ts + 1547
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 	}
 }
 
@@ -126282,7 +127193,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+29647,
+				ts+29717,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -126319,7 +127230,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+29704)
+			ts+29774)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -126424,7 +127335,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29770, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29840, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -126444,24 +127355,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29790,
+				ts+29860,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+29855, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29925, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+29891, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+29961, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -126477,7 +127388,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29925,
+						ts+29995,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -126485,9 +127396,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29986
+											return ts + 30056
 										}
-										return ts + 29990
+										return ts + 30060
 									}()
 								}
 								return ts + 1547
@@ -126496,20 +127407,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29996,
+						ts+30066,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30057,
+						ts+30127,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29986
+									return ts + 30056
 								}
-								return ts + 29990
+								return ts + 30060
 							}(),
 							zCollist, zLimit))
 				}
@@ -126534,8 +127445,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6385)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6381)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6445)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6441)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -126546,16 +127457,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1547
 				}
-				return ts + 30216
+				return ts + 30286
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30225,
+						ts+30295,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30261
+								return ts + 30331
 							}
 							return ts + 1547
 						}(), zBindings)))
@@ -126564,32 +127475,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30271, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30341, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1547
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30299
+					zRbuRowid = ts + 30369
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30311, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30381, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30387
+							return ts + 30457
 						}
 						return ts + 1547
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30404,
+					ts+30474,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30703,
+						ts+30773,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -126602,9 +127513,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30802
+						zRbuRowid = ts + 30872
 					} else {
-						zRbuRowid = ts + 30812
+						zRbuRowid = ts + 30882
 					}
 				}
 
@@ -126617,20 +127528,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28859, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28929, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14597, ts+1547)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1547, ts+14607, ts+1547)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30823,
+							ts+30893,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30871
+										return ts + 30941
 									}
 									return ts + 1547
 								}(),
@@ -126643,7 +127554,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19743
+										return ts + 22852
 									}
 									return ts + 1547
 								}(), zOrder,
@@ -126711,9 +127622,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1547
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30216
+				zPrefix = ts + 30286
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30877,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30947,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -126772,7 +127683,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+30907, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+30977, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -126842,28 +127753,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30937, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31007, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30965, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31035, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+48, ts+3279, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6374, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6434, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30983, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31053, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -126896,11 +127807,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31049, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31119, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24129, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24199, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*int8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -126912,13 +127823,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31081,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374),
+			zTarget = Xsqlite3_mprintf(tls, ts+31151,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
 						}
-						return ts + 31113
+						return ts + 31183
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1547
@@ -126937,37 +127848,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31115, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31185, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31130, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31200, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31147, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31217, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31163, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31191, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31261, 0)
 	}
 }
 
@@ -126996,15 +127907,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31163, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31233, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31209, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31279, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -127052,7 +127963,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -127112,7 +128023,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6374, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127129,23 +128040,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31244, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31314, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6374)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6374)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6434)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31269, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31276, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31339, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -127262,7 +128173,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23767, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23837, 0)
 			return
 		}
 
@@ -127355,7 +128266,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+31283)
+			ts+31353)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -127363,7 +128274,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31305, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31375, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -127384,7 +128295,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+31332,
+				ts+31402,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -127414,9 +128325,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+31490, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31560, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31505,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31575,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -127430,10 +128341,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31525, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31595, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31550)
+			ts+31620)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127447,12 +128358,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31658)
+			ts+31728)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+31723)
+			ts+31793)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -127464,7 +128375,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31767, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31837, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -127484,15 +128395,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17217)
-					rbuCopyPragma(tls, p, ts+16328)
+					rbuCopyPragma(tls, p, ts+17233)
+					rbuCopyPragma(tls, p, ts+16344)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31792, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31862, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -127516,10 +128427,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -127614,7 +128525,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31820, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31890, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -127627,16 +128538,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31269, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31339, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6434, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -127646,7 +128558,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31845, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31915, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -127680,7 +128592,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31856, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31926, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -127710,13 +128622,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31928, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31998, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31942)
+				ts+32012)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -127727,7 +128639,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31999)
+				ts+32069)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -127801,7 +128713,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32073, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32143, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -127819,12 +128731,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32105,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32175,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32137
+							return ts + 32207
 						}
-						return ts + 32144
+						return ts + 32214
 					}()))
 			}
 		}
@@ -127832,7 +128744,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14486, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14496, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -127843,19 +128755,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16931)
-						rbuCopyPragma(tls, p, ts+16343)
+						rbuCopyPragma(tls, p, ts+16947)
+						rbuCopyPragma(tls, p, ts+16359)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32151, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32221, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6374, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6434, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32167, uintptr(0), uintptr(0), p+64)
+								db, ts+32237, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -127909,7 +128821,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32191, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32261, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -127936,7 +128848,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30216, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30286, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -127953,7 +128865,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -127966,13 +128878,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32199, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32269, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128067,7 +128979,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14501, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14511, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128084,19 +128996,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14501, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14511, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14486
+				zBegin = ts + 14496
 			} else {
-				zBegin = ts + 32151
+				zBegin = ts + 32221
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32151, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32221, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128219,11 +129131,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -128362,7 +129277,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -128439,7 +129354,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32226, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32296, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -128464,7 +129379,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32249, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32319, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -128609,7 +129524,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6374)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6434)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -128624,7 +129539,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32260, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32330, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -128635,7 +129550,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -128665,6 +129586,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -129428,11 +130364,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11279, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11341, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32271, 0)
+				ts+32341, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1547, 0)
 		} else {
@@ -129445,7 +130381,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32392, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32462, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -129543,7 +130479,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11279, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11341, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130010,6 +130946,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -130092,6 +131031,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -130121,9 +131061,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32421,
+			zRet = Xsqlite3_mprintf(tls, ts+32491,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 21457
+			zSep = ts + 21518
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130146,9 +131086,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32455,
+				ts+32525,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 32496
+			zSep = ts + 32566
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130156,18 +131096,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7463, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7523, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32501,
+		ts+32571,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130177,7 +131117,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -130210,7 +131150,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32579,
+			ts+32649,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130337,7 +131277,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32632, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32702, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -130811,9 +131751,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11279, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11341, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32659, libc.VaList(bp, zDb))
+			ts+32729, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -130822,18 +131762,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1547
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32769, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32839, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1560, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32784, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32854, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+32792, bp+24)
+				sessionAppendStr(tls, bp+8, ts+32862, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21457
+				zSep = ts + 21518
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -130942,7 +131882,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32798, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32868, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -131034,7 +131974,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32818, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32888, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -131297,7 +132237,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -131320,7 +132260,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -131362,7 +132302,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -131423,7 +132363,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -131497,13 +132437,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -131565,7 +132505,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -131938,7 +132878,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -132106,7 +133046,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11279) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11341) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -132117,34 +133057,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32836, bp+16)
+				sessionAppendStr(tls, bp, ts+32906, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32849, bp+16)
+				sessionAppendStr(tls, bp, ts+32919, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+32855, bp+16)
+						sessionAppendStr(tls, bp, ts+32925, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14597
+						zSep = ts + 14607
 					}
 				}
 
 				zSep = ts + 1547
-				sessionAppendStr(tls, bp, ts+32784, bp+16)
+				sessionAppendStr(tls, bp, ts+32854, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32860, bp+16)
+								ts+32930, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32792, bp+16)
+							sessionAppendStr(tls, bp, ts+32862, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21457
+						zSep = ts + 21518
 					}
 				}
 
@@ -132196,34 +133136,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32935, bp+16)
+	sessionAppendStr(tls, bp, ts+33005, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32784, bp+16)
+	sessionAppendStr(tls, bp, ts+32854, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+32855, bp+16)
+			sessionAppendStr(tls, bp, ts+32925, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21457
+			zSep = ts + 21518
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32953, bp+16)
+		sessionAppendStr(tls, bp, ts+33023, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32496, bp+16)
+		sessionAppendStr(tls, bp, ts+32566, bp+16)
 
 		zSep = ts + 1547
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+32792, bp+16)
+				sessionAppendStr(tls, bp, ts+32862, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 32961
+				zSep = ts + 33031
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4950, bp+16)
@@ -132239,7 +133179,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6374, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6434, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -132250,19 +133190,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32966, bp+16)
+	sessionAppendStr(tls, bp, ts+33036, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21463, bp+16)
+	sessionAppendStr(tls, bp, ts+21524, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14597, bp+16)
+			sessionAppendStr(tls, bp, ts+14607, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+32984, bp+16)
+	sessionAppendStr(tls, bp, ts+33054, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+32995, bp+16)
+		sessionAppendStr(tls, bp, ts+33065, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+4950, bp+16)
 
@@ -132278,14 +133218,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11279, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11341, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+32999)
+			ts+33069)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33112)
+			ts+33182)
 	}
 	return rc
 }
@@ -132313,7 +133253,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -132322,7 +133262,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -132399,7 +133339,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -132525,7 +133465,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -132566,7 +133506,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33256, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33326, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -132582,7 +133522,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33277, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33347, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -132655,10 +133595,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33296, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33366, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33322, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33392, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -132704,7 +133644,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6374, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6434, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -132717,19 +133657,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33352, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33422, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33396,
+						ts+33466,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33467, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33537, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11279) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11341) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -132780,14 +133720,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33527, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33597, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33557, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33581, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33557, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33651, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33627, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134035,7 +134975,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33609, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33679, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134323,7 +135263,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33637, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33707, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134510,7 +135450,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33668, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33738, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -134578,7 +135518,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33675
+		var zErr uintptr = ts + 33745
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -134760,7 +135700,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33725
+		var zErr uintptr = ts + 33795
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135084,13 +136024,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33773, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33843, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33781, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33851, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33791, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33861, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -135641,7 +136581,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33796, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33866, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -135668,14 +136608,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*int8)(unsafe.Pointer(p))) < '0' || int32(*(*int8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33803, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33873, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33834, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33904, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135686,7 +136626,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33867, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33937, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135699,7 +136639,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33904, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33974, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -135708,7 +136648,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33913, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33983, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -135727,7 +136667,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33946, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34016, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -135742,14 +136682,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33980, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34050, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33988, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34058, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*int8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34020, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34090, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -135757,9 +136697,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34026, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34096, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34040, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34110, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -135767,9 +136707,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34078, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34148, zCmd, nCmd) == 0 {
 		if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || int32(*(*int8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34089, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34159, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -135779,19 +136719,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5068, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 7951, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17322},
-			{FzName: ts + 34124, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8019, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17338},
+			{FzName: ts + 34194, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34132, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34202, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34163, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34233, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -135838,15 +136778,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22123) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16244) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34191, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22184) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16260) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34261, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34221) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34291) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34231, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34301, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -135863,13 +136803,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34262, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34332, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34267, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34337, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34274, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34344, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -135907,8 +136847,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22123) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34282, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22184) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34352, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -135940,7 +136880,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34311, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34381, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -135977,19 +136917,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33980
+			zTail = ts + 34050
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34331
+			zTail = ts + 34401
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34339, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34409, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16244, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16260, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136033,18 +136973,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34350, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34420, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1547
 			}
-			return ts + 14597
+			return ts + 14607
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34366, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34436, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34373,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22123))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34443,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22184))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136154,7 +137094,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34399) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34469) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136164,7 +137104,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34404) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34474) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136174,7 +137114,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34413) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34483) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -136187,7 +137127,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34423) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34493) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -136197,7 +137137,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34433) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34503) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -136213,7 +137153,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22123) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22184) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -136236,7 +137176,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34445
+	var zSelect uintptr = ts + 34515
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -136258,7 +137198,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34477) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34547) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -136272,7 +137212,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34485,
+				ts+34555,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -136370,7 +137310,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34550, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34620, 0)
 					return FTS5_EOF
 				}
 			}
@@ -136383,20 +137323,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34570, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34640, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34601, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34671, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34604, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34674, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29986, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30056, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -136482,6 +137422,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*int8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -136510,7 +137461,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 1))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*int8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = int8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -138163,9 +139114,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34608, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34678, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33637, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33707, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -138181,7 +139132,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c int8 = *(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34613, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34683, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -138268,7 +139219,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20460, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20521, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -138349,7 +139300,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34642, 0)
+			ts+34712, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -138519,12 +139470,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34695,
+								ts+34765,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34745
+										return ts + 34815
 									}
-									return ts + 34608
+									return ts + 34678
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -139467,7 +140418,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34752, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34822, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -139546,7 +140497,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+34758,
+			ts+34828,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -139571,7 +140522,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34809,
+			ts+34879,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -139594,7 +140545,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+34858,
+			ts+34928,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -139833,7 +140784,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+34898, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34968, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141032,7 +141983,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+34921,
+			ts+34991,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -142498,7 +143449,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+35005,
+			ts+35075,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -142989,10 +143940,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -143575,13 +144531,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35062, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35132, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24979, ts+35070, 0, pzErr)
+				pConfig, ts+25049, ts+35140, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11419,
-					ts+35105,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11481,
+					ts+35175,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -143834,7 +144790,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34752, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+34822, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -143948,7 +144904,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35149,
+		ts+35219,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -144118,7 +145074,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35235)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35305)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -144389,7 +145345,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35240, 0)
+			ts+35310, 0)
 		return SQLITE_ERROR
 	}
 
@@ -144813,11 +145769,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35279,
+		ts+35349,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14597
+					return ts + 14607
 				}
 				return ts + 1547
 			}(),
@@ -144829,9 +145785,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35334
+					return ts + 35404
 				}
-				return ts + 35339
+				return ts + 35409
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -144877,12 +145833,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35343, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35413, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5050, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35349, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35419, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -144913,7 +145869,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35377, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35447, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -144944,7 +145900,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35387, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35457, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -144976,14 +145932,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35408, libc.VaList(bp, z))
+				ts+35478, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33791
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33861
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145039,7 +145995,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35240, 0)
+		ts+35310, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145256,7 +146212,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35441, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35511, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -145401,28 +146357,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35477, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35547, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35488, 0)
+				ts+35558, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35568, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35576, 0)
+				ts+35646, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16911, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16927, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35632, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35702, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35638, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35708, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -145480,7 +146436,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17456, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17472, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -145493,12 +146449,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35654,
+				ts+35724,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20361
+						return ts + 20422
 					}
-					return ts + 35691
+					return ts + 35761
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146128,7 +147084,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35703, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35773, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -146372,7 +147328,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35724, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35794, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -146391,7 +147347,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35746, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35816, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -146438,7 +147394,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35777)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35847)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -146447,7 +147403,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35790, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35860, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -146461,7 +147417,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35881, ts + 33980, ts + 24979, ts + 34331, ts + 11419,
+	ts + 35951, ts + 34050, ts + 25049, ts + 34401, ts + 11481,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -146485,7 +147441,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35888, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35958, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -146503,13 +147459,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35888, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35958, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35893, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35963, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -146564,17 +147522,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35908,
-			ts + 35976,
-			ts + 36045,
-			ts + 36078,
-			ts + 36117,
-			ts + 36157,
-			ts + 36196,
-			ts + 36237,
-			ts + 36276,
-			ts + 36318,
-			ts + 36358,
+			ts + 35978,
+			ts + 36046,
+			ts + 36115,
+			ts + 36148,
+			ts + 36187,
+			ts + 36227,
+			ts + 36266,
+			ts + 36307,
+			ts + 36346,
+			ts + 36388,
+			ts + 36428,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -146676,18 +147634,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36381,
+		ts+36451,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36485,
+			ts+36555,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36523,
+			ts+36593,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -146699,7 +147657,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36561,
+			ts+36631,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -146711,14 +147669,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24979, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11419, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35881, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25049, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11481, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35951, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34331, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34401, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33980, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34050, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -146730,17 +147688,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36603,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36673,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29632
+					return ts + 29702
 				}
 				return ts + 1547
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36633,
+			ts+36703,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -146777,27 +147735,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36677, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36747, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36700, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36770, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33980, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34050, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34331, ts+36706, 0, pzErr)
+				pConfig, ts+34401, ts+36776, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35881, ts+36738, 1, pzErr)
+				pConfig, ts+35951, ts+36808, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34477, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147003,12 +147961,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36755,
+		ts+36825,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36805,
+			ts+36875,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147016,7 +147974,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34477, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34547, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -147192,7 +148150,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36834,
+	zSql = Xsqlite3_mprintf(tls, ts+36904,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -147374,14 +148332,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33980, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34050, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34331, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34401, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -147576,9 +148534,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36866) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36936) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36877) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36947) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -147793,7 +148751,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36888
+			var zCat uintptr = ts + 36958
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -147805,7 +148763,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36897) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36967) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -147816,18 +148774,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36908) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36978) {
 					if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' && int32(*(*int8)(unsafe.Pointer(zArg))) != '2' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*int8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36866) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36936) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36877) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36947) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36897) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36967) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148103,7 +149061,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36926
+	var zBase uintptr = ts + 36996
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -148245,7 +149203,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36936, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148253,11 +149211,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36939, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37009, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36944, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37014, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148265,7 +149223,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36949, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37019, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148273,7 +149231,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36952, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148281,11 +149239,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36955, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36960, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37030, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148293,19 +149251,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36965, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36969, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37039, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36975, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37045, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36980, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37050, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148313,11 +149271,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36984, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37054, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36988, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37058, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148325,7 +149283,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36991, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148333,11 +149291,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36995, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36999, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37069, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148345,7 +149303,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37003, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37073, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148353,7 +149311,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37007, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148361,7 +149319,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37011, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37081, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148377,24 +149335,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37015, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+36995, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37085, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37065, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37018, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37021, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37091, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37011, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37081, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -148409,137 +149367,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37028, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37098, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+36995, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37065, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37036, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37106, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37043, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37113, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37048, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37118, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36944, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37014, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37053, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37123, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36939, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37009, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37058, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37011, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37081, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37063, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15457, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15473, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37021, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37091, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37142, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36936, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37006, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37077, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36980, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37050, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37083, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37153, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37087, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37157, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37089, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37159, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37003, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37073, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37165, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37011, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37081, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37103, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37173, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36995, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37065, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37109, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36995, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37065, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37114, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37120, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37007, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37077, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37128, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37198, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37136, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37206, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37210, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37003, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37073, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37148, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37154, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37224, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37007, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37077, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37230, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37021, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37091, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -148554,16 +149512,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37167, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36952, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37022, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37242, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148571,21 +149529,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37177, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37247, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36952, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37183, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37253, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36952, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37022, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37136, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37206, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148593,7 +149551,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37189, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37259, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -148601,9 +149559,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37195, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37265, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36936, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37006, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -148618,12 +149576,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37201, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37271, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37205, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37275, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37208, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -148632,7 +149590,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37211, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37281, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -148788,7 +149746,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37215) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37285) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -148968,22 +149926,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36926, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 36996, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37230, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37300, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37236, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37306, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37243, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -150126,14 +151084,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37251) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37321) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37255) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37325) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37259) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37329) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37268, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37338, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150159,19 +151117,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 37302,
-		ts + 37342,
-		ts + 37377,
+		ts + 37372,
+		ts + 37412,
+		ts + 37447,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23275, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23345, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37420, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37490, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -150304,11 +151262,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37453, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37523, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37484,
+		ts+37554,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -150332,7 +151290,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37535, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37605, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -150727,7 +151685,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37561, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37631, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -150749,7 +151707,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37571
+	return ts + 37641
 }
 
 func init() {
@@ -150804,114 +151762,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -151369,6 +152329,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -151687,6 +152659,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -151708,5 +152681,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_linux_386.go b/vendor/modernc.org/sqlite/lib/sqlite_linux_386.go
index 77fd9810..bffbc040 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_linux_386.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_linux_386.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_386.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_386.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -495,6 +495,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -610,6 +611,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -985,6 +987,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1472,6 +1475,7 @@ const (
 	SF_Recursive                          = 0x0002000
 	SF_Resolved                           = 0x0000004
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1556,6 +1560,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1674,6 +1679,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -2040,6 +2046,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -2137,11 +2144,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -2156,7 +2166,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2264,8 +2274,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2745,6 +2755,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -4153,6 +4164,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -5759,10 +5771,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -5817,12 +5827,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -6184,7 +6192,7 @@ type Parse1 = struct {
 	FnLabelAlloc      int32
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -6203,6 +6211,7 @@ type Parse1 = struct {
 	FnQueryLoop       U32
 	Foldmask          U32
 	Fnewmask          U32
+	FnProgressSteps   U32
 	FeTriggerOp       U8
 	FbReturning       U8
 	FeOrconf          U8
@@ -6836,7 +6845,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -6964,7 +6973,6 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
 }
@@ -6983,7 +6991,6 @@ type AggInfo_col = struct {
 type AggInfo_func = struct {
 	FpFExpr    uintptr
 	FpFunc     uintptr
-	FiMem      int32
 	FiDistinct int32
 	FiDistAddr int32
 }
@@ -7164,9 +7171,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
-	FpIdx    uintptr
-	FiTabCur int32
+type CoveringIndexCheck1 = struct {
+	FpIdx        uintptr
+	FiTabCur     int32
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -7370,7 +7380,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1099))
@@ -7519,7 +7529,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -7568,8 +7577,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -7580,6 +7599,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -7696,7 +7724,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint32(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint32(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8543,14 +8571,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = int8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -8558,7 +8586,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -10368,7 +10396,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = (int32(zEnd) - int32(zStart)) / 1
-	for n > 0 && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -10624,6 +10652,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -11610,6 +11640,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -11618,11 +11649,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -11634,30 +11689,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1554
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -11666,83 +11721,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 21)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = (int32(z) - int32(bufpt)) / 1
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = (int32(z) - int32(bufpt)) / 1
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -11756,17 +11811,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -11774,90 +11829,90 @@ __219:
 		}
 		return ts + 1560
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(j))) = int8(0)
 	length = int32(j)
@@ -11865,89 +11920,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -11960,32 +12015,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -12044,7 +12099,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -12060,8 +12115,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -12090,12 +12144,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -12104,7 +12159,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint32(N))
 		*(*U32)(unsafe.Pointer(p + 16)) += U32(N)
@@ -13224,6 +13279,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if libc.AtomicLoadNInt32(db+304, 0) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -13829,10 +13902,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13858,6 +13934,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = int8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint32(unsafe.Sizeof([22]int8{}))-uint32(1)-uint32(i))
+	return int32(uint32(unsafe.Sizeof([22]int8{})) - uint32(2) - uint32(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14819,11 +14896,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -15720,7 +15798,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15943,7 +16021,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -15959,113 +16037,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -16197,7 +16275,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16488,7 +16566,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3378, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16505,14 +16583,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*12 + 4)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16532,7 +16610,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16600,7 +16678,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -16827,7 +16905,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16855,7 +16933,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -16954,7 +17032,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3261, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -17084,7 +17162,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -17130,7 +17208,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -17361,7 +17439,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17495,7 +17573,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+8)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17516,7 +17594,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17832,7 +17910,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3261, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -17923,7 +18001,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43337)
 		}
 		return rc
 	}
@@ -17931,9 +18009,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*12 + 4)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -17976,12 +18054,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*int8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -18000,18 +18075,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*12 + 4)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3459, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3459, zIn, 43443)
 			}
 		} else if (*stat)(unsafe.Pointer(bp)).Fst_mode&X__mode_t(0170000) == X__mode_t(0120000) {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*12 + 4)))(tls, zIn, bp+96, uint32(unsafe.Sizeof([4098]int8{}))-uint32(2))
 			if got <= 0 || got >= Ssize_t(unsafe.Sizeof([4098]int8{}))-2 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3450, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3450, zIn, 43454)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 96 + uintptr(got))) = int8(0)
@@ -18051,14 +18126,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 4100)).FzOut = zOut
 	if int32(*(*int8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*12 + 4)))(tls, bp, uint32(unsafe.Sizeof([4098]int8{}))-uint32(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3279, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3279, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+4100, bp)
 	}
 	appendAllPathElements(tls, bp+4100, zPath)
 	*(*int8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+4100)).FnUsed))) = int8(0)
 	if (*DbPath)(unsafe.Pointer(bp+4100)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+4100)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4100)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18157,7 +18232,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == EINTR {
 				got = (*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*12 + 4)))(tls, fd, zBuf, uint32(nBuf))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -18165,12 +18240,12 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 }
 
 func unixSleep(tls *libc.TLS, NotUsed uintptr, microseconds int32) int32 {
-	if microseconds >= 1000000 {
-		libc.Xsleep(tls, uint32(microseconds/1000000))
-	}
-	if microseconds%1000000 != 0 {
-		libc.Xusleep(tls, uint32(microseconds%1000000))
-	}
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	(*timespec)(unsafe.Pointer(bp)).Ftv_sec = microseconds / 1000000
+	(*timespec)(unsafe.Pointer(bp)).Ftv_nsec = microseconds % 1000000 * 1000
+	libc.Xnanosleep(tls, bp, uintptr(0))
 	_ = NotUsed
 	return microseconds
 }
@@ -22075,7 +22150,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint32(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint32(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -23127,7 +23202,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -23144,7 +23218,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 8)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -23210,7 +23283,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + Size_t(1))
 	z += uintptr(libc.Xstrlen(tls, z) + Size_t(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -23220,7 +23292,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23411,36 +23483,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -23612,7 +23673,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23736,7 +23797,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23775,7 +23836,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23852,7 +23913,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24764,10 +24825,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]int8{int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0)}
@@ -24853,7 +24916,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 28)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25607,7 +25670,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25706,7 +25769,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -26291,7 +26354,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+12)
@@ -26566,7 +26629,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27039,7 +27102,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27544,7 +27607,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27778,8 +27841,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27787,23 +27850,24 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt    uintptr
+	FpPager uintptr
+	FaPgRef uintptr
+	FnPage  Pgno
+	FmxErr  int32
+	FnErr   int32
+	Frc     int32
+	FnStep  U32
+	FzPfx   uintptr
+	Fv1     Pgno
+	Fv2     int32
+	FerrMsg StrAccum
+	Fheap   uintptr
+	Fdb     uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -28199,7 +28263,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28336,7 +28400,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -28353,7 +28417,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -28361,7 +28425,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -28404,7 +28468,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28414,7 +28478,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -28664,7 +28728,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28711,7 +28775,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28721,7 +28785,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28734,7 +28798,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28743,14 +28807,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint32(iFree2-(iFree+sz)))
@@ -28760,7 +28824,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -28824,7 +28888,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -28834,7 +28898,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28856,7 +28920,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28891,7 +28955,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28904,13 +28968,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -28935,7 +28999,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -28946,7 +29010,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, (int32(pSpace)-int32(data))/1)
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -28998,22 +29062,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29023,7 +29087,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29031,7 +29095,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29039,10 +29103,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29066,13 +29130,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29080,7 +29143,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29088,32 +29190,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -29141,11 +29232,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -29156,15 +29247,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29192,14 +29283,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellOffset+i*2)))))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -29213,7 +29304,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29225,7 +29316,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29328,7 +29419,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29356,7 +29447,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29395,7 +29486,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -30278,7 +30369,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30693,7 +30784,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30719,7 +30810,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -30728,7 +30819,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30739,7 +30830,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30755,7 +30846,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30816,7 +30907,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30851,7 +30942,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 20)))
 				if *(*Pgno)(unsafe.Pointer(bp + 24)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -30911,7 +31002,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -30950,7 +31041,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -30981,7 +31072,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31322,7 +31413,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31566,14 +31657,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int32(aPayload)-int32((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > (*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31618,7 +31709,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31667,7 +31758,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -31747,7 +31838,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31838,7 +31929,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -31858,7 +31949,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -31922,18 +32013,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -31949,6 +32030,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -32070,7 +32159,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -32274,7 +32363,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32339,7 +32428,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -32387,7 +32476,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -32506,7 +32595,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32666,7 +32755,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32731,7 +32820,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+4, 0)
@@ -32767,7 +32856,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32811,7 +32900,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -32923,7 +33012,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -33081,7 +33170,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33138,7 +33227,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -33154,7 +33243,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -33228,7 +33317,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33240,7 +33329,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 4)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+4)
@@ -33251,7 +33340,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33416,7 +33505,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33440,9 +33529,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -33465,16 +33554,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -33495,9 +33582,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -33630,11 +33723,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*4)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*4)))
 		} else {
 		}
 		idx++
@@ -33687,12 +33783,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int32(pCell)-int32(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -33700,7 +33796,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int32(pData) - int32(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint32(sz))
 
@@ -33760,7 +33856,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4)), uint32(sz))
@@ -33849,7 +33945,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint32(nCell*2))
@@ -33965,7 +34061,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 80)) = allocateBtreePage(tls, pBt, bp, bp+4, uint32(0), uint8(0))
@@ -34008,8 +34104,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 80)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, (int32(pOut)-int32(pSpace))/1,
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+80)
+			*(*int32)(unsafe.Pointer(bp + 80)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, (int32(pOut)-int32(pSpace))/1,
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 4)))
@@ -34091,6 +34187,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -34283,7 +34381,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 72)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -34294,7 +34392,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -34452,7 +34550,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -34526,7 +34624,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -34552,9 +34650,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -34565,8 +34664,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 136 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -34588,7 +34687,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -34616,7 +34715,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 112)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != 0) {
@@ -34877,11 +34976,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+112)
+	*(*int32)(unsafe.Pointer(bp + 112)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != SQLITE_OK) {
 		goto __122
 	}
@@ -35069,7 +35168,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -35107,7 +35206,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 112 + uintptr(iPage-1)*4))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 64 + uintptr(iPage-1)*2)))
@@ -35184,7 +35283,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(4)
 	defer tls.Free(4)
 
@@ -35196,19 +35295,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -35221,7 +35312,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35240,6 +35331,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -35275,7 +35383,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -35284,13 +35391,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 88)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 84)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 84)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 84)) != 0) {
 		goto __2
 	}
@@ -35301,7 +35407,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -35414,7 +35520,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 84)) = btreeComputeFreeSpace(tls, pPage)
@@ -35428,20 +35534,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 84)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 88)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 88)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 88)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 88)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 88)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 88)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -35451,7 +35557,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 88))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+84)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+84)
+	if !(*(*int32)(unsafe.Pointer(bp + 84)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -35459,100 +35571,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 84)) = fillInCell(tls, pPage, newCell, pX, bp+88)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 84)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 84)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 84)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint32(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+92)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+92)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+92)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 84)) = clearCellOverflow(tls, pPage, oldCell, bp+92)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 84)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 84)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+92)).FnSize) == *(*int32)(unsafe.Pointer(bp + 88)) && U32((*CellInfo)(unsafe.Pointer(bp+92)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+92)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 88)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 88)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 88))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 88))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint32(*(*int32)(unsafe.Pointer(bp + 88))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+92)).FnSize), bp+84)
 	if !(*(*int32)(unsafe.Pointer(bp + 84)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 88)), uintptr(0), uint32(0), bp+84)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 84)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 88)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -35561,30 +35673,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 84)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 84)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint32((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint32((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 84))
@@ -35607,7 +35719,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -35626,13 +35737,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, nIn)
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(nIn + U32((int32(aOut)-int32((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1))
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -35649,7 +35762,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35708,9 +35821,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 12))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 12))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -35750,7 +35863,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 20))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -35758,11 +35871,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35837,7 +35950,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35847,7 +35960,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 20)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 20)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+20)
+			*(*int32)(unsafe.Pointer(bp + 20)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+20)
 		if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
@@ -35906,7 +36019,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -35935,7 +36048,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 24)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+16, bp+20)
 			if int32(*(*U8)(unsafe.Pointer(bp + 16))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 16))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 12)))
@@ -36011,7 +36124,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 24)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36025,7 +36138,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36159,7 +36272,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36334,12 +36447,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if libc.AtomicLoadNInt32(db+304, 0) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -36347,15 +36489,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+40, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+44, ts+4062, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+40, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+44, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+40, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+44, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -36379,9 +36521,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if libc.AtomicLoadNInt32((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb+304, 0) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -36395,7 +36534,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
 		return
@@ -36469,7 +36608,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -36554,48 +36695,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4318, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4356, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -36610,29 +36758,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+100, *(*I64)(unsafe.Pointer(bp + 100)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -36640,28 +36788,28 @@ __9:
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(pCellIdx))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4470,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+108)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+108)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4500, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -36669,97 +36817,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+108)).FnKey >= *(*I64)(unsafe.Pointer(bp + 100)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+108)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 100)) = (*CellInfo)(unsafe.Pointer(bp + 108)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+108)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+108)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+108)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+108)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+108)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+100, *(*I64)(unsafe.Pointer(bp + 100)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4548, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+108)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+108)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 100))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellStart+i*2)))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -36769,48 +36917,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+128) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 128))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 128))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 128))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 128))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4610,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -36839,9 +36987,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(212)
-	defer tls.Free(212)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(216)
+	defer tls.Free(216)
 
 	var i Pgno
 
@@ -36873,19 +37021,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint32(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+40, uintptr(0), bp+104, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+44, uintptr(0), bp+108, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -36897,7 +37039,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -36905,7 +37047,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -36990,7 +37132,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+204, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+208, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -37033,22 +37175,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+40)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+40)
+	Xsqlite3_str_reset(tls, bp+32+44)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+44)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+40)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -37275,8 +37414,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(292)
-	defer tls.Free(292)
+	bp := tls.Alloc(296)
+	defer tls.Free(296)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -37776,7 +37915,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
 		libc.Xmemcpy(tls, bp+8, p, uint32(int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int*2))
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+16, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+16, ts+4925,
@@ -37788,6 +37927,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*int8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+16)).FnChar))) = int8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 16)).FnChar)
 	}
 }
 
@@ -37975,7 +38115,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & Size_t(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 16)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -38149,16 +38288,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -38601,7 +38742,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38837,43 +38978,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*4)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -39258,7 +39390,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39273,14 +39405,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39650,7 +39782,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -39662,13 +39796,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -39745,6 +39881,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -40633,7 +40772,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 88
+	var aMem uintptr = p + 80
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*40
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -40642,7 +40781,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+40, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+36, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -40676,7 +40815,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -40718,7 +40856,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*40, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -41470,7 +41608,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -41578,7 +41716,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42129,7 +42267,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -42194,7 +42332,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42228,7 +42366,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 48)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42278,7 +42416,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 48)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -42424,7 +42562,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -42595,7 +42733,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42621,7 +42759,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42895,7 +43033,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43247,8 +43385,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -43258,15 +43399,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -43454,6 +43595,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -43506,7 +43648,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -43570,6 +43712,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(48)
 	defer tls.Free(48)
@@ -43581,9 +43732,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5357)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -43817,7 +43969,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -43841,8 +43993,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*40
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*40
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -44016,15 +44168,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5367, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44135,14 +44287,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -44426,7 +44581,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -44570,7 +44725,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -44742,7 +44897,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*int8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5407, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5397, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, (int32(zRawSql)-int32(zStart))/1)
 		}
@@ -44797,21 +44952,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 80
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+80)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5418, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5431, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5434, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5424, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5439, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
 			}
 		}
 	}
@@ -44903,11 +45058,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity int8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -45038,8 +45193,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(804)
-	defer tls.Free(804)
+	bp := tls.Alloc(808)
+	defer tls.Free(808)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -45274,7 +45429,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -45375,593 +45529,597 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 156 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(libc.AtomicLoadNInt32(db+304, 0) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*20
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
+
+	case OP_IfNoHope:
 		goto __100
-	case OP_NotFound:
+	case OP_NoConflict:
 		goto __101
-	case OP_Found:
+	case OP_NotFound:
 		goto __102
+	case OP_Found:
+		goto __103
 
 	case OP_SeekRowid:
-		goto __103
-	case OP_NotExists:
 		goto __104
-
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
 
 check_for_interrupt:
 	if !(libc.AtomicLoadNInt32(db+304, 0) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
@@ -45970,56 +46128,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*20
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -46027,20 +46185,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64((int32(pOp) - int32(aOp)) / 20)
 
 	pOp = aOp + uintptr(pcDest)*20
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -46048,124 +46207,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*20)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*20
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5441, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5462, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5452, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = (int32(pOp) - int32(aOp)) / 20
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5469, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5459, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 116))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -46173,10 +46332,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -46187,9 +46346,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 40
 
@@ -46197,171 +46356,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*40
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*40
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint32(uintptr(0)+20))
 	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*40
 	pOut = aMem + uintptr(p2)*40
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 40
 	pOut += 40
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 40
 	pIn1 += 40
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 212))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp)-int32(aOp))/20 + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
@@ -46369,95 +46528,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 116)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint32((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint32((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = int8(0)
@@ -46465,231 +46624,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -46698,95 +46857,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint32(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint32(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
@@ -46796,189 +46955,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -46987,38 +47150,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*20 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -47026,9 +47189,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -47039,298 +47202,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*40, aMem+uintptr(U32(p21)+idx)*40, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*40)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*40)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*20
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*20
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*20
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*20
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32((int32(pOp) - int32((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 20)
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 80 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -47340,144 +47504,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*40
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+76, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 36))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 12)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 12)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+76)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint32(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -47485,353 +47649,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+80+uintptr(i1)*4, libc.AssignPtrUint32(bp+272, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 272)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+272))
 	*(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 272))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 272))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int32(zHdr) - int32(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 272)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int32(zHdr) - int32(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 272)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 272)) = *(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 272)) = *(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 272)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 272)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 272))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 116))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint32(len))
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = int8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 272))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 272)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 272))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 272))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 272)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 116))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 272)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*20
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 40
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 40
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*16 + 4)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 40
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5493,
+	Xsqlite3VdbeError(tls, p, ts+5483,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*16 + 4))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*int8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 40
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -47845,319 +48009,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*int8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 40
 
-	goto __455
-__455:
-	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 16)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 40
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 116)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+276, pRec, uint32(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 276)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 276)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 276)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 276)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 276)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint32((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -48165,467 +48318,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint32((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 40
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 40
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)) + 36))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 284)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 284)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+284)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 284))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5534, 0)
+	Xsqlite3VdbeError(tls, p, ts+5524, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(unsafe.Sizeof(Savepoint{}))+uint32(nName)+uint32(1)))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*24
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint32(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5585, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5607, 0)
+		ts+5597, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*16)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*16)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5661, 0)
+		ts+5651, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5716
+				return ts + 5706
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5764
+					return ts + 5754
 				}
-				return ts + 5807
+				return ts + 5797
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 292)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+292)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 144))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 292)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5848)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 292))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+144, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -48633,67 +48797,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt, iCookie, bp+296)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 296)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 36)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 144))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -48704,24 +48868,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*40
@@ -48729,30 +48893,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -48768,22 +48932,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 36)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*4))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -48797,133 +48961,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 12)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 36)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fz = ts + 1554
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+12,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+40, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), pCx1+48,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 36)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 36)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -48931,18 +49095,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 36)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -48953,92 +49117,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), bp+300)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), int64(U64(iKey)), 0, bp+300)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -49056,106 +49220,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 304)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), bp+304, bp+300)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+304)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 300)) < 0 || *(*int32)(unsafe.Pointer(bp + 300)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 300)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 300)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 300)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 300)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 300)) > 0 || *(*int32)(unsafe.Pointer(bp + 300)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 300)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 300)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 300)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 300)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 300)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 20
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*20)).Fp1)*4))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 36))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -49164,108 +49328,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 332)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 332)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*20)).Fp3)*40
 	*(*int32)(unsafe.Pointer(bp + 360)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+332, bp+360)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 360)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 20
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 360)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 360)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 36)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49273,14 +49437,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 364)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+364)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 364)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 364)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 36)), bp+364, pC9+28)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+364)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -49290,108 +49454,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+364)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+364)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 36)), pIdxKey, pC9+28)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+364)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+364)).FaMem+uintptr(ii1)*40)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 392)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+392, int8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+392)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 392)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -49410,35 +49574,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 432))
 	if !(*(*int32)(unsafe.Pointer(bp + 432)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 440)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 436)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -49446,123 +49610,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)), bp+436)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 436)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 440)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 436)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 440)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 440)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)))
 	if !(*(*I64)(unsafe.Pointer(bp + 440)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 440))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 440))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 440)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 440)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 440)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 440)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 440))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+440)
 	*(*I64)(unsafe.Pointer(bp + 440)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 440))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)), int64(U64(*(*I64)(unsafe.Pointer(bp + 440)))),
 		0, bp+436)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 436)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 436)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 436)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 440))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -49572,52 +49736,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 448)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*16)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+448)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 448)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 448)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -49629,15 +49793,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 448)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 448)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 448)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 448)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 36)), bp+448,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -49645,13 +49810,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -49664,11 +49829,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+448)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*4))
@@ -49679,38 +49844,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 36)), *(*uintptr)(unsafe.Pointer(pSrc + 36)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*16)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 36)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -49722,47 +49887,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 36)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
@@ -49771,35 +49936,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+480)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 480)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 480)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -49808,51 +49973,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 116)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 484)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 36)))).FpVtab
@@ -49862,72 +50027,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)), bp+484)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 484)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 484)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 484))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 36)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 36)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49935,43 +50100,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 492)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+492)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 492)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 492)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49979,84 +50144,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+496)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 496)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 496)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 496)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 496)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 496)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 156 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	*(*int32)(unsafe.Pointer(bp + 500)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+500)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 36))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+500)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 500)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 500)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 500)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 500)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 36)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -50066,34 +50236,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 156 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -50102,10 +50272,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 504)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 504)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -50122,14 +50292,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -50142,21 +50312,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -50168,62 +50338,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 536)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+536, bp+564)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 564)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5876)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 568)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 36)), bp+568)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
@@ -50236,56 +50406,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 12)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 568))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 616)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 616)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 616)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 616)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 616)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
@@ -50296,54 +50466,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+576, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+576)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+576)).Fn, (*Mem)(unsafe.Pointer(bp+576)).Fz, bp+616, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+576)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 644)) = 0
@@ -50351,72 +50521,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 644)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 644)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 644))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 648)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*16)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+648)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 40)) += *(*I64)(unsafe.Pointer(bp + 648))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)) += *(*I64)(unsafe.Pointer(bp + 648))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 36)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 36)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 656)) = Pgno(0)
@@ -50425,55 +50595,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+656, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 656)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+120, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5893
+	goto __799
+__798:
+	zSchema = ts + 5883
 	(*InitData)(unsafe.Pointer(bp + 660)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 660)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 660)).FpzErrMsg = p + 120
 	(*InitData)(unsafe.Pointer(bp + 660)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 660)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5907,
+		ts+5897,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 660)).Frc = SQLITE_OK
@@ -50483,66 +50653,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+660, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 660)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+660)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -50551,151 +50721,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*16)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+688)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*16)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+688, bp+692)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 688)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 692)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 688)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 692)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+692) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+696) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40, *(*I64)(unsafe.Pointer(bp + 692)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40, *(*I64)(unsafe.Pointer(bp + 696)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 116 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5950, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 116 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint32(unsafe.Sizeof(VdbeFrame{}))+uint32(7))&libc.Uint32FromInt32(libc.CplInt32(7)) +
 		uint32(nMem)*uint32(unsafe.Sizeof(Mem{})) +
@@ -50703,10 +50874,10 @@ __826:
 		uint32(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -50726,26 +50897,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 88 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*40
-	pMem1 = pFrame2 + 88
-__828:
+	pEnd = pFrame2 + 80 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*40
+	pMem1 = pFrame2 + 80
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 40
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -50757,7 +50928,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+88)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+80)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*40
@@ -50768,170 +50939,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*20
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*20)).Fp1)*40
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 528)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 520)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 60)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 528)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 520)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 60)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 700)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 700)) <= int64(0) || Xsqlite3AddInt64(tls, bp+700, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 704)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 704)) <= int64(0) || Xsqlite3AddInt64(tls, bp+704, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 700))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(n4)*uint32(unsafe.Sizeof(uintptr(0)))+(uint32(unsafe.Sizeof(Sqlite3_context{}))+uint32(unsafe.Sizeof(Mem{}))-uint32(unsafe.Sizeof(uintptr(0))))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 28 + uintptr(n4)*4
@@ -50948,146 +51119,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 28 + uintptr(i5)*4)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*40
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+28)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+28)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*20)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*40, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 708)) = 0
-	*(*int32)(unsafe.Pointer(bp + 708 + 1*4)) = libc.AssignPtrInt32(bp+708+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 712)) = 0
+	*(*int32)(unsafe.Pointer(bp + 712 + 1*4)) = libc.AssignPtrInt32(bp+712+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+708+1*4, bp+708+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+712+1*4, bp+712+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 708)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 712)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 708 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 712 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 40
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -51095,70 +51266,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5987,
+		ts+5977,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6039
+				return ts + 6029
 			}
-			return ts + 6044
+			return ts + 6034
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -51166,17 +51337,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -51186,14 +51357,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+120, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -51203,197 +51374,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+144, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+144, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 36)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 36)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*16)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6051, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+720, 0, uint32(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 720)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+720, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
-
-	zTab = Xsqlite3_value_text(tls, bp+720)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+120)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+720)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+724, 0, uint32(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 724)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+724, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
+
+	zTab = Xsqlite3_value_text(tls, bp+724)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+120)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+724)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 760)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+760)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 760)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 764)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+764)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 764)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 36)) = *(*uintptr)(unsafe.Pointer(bp + 760))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 36)) = *(*uintptr)(unsafe.Pointer(bp + 764))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 760)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 764)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 36))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5357, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pArgc = pQuery + 1*40
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -51407,27 +51578,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*4)) = pArgc + uintptr(i7+1)*40
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -51435,72 +51606,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 36)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+764, 0, uint32(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 764)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 764)).Fenc = encoding
+	libc.Xmemset(tls, bp+768, 0, uint32(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 768)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 768)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 36)), bp+764, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 36)), bp+768, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+764)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+768)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 764)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 768)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 36)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -51510,192 +51681,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 36)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 36)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 28)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 28)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 796)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 28)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+144, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 800)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*4)) = pX1
 	pX1 += 40
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+796)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+800)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 796))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 800))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 28 + uintptr(i9)*4)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*40
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -51704,63 +51875,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+28)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+220, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= int8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 156 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 156 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -51770,104 +51941,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 212))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 212))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 212))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*20)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*20)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 156 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 20
-	goto __5
 	goto __7
 __7:
+	pOp += 20
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -51875,52 +52046,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6086,
 		libc.VaList(bp+184, (int32(pOp)-int32(aOp))/20, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 28)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 28)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 156 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -52039,8 +52214,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(328)
-	defer tls.Free(328)
+	bp := tls.Alloc(332)
+	defer tls.Free(332)
 
 	var nAttempt int32
 	var iCol int32
@@ -52060,7 +52235,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -52080,8 +52255,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -52112,8 +52287,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -52146,8 +52321,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52227,8 +52402,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52297,7 +52472,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+324)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+328)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -52325,12 +52500,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 324)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 328)) != 0 {
 			return ts + 3663
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 324))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 328))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52374,7 +52549,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52457,7 +52632,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -54986,6 +55161,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6381, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6389+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6408+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(100)
 	defer tls.Free(100)
@@ -55005,7 +55208,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -55060,7 +55262,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6381, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
 		goto __8
 	}
 
@@ -55181,7 +55383,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6386) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55189,73 +55391,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+44)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 48)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -55267,28 +55487,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 16
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -55299,160 +55519,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6388, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6392, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6396, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 16
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 8)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 8)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 144)) |= func() uint32 {
@@ -55461,8 +55682,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 148)) |= func() uint32 {
 		if iCol >= 32 {
@@ -55470,19 +55691,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -55490,81 +55711,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 8))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*20)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*20 + 8 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*20)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6405, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6436, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -55577,144 +55798,144 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6491, libc.VaList(bp+16, zCol))
+		ts+6551, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+44, 0, uint32(unsafe.Sizeof(struct {
 		FpTab        uintptr
 		F__ccgo_pad1 [4]byte
 	}{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6526
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6586
 	*(*uintptr)(unsafe.Pointer(pExpr + 20)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6535
+		zErr = ts + 6595
 	} else {
-		zErr = ts + 6550
+		zErr = ts + 6610
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6572, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 52)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -55758,15 +55979,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6602
+	var zIn uintptr = ts + 6662
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6630
+		zIn = ts + 6690
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6648
+		zIn = ts + 6708
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6666
+		zIn = ts + 6726
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6684, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55845,10 +56066,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6704
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6764
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -55895,7 +56116,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6715, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6775, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -55959,7 +56180,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*20)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6732, libc.VaList(bp, pExpr))
+								ts+6792, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -55975,7 +56196,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6796,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6856,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -55989,7 +56210,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6832, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6892, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56012,30 +56233,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6860, libc.VaList(bp+16, pExpr))
+						ts+6920, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6903
+						zType = ts + 6963
 					} else {
-						zType = ts + 6910
+						zType = ts + 6970
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6920, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6948, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7008, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6970,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7014,
+						ts+7074,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56107,7 +56328,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7062, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7122, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
 				}
@@ -56123,7 +56344,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7073, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7133, pExpr, pExpr)
 			}
 
 			break
@@ -56179,7 +56400,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56254,7 +56475,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7084, libc.VaList(bp, i, zType, mx))
+		ts+7144, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56274,7 +56495,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 116 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7140, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7200, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56309,7 +56530,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7174, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56366,7 +56587,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 8 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7180, libc.VaList(bp, i+1))
+				ts+7240, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56394,7 +56615,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 116 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7241, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7301, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56608,7 +56829,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 24)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7272, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7332, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56648,7 +56869,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56659,7 +56880,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7311) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56671,7 +56892,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7317, 0)
+						ts+7377, 0)
 					return WRC_Abort
 				}
 
@@ -56771,12 +56992,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 24)) |= savedHasAgg
@@ -56812,12 +57033,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -56927,33 +57148,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) int8 {
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) int8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 20)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*20)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 44)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 20)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*20)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 20))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*20)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -57023,7 +57345,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 44)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -57358,7 +57681,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 		return
 	}
 
@@ -57433,7 +57756,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 116 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7376, libc.VaList(bp, mxHeight))
+			ts+7436, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57682,10 +58005,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7424,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7468
+						return ts + 7528
 					}
 					return ts + 1554
 				}(), nElem))
@@ -57726,7 +58049,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57752,7 +58075,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 116 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7472, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7532, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 20)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57780,7 +58103,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7506, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7566, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57827,7 +58150,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 116 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7526,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7586,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 116 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57852,7 +58175,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 116 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7569, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7629, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58427,7 +58750,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58550,7 +58873,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 116 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7622, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7682, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58606,10 +58929,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6704) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6764) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6709) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59039,13 +59362,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff int8) int32
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7645) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7705) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7653) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7659) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
 		return 1
 	}
 	return 0
@@ -59249,7 +59572,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7663, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59327,7 +59650,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7710, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -59421,7 +59744,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7741
+		var zFmt uintptr = ts + 7801
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59439,7 +59762,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	}
 }
 
@@ -59480,7 +59803,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7785, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
@@ -59510,11 +59833,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7808, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7868, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1554
 			}
-			return ts + 7827
+			return ts + 7887
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59641,7 +59964,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7839, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 44)))
@@ -59656,12 +59979,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7857, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1554
 		}
-		return ts + 7827
+		return ts + 7887
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -59682,7 +60006,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59691,7 +60015,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7878)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7938)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60077,8 +60401,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7880, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7883,
+			if Xsqlite3_strnicmp(tls, z, ts+7940, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4932
@@ -60154,7 +60478,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60240,8 +60564,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(76)
+	defer tls.Free(76)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -60327,14 +60651,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 52)) = [5]uintptr{ts + 7940, ts + 7945, ts + 7950, ts + 6191, ts + 6186}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
+				ts + 6186, ts + 8018}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7958
+						return ts + 8026
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 52 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*4))
 				}())
@@ -60348,7 +60674,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60371,10 +60697,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -60474,7 +60800,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -60604,12 +60930,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -60618,110 +60945,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*16)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*16)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 44)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 44))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*16
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 12)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 12)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 44)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -60764,13 +61104,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -60780,11 +61120,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -60807,11 +61147,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -60820,15 +61160,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -60855,20 +61195,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -60877,9 +61217,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -60917,14 +61257,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -60935,17 +61277,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 	if pFarg != 0 {
@@ -60957,128 +61299,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7990, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*20)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*20)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 44)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*20)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*20)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -61086,42 +61428,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -61144,23 +61486,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -61177,42 +61519,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*16)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -61233,15 +61577,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61251,22 +61595,22 @@ __128:
 	pTest = bp + 100
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 100)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61275,21 +61619,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*20)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*20)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61299,27 +61643,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8014, 0)
+		ts+8082, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61328,7 +61672,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -61339,7 +61683,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]int8)(unsafe.Pointer(ts + 8064))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8132))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62711,18 +63055,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*20)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*16)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*20)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*16)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*20)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*16)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*20)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*16)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -62752,7 +63096,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+32,
+		pInfo+24,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -62765,12 +63109,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+44,
+		pInfo+36,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 16
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*16
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 44))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 20
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 24))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -62778,6 +63220,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 8))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*16)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -62792,81 +63274,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 20
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*20
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 44))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 20
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -62888,34 +63297,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 20
-				goto __10
-				goto __12
-			__12:
+				pItem += 16
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*20
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*16
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -63005,7 +63413,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 156 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 160 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -63013,7 +63421,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint32(unsafe.Sizeof([8]int32{}))/uint32(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 156 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 160 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -63064,11 +63472,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63080,13 +63488,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8108,
+		ts+8170,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8283,
+			ts+8345,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63096,10 +63504,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8457, libc.VaList(bp, zDb, zDb))
+		ts+8519, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8604, 0)
+			ts+8666, 0)
 	}
 }
 
@@ -63163,7 +63571,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8755, libc.VaList(bp, zName))
+		ts+8817, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63173,7 +63581,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8814, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63182,7 +63590,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8820, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63223,19 +63631,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8847, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9031,
+		ts+9093,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9336, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9352,
+		ts+9414,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63243,7 +63651,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9410, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63255,7 +63663,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9675, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63267,7 +63675,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9688,
+		ts+9750,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63313,12 +63721,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9726, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9758, 0)
+			ts+9820, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63328,11 +63736,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 44 + 4)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9785)
+				ts+9847)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9844)
+				ts+9906)
 		}
 
 		if pDflt != 0 {
@@ -63345,12 +63753,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9897)
+					ts+9959)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9943)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63361,7 +63769,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9970,
+			ts+10032,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 44)), zCol, *(*int32)(unsafe.Pointer(pNew + 44)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63383,7 +63791,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10116,
+				ts+10178,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63431,14 +63839,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10346, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10380, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63466,7 +63874,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(uint32(unsafe.Sizeof(Column{}))*uint32(nAlloc)))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10410, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -63506,18 +63914,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10429
+		zType = ts + 10491
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10434
+		zType = ts + 10496
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10448,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10466
+					return ts + 10528
 				}
-				return ts + 10483
+				return ts + 10545
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -63601,7 +64009,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -63618,17 +64026,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10522,
+		ts+10584,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10704,
+		ts+10766,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9675, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9737, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63823,7 +64231,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 272; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 12 {
+	for pp = pParse + 276; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 12 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -63886,10 +64294,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10835,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10897,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10858
+				return ts + 10920
 			}
 			return ts + 1554
 		}(), zWhen,
@@ -63931,8 +64339,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10860, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10922, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63949,7 +64357,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63971,7 +64379,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10868, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10930, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64011,10 +64419,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)
 				*(*int8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = int8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10874, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10936, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*int8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10858
+							return ts + 10920
 						}
 						return ts + 1554
 					}()))
@@ -64190,8 +64598,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(324)
-	defer tls.Free(324)
+	bp := tls.Alloc(328)
+	defer tls.Free(328)
 
 	var db uintptr
 
@@ -64274,15 +64682,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+20, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+296, 0, uint32(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 296)).FpParse = bp + 20
-	(*Walker)(unsafe.Pointer(bp + 296)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+300, 0, uint32(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 300)).FpParse = bp + 20
+	(*Walker)(unsafe.Pointer(bp + 300)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 296)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 300)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 296 + 24)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 300 + 24)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -64310,7 +64718,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+296, pSelect)
+	Xsqlite3WalkSelect(tls, bp+300, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -64343,13 +64751,13 @@ __15:
 	renameTokenFind(tls, bp+20, bp, (*Parse)(unsafe.Pointer(bp+20)).FpNewTable+32)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+296, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+300, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 20)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64362,7 +64770,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64377,7 +64785,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+20)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FaCol+uintptr(i)*16)
-	Xsqlite3WalkExpr(tls, bp+296, pExpr)
+	Xsqlite3WalkExpr(tls, bp+300, pExpr)
 	goto __24
 __24:
 	i++
@@ -64433,8 +64841,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+20)
@@ -64482,7 +64890,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+20, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+296, (*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+300, (*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -64550,8 +64958,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(356)
-	defer tls.Free(356)
+	bp := tls.Alloc(360)
+	defer tls.Free(360)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64593,11 +65001,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 44))
 
-						libc.Xmemset(tls, bp+324, 0, uint32(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 324)).FpParse = bp + 48
+						libc.Xmemset(tls, bp+328, 0, uint32(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 328)).FpParse = bp + 48
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+48, *(*uintptr)(unsafe.Pointer(pTab + 44)), bp+324)
+						Xsqlite3SelectPrep(tls, bp+48, *(*uintptr)(unsafe.Pointer(pTab + 44)), bp+328)
 						if (*Parse)(unsafe.Pointer(bp+48)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 48)).Frc
 						} else {
@@ -64690,8 +65098,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(324)
-	defer tls.Free(324)
+	bp := tls.Alloc(328)
+	defer tls.Free(328)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64709,16 +65117,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+276, 0, uint32(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+296, 0, uint32(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 296)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 296)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+280, 0, uint32(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+300, 0, uint32(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 300)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 300)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 296)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 300)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 296 + 24)) = bp + 276
+			*(*uintptr)(unsafe.Pointer(bp + 300 + 24)) = bp + 280
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -64733,31 +65141,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+296, pSelect)
+						Xsqlite3WalkSelect(tls, bp+300, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+296, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+300, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+296,
+						Xsqlite3WalkExpr(tls, bp+300,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*16))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+296, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+300, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+276, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+280, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+276)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+280)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -64775,8 +65183,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(308)
-	defer tls.Free(308)
+	bp := tls.Alloc(312)
+	defer tls.Free(312)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64802,9 +65210,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 28)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+276, 0, uint32(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 276)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 44)), bp+276)
+				libc.Xmemset(tls, bp+280, 0, uint32(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 280)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 44)), bp+280)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -64832,8 +65240,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(300)
-	defer tls.Free(300)
+	bp := tls.Alloc(304)
+	defer tls.Free(304)
 
 	var db uintptr
 	var iSchema int32
@@ -64870,7 +65278,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -64894,7 +65302,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10879, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -64975,17 +65383,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10886,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10948,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10914
+				return ts + 10976
 			}
 			return ts + 6127
 		}(),
@@ -64996,7 +65404,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10926, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65013,10 +65421,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10974, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11095, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11157, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -65134,11 +65542,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11113},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11134},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11154},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11173},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11192}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11175},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11196},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11216},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65172,7 +65580,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11215, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -65181,10 +65589,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11238,
+					ts+11300,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11268, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -65202,9 +65610,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11286, FzCols: ts + 11299},
-	{FzName: ts + 11312, FzCols: ts + 11325},
-	{FzName: ts + 11353},
+	{FzName: ts + 11348, FzCols: ts + 11361},
+	{FzName: ts + 11374, FzCols: ts + 11387},
+	{FzName: ts + 11415},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65301,7 +65709,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*36)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+28)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+36)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -65347,13 +65755,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*100
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*112
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -65366,11 +65774,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*36
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*36
 		for i = 0; i < mxSample+nCol; i++ {
@@ -65394,17 +65802,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11366}
+	FzName:     ts + 11428}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -65415,8 +65823,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -65459,7 +65867,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*36
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -65487,7 +65895,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -65554,7 +65962,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*36
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*36) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -65570,8 +65978,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*36)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*36)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*36)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*36)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -65588,9 +65996,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -65598,14 +66006,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -65613,31 +66021,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+28, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+36, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+28, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+36, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+72, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+84, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+28, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+36, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+28, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*36) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*36, p+28)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+36, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*36) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*36, p+36)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -65645,7 +66053,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11376}
+	FzName:     ts + 11438}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(72)
@@ -65659,20 +66067,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11386,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11448,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11391, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65714,7 +66122,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+48, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+48, ts+11397, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+48, ts+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+48)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+48)).FnChar--
@@ -65728,7 +66136,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11403}
+	FzName:     ts + 11465}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -65772,7 +66180,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11412, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65789,7 +66197,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*64
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11286, uint32(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11348, uint32(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -65945,7 +66353,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66002,7 +66410,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66049,9 +66457,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 40)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11426)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11488)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11430)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66137,16 +66545,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1554
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*int8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -66156,15 +66564,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(0), 6, 0x40)
 		for *(*int8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11434, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11496, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11445, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11455, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11517, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -66178,8 +66586,8 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 }
 
 func analysisLoader(tls *libc.TLS, pData uintptr, argc int32, argv uintptr, NotUsed uintptr) int32 {
-	bp := tls.Alloc(92)
-	defer tls.Free(92)
+	bp := tls.Alloc(96)
+	defer tls.Free(96)
 
 	var pInfo uintptr = pData
 	var pIndex uintptr
@@ -66244,7 +66652,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -66258,42 +66666,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*20)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*20)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -66367,15 +66775,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*20
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 28)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -66440,11 +66848,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11312, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11374, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11467,
-			ts+11521,
+			ts+11529,
+			ts+11583,
 			zDb)
 	}
 	return rc
@@ -66491,10 +66899,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11286, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11573, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66552,12 +66960,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6381, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6441, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(44)
-	defer tls.Free(44)
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
 
 	var i int32
 	var rc int32
@@ -66568,13 +66976,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -66595,128 +67006,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 28)) = Xsqlite3_vfs_find(tls, ts+3835)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 28)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3835)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*16
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*16
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 28)), ts+11614, db, pNew+4, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 116 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11617,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 116 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11654, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11679,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 116 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+468) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(unsafe.Sizeof(Db{}))*uint32(3)))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint32(unsafe.Sizeof(Db{}))*uint32(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(uint32(unsafe.Sizeof(Db{}))*uint32((*Sqlite3)(unsafe.Pointer(db)).FnDb+1)))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*16
 	libc.Xmemset(tls, pNew, 0, uint32(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+28, bp+32, bp+36)
+	*(*uint32)(unsafe.Pointer(bp + 28)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+28, bp+32, bp+36, bp+40)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 36)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 36)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 40)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 28)), *(*uintptr)(unsafe.Pointer(bp + 32)), db, pNew+4, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 28)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 36)), db, pNew+4, 0, int32(*(*uint32)(unsafe.Pointer(bp + 28))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11684, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db,
-		ts+11713, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db,
+		ts+11775, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -66726,89 +67160,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 36)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 168 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+40)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+44)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 168 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 40)))
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11781, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 40)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 40)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 44)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66862,14 +67296,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11809, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11871, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11830, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66877,7 +67311,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11856, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66919,42 +67353,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -66963,13 +67403,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -66988,7 +67428,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11878}
+	FzName:     ts + 11940}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67001,7 +67441,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11892}
+	FzName:     ts + 11954}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67015,7 +67455,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11906, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67047,7 +67487,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11930,
+						ts+11992,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67222,7 +67662,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11976, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67248,11 +67688,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12005, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12011, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67299,7 +67739,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName
 	} else {
-		zCol = ts + 7653
+		zCol = ts + 7713
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67323,7 +67763,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12100, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -67548,6 +67988,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -67560,13 +68003,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint32(uintptr(0)+200)), uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint32(uintptr(0)+204)), uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint32(uintptr(0)+200)), bp, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemcpy(tls, pParse+uintptr(uint32(uintptr(0)+204)), bp, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -67591,25 +68034,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6381) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-						ts+12086)
+						ts+6389)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8,
-						ts+5893)
+						ts+5883)
 				}
 			}
 		}
@@ -67630,12 +68073,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5893)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5883)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-					ts+12086)
+					ts+6389)
 			}
 		}
 	}
@@ -67666,7 +68109,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+396, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12105, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12115, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67684,14 +68127,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12113
+			zMsg = ts + 12123
 		} else {
-			zMsg = ts + 12126
+			zMsg = ts + 12136
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67721,12 +68164,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
-			return ts + 12072
+	if Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
+			return ts + 6427
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12086+7) == 0 {
-			return ts + 12053
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
+			return ts + 6408
 		}
 	}
 	return zName
@@ -68084,7 +68527,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5893)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5883)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68110,7 +68553,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6381, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
 				goto __3
 			}
 
@@ -68163,13 +68606,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12140, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12150, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12157, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68211,9 +68654,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8072, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12177,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68373,9 +68816,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68391,7 +68834,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12219, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
 	return
 __4:
 	;
@@ -68419,9 +68862,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10429
+			return ts + 10491
 		}
-		return ts + 8814
+		return ts + 8876
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68437,9 +68880,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68470,12 +68913,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12260,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10429
+				return ts + 10491
 			}
-			return ts + 8814
+			return ts + 8876
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68490,7 +68933,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12281, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -68577,7 +69020,7 @@ var nullRow = [6]int8{int8(6), int8(0), int8(0), int8(0), int8(0), int8(0)}
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema + 40
-	Xsqlite3HashInsert(tls, pHash, ts+12316, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12326, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -68601,7 +69044,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12333, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12343, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68621,7 +69064,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12316
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12326
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -68633,7 +69076,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema + 40
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12316, pRet+8) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12326, pRet+8) ==
 		pRet+8 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68667,7 +69110,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 116 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68675,13 +69118,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+24)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12390, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12400, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 24 + 4)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+24)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+24)).Fz + uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(1)))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+24)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+24)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12397, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12407, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 24 + 4)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+24)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+24)).Fz + uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(1)))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+24)).Fn--
@@ -68718,7 +69161,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*16)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*16)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12407, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12417, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68882,10 +69325,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*16
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12433,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12443,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12478, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint32(unsafe.Sizeof(Expr{})))
@@ -68916,7 +69359,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 12)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12519, 0)
+			ts+12529, 0)
 	}
 }
 
@@ -68961,7 +69404,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12571, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69050,7 +69493,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12612, 0)
+		ts+12622, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69145,7 +69588,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12668, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
 	goto generated_done
 __2:
 	;
@@ -69158,13 +69601,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12711, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12719, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69191,13 +69634,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12726,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69319,12 +69769,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1554
-		zSep2 = ts + 12757
+		zSep2 = ts + 12767
 		zEnd = ts + 4957
 	} else {
-		zSep = ts + 12759
-		zSep2 = ts + 12763
-		zEnd = ts + 12768
+		zSep = ts + 12769
+		zSep2 = ts + 12773
+		zEnd = ts + 12778
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69332,7 +69782,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12771, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*int8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = int8('(')
@@ -69370,11 +69820,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1554,
-	ts + 12785,
-	ts + 12791,
-	ts + 12796,
+	ts + 12795,
+	ts + 12801,
+	ts + 12806,
+	ts + 12811,
 	ts + 12801,
 }
 
@@ -69782,10 +70233,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12807,
+						ts+12817,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12840,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69804,11 +70255,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12867, 0)
+				ts+12877, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12917, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 28)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69842,7 +70293,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12949, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
 			return
 		}
 	}
@@ -69867,11 +70318,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8814
-			zType2 = ts + 12993
+			zType = ts + 8876
+			zType2 = ts + 13003
 		} else {
-			zType = ts + 10429
-			zType2 = ts + 12999
+			zType = ts + 10491
+			zType2 = ts + 13009
 		}
 
 		if pSelect != 0 {
@@ -69933,7 +70384,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 200
+				pEnd2 = pParse + 204
 			} else {
 				pEnd2 = pEnd
 			}
@@ -69942,11 +70393,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+13004, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13019,
+			ts+13029,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69962,13 +70413,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13117,
+					ts+13127,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13159, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -69983,7 +70434,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9336) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9398) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70013,7 +70464,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13193, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13203, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70029,7 +70480,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10429, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+4, pSelect) != 0) {
 		goto __3
 	}
@@ -70111,7 +70562,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13229, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70139,8 +70590,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+34, pTable+4)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, int8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -70237,13 +70687,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13259, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13269, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13274,
+		ts+13284,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*16)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -70284,10 +70734,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*16)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13341, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13351, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11238,
+				ts+11300,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70319,12 +70769,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13355,
+			ts+13365,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13400,
+		ts+13410,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -70352,11 +70802,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7073, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70434,9 +70884,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70495,21 +70945,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13467, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13495, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13529, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70521,7 +70971,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11430, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -70585,7 +71035,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13561,
+		ts+13571,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*16)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -70597,7 +71047,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13624, 0)
+		ts+13634, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70682,7 +71132,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13718,
+		ts+13728,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*20)).FzEName))
 	goto fk_end
 __23:
@@ -70909,12 +71359,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*20 + 8 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*20)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13764,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13774,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13792
+							return ts + 13802
 						}
-						return ts + 13798
+						return ts + 13808
 					}()))
 				return 1
 			}
@@ -71035,7 +71485,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13803, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+132, pTblName) != 0) {
 		goto __10
 	}
@@ -71054,7 +71504,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13809,
+		ts+13819,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71080,26 +71530,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13859, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13887, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13897, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13912, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71113,7 +71563,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13803, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71128,7 +71578,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13946, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71140,7 +71590,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13980, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71169,7 +71619,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14004, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71190,9 +71640,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71231,7 +71681,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13803)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71332,7 +71782,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14027, 0)
+		ts+14037, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71549,7 +71999,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14088, libc.VaList(bp+48, 0))
+		ts+14098, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -71601,8 +72051,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14130, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -71648,12 +72098,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14147,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1554
 			}
-			return ts + 14167
+			return ts + 14177
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71661,7 +72111,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14175,
+		ts+14185,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -71675,7 +72125,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14234, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71836,7 +72286,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14261, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71851,7 +72301,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14279, libc.VaList(bp+8, 0))
+		ts+14289, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71862,9 +72312,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71890,9 +72340,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14352,
+		ts+14362,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11426, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -72027,7 +72477,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14412,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14422,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72235,12 +72685,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14448,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14458,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14484
+				return ts + 14494
 			}
-			return ts + 14487
+			return ts + 14497
 		}()))
 	goto append_from_error
 __1:
@@ -72409,7 +72859,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14493, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72445,9 +72895,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14499
+				return ts + 14509
 			}
-			return ts + 14508
+			return ts + 14518
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72472,7 +72922,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14493, ts + 14515, ts + 14499}
+var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72487,7 +72937,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14523, 0)
+				ts+14533, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72624,14 +73074,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 116)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14593, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*16)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14604, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14614, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
@@ -72657,11 +73107,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14607, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72791,7 +73241,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14616, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72887,7 +73337,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+12+uintptr(i)*24)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14662, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14672, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73080,7 +73530,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14692, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73360,7 +73810,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73392,11 +73842,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14756, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14785, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -73900,7 +74350,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14823)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
 __62:
 	;
 delete_from_cleanup:
@@ -74015,7 +74465,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11286) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11348) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74245,7 +74695,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 7945, ts + 7940, ts + 6181}
+var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 8005, ts + 8000, ts + 6181}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74304,7 +74754,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14836, -1)
+					Xsqlite3_result_error(tls, context, ts+14846, -1)
 					return
 				}
 				iVal = -iVal
@@ -74608,7 +75058,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14853, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74954,7 +75404,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 116 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14858, -1)
+		Xsqlite3_result_error(tls, context, ts+14868, -1)
 		return
 	}
 	if argc == 3 {
@@ -74964,7 +75414,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14891, -1)
+				ts+14901, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75063,7 +75513,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14936, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14946, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75078,21 +75528,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = int8('\'')
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = int8(0)
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = int8('\'')
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = int8(0)
 				*(*int8)(unsafe.Pointer(zText)) = int8('X')
 				*(*int8)(unsafe.Pointer(zText + 1)) = int8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -75100,7 +75550,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14943, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14953, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -75214,6 +75664,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1554
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, (int32(p)-int32(pBlob))/1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -75416,7 +75979,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10858}
+var azOne = [1]uintptr{ts + 10920}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75452,7 +76015,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(j))) = int8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14946, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14956, 4, uintptr(0))
 	}
 }
 
@@ -75477,7 +76040,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12038, -1)
+		Xsqlite3_result_error(tls, context, ts+12100, -1)
 		return
 	}
 
@@ -75555,7 +76118,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14836, -1)
+			Xsqlite3_result_error(tls, context, ts+14846, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75817,7 +76380,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14951, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14961, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75837,14 +76400,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14957, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14957, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -75974,17 +76537,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -76043,6 +76606,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -76083,108 +76647,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_implies_nonnull_row), FxSFunc: 0, FzName: ts + 14962},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_compare), FxSFunc: 0, FzName: ts + 14982},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_implies_expr), FxSFunc: 0, FzName: ts + 14995},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_affinity), FxSFunc: 0, FzName: ts + 15013},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15022},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15045},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15071},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15096},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15105},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15116},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_sqlite_offset), FxSFunc: 0, FzName: ts + 15123},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15154},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15154},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15154},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15158},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(1), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15162},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15169},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15177},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15184},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15190},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15197},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15204},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15212},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15217},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_implies_nonnull_row), FxSFunc: 0, FzName: ts + 14972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_compare), FxSFunc: 0, FzName: ts + 14992},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_implies_expr), FxSFunc: 0, FzName: ts + 15005},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_affinity), FxSFunc: 0, FzName: ts + 15023},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15032},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15055},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15081},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15106},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15115},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15126},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_sqlite_offset), FxSFunc: 0, FzName: ts + 15133},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15164},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15164},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15164},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15168},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(1), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15179},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15187},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15194},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15200},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15207},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15222},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15227},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15233},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15239},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15243},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15257},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15275},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15290},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15307},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15318},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15324},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15350},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15364},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15398},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15402},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15408},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15237},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15249},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15259},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15266},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15273},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15284},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15291},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15306},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15323},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15334},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15340},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15358},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15366},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15380},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15414},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15431},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15436},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15441},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15449},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15455},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15461},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15468},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15474},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15479},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15483},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15487},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15493},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15497},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15507},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15512},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15424},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15447},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15452},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15457},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15465},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15471},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15484},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15490},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15495},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15503},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15509},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15513},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15530},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15540},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15545},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15523},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15528},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15534},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15538},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15542},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15546},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15551},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15557},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15563},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15568},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15576},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15584},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15587},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6526},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_iif), FxSFunc: 0, FzName: ts + 15592}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15556},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15561},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15567},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15573},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15579},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15584},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15592},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15600},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6586},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_iif), FxSFunc: 0, FzName: ts + 15608}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76305,7 +76871,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15596,
+				ts+15612,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -76965,8 +77531,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6392, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6388, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6452, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6448, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77467,7 +78033,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7910, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77935,7 +78501,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15641,
+		ts+15657,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77960,7 +78526,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15682,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*8)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -78109,7 +78675,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15714,
+		ts+15730,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78119,7 +78685,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15766, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78171,7 +78737,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15791,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78179,7 +78745,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15837, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -78591,7 +79157,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15858)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
 __125:
 	;
 insert_cleanup:
@@ -78906,8 +79472,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 								onError, iReg)
 							Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -79997,7 +80564,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -80443,6 +81010,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80481,7 +81049,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12038, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -80490,7 +81058,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15872
+		zEntry = ts + 15888
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -80505,7 +81073,7 @@ __5:
 	if !(ii < int32(uint32(unsafe.Sizeof(azEndings))/uint32(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -80541,7 +81109,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15895, uint32(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint32(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -80555,7 +81123,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15904, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -80579,7 +81147,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15908, uint32(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint32(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -80597,7 +81165,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15914, libc.VaList(bp+16, zEntry, zFile))
+		ts+15930, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80624,7 +81192,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15957, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80662,7 +81230,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15989, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80672,7 +81240,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16026,
+	ts + 16042,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80827,7 +81395,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16029, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80836,62 +81404,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5057,
-	ts + 16068,
-	ts + 8814,
-	ts + 16072,
-	ts + 16077,
-	ts + 16080,
-	ts + 16090,
-	ts + 16100,
+	ts + 16084,
+	ts + 8876,
+	ts + 16088,
+	ts + 16093,
+	ts + 16096,
 	ts + 16106,
-	ts + 16110,
-	ts + 16115,
-	ts + 16120,
-	ts + 16128,
-	ts + 16139,
-	ts + 16142,
-	ts + 16149,
-	ts + 16110,
-	ts + 16115,
-	ts + 16156,
-	ts + 16161,
-	ts + 16164,
-	ts + 16171,
-	ts + 16106,
-	ts + 16110,
+	ts + 16116,
+	ts + 16122,
+	ts + 16126,
+	ts + 16131,
+	ts + 16136,
+	ts + 16144,
+	ts + 16155,
+	ts + 16158,
+	ts + 16165,
+	ts + 16126,
+	ts + 16131,
+	ts + 16172,
 	ts + 16177,
-	ts + 16182,
+	ts + 16180,
 	ts + 16187,
-	ts + 16110,
-	ts + 16191,
-	ts + 16115,
-	ts + 16199,
+	ts + 16122,
+	ts + 16126,
+	ts + 16193,
+	ts + 16198,
 	ts + 16203,
-	ts + 16208,
-	ts + 11430,
-	ts + 11426,
-	ts + 16214,
+	ts + 16126,
+	ts + 16207,
+	ts + 16131,
+	ts + 16215,
 	ts + 16219,
 	ts + 16224,
-	ts + 16068,
-	ts + 16110,
-	ts + 16229,
-	ts + 16236,
-	ts + 16243,
-	ts + 8814,
-	ts + 16251,
-	ts + 5060,
-	ts + 16257,
-	ts + 16068,
-	ts + 16110,
-	ts + 16262,
+	ts + 11492,
+	ts + 11488,
+	ts + 16230,
+	ts + 16235,
+	ts + 16240,
+	ts + 16084,
+	ts + 16126,
+	ts + 16245,
+	ts + 16252,
+	ts + 16259,
+	ts + 8876,
 	ts + 16267,
-	ts + 15464,
-	ts + 16272,
-	ts + 16285,
-	ts + 16294,
+	ts + 5060,
+	ts + 16273,
+	ts + 16084,
+	ts + 16126,
+	ts + 16278,
+	ts + 16283,
+	ts + 15480,
+	ts + 16288,
 	ts + 16301,
-	ts + 16312,
+	ts + 16310,
+	ts + 16317,
+	ts + 16328,
 }
 
 // Definitions of all built-in pragmas
@@ -80908,238 +81476,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16320,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16335,
+	{FzName: ts + 16351,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16350,
+	{FzName: ts + 16366,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16362,
+	{FzName: ts + 16378,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16394,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16301,
+	{FzName: ts + 16317,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16391,
+	{FzName: ts + 16407,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16403,
+	{FzName: ts + 16419,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16423,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16439,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16455,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16460,
+	{FzName: ts + 16476,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16475,
+	{FzName: ts + 16491,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16507,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16505,
+	{FzName: ts + 16521,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16518,
+	{FzName: ts + 16534,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16532,
+	{FzName: ts + 16548,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16551,
+	{FzName: ts + 16567,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16570,
+	{FzName: ts + 16586,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16593,
+	{FzName: ts + 16609,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16618,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16620,
+	{FzName: ts + 16636,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16637,
+	{FzName: ts + 16653,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16650,
+	{FzName: ts + 16666,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16665,
+	{FzName: ts + 16681,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16683,
+	{FzName: ts + 16699,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16693,
+	{FzName: ts + 16709,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16723,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16739,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16748,
+	{FzName: ts + 16764,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16767,
+	{FzName: ts + 16783,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16778,
+	{FzName: ts + 16794,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16789,
+	{FzName: ts + 16805,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16801,
+	{FzName: ts + 16817,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16833,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16830,
+	{FzName: ts + 16846,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16849,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16868,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16881,
+	{FzName: ts + 16897,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16896,
+	{FzName: ts + 16912,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16906,
+	{FzName: ts + 16922,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16918,
+	{FzName: ts + 16934,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16943,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16938,
+	{FzName: ts + 16954,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16948,
+	{FzName: ts + 16964,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16960,
+	{FzName: ts + 16976,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16971,
+	{FzName: ts + 16987,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16983,
+	{FzName: ts + 16999,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17000,
+	{FzName: ts + 17016,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17019,
+	{FzName: ts + 17035,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17045,
+	{FzName: ts + 17061,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17060,
+	{FzName: ts + 17076,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17074,
+	{FzName: ts + 17090,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17093,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17107,
+	{FzName: ts + 17123,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17139,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17135,
+	{FzName: ts + 17151,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17146,
+	{FzName: ts + 17162,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17157,
+	{FzName: ts + 17173,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17169,
+	{FzName: ts + 17185,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17180,
+	{FzName: ts + 17196,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17201,
+	{FzName: ts + 17217,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17209,
+	{FzName: ts + 17225,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17224,
+	{FzName: ts + 17240,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17237,
+	{FzName: ts + 17253,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17256,
+	{FzName: ts + 17272,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17271,
+	{FzName: ts + 17287,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81161,7 +81729,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17287))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17303))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -81173,10 +81741,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17312) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17328) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81185,13 +81753,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7958) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8026) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17329) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17334) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81206,9 +81774,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*int8)(unsafe.Pointer(z))) >= '0' && int32(*(*int8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*int8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16262) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16278) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17346) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81222,7 +81790,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17353, 0)
+				ts+17369, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt)
@@ -81313,19 +81881,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17415
+		zName = ts + 17431
 		break
 	case OE_SetDflt:
-		zName = ts + 17424
+		zName = ts + 17440
 		break
 	case OE_Cascade:
-		zName = ts + 17436
+		zName = ts + 17452
 		break
 	case OE_Restrict:
-		zName = ts + 17444
+		zName = ts + 17460
 		break
 	default:
-		zName = ts + 17453
+		zName = ts + 17469
 		break
 	}
 	return zName
@@ -81342,7 +81910,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17463, ts + 17470, ts + 17478, ts + 17482, ts + 17346, ts + 17491,
+	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81389,13 +81957,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17495
+			zType = ts + 17511
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17497
+			zType = ts + 17513
 		} else {
-			zType = ts + 7468
+			zType = ts + 7528
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17499,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -81403,7 +81971,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17506, ts + 17511, ts + 17519}
+var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -81554,14 +82122,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -81648,7 +82218,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17527, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81909,7 +82479,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17531) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81981,7 +82551,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17322
+	zRet = ts + 17338
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82019,7 +82589,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17312
+	zRet = ts + 17328
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82306,7 +82876,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 532)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17536, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82347,7 +82917,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17561, 0)
+		ts+17577, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82401,7 +82971,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17614) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
 		goto __142
 	}
 
@@ -82498,9 +83068,9 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17620
+			return ts + 17636
 		}
-		return ts + 17628
+		return ts + 17644
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -82569,7 +83139,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17635, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82615,29 +83185,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10429
+	zType = ts + 10491
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12711
+	zType = ts + 12721
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17651
+	zType = ts + 17667
 	goto __183
 __182:
-	zType = ts + 8814
+	zType = ts + 8876
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*16)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82703,7 +83273,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17665, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82713,7 +83283,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17670,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*4)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -82750,8 +83320,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 540)) = [3]uintptr{ts + 17675, ts + 17677, ts + 16139}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17679,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 540)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82784,7 +83354,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*16)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*16)).FpBt)))
@@ -82806,7 +83376,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17689, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82870,7 +83440,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82886,7 +83456,7 @@ __218:
 	if !(i6 < int32(uint32(unsafe.Sizeof(aPragmaName))/uint32(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -82921,7 +83491,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17692,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82929,7 +83499,7 @@ __226:
 			(*sColMap)(unsafe.Pointer(pFK+36+uintptr(j2)*8)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 25 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 25))),
-			ts+17701))
+			ts+17717))
 	goto __227
 __227:
 	j2++
@@ -83118,7 +83688,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17706, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 556)))
@@ -83335,7 +83905,7 @@ __284:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17710, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -83396,262 +83966,284 @@ __299:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 564)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__300:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __301
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __300
+	}
+	mxCol = -1
+	j4 = 0
+__302:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __304
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __305
+	}
+	mxCol++
+__305:
+	;
+	goto __303
+__303:
+	j4++
+	goto __302
+	goto __304
+__304:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __306
 	}
 	mxCol--
-	goto __300
+__306:
+	;
+	goto __301
+__300:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __301:
 	;
 	if !(mxCol >= 0) {
-		goto __302
+		goto __307
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 564)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 564)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__302:
+__307:
 	;
 	if !!(isQuick != 0) {
-		goto __303
+		goto __308
 	}
 	if !(pPk1 != 0) {
-		goto __304
+		goto __309
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 564)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17734,
+		ts+17750,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__305:
+__310:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __307
+		goto __312
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 564)), j4, r2+j4)
-	goto __306
-__306:
+	goto __311
+__311:
 	j4++
-	goto __305
-	goto __307
-__307:
+	goto __310
+	goto __312
+__312:
 	;
-__304:
+__309:
 	;
-__303:
+__308:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__308:
+__313:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __310
+		goto __315
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*16
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __311
+		goto __316
 	}
-	goto __309
-__311:
+	goto __314
+__316:
 	;
 	if !(bStrict != 0) {
-		goto __312
+		goto __317
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4) > COLTYPE_ANY)
-	goto __313
-__312:
+	goto __318
+__317:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__313:
+__318:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __314
+		goto __319
 	}
-	goto __309
-__314:
+	goto __314
+__319:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 564)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __316
-__315:
+	goto __321
+__320:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __317
+		goto __322
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 572)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		uint8((*Column)(unsafe.Pointer(pCol1)).Faffinity), bp+572)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 572)) != 0) {
-		goto __318
+		goto __323
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 572)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 572)))
-__318:
+__323:
 	;
-__317:
+__322:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 564))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __319
+		goto __324
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __320
-__319:
+	goto __325
+__324:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__320:
+__325:
 	;
-__316:
+__321:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf>>0)) != 0) {
-		goto __321
+		goto __326
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17770, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __323
-__322:
+	goto __328
+__327:
 	;
-__323:
+__328:
 	;
-__321:
+__326:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __324
+		goto __329
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17790,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __325
-__324:
+	goto __330
+__329:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __326
+		goto __331
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17812,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __327
-__326:
+	goto __332
+__331:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __328
+		goto __333
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 564)), j4, 3)
-__329:
+__334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17835, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17837,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__328:
+__333:
 	;
-__327:
+__332:
 	;
-__325:
+__330:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __309
-__309:
+	goto __314
+__314:
 	j4++
-	goto __308
-	goto __310
-__310:
+	goto __313
+	goto __315
+__315:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __330
+		goto __335
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __331
+		goto __336
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 564)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__332:
+__337:
 	if !(k3 > 0) {
-		goto __334
+		goto __339
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*20)).FpExpr, addrCkFault, 0)
-	goto __333
-__333:
+	goto __338
+__338:
 	k3--
-	goto __332
-	goto __334
-__334:
+	goto __337
+	goto __339
+__339:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17857,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__331:
+__336:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__330:
+__335:
 	;
 	if !!(isQuick != 0) {
-		goto __335
+		goto __340
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__336:
+__341:
 	if !(pIdx5 != 0) {
-		goto __338
+		goto __343
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __339
+		goto __344
 	}
-	goto __337
-__339:
+	goto __342
+__344:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 564)), 0, 0, bp+576,
 		pPrior, r1)
@@ -83660,80 +84252,119 @@ __339:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 568))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17892)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__345:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __347
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*4)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __348
+	}
+	goto __346
+__348:
+	;
+	if !(label6 == 0) {
+		goto __349
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__349:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 568))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	if !(label6 != 0) {
+		goto __350
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__350:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __340
+		goto __351
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__341:
+__352:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __343
+		goto __354
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*16 + 4))&0xf>>0)) != 0) {
-		goto __344
+		goto __355
 	}
-	goto __342
-__344:
+	goto __353
+__355:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 568))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 568))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17956)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__351:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 576)))
 	goto __342
 __342:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __341
 	goto __343
 __343:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 568))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 568))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17913)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __340:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 576)))
-	goto __337
-__337:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __336
-	goto __338
-__338:
-	;
-__335:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 564)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __345
+		goto __356
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17940)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__346:
+__357:
 	if !(pIdx5 != 0) {
-		goto __348
+		goto __359
 	}
 	if !(pPk1 == pIdx5) {
-		goto __349
+		goto __360
 	}
-	goto __347
-__349:
+	goto __358
+__360:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 568))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83742,21 +84373,21 @@ __349:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __347
-__347:
+	goto __358
+__358:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __346
-	goto __348
-__348:
+	goto __357
+	goto __359
+__359:
 	;
 	if !(pPk1 != 0) {
-		goto __350
+		goto __361
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__350:
+__361:
 	;
-__345:
+__356:
 	;
 	goto __291
 __291:
@@ -83774,14 +84405,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(endCode))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __351
+		goto __362
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 560))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*20)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 17969
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 18012
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*20)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*20 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__351:
+__362:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83789,27 +84420,27 @@ __351:
 
 __45:
 	if !!(zRight != 0) {
-		goto __352
+		goto __363
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __354
+		goto __365
 	}
 	goto pragma_out
-__354:
+__365:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __353
-__352:
+	goto __364
+__363:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __355
+		goto __366
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__356:
+__367:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __358
+		goto __369
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __359
+		goto __370
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83818,25 +84449,25 @@ __356:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __358
-__359:
+	goto __369
+__370:
 	;
-	goto __357
-__357:
+	goto __368
+__368:
 	pEnc += 8
-	goto __356
-	goto __358
-__358:
+	goto __367
+	goto __369
+__369:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __360
+		goto __371
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17972, libc.VaList(bp+456, zRight))
-__360:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+__371:
 	;
-__355:
+__366:
 	;
-__353:
+__364:
 	;
 	goto __15
 
@@ -83844,15 +84475,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __361
+		goto __372
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(setCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __363
+		goto __374
 	}
 	goto __15
-__363:
+__374:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp1 = iDb
@@ -83860,41 +84491,41 @@ __363:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __364
+		goto __375
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fopcode = U8(OP_Noop)
-__364:
+__375:
 	;
-	goto __362
-__361:
+	goto __373
+__372:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(readCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __365
+		goto __376
 	}
 	goto __15
-__365:
+__376:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*20)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*20)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__362:
+__373:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__366:
+__377:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __366
-__367:
+	goto __377
+__378:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83909,31 +84540,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17329) == 0) {
-		goto __369
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
+		goto __380
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __370
-__369:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17997) == 0) {
-		goto __371
+	goto __381
+__380:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
+		goto __382
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __372
-__371:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17482) == 0) {
-		goto __373
+	goto __383
+__382:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
+		goto __384
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__373:
+__384:
 	;
-__372:
+__383:
 	;
-__370:
+__381:
 	;
-__368:
+__379:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83943,10 +84574,10 @@ __368:
 
 __49:
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__374:
+__385:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83966,19 +84597,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __377
+		goto __388
 	}
 	goto __15
-__377:
+__388:
 	;
-	goto __376
-__375:
+	goto __387
+__386:
 	opMask = U32(0xfffe)
-__376:
+__387:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -83987,86 +84618,86 @@ __376:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__378:
+__389:
 	if !(iDb <= iDbLast) {
-		goto __380
+		goto __391
 	}
 	if !(iDb == 1) {
-		goto __381
+		goto __392
 	}
-	goto __379
-__381:
+	goto __390
+__392:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__382:
+__393:
 	if !(k4 != 0) {
-		goto __384
+		goto __395
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __385
+		goto __396
 	}
-	goto __383
-__385:
+	goto __394
+__396:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__386:
+__397:
 	if !(pIdx6 != 0) {
-		goto __388
+		goto __399
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
-		goto __389
+		goto __400
 	}
 	szThreshold = int16(0)
-	goto __388
-__389:
+	goto __399
+__400:
 	;
-	goto __387
-__387:
+	goto __398
+__398:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __386
-	goto __388
-__388:
+	goto __397
+	goto __399
+__399:
 	;
 	if !(szThreshold != 0) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__390:
+__401:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18005,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __391
+		goto __402
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __392
-__391:
+	goto __403
+__402:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__392:
+__403:
 	;
-	goto __383
-__383:
+	goto __394
+__394:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __382
-	goto __384
-__384:
+	goto __393
+	goto __395
+__395:
 	;
-	goto __379
-__379:
+	goto __390
+__390:
 	iDb++
-	goto __378
-	goto __380
-__380:
+	goto __389
+	goto __391
+__391:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84074,36 +84705,36 @@ __380:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __393
+		goto __404
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__393:
+__404:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+580) == SQLITE_OK) {
-		goto __394
+		goto __405
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 580)))
-__394:
+__405:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+588) == SQLITE_OK) {
-		goto __395
+		goto __406
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 588)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 588)))) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 588)))
-__396:
+__407:
 	;
-__395:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84112,10 +84743,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+596) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 596)) >= int64(0)) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 596))&int64(0x7fffffff)))
-__397:
+__408:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84124,10 +84755,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+604) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 604)) >= int64(0)) {
-		goto __398
+		goto __409
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 604)) & int64(0x7fffffff))
-__398:
+__409:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84135,10 +84766,10 @@ __398:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __399
+		goto __410
 	}
 
-__399:
+__410:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84190,14 +84821,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18023, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18028, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18034, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18043, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18052, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18060, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18068},
-	{FzName: ts + 18075},
+	{FzName: ts + 18066, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18071, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18077, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18086, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18095, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18103, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18111},
+	{FzName: ts + 18118},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84249,7 +84880,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+56, int32(unsafe.Sizeof([200]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18081)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18124)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84257,7 +84888,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18096, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -84270,16 +84901,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18103, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18109)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18152)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18121)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
@@ -84462,13 +85093,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 116 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18136)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18179)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18144, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18148, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -84545,12 +85176,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18152, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
+			ts+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -84559,19 +85190,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5008
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18180, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18211, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18219,
-	ts + 18226,
-	ts + 18238,
+	ts + 18262,
+	ts + 18269,
+	ts + 18281,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84631,7 +85262,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)), db+168) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+168+8, uint32(0), 0, 0x1)
@@ -84663,13 +85294,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*4)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18249)
+			corruptSchema(tls, pData, argv, ts+18292)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)), pIndex+44) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 	}
@@ -84702,16 +85333,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8814
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8876
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*4)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*4)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*4))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7878
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18262
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7938
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18305
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*4)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 40)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 40)).FiDb = iDb
@@ -84789,17 +85420,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 68 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11713)
+		ts+11775)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -84808,44 +85448,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 68 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 68 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18334)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 68 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 28)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18377)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 68 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 28)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 40)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18358,
+		ts+18401,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -84856,57 +85496,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 40)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema + 78)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -84995,8 +85635,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -85109,8 +85751,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+156)-uint32(uintptr(0)+4))
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+160)-uint32(uintptr(0)+4))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -85121,8 +85763,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(292)
-	defer tls.Free(292)
+	bp := tls.Alloc(296)
+	defer tls.Free(296)
 
 	var rc int32
 	var i int32
@@ -85134,8 +85776,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+156)-uint32(uintptr(0)+4))
-	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+160)-uint32(uintptr(0)+4))
+	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -85175,7 +85817,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*16)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18392, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85205,7 +85847,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18422, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85301,7 +85943,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -85400,7 +86042,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85718,8 +86360,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10858
-		var zSp2 uintptr = ts + 10858
+		var zSp1 uintptr = ts + 10920
+		var zSp2 uintptr = ts + 10920
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85727,13 +86369,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18441, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18471))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18514))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85908,7 +86550,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 48)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18505, libc.VaList(bp, 0))
+					ts+18548, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85953,7 +86595,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18555, libc.VaList(bp+8, zName))
+						ts+18598, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85964,7 +86606,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*68 + 36 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*68 + 48)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18619,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18662,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86008,7 +86650,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6526, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -86355,9 +86997,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -86595,16 +87234,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18656
+		z = ts + 18699
 		break
 	case TK_INTERSECT:
-		z = ts + 18666
+		z = ts + 18709
 		break
 	case TK_EXCEPT:
-		z = ts + 18676
+		z = ts + 18719
 		break
 	default:
-		z = ts + 18683
+		z = ts + 18726
 		break
 	}
 	return z
@@ -86614,10 +87253,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18689, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -86637,6 +87279,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18755, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18786
+		}
+		return ts + 1554
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -86703,6 +87352,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -86767,6 +87417,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -86821,7 +87472,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16251
+					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16267
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 40)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, uintptr(0))
@@ -86960,13 +87611,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16251
+				zCol = ts + 16267
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -86974,7 +87625,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*20)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87039,7 +87690,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -87064,7 +87715,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 				} else {
-					zName = ts + 16251
+					zName = ts + 16267
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87074,7 +87725,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 48)) = U32(0)
@@ -87090,7 +87741,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18721, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 48)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+48)
 			}
@@ -87115,45 +87767,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*16)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -87163,14 +87818,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*20)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*20)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18818
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -87180,9 +87867,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 12)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -87226,7 +87910,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+34, pTab+4)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -87377,7 +88061,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18729, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
 	return
 __1:
 	;
@@ -87468,7 +88152,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18778, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -87488,7 +88172,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18820, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -87525,7 +88209,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18826, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -87559,11 +88243,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18841, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18934, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1554
 		}
-		return ts + 18864
+		return ts + 18957
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87664,8 +88348,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18866, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18881, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87712,7 +88396,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18656, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87779,7 +88463,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 48)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+48)
 
@@ -87841,7 +88525,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 76)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+76)
 
@@ -87994,10 +88678,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19014, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18967,
+			ts+19060,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88251,8 +88935,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7174)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88279,13 +88963,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+36, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19049, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19060, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19153, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88297,7 +88981,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19065, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19158, 0)
 	Xsqlite3Select(tls, pParse, p, bp+36)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88711,6 +89395,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff int8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*20)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
@@ -88830,15 +89533,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff int8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*20)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*20)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -89214,16 +89910,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -89283,12 +89996,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15154) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15158) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15168) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -89354,7 +90067,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19071, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19164, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -89437,7 +90150,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19089, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89566,15 +90279,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19112, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 60))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 60))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+36+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 64)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -89592,7 +90302,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+36+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19132, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89608,7 +90318,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19175
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -89634,7 +90344,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19198,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19291,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -89645,9 +90355,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+34, pTab+4)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19236
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19329
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19270
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89694,7 +90404,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19308, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19401, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89806,7 +90516,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19312,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89825,7 +90535,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19351,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19444,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 44)), 0)
@@ -89833,7 +90543,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -89934,7 +90644,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 						} else {
-							zSchemaName = ts + 6386
+							zSchemaName = ts + 6446
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -89949,7 +90659,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*20
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19382, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19475, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 7, 0x80)
 							}
@@ -90014,7 +90724,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*20)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19387,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19480,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90026,7 +90736,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -90045,9 +90755,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19396, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19414, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
 					}
 				}
 			}
@@ -90057,7 +90767,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 116 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19434, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19527, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90116,11 +90826,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, int8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -90179,6 +90885,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*16)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 24)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*16)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(28)
+	defer tls.Free(28)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 44)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -90194,7 +90975,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -90207,13 +90989,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 20)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 20)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19465, 0)
+					ts+19558, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 20)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19516, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -90221,7 +91003,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 20
+	pFunc += 16
 	goto __1
 	goto __3
 __3:
@@ -90241,19 +91023,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 20))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 20
+	pF += 16
 	goto __1
 	goto __3
 __3:
@@ -90267,6 +91052,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -90341,7 +91129,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -90353,7 +91143,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 20
+	pF += 16
 	goto __1
 	goto __3
 __3:
@@ -90371,13 +91161,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 20
+	pC += 16
 	goto __7
 	goto __9
 __9:
@@ -90394,11 +91184,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19549,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19642,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19561
+						return ts + 19654
 					}
 					return ts + 1554
 				}(),
@@ -90419,7 +91209,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90451,14 +91241,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 68 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*68
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -90512,6 +91303,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*68
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 64))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*68)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 68
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -90576,7 +91418,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -90675,7 +91516,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19584,
+		ts+19677,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90736,7 +91577,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19638,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -90850,7 +91691,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 220)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 224)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 36 + 4))&0x100>>8) == 0 ||
@@ -90867,11 +91708,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*68)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 36 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 64)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -90882,7 +91719,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19678, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19771, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+36+4, uint32(1), 5, 0x20)
@@ -90908,7 +91745,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -90940,11 +91777,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19693, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 88)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+88)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 88)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -90978,7 +91813,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 220)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 224)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -91287,12 +92122,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 128)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 128 + 8)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+128, pEList)
@@ -91321,39 +92155,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*20)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 128 + 24)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+128, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+128, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 128 + 24)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+128)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -91364,24 +92174,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -91414,27 +92224,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+128)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+116)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19709
+				return ts + 19802
 			}
-			return ts + 19718
+			return ts + 19811
 		}())
 
 	groupBySort = 1
@@ -91442,47 +92259,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*20)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*16)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*20
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*16
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -91498,45 +92315,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*20)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -91555,16 +92378,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -91595,16 +92418,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -91617,98 +92440,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 36 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*20)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*20)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20))
@@ -91717,79 +92543,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 160)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+116)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19709)
-__148:
+	explainTempTable(tls, pParse, ts+19802)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19727
-			}
-			return ts + 19750
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -91885,7 +92706,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19759, 0)
+		ts+19820, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92118,7 +92939,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19824, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19885, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92162,7 +92983,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19870, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+36, pTableName) != 0) {
 		goto __9
 	}
@@ -92180,7 +93001,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19878, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -92192,7 +93013,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19870, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -92207,7 +93028,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19919, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -92219,22 +93040,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19945, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19983,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20020
+				return ts + 20081
 			}
-			return ts + 20027
+			return ts + 20088
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -92243,7 +93064,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20033, libc.VaList(bp+24, pTableName+8))
+		ts+20094, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -92272,9 +93093,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -92392,7 +93213,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19870, bp+56)
+	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19931, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+64, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+64, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -92425,7 +93246,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20079,
+		ts+20140,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92450,13 +93271,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20127,
+		ts+20188,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20202, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20263, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92712,7 +93533,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20231, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92751,9 +93572,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12086
+				return ts + 6389
 			}
-			return ts + 5893
+			return ts + 5883
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92765,7 +93586,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20251,
+			ts+20312,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -92879,12 +93700,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20313,
+		ts+20374,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20361
+				return ts + 20422
 			}
-			return ts + 20368
+			return ts + 20429
 		}()))
 __15:
 	;
@@ -92998,7 +93819,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20375, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20436, 0)
 	return 1
 }
 
@@ -93181,8 +94002,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(316)
-	defer tls.Free(316)
+	bp := tls.Alloc(320)
+	defer tls.Free(320)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -93215,8 +94036,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 16 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+284, 0, uint32(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 284)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+288, 0, uint32(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 288)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -93228,13 +94049,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20417, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+284, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+288, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -93550,7 +94371,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -93820,7 +94642,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20431,
+		ts+20492,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto update_cleanup
 __27:
@@ -93852,7 +94674,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20467, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -93862,7 +94684,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7653
+				return ts + 7713
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*16)).FzCnName
 		}(),
@@ -94732,7 +95554,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20486)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
 __169:
 	;
 update_cleanup:
@@ -95038,10 +95860,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*int8)(unsafe.Pointer(bp + 152)) = int8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+152, ts+20499, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+152, ts+20560, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20503, libc.VaList(bp+8, bp+152))
+				ts+20564, libc.VaList(bp+8, bp+152))
 			return SQLITE_ERROR
 		}
 
@@ -95132,7 +95954,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12140, -1)
+				ts+12150, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95164,7 +95986,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20576, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20580, uint32(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20637, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint32(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -95312,14 +96134,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20584)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20645)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20624)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
 	return SQLITE_ERROR
 __2:
 	;
@@ -95330,7 +96152,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20667)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
 	return SQLITE_ERROR
 __5:
 	;
@@ -95358,7 +96180,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20685, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -95378,7 +96200,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20708)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
 	goto end_of_vacuum
 __8:
 	;
@@ -95393,7 +96215,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14493)
+	rc = execSql(tls, db, pzErrMsg, ts+14503)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -95438,7 +96260,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20735,
+		ts+20796,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95447,7 +96269,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20843,
+		ts+20904,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95458,7 +96280,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20897,
+		ts+20958,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95469,7 +96291,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21048,
+		ts+21109,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95691,12 +96513,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -95814,7 +96636,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint32(unsafe.Sizeof(uintptr(0))) * uint32(2+*(*int32)(unsafe.Pointer(pTable + 44))))
 	if *(*int32)(unsafe.Pointer(pTable + 44))+3 >= *(*int32)(unsafe.Pointer(db + 116 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 44 + 4)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -95898,11 +96720,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32((int32((*Token)(unsafe.Pointer(pEnd)).Fz)-int32((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21178, libc.VaList(bp, pParse+192))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21239, libc.VaList(bp, pParse+196))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21202,
+			ts+21263,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -95912,7 +96734,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21301, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -95946,7 +96768,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 256
+	var pArg uintptr = pParse + 260
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -95973,7 +96795,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21320, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96011,7 +96833,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21423, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
@@ -96023,7 +96845,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21392
+			var zFormat uintptr = ts + 21453
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96040,7 +96862,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16142, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -96097,7 +96919,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 4))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21438, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21499, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -96155,7 +96977,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+396, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21438, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21499, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -96175,8 +96997,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(284)
-	defer tls.Free(284)
+	bp := tls.Alloc(288)
+	defer tls.Free(288)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -96189,7 +97011,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96642,7 +97464,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -96669,7 +97491,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -96895,10 +97717,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21457
+		return ts + 21518
 	}
 	if i == -1 {
-		return ts + 16251
+		return ts + 16267
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*16)).FzCnName
 }
@@ -96907,15 +97729,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -96926,11 +97748,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
 	}
@@ -96952,27 +97774,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21472, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21533, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21475
+				return ts + 21536
 			}
-			return ts + 21480
+			return ts + 21541
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21488)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21549)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21490)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21551)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
 }
@@ -97015,11 +97837,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+88, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21492, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21553, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21498
+				return ts + 21559
 			}
-			return ts + 21505
+			return ts + 21566
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97029,43 +97851,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10914
+					zFmt = ts + 10976
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21510
+				zFmt = ts + 21571
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21543
+				zFmt = ts + 21604
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21568
+				zFmt = ts + 21629
 			} else {
-				zFmt = ts + 21586
+				zFmt = ts + 21647
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21595, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp int8
-			var zRowid uintptr = ts + 16251
-			Xsqlite3_str_appendf(tls, bp+64, ts+21603, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16267
+			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = int8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21634, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21695, libc.VaList(bp+32, zRowid))
 				cRangeOp = int8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = int8('>')
 			} else {
 				cRangeOp = int8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21644, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21705, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21649,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 12))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21676, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21737, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97097,28 +97919,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+48, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21687, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21748, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21708, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21769, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21464, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21525, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -97179,52 +98002,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 20)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 20)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 20)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)) + 24 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)) + 24 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*20)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*20)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 20)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 20))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 16)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 16)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -98702,7 +99531,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21716, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98730,7 +99559,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21731, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -99248,7 +100077,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21740, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99606,10 +100435,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16100, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15431, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14957, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21754, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16116, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15447, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14967, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21815, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -99986,49 +100815,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*68)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*68)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*68)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*68)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -100036,13 +100854,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*68)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -100107,12 +100928,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -100136,7 +100957,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 20)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 24 + 4))-1)*20)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 24)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -100146,7 +100967,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 10)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -100191,7 +101012,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -100285,7 +101106,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
-				return ts + 21802
+				return ts + 21863
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100296,7 +101117,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -100304,6 +101124,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*48
 		if *(*int32)(unsafe.Pointer(bp + 12)) != 0 {
@@ -100337,7 +101158,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 24 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -100490,6 +101311,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FleftCursor != iCsr {
 				return
 			}
@@ -100658,7 +101482,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21809,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101391,7 +102215,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21845, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*16)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101462,7 +102286,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21871
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101969,7 +102793,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -101989,7 +102813,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*20)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*20)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -102000,10 +102824,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -102014,29 +102838,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -102138,8 +102962,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(24)
-	defer tls.Free(24)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -102151,7 +102975,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -102161,17 +102985,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -102191,19 +103015,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+12)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 12)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+20)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 12)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -102215,19 +103039,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -102237,10 +103061,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -102254,9 +103078,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 20)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+20)
-			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 28)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+28)
+			if *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 				return rc
 			}
 		}
@@ -102281,8 +103105,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(16)
-	defer tls.Free(16)
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -102294,7 +103118,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -102310,21 +103134,21 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 
 	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+8)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 8 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 8 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -102335,7 +103159,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -102657,6 +103481,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*68)).Ffg.Fjointype)&
@@ -102750,8 +103575,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(100)
-	defer tls.Free(100)
+	bp := tls.Alloc(104)
+	defer tls.Free(104)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -102775,8 +103600,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -102928,7 +103754,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 96)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 96)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -102947,7 +103773,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 96)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 96))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 96)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 10)) |= U16(TERM_HIGHTRUTH)
@@ -102961,7 +103787,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 96)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 96)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -102970,9 +103796,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -102991,6 +103821,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -103118,51 +103951,75 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 24))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
-	bp := tls.Alloc(36)
-	defer tls.Free(36)
+	bp := tls.Alloc(40)
+	defer tls.Free(40)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 28)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 28)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -103171,19 +104028,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = bp + 28
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+28)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+28)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
-	bp := tls.Alloc(98)
-	defer tls.Free(98)
+	bp := tls.Alloc(102)
+	defer tls.Free(102)
 
 	var pWInfo uintptr
 	var pProbe uintptr
 
-	*(*I16)(unsafe.Pointer(bp + 92)) = int16(-1)
+	*(*I16)(unsafe.Pointer(bp + 96)) = int16(-1)
 	var pTabList uintptr
 	var pSrc uintptr
 	var pNew uintptr
@@ -103210,14 +104073,14 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Index{})))
 		(*Index)(unsafe.Pointer(bp)).FnKeyCol = U16(1)
 		(*Index)(unsafe.Pointer(bp)).FnColumn = U16(1)
-		(*Index)(unsafe.Pointer(bp)).FaiColumn = bp + 92
-		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 94
+		(*Index)(unsafe.Pointer(bp)).FaiColumn = bp + 96
+		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 98
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+56, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
-		*(*LogEst)(unsafe.Pointer(bp + 94)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
-		*(*LogEst)(unsafe.Pointer(bp + 94 + 1*2)) = int16(0)
+		*(*LogEst)(unsafe.Pointer(bp + 98)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
+		*(*LogEst)(unsafe.Pointer(bp + 98 + 1*2)) = int16(0)
 		pFirst = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FpIndex
 		if int32(*(*uint16)(unsafe.Pointer(pSrc + 36 + 4))&0x1>>0) == 0 {
 			(*Index)(unsafe.Pointer(bp)).FpNext = pFirst
@@ -103254,7 +104117,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -103320,19 +104184,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 44)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -103512,7 +104381,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*4)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103570,7 +104439,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*4)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -103968,7 +104837,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21908, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21969, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104179,8 +105048,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*20)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*20)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -104299,14 +105168,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -104458,7 +105336,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -104566,7 +105444,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21943, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104828,19 +105706,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 752)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 752 + uintptr(i)*84)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*68
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*68
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 44)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 44)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -104852,9 +105732,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -104887,13 +105767,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -105045,7 +105925,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21961, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105109,7 +105989,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21989, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
 	goto __5
 __4:
 	ii = 0
@@ -105810,7 +106690,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -105991,7 +106871,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22007, -1)
+		pCtx, ts+22068, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -106124,7 +107004,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22063, -1)
+					pCtx, ts+22124, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -106213,17 +107093,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22108))
-var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22119))
-var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22130))
-var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22135))
-var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22148))
-var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22158))
-var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22164))
-var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22175))
-var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22185))
-var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22197))
-var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22202))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22169))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22180))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22191))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22196))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22209))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22219))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22225))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22236))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22246))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22258))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22263))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -106269,7 +107149,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22206, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -106313,12 +107193,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22225, 0)
+			ts+22286, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22296, 0)
+				ts+22357, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -106341,7 +107221,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*16)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 					}
 					break
 				}
@@ -106546,7 +107426,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22359, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106662,7 +107542,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 28)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 28)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106673,6 +107553,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+36+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, int8(SQLITE_AFF_NONE))
@@ -106776,7 +107657,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22385, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -106841,15 +107722,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22417
+				zErr = ts + 22478
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22434
+				zErr = ts + 22495
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22450
+				zErr = ts + 22511
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22470, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -106870,7 +107751,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22503, 0)
+				ts+22564, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107026,11 +107907,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22550,
-	ts + 22603,
-	ts + 22007,
-	ts + 22654,
-	ts + 22706,
+	ts + 22611,
+	ts + 22664,
+	ts + 22068,
+	ts + 22715,
+	ts + 22767,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108226,8 +109107,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -108238,13 +109118,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -108426,19 +109303,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22756,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22817,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19750
+							return ts + 22859
 						}
-						return ts + 22798
+						return ts + 22868
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 116 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22804, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22874, 0)
 		}
 	}
 
@@ -108509,7 +109386,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22838,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22908,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109604,7 +110481,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22876, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110579,21 +111456,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16251, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16267, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16164, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16180, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 4)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -111336,7 +112213,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*12 + 4)), yymsp+libc.UintptrFromInt32(-4)*12+4)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+22925)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+22995)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -111500,7 +112377,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 92)) = *(*Token)(unsafe.Pointer(yymsp + 4))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp+32, bp+92))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp+32, bp+92))
 						*(*uintptr)(unsafe.Pointer(yymsp + 4)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 4)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -111717,9 +112594,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*12 + 4)) != 0 {
-							return ts + 6704
+							return ts + 6764
 						}
-						return ts + 6709
+						return ts + 6769
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
@@ -111731,6 +112608,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), *(*uintptr)(unsafe.Pointer(pRHS + 20)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 20)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) == uintptr(0) {
@@ -111998,19 +112880,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)) = *(*Token)(unsafe.Pointer(yymsp + 4))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22958, 0)
+					ts+23028, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23053, 0)
+					ts+23123, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23137, 0)
+					ts+23207, 0)
 			}
 			break
 		case uint32(273):
@@ -112389,9 +113271,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23222, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -113159,7 +114041,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 1248)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 1248)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23239, libc.VaList(bp, bp+1248))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23309, libc.VaList(bp, bp+1248))
 				break
 			}
 		}
@@ -113182,7 +114064,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23264, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -113355,7 +114237,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23275, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -113368,11 +114250,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19870, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23282, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23287, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113385,9 +114267,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23297, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23301, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113621,7 +114503,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -114196,7 +115078,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -114211,7 +115093,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23309, 0)
+			ts+23379, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114402,23 +115284,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23377
+	var zErr uintptr = ts + 23447
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23391
+			zErr = ts + 23461
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23413
+			zErr = ts + 23483
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23435
+			zErr = ts + 23505
 			break
 
 		}
@@ -114436,35 +115318,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23458,
-	ts + 23471,
+	ts + 23528,
+	ts + 23541,
 	uintptr(0),
-	ts + 23487,
-	ts + 23512,
-	ts + 23526,
-	ts + 23545,
+	ts + 23557,
+	ts + 23582,
+	ts + 23596,
+	ts + 23615,
 	ts + 1490,
-	ts + 23570,
-	ts + 23607,
-	ts + 23619,
-	ts + 23634,
-	ts + 23667,
-	ts + 23685,
-	ts + 23710,
-	ts + 23739,
+	ts + 23640,
+	ts + 23677,
+	ts + 23689,
+	ts + 23704,
+	ts + 23737,
+	ts + 23755,
+	ts + 23780,
+	ts + 23809,
 	uintptr(0),
-	ts + 5848,
+	ts + 5838,
 	ts + 5334,
-	ts + 23756,
-	ts + 23774,
-	ts + 23792,
-	uintptr(0),
 	ts + 23826,
+	ts + 23844,
+	ts + 23862,
 	uintptr(0),
-	ts + 23847,
-	ts + 23873,
 	ts + 23896,
+	uintptr(0),
 	ts + 23917,
+	ts + 23943,
+	ts + 23966,
+	ts + 23987,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114565,6 +115447,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	libc.AtomicStoreNInt32(db+304, int32(1), 0)
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(libc.AtomicLoadNInt32(db+304, 0) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -114579,7 +115467,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114624,7 +115512,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23933, 0)
+				ts+24003, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114741,7 +115629,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23996, libc.VaList(bp, zName))
+		ts+24066, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -114977,7 +115865,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24047, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24117, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115070,7 +115958,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -115140,7 +116028,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115150,7 +116038,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115182,14 +116070,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24068, 0)
+				ts+24138, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -115319,7 +116207,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24136, uint32(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24206, uint32(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -115364,10 +116252,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24142, zUri+7, uint32(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint32(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24152,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115472,7 +116360,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24180, zOpt, uint32(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint32(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115483,17 +116371,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24184, zOpt, uint32(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint32(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24184
+	zModeType = ts + 24254
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24190, zOpt, uint32(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint32(4)) == 0) {
 		goto __32
 	}
 
@@ -115531,7 +116419,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24195, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115539,7 +116427,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115579,7 +116467,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24239, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115602,15 +116490,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24255, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24262, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24270, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24273, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24276, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17346, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24340, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24343, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24346, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17362, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115756,10 +116644,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21802, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24280, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -115773,7 +116661,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+12, bp+16)
@@ -115824,9 +116712,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6381
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6441
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23282
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23352
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -115931,7 +116819,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24286
+		zFilename = ts + 24356
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -116034,21 +116922,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24289,
+	Xsqlite3_log(tls, iErr, ts+24359,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24314)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24384)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24334)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24341)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -116206,7 +117094,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24358, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -116862,7 +117750,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24386, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -116980,7 +117868,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24394
+			return ts + 24464
 		}
 		return uintptr(0)
 	}(), 0)
@@ -117157,7 +118045,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6704, ts + 6709, ts + 6191, ts + 6186, ts + 7945, ts + 24417, ts + 24423,
+	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -117310,7 +118198,7 @@ __10:
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0' + int32(c)>>4)
-	c = uint8(*(*int8)(unsafe.Pointer(ts + 24430 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24500 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -117365,7 +118253,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24447, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24517, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117429,13 +118317,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6704, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6709, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
 			break
 
 		}
@@ -117985,12 +118873,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6704, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6764, uint32(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6709, uint32(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6769, uint32(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(5)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -118091,7 +118979,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24476, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24546, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118397,7 +119285,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*int8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24491, uint32(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24561, uint32(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118412,7 +119300,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24495, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118466,7 +119354,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24521,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24591,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118571,11 +119459,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*int8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zPath)))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24564, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24634, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24567, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -118732,14 +119620,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24570, -1)
+			ts+24640, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, int8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24621, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24691, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -118834,7 +119722,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15364)
+	jsonWrongNumArgs(tls, ctx, ts+15380)
 	return
 __2:
 	;
@@ -118909,9 +119797,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24655
+			return ts + 24725
 		}
-		return ts + 24659
+		return ts + 24729
 	}())
 	return
 __2:
@@ -119044,7 +119932,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24666, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119141,7 +120029,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24669, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119185,7 +120073,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24672)
+		ts+24742)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -119316,7 +120204,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24755, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -119335,7 +120223,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*12
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*12
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24761, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 12
@@ -119431,7 +120319,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, int8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24761, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119455,7 +120343,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24766
+				zRoot = ts + 24836
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119520,6 +120408,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -119571,7 +120465,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24476, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24546, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119666,25 +120560,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24768},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24773},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24802},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24815},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24818},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24822},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24834},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24846},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24857},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24868},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24880},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 24893},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24912},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24923},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24940}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24838},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24843},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24872},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24885},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24888},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24892},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24904},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24916},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24927},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24938},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24950},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 24963},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24982},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24993},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25010}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119703,8 +120597,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24958, FpModule: 0},
-	{FzName: ts + 24968, FpModule: 0},
+	{FzName: ts + 25028, FpModule: 0},
+	{FzName: ts + 25038, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -119957,11 +120851,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24978, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24986, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25056, iNode, 0,
 			pRtree+72)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -120172,7 +121066,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24991,
+		ts+25061,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -120870,7 +121764,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25073)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122211,7 +123105,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25087, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -122223,12 +123117,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25107, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25139, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122454,7 +123348,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25176, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25246, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -122477,14 +123371,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(20)
 	defer tls.Free(20)
 
-	var zFmt uintptr = ts + 25321
+	var zFmt uintptr = ts + 25391
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11286, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -122525,7 +123419,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25377, ts + 5060, ts + 16251,
+	ts + 25447, ts + 5060, ts + 16267,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122568,19 +123462,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25382,
+			ts+25452,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25444, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25449,
+			ts+25519,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25513,
+			ts+25583,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25653,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122609,7 +123503,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25632
+			zFormat = ts + 25702
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122621,7 +123515,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25740,
+			ts+25810,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122629,18 +123523,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25785, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25855, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12757, 1)
+					Xsqlite3_str_append(tls, p, ts+12767, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25812, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25834, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25842, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122655,14 +123549,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25858,
-	ts + 25911,
-	ts + 25956,
-	ts + 26008,
-	ts + 26062,
-	ts + 26107,
-	ts + 26165,
-	ts + 26220,
+	ts + 25928,
+	ts + 25981,
+	ts + 26026,
+	ts + 26078,
+	ts + 26132,
+	ts + 26177,
+	ts + 26235,
+	ts + 26290,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122691,7 +123585,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26267, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -122703,7 +123597,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26287,
+			ts+26357,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+16)
 		if rc != SQLITE_OK {
@@ -122711,7 +123605,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26344,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122753,10 +123647,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26379,
-		ts + 26422,
-		ts + 26457,
-		ts + 26493,
+		ts + 26449,
+		ts + 26492,
+		ts + 26527,
+		ts + 26563,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -122787,7 +123681,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*4)), uint32(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26530,
+	Xsqlite3_str_appendf(tls, pSql, ts+26600,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))), *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	ii = 4
 __3:
@@ -122799,7 +123693,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26554, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -122822,7 +123716,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -122918,7 +123812,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26563, ts + 26574}
+var azFormat = [2]uintptr{ts + 26633, ts + 26644}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(592)
@@ -122956,13 +123850,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+44, bp+16, ii, bp+544)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10858, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10920, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26584, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+544)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+544)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+44)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26590, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 544 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 544 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26594, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -122973,7 +123867,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26596, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26666, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123049,7 +123943,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26629,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26699,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4062
@@ -123073,7 +123967,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26636,
+			ts+26706,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123092,7 +123986,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26681, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26751, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -123106,8 +124000,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26713,
-		ts + 26767,
+		ts + 26783,
+		ts + 26837,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 24 + uintptr(bLeaf)*4)) == uintptr(0) {
@@ -123122,23 +124016,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26815,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26885,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26860
+					return ts + 26930
 				}
-				return ts + 26868
+				return ts + 26938
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26877,
+				ts+26947,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26860
+						return ts + 26930
 					}
-					return ts + 26868
+					return ts + 26938
 				}(), iKey, iVal))
 		}
 	}
@@ -123162,7 +124056,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26935, libc.VaList(bp, i, iCell, iNode))
+				ts+27005, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -123182,7 +124076,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26983, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27053, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -123199,14 +124093,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27050, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27084, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27154, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -123214,7 +124108,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27114,
+					ts+27184,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -123243,14 +124137,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27169,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27239,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27200, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -123272,12 +124166,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14493, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14503, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27267, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -123286,12 +124180,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25087, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27295, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27365, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -123305,8 +124199,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27326, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27333, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -123314,7 +124208,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 24 + 1*4)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27341, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27411, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -123329,7 +124223,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27345, -1)
+			ts+27415, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -123337,7 +124231,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6381
+			zDb = ts + 6441
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*4)))
 		}
@@ -123347,7 +124241,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17969
+				return ts + 18012
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123641,7 +124535,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint32(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint32(4)+uint32(6)*uint32(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint32(4)+uint32(6)*uint32(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -123699,6 +124593,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123711,15 +124606,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27396, 1)
+		Xsqlite3_str_append(tls, x, ts+27466, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27398, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27468, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27409, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123739,19 +124635,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep int8 = int8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27420, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27490, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27438, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27508, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = int8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27446, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4)))
 			if z != 0 && *(*int8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27454, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27524, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27458, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123770,6 +124666,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -123801,6 +124698,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -123809,6 +124707,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -123867,6 +124766,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -124035,6 +124935,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -124056,6 +124957,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -124140,6 +125042,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -124168,6 +125072,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124604,6 +125509,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124617,6 +125523,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -124631,6 +125540,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -124655,7 +125565,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*4)), uint32(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27471, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27541, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124664,7 +125574,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27493, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
 	goto __3
 __3:
 	ii++
@@ -124672,7 +125582,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124751,6 +125661,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 36)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 12)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -124879,6 +125790,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -124897,7 +125809,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16251
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16267
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -124907,7 +125819,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27497
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27567
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -124915,7 +125827,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27503
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27573
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125027,7 +125939,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27512, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -125157,14 +126069,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27552) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27568) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27638) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -125201,8 +126115,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint32(i) < uint32(unsafe.Sizeof(aFunc))/uint32(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); i < uint32(unsafe.Sizeof(aFunc))/uint32(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -125219,7 +126133,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint32(i) < uint32(unsafe.Sizeof(aAgg))/uint32(unsafe.Sizeof(struct {
+	for i = uint32(0); i < uint32(unsafe.Sizeof(aAgg))/uint32(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -125229,7 +126143,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27583, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -125241,25 +126155,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [2]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27591},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27604},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27617},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27630},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27568},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27642},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27552},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27665},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27679},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27692},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27706},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27722},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27661},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27674},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27687},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27700},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27638},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27712},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27622},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27735},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27749},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27762},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27776},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27792},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27734},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -125269,26 +126183,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27753, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27763, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27774, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27497, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27785, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125342,7 +126256,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25073, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125657,7 +126571,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27795, -1)
+		Xsqlite3_result_error(tls, context, ts+27865, -1)
 		return
 	}
 
@@ -125668,7 +126582,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27795, -1)
+			Xsqlite3_result_error(tls, context, ts+27865, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125769,7 +126683,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27816, uintptr(0), uintptr(0), p+36)
+				ts+27886, uintptr(0), uintptr(0), p+36)
 		}
 
 		if rc == SQLITE_OK {
@@ -125833,7 +126747,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+24986, zIn, uint32(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+25056, zIn, uint32(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -125854,16 +126768,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+27987, libc.VaList(bp, func() uintptr {
+			ts+28057, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28137
+					return ts + 28207
 				}
 				return ts + 1554
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+4, p+36,
-			ts+28178)
+			ts+28248)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -125979,7 +126893,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28303, libc.VaList(bp, zTab)))
+			ts+28373, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -125997,7 +126911,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*4, p+36,
-		Xsqlite3_mprintf(tls, ts+28422, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28492, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126015,7 +126929,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*4, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28443, libc.VaList(bp+16, zIdx)))
+			ts+28513, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126038,7 +126952,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*4, p+36,
-		Xsqlite3_mprintf(tls, ts+28494, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28564, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126084,7 +126998,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint32(unsafe.Sizeof(U8(0)))*uint32((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+36,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -126099,7 +127013,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint32(unsafe.Sizeof(U8(0)))*uint32((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+20, p+36,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 20))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 20)), 1)
 			if iCid >= 0 {
@@ -126139,7 +127053,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+36, bp+56, pIter+60)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19396, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -126149,18 +127063,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+60, p+36,
-			Xsqlite3_mprintf(tls, ts+28572, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 60)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), i)
-			if Xsqlite3_strnicmp(tls, ts+28591, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28661, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+32)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*4)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28596, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28666, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -126172,18 +127086,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28606, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28635
+							return ts + 28705
 						}
-						return ts + 28648
+						return ts + 28718
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+60, p+36,
-				Xsqlite3_mprintf(tls, ts+28657, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 60))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 1)
@@ -126197,7 +127111,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28679,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28749,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 5)
@@ -126244,8 +127158,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-		zList = rbuMPrintf(tls, p, ts+28706, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14604
+		zList = rbuMPrintf(tls, p, ts+28776, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14614
 	}
 	return zList
 }
@@ -126262,7 +127176,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zRet = rbuMPrintf(tls, p, ts+28715, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -126284,25 +127198,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+36,
 			Xsqlite3_mprintf(tls,
-				ts+28728, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28760, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28830, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+28783)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28789, ts+28796, ts+4957)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+28853)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28859, ts+28866, ts+4957)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+36,
 				Xsqlite3_mprintf(tls,
-					ts+28804,
+					ts+28874,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28846, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28916, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126344,7 +127258,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+36,
-		Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -126379,7 +127293,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 	goto __7
 __6:
-	zCol = ts + 28866
+	zCol = ts + 28936
 __7:
 	;
 	goto __5
@@ -126387,13 +127301,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28874,
+	zLhs = rbuMPrintf(tls, p, ts+28944,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28895,
+	zOrder = rbuMPrintf(tls, p, ts+28965,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28931,
+	zSelect = rbuMPrintf(tls, p, ts+29001,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14604
+	zSep = ts + 14614
 	iCol++
 	goto __1
 __2:
@@ -126411,7 +127325,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 180)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+180, p+36,
-		Xsqlite3_mprintf(tls, ts+28958,
+		Xsqlite3_mprintf(tls, ts+29028,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 180)))) {
 		goto __13
@@ -126438,8 +127352,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29006, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14604
+	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14614
 	goto __15
 __15:
 	iCol++
@@ -126450,7 +127364,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29013, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126483,7 +127397,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+36,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126495,7 +127409,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29025, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29095, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*8)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*8)).FzSpan, zCollate))
 			zType = ts + 1554
 		} else {
@@ -126507,37 +127421,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28866
+					zCol = ts + 28936
 				} else {
-					zCol = ts + 28596
+					zCol = ts + 28666
 				}
 				zType = ts + 1119
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29047, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28783
+					return ts + 28853
 				}
 				return ts + 1554
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29067,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29088,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29121, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14604
-		zAnd = ts + 21464
+		zCom = ts + 14614
+		zAnd = ts + 21525
 		nBind++
 	}
 
@@ -126576,11 +127490,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = Xsqlite3_mprintf(tls, ts+29145, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29215, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29157, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14604
+			zS = ts + 14614
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126588,7 +127502,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29166, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29236, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126600,18 +127514,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29181, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1554
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29195, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21525
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29207, libc.VaList(bp+40, zList))
+			ts+29277, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1554
@@ -126619,8 +127533,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = rbuMPrintf(tls, p, ts+29257, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21525
 			}
 		}
 	}
@@ -126629,7 +127543,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29270, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29340, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126647,17 +127561,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c int8 = *(*int8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29257,
+					zList = rbuMPrintf(tls, p, ts+29327,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29296,
+					zList = rbuMPrintf(tls, p, ts+29366,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29326,
+					zList = rbuMPrintf(tls, p, ts+29396,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				}
 			}
 		}
@@ -126692,19 +127606,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29363
+		var zSep uintptr = ts + 29433
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 60)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+36,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16139) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16155) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+60, p+36,
-						Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126716,15 +127630,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 3) != 0 {
-					zDesc = ts + 28783
+					zDesc = ts + 28853
 				} else {
 					zDesc = ts + 1554
 				}
-				z = rbuMPrintf(tls, p, ts+29376, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14604
+				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14614
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29387, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 60)))
 	}
 	return z
@@ -126744,7 +127658,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+36,
-			ts+29391)
+			ts+29461)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -126753,7 +127667,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+172, p+36,
-				Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -126763,25 +127677,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29441, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29511, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29463, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28783
+						return ts + 28853
 					}
 					return ts + 1554
 				}()))
-				zComma = ts + 14604
+				zComma = ts + 14614
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29473, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 172)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29488,
+			ts+29558,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -126794,7 +127708,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1554
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1554
@@ -126802,39 +127716,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29550
+				zPk = ts + 29620
 			}
-			zSql = rbuMPrintf(tls, p, ts+29563,
+			zSql = rbuMPrintf(tls, p, ts+29633,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*4)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29590
+							return ts + 29660
 						}
 						return ts + 1554
 					}()))
-			zComma = ts + 14604
+			zComma = ts + 14614
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29600, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29670, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29607,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29677,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29639
+						return ts + 29709
 					}
 					return ts + 1554
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -126847,7 +127761,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+88, p+36, Xsqlite3_mprintf(tls,
-				ts+29654,
+				ts+29724,
 				libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -126884,7 +127798,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 4)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+36,
-			ts+29711)
+			ts+29781)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		var rc2 int32
@@ -126989,7 +127903,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29777, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29847, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127009,24 +127923,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+604, bp+608, bp+612)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 612)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29797,
+				ts+29867,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 604))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 612))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+80, p+36,
-					Xsqlite3_mprintf(tls, ts+29862, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29932, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+84, p+36,
-					Xsqlite3_mprintf(tls, ts+29898, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
+					Xsqlite3_mprintf(tls, ts+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127042,7 +127956,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29932,
+						ts+30002,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127050,9 +127964,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29993
+											return ts + 30063
 										}
-										return ts + 29997
+										return ts + 30067
 									}()
 								}
 								return ts + 1554
@@ -127061,20 +127975,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30003,
+						ts+30073,
 						libc.VaList(bp+216, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30064,
+						ts+30134,
 						libc.VaList(bp+264, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29993
+									return ts + 30063
 								}
-								return ts + 29997
+								return ts + 30067
 							}(),
 							zCollist, zLimit))
 				}
@@ -127099,8 +128013,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6392)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6388)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6452)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -127111,16 +128025,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1554
 				}
-				return ts + 30223
+				return ts + 30293
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+80, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30232,
+						ts+30302,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30268
+								return ts + 30338
 							}
 							return ts + 1554
 						}(), zBindings)))
@@ -127129,32 +128043,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+84, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30278, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1554
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30306
+					zRbuRowid = ts + 30376
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30318, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30388, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30394
+							return ts + 30464
 						}
 						return ts + 1554
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30411,
+					ts+30481,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30710,
+						ts+30780,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -127167,9 +128081,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30809
+						zRbuRowid = ts + 30879
 					} else {
-						zRbuRowid = ts + 30819
+						zRbuRowid = ts + 30889
 					}
 				}
 
@@ -127182,20 +128096,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28866, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+76, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30830,
+							ts+30900,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30878
+										return ts + 30948
 									}
 									return ts + 1554
 								}(),
@@ -127208,7 +128122,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19750
+										return ts + 22859
 									}
 									return ts + 1554
 								}(), zOrder,
@@ -127276,9 +128190,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1554
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30223
+				zPrefix = ts + 30293
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30884,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+4, p+36, zUpdate)
@@ -127337,7 +128251,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+36,
-		Xsqlite3_mprintf(tls, ts+30914, libc.VaList(bp, p+24)))
+		Xsqlite3_mprintf(tls, ts+30984, libc.VaList(bp, p+24)))
 	for *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -127407,28 +128321,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30944, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30972, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31042, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+24, ts+3286, uint32(4))
 	} else {
-		libc.Xmemcpy(tls, p+24, ts+6381, uint32(4))
+		libc.Xmemcpy(tls, p+24, ts+6441, uint32(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30990, libc.VaList(bp+24, p+24))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+24))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127461,11 +128375,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31056, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31126, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24136, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*int8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -127477,13 +128391,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31088,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381),
+			zTarget = Xsqlite3_mprintf(tls, ts+31158,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
 						}
-						return ts + 31120
+						return ts + 31190
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
@@ -127502,37 +128416,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31122, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31137, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31154, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31198, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31268, 0)
 	}
 }
 
@@ -127561,15 +128475,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31216, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31286, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -127617,7 +128531,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -127677,7 +128591,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127694,23 +128608,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31251, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31321, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31276, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31283, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -127827,7 +128741,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23774, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23844, 0)
 			return
 		}
 
@@ -127920,7 +128834,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+36,
-			ts+31290)
+			ts+31360)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -127928,7 +128842,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31312, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31382, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -127949,7 +128863,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+36,
 			Xsqlite3_mprintf(tls,
-				ts+31339,
+				ts+31409,
 				libc.VaList(bp, p+24,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -127979,9 +128893,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+36,
-			Xsqlite3_mprintf(tls, ts+31497, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31567, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31512,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31582,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -127995,10 +128909,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 4)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31532, uintptr(0), uintptr(0), p+36)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31602, uintptr(0), uintptr(0), p+36)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-			ts+31557)
+			ts+31627)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128012,12 +128926,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-			ts+31665)
+			ts+31735)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+4, p+36,
-			ts+31730)
+			ts+31800)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128029,7 +128943,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 4)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31774, uintptr(0), uintptr(0), p+36)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31844, uintptr(0), uintptr(0), p+36)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128049,15 +128963,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17224)
-					rbuCopyPragma(tls, p, ts+16335)
+					rbuCopyPragma(tls, p, ts+17240)
+					rbuCopyPragma(tls, p, ts+16351)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31799, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31869, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128081,10 +128995,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+36)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+36)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -128179,7 +129093,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31827, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31897, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -128192,16 +129106,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(12)
+	defer tls.Free(12)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31276, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -128211,7 +129126,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31852, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -128245,7 +129160,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+12,
 		Xsqlite3_mprintf(tls,
-			ts+31863, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 12)), -1)
 	} else {
@@ -128275,13 +129190,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31935, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-				ts+31949)
+				ts+32019)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -128292,7 +129207,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-				ts+32006)
+				ts+32076)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -128366,7 +129281,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32080, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32150, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -128384,12 +129299,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32112,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32182,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32144
+							return ts + 32214
 						}
-						return ts + 32151
+						return ts + 32221
 					}()))
 			}
 		}
@@ -128397,7 +129312,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14493, uintptr(0), uintptr(0), p+36)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14503, uintptr(0), uintptr(0), p+36)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+48)
@@ -128408,19 +129323,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16938)
-						rbuCopyPragma(tls, p, ts+16350)
+						rbuCopyPragma(tls, p, ts+16954)
+						rbuCopyPragma(tls, p, ts+16366)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32158, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+36)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32174, uintptr(0), uintptr(0), p+36)
+								db, ts+32244, uintptr(0), uintptr(0), p+36)
 						}
 					}
 
@@ -128474,7 +129389,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32198, zState+uintptr(n-7), uint32(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32268, zState+uintptr(n-7), uint32(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128501,7 +129416,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); i < nErrmsg-Size_t(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30223, uint32(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30293, uint32(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -128518,7 +129433,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+36)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128531,13 +129446,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+36)
 		}
 
 		rbuObjIterFinalize(tls, p+48)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32206, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32276, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128632,7 +129547,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128649,19 +129564,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14493
+				zBegin = ts + 14503
 			} else {
-				zBegin = ts + 32158
+				zBegin = ts + 32228
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32158, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32228, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128784,11 +129699,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -128927,7 +129845,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -129004,7 +129922,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32233, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32303, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129029,7 +129947,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32256, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129174,7 +130092,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6381)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6441)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -129189,7 +130107,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32267, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32337, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129200,7 +130118,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -129230,6 +130154,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -129989,11 +130928,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11286, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11348, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32278, 0)
+				ts+32348, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
 		} else {
@@ -130006,7 +130945,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32399, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -130104,7 +131043,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11286, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130571,6 +131510,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -130652,6 +131594,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -130681,9 +131624,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32428,
+			zRet = Xsqlite3_mprintf(tls, ts+32498,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4))))
-			zSep = ts + 21464
+			zSep = ts + 21525
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130706,9 +131649,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32462,
+				ts+32532,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4))))
-			zSep = ts + 32503
+			zSep = ts + 32573
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130716,18 +131659,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7470, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32508,
+		ts+32578,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130737,7 +131680,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(4)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -130770,7 +131713,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32586,
+			ts+32656,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130897,7 +131840,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32639, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -131371,9 +132314,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11286, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11348, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32666, libc.VaList(bp, zDb))
+			ts+32736, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_NOMEM
 		}
@@ -131382,18 +132325,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1554
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32776, bp+20)
+		sessionAppendStr(tls, bp+8, ts+32846, bp+20)
 		sessionAppendIdent(tls, bp+8, zDb, bp+20)
 		sessionAppendStr(tls, bp+8, ts+1567, bp+20)
 		sessionAppendIdent(tls, bp+8, zTab, bp+20)
-		sessionAppendStr(tls, bp+8, ts+32791, bp+20)
+		sessionAppendStr(tls, bp+8, ts+32861, bp+20)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+20)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), bp+20)
-				sessionAppendStr(tls, bp+8, ts+32799, bp+20)
+				sessionAppendStr(tls, bp+8, ts+32869, bp+20)
 				sessionAppendInteger(tls, bp+8, i+1, bp+20)
-				zSep = ts + 21464
+				zSep = ts + 21525
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131502,7 +132445,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32805, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32875, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 24))
 	}
@@ -131594,7 +132537,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+12)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32825, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 24))
 }
@@ -131857,7 +132800,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -131880,7 +132823,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -131922,7 +132865,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -131983,7 +132926,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+44, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -132057,13 +133000,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -132125,7 +133068,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*4)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*4)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4)) = uintptr(0)
 				}
@@ -132498,7 +133441,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -132664,7 +133607,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint32(unsafe.Sizeof(SessionUpdate{})) * uint32(nU32) * uint32(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11286) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11348) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_NOMEM
@@ -132675,34 +133618,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*12
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint32(nU32)*uint32(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32843, bp+12)
+				sessionAppendStr(tls, bp, ts+32913, bp+12)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+12)
-				sessionAppendStr(tls, bp, ts+32856, bp+12)
+				sessionAppendStr(tls, bp, ts+32926, bp+12)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*4)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+12)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*4)), bp+12)
-						sessionAppendStr(tls, bp, ts+32862, bp+12)
+						sessionAppendStr(tls, bp, ts+32932, bp+12)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+12)
-						zSep = ts + 14604
+						zSep = ts + 14614
 					}
 				}
 
 				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32791, bp+12)
+				sessionAppendStr(tls, bp, ts+32861, bp+12)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*4)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+12)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32867, bp+12)
+								ts+32937, bp+12)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*4)), bp+12)
-							sessionAppendStr(tls, bp, ts+32799, bp+12)
+							sessionAppendStr(tls, bp, ts+32869, bp+12)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+12)
 						}
-						zSep = ts + 21464
+						zSep = ts + 21525
 					}
 				}
 
@@ -132754,34 +133697,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32942, bp+12)
+	sessionAppendStr(tls, bp, ts+33012, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+32791, bp+12)
+	sessionAppendStr(tls, bp, ts+32861, bp+12)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+12)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
-			sessionAppendStr(tls, bp, ts+32862, bp+12)
+			sessionAppendStr(tls, bp, ts+32932, bp+12)
 			sessionAppendInteger(tls, bp, i+1, bp+12)
-			zSep = ts + 21464
+			zSep = ts + 21525
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32960, bp+12)
+		sessionAppendStr(tls, bp, ts+33030, bp+12)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+12)
-		sessionAppendStr(tls, bp, ts+32503, bp+12)
+		sessionAppendStr(tls, bp, ts+32573, bp+12)
 
 		zSep = ts + 1554
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+12)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
-				sessionAppendStr(tls, bp, ts+32799, bp+12)
+				sessionAppendStr(tls, bp, ts+32869, bp+12)
 				sessionAppendInteger(tls, bp, i+1, bp+12)
-				zSep = ts + 32968
+				zSep = ts + 33038
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4957, bp+12)
@@ -132797,7 +133740,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6381, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
+		db, ts+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -132808,19 +133751,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32973, bp+12)
+	sessionAppendStr(tls, bp, ts+33043, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+21470, bp+12)
+	sessionAppendStr(tls, bp, ts+21531, bp+12)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14604, bp+12)
+			sessionAppendStr(tls, bp, ts+14614, bp+12)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
 	}
 
-	sessionAppendStr(tls, bp, ts+32991, bp+12)
+	sessionAppendStr(tls, bp, ts+33061, bp+12)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33002, bp+12)
+		sessionAppendStr(tls, bp, ts+33072, bp+12)
 	}
 	sessionAppendStr(tls, bp, ts+4957, bp+12)
 
@@ -132836,14 +133779,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11286, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11348, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33006)
+			ts+33076)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+4,
-			ts+33119)
+			ts+33189)
 	}
 	return rc
 }
@@ -132871,7 +133814,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -132880,7 +133823,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(12)
 	defer tls.Free(12)
 
@@ -132957,7 +133900,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+4, bp+8, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 12)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 12)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	}
@@ -133083,7 +134026,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -133124,7 +134067,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33263, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33333, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -133140,7 +134083,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33284, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33354, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -133213,10 +134156,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33303, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33373, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33329, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+124, bp+128, bp+132, uintptr(0))
@@ -133262,7 +134205,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+136, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6381, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
+					db, ts+6441, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -133275,19 +134218,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33359, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 128)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33403,
+						ts+33473,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 140)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 128))))
 				} else if *(*int32)(unsafe.Pointer(bp + 128)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 136)), uint32(*(*int32)(unsafe.Pointer(bp + 128)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33474, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 128))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11286) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11348) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133338,14 +134281,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33534, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33588, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134577,7 +135520,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33616, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134865,7 +135808,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33644, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135050,7 +135993,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33675, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -135118,7 +136061,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33682
+		var zErr uintptr = ts + 33752
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135299,7 +136242,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33732
+		var zErr uintptr = ts + 33802
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135622,13 +136565,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(48)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33780, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33788, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33798, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136178,7 +137121,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33803, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33873, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint32(unsafe.Sizeof(int32(0))) * uint32(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -136205,14 +137148,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*int8)(unsafe.Pointer(p))) < '0' || int32(*(*int8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33810, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33880, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33841, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136223,7 +137166,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33874, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136236,7 +137179,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33911, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + Size_t(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, Sqlite3_int64(unsafe.Sizeof(uintptr(0)))*nArg)
@@ -136245,7 +137188,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33920, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33990, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136264,7 +137207,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33953, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136279,14 +137222,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33987, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33995, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*int8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34027, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136294,9 +137237,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34033, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34047, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136304,9 +137247,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34085, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
 		if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || int32(*(*int8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34096, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34166, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -136316,19 +137259,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 44)) = [4]Fts5Enum{
-			{FzName: ts + 7958, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17329},
-			{FzName: ts + 34131, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17345},
+			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+44, zArg, pConfig+48)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34139, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34209, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34170, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136375,15 +137318,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22130) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16251) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34198, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22191) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34228) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34238, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34308, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136400,13 +137343,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 28)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34269, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34274, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34281, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34351, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136444,8 +137387,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*4)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22130) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34289, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22191) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136477,7 +137420,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34318, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34388, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136514,19 +137457,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33987
+			zTail = ts + 34057
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34338
+			zTail = ts + 34408
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34346, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16251, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16267, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136570,18 +137513,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34357, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34427, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1554
 			}
-			return ts + 14604
+			return ts + 14614
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34373, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*4))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34443, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*4))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34380,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22130))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136691,7 +137634,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34406) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136701,7 +137644,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34411) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34481) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136711,7 +137654,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34420) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34490) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -136724,7 +137667,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34430) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34500) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -136734,7 +137677,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34440) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34510) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -136750,7 +137693,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22130) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22191) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+4)
@@ -136773,7 +137716,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(44)
 	defer tls.Free(44)
 
-	var zSelect uintptr = ts + 34452
+	var zSelect uintptr = ts + 34522
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -136795,7 +137738,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 36))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 36)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 36)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34484) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34554) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 40)) = 0
@@ -136809,7 +137752,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34492,
+				ts+34562,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -136907,7 +137850,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34557, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
 					return FTS5_EOF
 				}
 			}
@@ -136920,20 +137863,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34577, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34647, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = (int32(z2) - int32(z)) / 1
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34608, uint32(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34678, uint32(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34611, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint32(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29993, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint32(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -137019,6 +137962,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*int8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -137047,7 +138001,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 1))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*int8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = int8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -138699,9 +139653,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34615, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33644, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -138717,7 +139671,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c int8 = *(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34620, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -138804,7 +139758,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20467, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -138885,7 +139839,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34649, 0)
+			ts+34719, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -139055,12 +140009,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+20)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34702,
+								ts+34772,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34752
+										return ts + 34822
 									}
-									return ts + 34615
+									return ts + 34685
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140000,7 +140954,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34759, iRowid, 0, p+36)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34829, iRowid, 0, p+36)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -140079,7 +141033,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+40, Xsqlite3_mprintf(tls,
-			ts+34765,
+			ts+34835,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -140104,7 +141058,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34816,
+			ts+34886,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+44, zSql) != 0 {
 			return
@@ -140127,7 +141081,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+52, Xsqlite3_mprintf(tls,
-			ts+34865,
+			ts+34935,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140366,7 +141320,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+64,
-				Xsqlite3_mprintf(tls, ts+34905, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141565,7 +142519,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+56, Xsqlite3_mprintf(tls,
-			ts+34928,
+			ts+34998,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143030,7 +143984,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+48, Xsqlite3_mprintf(tls,
-			ts+35012,
+			ts+35082,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -143521,10 +144475,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint32(nSeg) * uint32(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 20 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*12
+		pLvl = pNew + 20 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*12
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+32, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -144106,13 +145065,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35069, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24986, ts+35077, 0, pzErr)
+				pConfig, ts+25056, ts+35147, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11426,
-					ts+35112,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
+					ts+35182,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144365,7 +145324,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34759, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
+		ts+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 4)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 4)))
@@ -144479,7 +145438,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35156,
+		ts+35226,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -144649,7 +145608,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 8)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+68+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*92, uintptr(0), bp+8)
-			sqlite3Fts5BufferAppendBlob(tls, p+32, bp+8, uint32(4), ts+35242)
+			sqlite3Fts5BufferAppendBlob(tls, p+32, bp+8, uint32(4), ts+35312)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+8)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+8)).Fn, bp+20, bp+24) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 24)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 24)) & int64(0x7FFFFFFF))
@@ -144917,7 +145876,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35247, 0)
+			ts+35317, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145341,11 +146300,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35286,
+		ts+35356,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14604
+					return ts + 14614
 				}
 				return ts + 1554
 			}(),
@@ -145357,9 +146316,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35341
+					return ts + 35411
 				}
-				return ts + 35346
+				return ts + 35416
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145405,12 +146364,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35350, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35420, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5057, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35356, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145441,7 +146400,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35384, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35454, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 20)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -145472,7 +146431,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35394, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35464, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145504,14 +146463,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 56)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35415, libc.VaList(bp, z))
+				ts+35485, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33798
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33868
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145567,7 +146526,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35247, 0)
+		ts+35317, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145784,7 +146743,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35448, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -145929,28 +146888,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35484, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35554, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35495, 0)
+				ts+35565, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35575, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35583, 0)
+				ts+35653, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16918, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35639, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35715, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146008,7 +146967,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*4))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*4)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17463, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17479, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*4)))
@@ -146021,12 +146980,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35661,
+				ts+35731,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20368
+						return ts + 20429
 					}
-					return ts + 35698
+					return ts + 35768
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146656,7 +147615,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35710, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35780, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -146900,7 +147859,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35731, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -146919,7 +147878,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 8
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35753, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35823, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -146966,7 +147925,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35784)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35854)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -146975,7 +147934,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35797, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35867, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -146989,7 +147948,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35888, ts + 33987, ts + 24986, ts + 34338, ts + 11426,
+	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147013,7 +147972,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35895, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147031,13 +147990,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35895, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35900, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35970, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -147092,17 +148053,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 24 + uintptr(eStmt)*4)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35915,
-			ts + 35983,
-			ts + 36052,
-			ts + 36085,
-			ts + 36124,
-			ts + 36164,
-			ts + 36203,
-			ts + 36244,
-			ts + 36283,
-			ts + 36325,
-			ts + 36365,
+			ts + 35985,
+			ts + 36053,
+			ts + 36122,
+			ts + 36155,
+			ts + 36194,
+			ts + 36234,
+			ts + 36273,
+			ts + 36314,
+			ts + 36353,
+			ts + 36395,
+			ts + 36435,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -147204,18 +148165,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36388,
+		ts+36458,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36492,
+			ts+36562,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36530,
+			ts+36600,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -147227,7 +148188,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36568,
+			ts+36638,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147239,14 +148200,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24986, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11426, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35888, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25056, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34338, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33987, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147258,17 +148219,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36610,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36680,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29639
+					return ts + 29709
 				}
 				return ts + 1554
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36640,
+			ts+36710,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147305,27 +148266,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36684, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36707, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36777, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33987, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34338, ts+36713, 0, pzErr)
+				pConfig, ts+34408, ts+36783, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35888, ts+36745, 1, pzErr)
+				pConfig, ts+35958, ts+36815, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147531,12 +148492,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36762,
+		ts+36832,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36812,
+			ts+36882,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147544,7 +148505,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -147720,7 +148681,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36841,
+	zSql = Xsqlite3_mprintf(tls, ts+36911,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -147902,14 +148863,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 36)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33987, bp+36)
+			rc = fts5StorageCount(tls, p, ts+34057, bp+36)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 36)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 44)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34338, bp+44)
+			rc = fts5StorageCount(tls, p, ts+34408, bp+44)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 44)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -148104,9 +149065,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint32(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36873) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36943) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36954) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148320,7 +149281,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36895
+			var zCat uintptr = ts + 36965
 			var i int32
 			libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148332,7 +149293,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36904) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36974) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
 				}
 			}
@@ -148343,18 +149304,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36915) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36985) {
 					if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' && int32(*(*int8)(unsafe.Pointer(zArg))) != '2' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*int8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36873) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36943) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36954) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36904) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36974) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148630,7 +149591,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36933
+	var zBase uintptr = ts + 37003
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -148770,7 +149731,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36943, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37013, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148778,11 +149739,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36946, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36951, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37021, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148790,7 +149751,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36956, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148798,7 +149759,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36959, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148806,11 +149767,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36962, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36967, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37037, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148818,19 +149779,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36972, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36976, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37046, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36982, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37052, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36987, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37057, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148838,11 +149799,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36991, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36995, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148850,7 +149811,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36998, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148858,11 +149819,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37002, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37076, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148870,7 +149831,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37010, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148878,7 +149839,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37014, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148886,7 +149847,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37018, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148902,24 +149863,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37002, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37092, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37028, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37098, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37018, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37088, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -148934,137 +149895,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37105, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37002, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37043, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37050, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37055, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36951, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37060, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36946, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37018, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37070, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15464, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37075, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37028, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37079, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36943, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37154, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36987, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37090, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37094, uint32(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint32(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37096, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37010, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37018, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37110, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37002, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37116, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37002, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37121, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37127, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37014, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37143, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37010, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37155, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37161, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37014, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37167, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37028, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -149079,16 +150040,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37174, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37244, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36959, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149096,21 +150057,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37143, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149118,7 +150079,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37196, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -149126,9 +150087,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37202, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -149143,12 +150104,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37208, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37212, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37215, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -149157,7 +150118,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149313,7 +150274,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37222) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37292) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149493,22 +150454,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(64)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36933, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37237, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37243, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37250, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -150647,14 +151608,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37258) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37328) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37262) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37266) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37275, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150680,19 +151641,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(20)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 4)) = [3]uintptr{
-		ts + 37309,
-		ts + 37349,
-		ts + 37384,
+		ts + 37379,
+		ts + 37419,
+		ts + 37454,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4))) == Size_t(4) && libc.Xmemcmp(tls, ts+23282, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4))) == Size_t(4) && libc.Xmemcmp(tls, ts+23352, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37427, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -150825,11 +151786,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37460, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37491,
+		ts+37561,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+68, uintptr(0))
@@ -150853,7 +151814,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 68)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37542, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -151248,7 +152209,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37568, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151270,7 +152231,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37578
+	return ts + 37648
 }
 
 func init() {
@@ -151325,114 +152286,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1456)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1496)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1536)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1576)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1616)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1656)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1696)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1736)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1776)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1816)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1856)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1896)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1936)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1976)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2016)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2056)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2096)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2136)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1576)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1616)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1656)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1696)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1736)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1776)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1816)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1856)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1896)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1936)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1976)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2016)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2056)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2096)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2136)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2176)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2216)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2256)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2260)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2264)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2268)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2296)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2300)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2304)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2308)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2256)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2296)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2336)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2340)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2344)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2340)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2344)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2348)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2376)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2380)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2384)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2388)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2416)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2420)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2424)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2428)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2456)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2460)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2464)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2468)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2496)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2500)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2508)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2528)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2536)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2568)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2576)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2608)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2376)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2380)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2384)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2388)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2416)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2420)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2424)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2428)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2456)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2460)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2464)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2468)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2496)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2500)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2508)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2536)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2540)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2544)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2548)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2576)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2580)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2584)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2588)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2608)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2728)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2736)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2768)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2776)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2808)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2648)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2656)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2696)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2808)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2816)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2848)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2848)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2856)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2896)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2936)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2888)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2896)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2928)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2936)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3016)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3056)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3088)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3096)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3128)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3136)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3168)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3176)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3208)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3096)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3136)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3168)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3176)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3208)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3216)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3248)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3256)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3288)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3296)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3328)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3248)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3256)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3288)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3296)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3328)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3368)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3376)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3368)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3376)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3416)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3448)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3456)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3488)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3448)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3456)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3488)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3496)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3528)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3528)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3536)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3568)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3568)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3608)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3608)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3616)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3648)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3648)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3656)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3688)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3688)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3728)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3728)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3736)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3776)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3808)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3808)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3816)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3848)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3848)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3856)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3896)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3936)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3976)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4016)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3888)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3896)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3928)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3936)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3976)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4016)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4096)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 16)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 48)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -151893,6 +152856,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 56)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 60)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 64)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 4)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 12)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 20)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 28)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 36)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 44)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 4)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 12)) = rtreeBestIndex
@@ -152211,6 +153186,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1052)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1056)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1060)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1064)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 4)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = sqlite3TestExtInit
@@ -152232,5 +153208,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 68)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_linux_amd64.go b/vendor/modernc.org/sqlite/lib/sqlite_linux_amd64.go
index e4775c89..9e987aac 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_linux_amd64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_linux_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -495,6 +495,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -610,6 +611,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -985,6 +987,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1472,6 +1475,7 @@ const (
 	SF_Recursive                          = 0x0002000
 	SF_Resolved                           = 0x0000004
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1556,6 +1560,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1674,6 +1679,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -2040,6 +2046,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -2137,11 +2144,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -2156,7 +2166,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2264,8 +2274,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2745,6 +2755,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -2924,6 +2935,7 @@ const (
 	X_LINUX_IOCTL_H                       = 0
 	X_LINUX_POSIX_TYPES_H                 = 0
 	X_LINUX_STAT_H                        = 0
+	X_LINUX_STDDEF_H                      = 0
 	X_LINUX_TYPES_H                       = 0
 	X_LP64                                = 1
 	X_MATH_H                              = 1
@@ -4161,6 +4173,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -5778,10 +5791,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -5837,12 +5848,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -6094,7 +6103,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -6215,7 +6223,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -6239,11 +6247,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -6251,11 +6261,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -6887,7 +6897,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -7025,10 +7035,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -7043,12 +7051,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -7238,10 +7244,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -7445,7 +7453,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1099))
@@ -7597,7 +7605,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -7646,8 +7653,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -7658,6 +7675,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -7774,7 +7800,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8625,14 +8651,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = int8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -8640,7 +8666,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -10451,7 +10477,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -10707,6 +10733,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -11693,6 +11721,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -11701,11 +11730,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -11717,30 +11770,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1554
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -11749,83 +11802,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -11839,17 +11892,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -11857,90 +11910,90 @@ __219:
 		}
 		return ts + 1560
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(j))) = int8(0)
 	length = int32(j)
@@ -11948,89 +12001,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -12043,32 +12096,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -12127,7 +12180,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -12143,8 +12196,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -12173,12 +12225,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -12187,7 +12240,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -13307,6 +13360,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -13912,10 +13983,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13941,6 +14015,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = int8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]int8{}))-uint64(1)-uint64(i))
+	return int32(uint64(unsafe.Sizeof([22]int8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14902,11 +14977,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -15807,7 +15883,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -16030,7 +16106,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -16046,113 +16122,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -16284,7 +16360,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16575,7 +16651,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3378, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16592,14 +16668,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16619,7 +16695,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16687,7 +16763,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -16914,7 +16990,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16942,7 +17018,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -17041,7 +17117,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3261, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -17171,7 +17247,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -17217,7 +17293,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -17448,7 +17524,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17582,7 +17658,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+16)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17603,7 +17679,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17919,7 +17995,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3261, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18010,7 +18086,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43337)
 		}
 		return rc
 	}
@@ -18018,9 +18094,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18063,12 +18139,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*int8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -18087,18 +18160,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*24 + 8)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3459, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3459, zIn, 43443)
 			}
 		} else if (*stat)(unsafe.Pointer(bp)).Fst_mode&X__mode_t(0170000) == X__mode_t(0120000) {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls, zIn, bp+144, uint64(unsafe.Sizeof([4098]int8{}))-uint64(2))
 			if got <= int64(0) || got >= Ssize_t(unsafe.Sizeof([4098]int8{}))-int64(2) {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3450, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3450, zIn, 43454)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 144 + uintptr(got))) = int8(0)
@@ -18138,14 +18211,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 4104)).FzOut = zOut
 	if int32(*(*int8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, bp, uint64(unsafe.Sizeof([4098]int8{}))-uint64(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3279, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3279, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+4104, bp)
 	}
 	appendAllPathElements(tls, bp+4104, zPath)
 	*(*int8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+4104)).FnUsed))) = int8(0)
 	if (*DbPath)(unsafe.Pointer(bp+4104)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+4104)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4104)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18246,7 +18319,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == EINTR {
 				got = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*24 + 8)))(tls, fd, zBuf, uint64(nBuf)))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -18254,12 +18327,12 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 }
 
 func unixSleep(tls *libc.TLS, NotUsed uintptr, microseconds int32) int32 {
-	if microseconds >= 1000000 {
-		libc.Xsleep(tls, uint32(microseconds/1000000))
-	}
-	if microseconds%1000000 != 0 {
-		libc.Xusleep(tls, uint32(microseconds%1000000))
-	}
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	(*timespec)(unsafe.Pointer(bp)).Ftv_sec = X__time_t(microseconds / 1000000)
+	(*timespec)(unsafe.Pointer(bp)).Ftv_nsec = X__syscall_slong_t(microseconds % 1000000 * 1000)
+	libc.Xnanosleep(tls, bp, uintptr(0))
 	_ = NotUsed
 	return microseconds
 }
@@ -22170,7 +22243,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -23222,7 +23295,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -23239,7 +23311,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -23305,7 +23376,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -23315,7 +23385,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23506,36 +23576,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -23707,7 +23766,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23831,7 +23890,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23870,7 +23929,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23947,7 +24006,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24859,10 +24918,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]int8{int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0)}
@@ -24948,7 +25009,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25705,7 +25766,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25804,7 +25865,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -26390,7 +26451,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26665,7 +26726,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27138,7 +27199,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27643,7 +27704,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27878,8 +27939,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27887,23 +27948,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -28299,7 +28362,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28436,7 +28499,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -28453,7 +28516,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -28461,7 +28524,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -28504,7 +28567,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28514,7 +28577,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -28764,7 +28827,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28811,7 +28874,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28821,7 +28884,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28834,7 +28897,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28843,14 +28906,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28860,7 +28923,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -28924,7 +28987,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -28934,7 +28997,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28956,7 +29019,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28991,7 +29054,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -29004,13 +29067,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -29035,7 +29098,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -29046,7 +29109,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -29098,22 +29161,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29123,7 +29186,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29131,7 +29194,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29139,10 +29202,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29166,13 +29229,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29180,7 +29242,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29188,32 +29289,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -29241,11 +29331,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -29256,15 +29346,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29292,14 +29382,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellOffset+i*2)))))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -29313,7 +29403,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29325,7 +29415,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29428,7 +29518,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29456,7 +29546,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29495,7 +29585,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -30378,7 +30468,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30793,7 +30883,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30819,7 +30909,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -30828,7 +30918,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30839,7 +30929,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30855,7 +30945,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30916,7 +31006,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30951,7 +31041,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -31011,7 +31101,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31050,7 +31140,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31081,7 +31171,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31422,7 +31512,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31666,14 +31756,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31718,7 +31808,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31767,7 +31857,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -31847,7 +31937,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31938,7 +32028,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -31958,7 +32048,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32022,18 +32112,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -32049,6 +32129,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -32170,7 +32258,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -32374,7 +32462,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32439,7 +32527,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -32487,7 +32575,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -32606,7 +32694,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32766,7 +32854,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32831,7 +32919,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32867,7 +32955,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32911,7 +32999,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -33023,7 +33111,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -33181,7 +33269,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33238,7 +33326,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -33254,7 +33342,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -33328,7 +33416,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33340,7 +33428,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -33351,7 +33439,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33516,7 +33604,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33540,9 +33628,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -33565,16 +33653,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -33595,9 +33681,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -33731,11 +33823,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -33788,12 +33883,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -33801,7 +33896,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33861,7 +33956,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -33950,7 +34045,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -34066,7 +34161,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -34109,8 +34204,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -34192,6 +34287,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -34384,7 +34481,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -34395,7 +34492,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -34553,7 +34650,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -34627,7 +34724,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -34653,9 +34750,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -34666,8 +34764,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -34689,7 +34787,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -34717,7 +34815,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -34978,11 +35076,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -35170,7 +35268,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -35208,7 +35306,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -35285,7 +35383,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -35297,19 +35395,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -35322,7 +35412,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35341,6 +35431,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -35376,7 +35483,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -35385,13 +35491,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -35402,7 +35507,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -35515,7 +35620,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -35529,20 +35634,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -35552,7 +35657,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -35560,100 +35671,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -35662,30 +35773,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -35708,7 +35819,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -35727,13 +35837,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, uint64(nIn))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -35750,7 +35862,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35809,9 +35921,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -35851,7 +35963,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -35859,11 +35971,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35938,7 +36050,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35948,7 +36060,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -36007,7 +36119,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36036,7 +36148,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -36112,7 +36224,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36126,7 +36238,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36260,7 +36372,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36435,12 +36547,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -36448,15 +36589,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4062, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -36480,9 +36621,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if libc.AtomicLoadNInt32((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb+432, 0) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -36496,7 +36634,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
 		return
@@ -36570,7 +36708,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -36655,48 +36795,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4318, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4356, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -36711,29 +36858,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -36741,28 +36888,28 @@ __9:
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(pCellIdx))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4470,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4500, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -36770,97 +36917,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4548, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellStart+i*2)))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -36870,48 +37017,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4610,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -36940,9 +37087,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -36974,19 +37121,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -36998,7 +37139,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -37006,7 +37147,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -37091,7 +37232,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -37134,22 +37275,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -37376,8 +37514,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -37877,7 +38015,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
 		libc.Xmemcpy(tls, bp+8, p, uint64(int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int*2))
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+16, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+16, ts+4925,
@@ -37889,6 +38027,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*int8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+16)).FnChar))) = int8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 16)).FnChar)
 	}
 }
 
@@ -38076,7 +38215,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -38250,16 +38388,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -38702,7 +38842,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38939,43 +39079,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -39360,7 +39491,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39375,14 +39506,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39752,7 +39883,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -39764,13 +39897,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -39847,6 +39982,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -40735,7 +40873,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -40744,7 +40882,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -40778,7 +40916,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -40820,7 +40957,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -41572,7 +41709,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -41680,7 +41817,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42231,7 +42368,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -42296,7 +42433,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42330,7 +42467,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42380,7 +42517,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -42526,7 +42663,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -42697,7 +42834,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42723,7 +42860,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42997,7 +43134,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43349,8 +43486,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -43360,15 +43500,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -43556,6 +43696,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -43608,7 +43749,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -43672,6 +43813,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -43683,9 +43833,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5357)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -43919,7 +44070,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -43943,8 +44094,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -44118,15 +44269,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5367, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44237,14 +44388,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -44528,7 +44682,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -44672,7 +44826,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -44844,7 +44998,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*int8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5407, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5397, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -44899,21 +45053,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5418, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5431, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5434, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5424, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5439, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
 			}
 		}
 	}
@@ -45005,11 +45159,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity int8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -45140,8 +45294,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -45376,7 +45530,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -45477,593 +45630,597 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
+
+	case OP_IfNoHope:
 		goto __100
-	case OP_NotFound:
+	case OP_NoConflict:
 		goto __101
-	case OP_Found:
+	case OP_NotFound:
 		goto __102
+	case OP_Found:
+		goto __103
 
 	case OP_SeekRowid:
-		goto __103
-	case OP_NotExists:
 		goto __104
-
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46072,56 +46229,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -46129,20 +46286,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -46150,124 +46308,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5441, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5462, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5452, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5469, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5459, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -46275,10 +46433,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -46289,9 +46447,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -46299,171 +46457,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint64(uintptr(0)+24))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -46471,95 +46629,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = int8(0)
@@ -46567,231 +46725,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -46800,95 +46958,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46898,189 +47056,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -47089,38 +47251,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -47128,9 +47290,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -47141,298 +47303,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -47442,144 +47605,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -47587,353 +47750,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len))
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = int8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5493,
+	Xsqlite3VdbeError(tls, p, ts+5483,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*int8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -47947,319 +48110,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*int8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -48267,467 +48419,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5534, 0)
+	Xsqlite3VdbeError(tls, p, ts+5524, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5585, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5607, 0)
+		ts+5597, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5661, 0)
+		ts+5651, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5716
+				return ts + 5706
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5764
+					return ts + 5754
 				}
-				return ts + 5807
+				return ts + 5797
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5848)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -48735,67 +48898,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -48806,24 +48969,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -48831,30 +48994,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -48870,22 +49033,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -48899,133 +49062,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1554
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -49033,18 +49196,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49055,92 +49218,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -49158,106 +49321,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -49266,108 +49429,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49375,14 +49538,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -49392,108 +49555,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, int8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -49512,35 +49675,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -49548,123 +49711,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49674,52 +49837,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -49731,15 +49894,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -49747,13 +49911,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -49766,11 +49930,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -49781,38 +49945,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -49824,47 +49988,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -49873,35 +50037,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49910,51 +50074,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -49964,72 +50128,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50037,43 +50201,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50081,84 +50245,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50168,34 +50337,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -50204,10 +50373,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -50224,14 +50393,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50244,21 +50413,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50270,62 +50439,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5876)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -50338,56 +50507,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -50398,54 +50567,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -50453,72 +50622,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -50527,55 +50696,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5893
+	goto __799
+__798:
+	zSchema = ts + 5883
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5907,
+		ts+5897,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -50585,66 +50754,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -50653,151 +50822,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5950, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -50805,10 +50975,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -50828,26 +50998,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -50859,7 +51029,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -50870,170 +51040,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -51050,146 +51220,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -51197,70 +51367,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5987,
+		ts+5977,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6039
+				return ts + 6029
 			}
-			return ts + 6044
+			return ts + 6034
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -51268,17 +51438,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -51288,14 +51458,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -51305,197 +51475,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6051, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5357, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -51509,27 +51679,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -51537,72 +51707,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.Xmemset(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -51612,192 +51782,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -51806,63 +51976,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= int8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -51872,104 +52042,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -51977,52 +52147,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6086,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -52141,8 +52315,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -52162,7 +52336,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -52182,8 +52356,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -52214,8 +52388,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -52248,8 +52422,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52329,8 +52503,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52399,7 +52573,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -52427,12 +52601,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 3663
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52476,7 +52650,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52559,7 +52733,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -55098,6 +55272,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6381, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6389+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6408+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -55117,7 +55319,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -55172,7 +55373,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6381, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
 		goto __8
 	}
 
@@ -55293,7 +55494,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6386) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55301,73 +55502,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -55379,28 +55598,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -55411,160 +55630,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6388, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6392, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6396, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -55573,8 +55793,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -55582,19 +55802,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -55602,81 +55822,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6405, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6436, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -55689,141 +55909,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6491, libc.VaList(bp+16, zCol))
+		ts+6551, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6526
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6586
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6535
+		zErr = ts + 6595
 	} else {
-		zErr = ts + 6550
+		zErr = ts + 6610
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6572, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -55867,15 +56087,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6602
+	var zIn uintptr = ts + 6662
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6630
+		zIn = ts + 6690
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6648
+		zIn = ts + 6708
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6666
+		zIn = ts + 6726
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6684, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55954,10 +56174,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6704
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6764
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -56004,7 +56224,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6715, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6775, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56068,7 +56288,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6732, libc.VaList(bp, pExpr))
+								ts+6792, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56084,7 +56304,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6796,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6856,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56098,7 +56318,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6832, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6892, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56121,30 +56341,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6860, libc.VaList(bp+16, pExpr))
+						ts+6920, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6903
+						zType = ts + 6963
 					} else {
-						zType = ts + 6910
+						zType = ts + 6970
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6920, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6948, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7008, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6970,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7014,
+						ts+7074,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56216,7 +56436,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7062, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7122, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -56232,7 +56452,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7073, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7133, pExpr, pExpr)
 			}
 
 			break
@@ -56288,7 +56508,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56363,7 +56583,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7084, libc.VaList(bp, i, zType, mx))
+		ts+7144, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56383,7 +56603,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7140, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7200, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56418,7 +56638,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7174, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56475,7 +56695,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7180, libc.VaList(bp, i+1))
+				ts+7240, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56503,7 +56723,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7241, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7301, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56717,7 +56937,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7272, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7332, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56757,7 +56977,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56768,7 +56988,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7311) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56780,7 +57000,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7317, 0)
+						ts+7377, 0)
 					return WRC_Abort
 				}
 
@@ -56880,12 +57100,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -56921,12 +57141,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -57036,33 +57256,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) int8 {
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) int8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -57132,7 +57453,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -57467,7 +57789,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 		return
 	}
 
@@ -57542,7 +57864,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7376, libc.VaList(bp, mxHeight))
+			ts+7436, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57791,10 +58113,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7424,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7468
+						return ts + 7528
 					}
 					return ts + 1554
 				}(), nElem))
@@ -57835,7 +58157,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57861,7 +58183,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7472, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7532, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57889,7 +58211,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7506, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7566, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57936,7 +58258,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7526,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7586,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57961,7 +58283,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7569, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7629, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58536,7 +58858,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58659,7 +58981,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7622, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7682, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58715,10 +59037,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6704) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6764) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6709) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59148,13 +59470,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff int8) int32
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7645) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7705) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7653) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7659) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
 		return 1
 	}
 	return 0
@@ -59358,7 +59680,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7663, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59436,7 +59758,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7710, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -59530,7 +59852,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7741
+		var zFmt uintptr = ts + 7801
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59548,7 +59870,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	}
 }
 
@@ -59589,7 +59911,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7785, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59619,11 +59941,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7808, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7868, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1554
 			}
-			return ts + 7827
+			return ts + 7887
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59750,7 +60072,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7839, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -59765,12 +60087,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7857, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1554
 		}
-		return ts + 7827
+		return ts + 7887
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -59791,7 +60114,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59800,7 +60123,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7878)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7938)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60186,8 +60509,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7880, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7883,
+			if Xsqlite3_strnicmp(tls, z, ts+7940, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4932
@@ -60263,7 +60586,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60349,8 +60672,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -60436,14 +60759,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 7940, ts + 7945, ts + 7950, ts + 6191, ts + 6186}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
+				ts + 6186, ts + 8018}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7958
+						return ts + 8026
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60457,7 +60782,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60480,10 +60805,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -60583,7 +60908,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -60713,12 +61038,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -60727,110 +61053,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -60873,13 +61212,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -60889,11 +61228,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -60916,11 +61255,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -60929,15 +61268,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -60964,20 +61303,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -60986,9 +61325,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -61026,14 +61365,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -61044,17 +61385,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -61066,128 +61407,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7990, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -61195,42 +61536,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -61253,23 +61594,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -61286,42 +61627,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -61342,15 +61685,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61360,22 +61703,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61384,21 +61727,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61408,27 +61751,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8014, 0)
+		ts+8082, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61437,7 +61780,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -61448,7 +61791,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]int8)(unsafe.Pointer(ts + 8064))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8132))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62820,18 +63163,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -62861,7 +63204,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -62874,12 +63217,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -62887,6 +63328,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -62901,81 +63382,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -62997,34 +63405,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -63114,7 +63521,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -63122,7 +63529,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -63173,11 +63580,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63189,13 +63596,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8108,
+		ts+8170,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8283,
+			ts+8345,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63205,10 +63612,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8457, libc.VaList(bp, zDb, zDb))
+		ts+8519, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8604, 0)
+			ts+8666, 0)
 	}
 }
 
@@ -63272,7 +63679,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8755, libc.VaList(bp, zName))
+		ts+8817, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63282,7 +63689,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8814, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63291,7 +63698,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8820, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63332,19 +63739,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8847, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9031,
+		ts+9093,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9336, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9352,
+		ts+9414,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63352,7 +63759,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9410, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63364,7 +63771,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9675, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63376,7 +63783,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9688,
+		ts+9750,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63422,12 +63829,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9726, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9758, 0)
+			ts+9820, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63437,11 +63844,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9785)
+				ts+9847)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9844)
+				ts+9906)
 		}
 
 		if pDflt != 0 {
@@ -63454,12 +63861,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9897)
+					ts+9959)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9943)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63470,7 +63877,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9970,
+			ts+10032,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63492,7 +63899,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10116,
+				ts+10178,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63540,14 +63947,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10346, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10380, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63575,7 +63982,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10410, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -63615,18 +64022,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10429
+		zType = ts + 10491
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10434
+		zType = ts + 10496
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10448,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10466
+					return ts + 10528
 				}
-				return ts + 10483
+				return ts + 10545
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -63710,7 +64117,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -63727,17 +64134,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10522,
+		ts+10584,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10704,
+		ts+10766,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9675, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9737, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63932,7 +64339,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -63995,10 +64402,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10835,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10897,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10858
+				return ts + 10920
 			}
 			return ts + 1554
 		}(), zWhen,
@@ -64040,8 +64447,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10860, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10922, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64058,7 +64465,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64080,7 +64487,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10868, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10930, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64120,10 +64527,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))
 				*(*int8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = int8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10874, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10936, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*int8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10858
+							return ts + 10920
 						}
 						return ts + 1554
 					}()))
@@ -64299,8 +64706,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -64383,15 +64790,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -64419,7 +64826,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -64452,13 +64859,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64471,7 +64878,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64486,7 +64893,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -64542,8 +64949,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -64591,7 +64998,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -64659,8 +65066,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64702,11 +65109,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.Xmemset(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.Xmemset(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -64799,8 +65206,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64818,16 +65225,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -64842,31 +65249,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -64884,8 +65291,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64911,9 +65318,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -64941,8 +65348,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -64979,7 +65386,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -65003,7 +65410,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10879, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -65084,17 +65491,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10886,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10948,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10914
+				return ts + 10976
 			}
 			return ts + 6127
 		}(),
@@ -65105,7 +65512,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10926, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65122,10 +65529,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10974, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11095, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11157, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -65243,11 +65650,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11113},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11134},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11154},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11173},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11192}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11175},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11196},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11216},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65281,7 +65688,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11215, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -65290,10 +65697,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11238,
+					ts+11300,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11268, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -65311,9 +65718,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11286, FzCols: ts + 11299},
-	{FzName: ts + 11312, FzCols: ts + 11325},
-	{FzName: ts + 11353},
+	{FzName: ts + 11348, FzCols: ts + 11361},
+	{FzName: ts + 11374, FzCols: ts + 11387},
+	{FzName: ts + 11415},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65332,7 +65739,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -65411,7 +65817,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -65457,13 +65863,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -65476,11 +65882,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -65504,17 +65910,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11366}
+	FzName:     ts + 11428}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -65525,8 +65931,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -65569,7 +65975,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -65597,7 +66003,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -65664,7 +66070,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -65680,8 +66086,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -65698,9 +66104,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -65708,14 +66114,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -65723,31 +66129,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -65755,7 +66161,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11376}
+	FzName:     ts + 11438}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -65769,20 +66175,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11386,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11448,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11391, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65824,7 +66230,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+11397, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -65838,7 +66244,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11403}
+	FzName:     ts + 11465}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -65882,7 +66288,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11412, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65899,7 +66305,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11286, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11348, uint64(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -66055,7 +66461,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66112,7 +66518,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66159,9 +66565,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11426)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11488)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11430)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66247,16 +66653,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1554
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*int8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -66266,15 +66672,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*int8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11434, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11496, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11445, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11455, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11517, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -66354,7 +66760,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -66368,42 +66774,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -66477,15 +66883,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -66550,11 +66956,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11312, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11374, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11467,
-			ts+11521,
+			ts+11529,
+			ts+11583,
 			zDb)
 	}
 	return rc
@@ -66601,10 +67007,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11286, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11573, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66662,12 +67068,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6381, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6441, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -66678,13 +67084,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -66705,128 +67114,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3835)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3835)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11614, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11617,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11654, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11679,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.Xmemset(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11684, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+11713, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+11775, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -66836,89 +67268,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11781, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66972,14 +67404,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11809, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11871, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11830, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66987,7 +67419,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11856, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67029,42 +67461,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -67073,13 +67511,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -67098,7 +67536,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11878}
+	FzName:     ts + 11940}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67111,7 +67549,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11892}
+	FzName:     ts + 11954}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67125,7 +67563,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11906, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67157,7 +67595,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11930,
+						ts+11992,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67332,7 +67770,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11976, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67358,11 +67796,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12005, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12011, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67409,7 +67847,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 7653
+		zCol = ts + 7713
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67433,7 +67871,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12100, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -67658,6 +68096,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -67670,13 +68111,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -67701,25 +68142,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6381) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+12086)
+						ts+6389)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5893)
+						ts+5883)
 				}
 			}
 		}
@@ -67740,12 +68181,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5893)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5883)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+12086)
+					ts+6389)
 			}
 		}
 	}
@@ -67776,7 +68217,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12105, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12115, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67794,14 +68235,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12113
+			zMsg = ts + 12123
 		} else {
-			zMsg = ts + 12126
+			zMsg = ts + 12136
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67831,12 +68272,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
-			return ts + 12072
+	if Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
+			return ts + 6427
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12086+7) == 0 {
-			return ts + 12053
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
+			return ts + 6408
 		}
 	}
 	return zName
@@ -68194,7 +68635,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5893)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5883)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68220,7 +68661,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6381, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
 				goto __3
 			}
 
@@ -68273,13 +68714,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12140, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12150, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12157, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68321,9 +68762,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8072, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12177,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68483,9 +68924,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68501,7 +68942,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12219, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
 	return
 __4:
 	;
@@ -68529,9 +68970,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10429
+			return ts + 10491
 		}
-		return ts + 8814
+		return ts + 8876
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68547,9 +68988,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68580,12 +69021,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12260,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10429
+				return ts + 10491
 			}
-			return ts + 8814
+			return ts + 8876
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68600,7 +69041,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12281, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -68687,7 +69128,7 @@ var nullRow = [6]int8{int8(6), int8(0), int8(0), int8(0), int8(0), int8(0)}
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+12316, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12326, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -68711,7 +69152,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12333, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12343, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68731,7 +69172,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12316
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12326
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -68743,7 +69184,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12316, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12326, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68777,7 +69218,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68785,13 +69226,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12390, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12400, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12397, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12407, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -68828,7 +69269,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12407, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12417, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68992,10 +69433,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12433,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12443,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12478, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -69026,7 +69467,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12519, 0)
+			ts+12529, 0)
 	}
 }
 
@@ -69071,7 +69512,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12571, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69160,7 +69601,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12612, 0)
+		ts+12622, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69255,7 +69696,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12668, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
 	goto generated_done
 __2:
 	;
@@ -69268,13 +69709,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12711, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12719, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69301,13 +69742,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12726,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69429,12 +69877,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1554
-		zSep2 = ts + 12757
+		zSep2 = ts + 12767
 		zEnd = ts + 4957
 	} else {
-		zSep = ts + 12759
-		zSep2 = ts + 12763
-		zEnd = ts + 12768
+		zSep = ts + 12769
+		zSep2 = ts + 12773
+		zEnd = ts + 12778
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69442,7 +69890,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12771, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*int8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = int8('(')
@@ -69480,11 +69928,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1554,
-	ts + 12785,
-	ts + 12791,
-	ts + 12796,
+	ts + 12795,
+	ts + 12801,
+	ts + 12806,
+	ts + 12811,
 	ts + 12801,
 }
 
@@ -69892,10 +70341,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12807,
+						ts+12817,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12840,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69914,11 +70363,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12867, 0)
+				ts+12877, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12917, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69952,7 +70401,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12949, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
 			return
 		}
 	}
@@ -69977,11 +70426,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8814
-			zType2 = ts + 12993
+			zType = ts + 8876
+			zType2 = ts + 13003
 		} else {
-			zType = ts + 10429
-			zType2 = ts + 12999
+			zType = ts + 10491
+			zType2 = ts + 13009
 		}
 
 		if pSelect != 0 {
@@ -70043,7 +70492,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -70052,11 +70501,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+13004, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13019,
+			ts+13029,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70072,13 +70521,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13117,
+					ts+13127,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13159, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70093,7 +70542,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9336) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9398) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70123,7 +70572,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13193, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13203, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70139,7 +70588,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10429, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -70221,7 +70670,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13229, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70249,8 +70698,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, int8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -70347,13 +70795,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13259, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13269, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13274,
+		ts+13284,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -70394,10 +70842,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13341, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13351, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11238,
+				ts+11300,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70429,12 +70877,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13355,
+			ts+13365,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13400,
+		ts+13410,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -70462,11 +70910,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7073, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70544,9 +70992,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70605,21 +71053,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13467, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13495, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13529, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70631,7 +71079,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11430, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -70695,7 +71143,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13561,
+		ts+13571,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -70707,7 +71155,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13624, 0)
+		ts+13634, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70792,7 +71240,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13718,
+		ts+13728,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -71019,12 +71467,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13764,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13774,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13792
+							return ts + 13802
 						}
-						return ts + 13798
+						return ts + 13808
 					}()))
 				return 1
 			}
@@ -71145,7 +71593,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13803, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -71164,7 +71612,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13809,
+		ts+13819,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71190,26 +71638,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13859, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13887, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13897, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13912, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71223,7 +71671,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13803, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71238,7 +71686,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13946, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71250,7 +71698,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13980, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71279,7 +71727,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14004, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71300,9 +71748,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71341,7 +71789,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13803)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71442,7 +71890,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14027, 0)
+		ts+14037, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71659,7 +72107,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14088, libc.VaList(bp+48, 0))
+		ts+14098, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -71711,8 +72159,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14130, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -71758,12 +72206,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14147,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1554
 			}
-			return ts + 14167
+			return ts + 14177
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71771,7 +72219,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14175,
+		ts+14185,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -71785,7 +72233,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14234, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71946,7 +72394,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14261, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71961,7 +72409,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14279, libc.VaList(bp+8, 0))
+		ts+14289, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71972,9 +72420,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72000,9 +72448,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14352,
+		ts+14362,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11426, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -72137,7 +72585,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14412,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14422,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72345,12 +72793,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14448,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14458,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14484
+				return ts + 14494
 			}
-			return ts + 14487
+			return ts + 14497
 		}()))
 	goto append_from_error
 __1:
@@ -72519,7 +72967,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14493, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72555,9 +73003,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14499
+				return ts + 14509
 			}
-			return ts + 14508
+			return ts + 14518
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72582,7 +73030,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14493, ts + 14515, ts + 14499}
+var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72597,7 +73045,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14523, 0)
+				ts+14533, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72734,14 +73182,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14593, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14604, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14614, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
@@ -72767,11 +73215,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14607, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72901,7 +73349,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14616, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72997,7 +73445,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14662, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14672, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73190,7 +73638,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14692, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73470,7 +73918,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73502,11 +73950,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14756, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14785, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74010,7 +74458,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14823)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
 __62:
 	;
 delete_from_cleanup:
@@ -74125,7 +74573,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11286) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11348) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74355,7 +74803,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 7945, ts + 7940, ts + 6181}
+var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 8005, ts + 8000, ts + 6181}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74414,7 +74862,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14836, -1)
+					Xsqlite3_result_error(tls, context, ts+14846, -1)
 					return
 				}
 				iVal = -iVal
@@ -74718,7 +75166,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14853, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75064,7 +75512,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14858, -1)
+		Xsqlite3_result_error(tls, context, ts+14868, -1)
 		return
 	}
 	if argc == 3 {
@@ -75074,7 +75522,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14891, -1)
+				ts+14901, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75173,7 +75621,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14936, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14946, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75188,21 +75636,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = int8('\'')
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = int8(0)
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = int8('\'')
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = int8(0)
 				*(*int8)(unsafe.Pointer(zText)) = int8('X')
 				*(*int8)(unsafe.Pointer(zText + 1)) = int8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -75210,7 +75658,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14943, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14953, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -75324,6 +75772,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1554
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -75526,7 +76087,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10858}
+var azOne = [1]uintptr{ts + 10920}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75562,7 +76123,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(j))) = int8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14946, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14956, 4, uintptr(0))
 	}
 }
 
@@ -75587,7 +76148,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12038, -1)
+		Xsqlite3_result_error(tls, context, ts+12100, -1)
 		return
 	}
 
@@ -75665,7 +76226,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14836, -1)
+			Xsqlite3_result_error(tls, context, ts+14846, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75927,7 +76488,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14951, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14961, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75947,14 +76508,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14957, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14957, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76084,17 +76645,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -76153,6 +76714,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -76193,108 +76755,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14962},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14982},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14995},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15013},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15022},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15045},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15071},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15096},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15105},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15116},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15123},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15154},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15154},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15154},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15158},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15162},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15169},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15177},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15184},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15190},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15197},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15204},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15212},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15217},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14992},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 15005},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15023},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15032},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15055},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15081},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15106},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15115},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15126},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15133},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15164},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15164},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15164},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15168},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15179},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15187},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15194},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15200},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15207},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15222},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15227},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15233},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15239},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15243},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15257},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15275},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15290},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15307},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15318},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15324},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15350},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15364},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15398},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15402},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15408},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15237},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15249},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15259},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15266},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15273},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15284},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15291},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15306},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15323},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15334},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15340},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15358},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15366},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15380},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15414},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15431},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15436},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15441},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15449},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15455},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15461},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15468},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15474},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15479},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15483},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15487},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15493},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15497},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15507},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15512},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15424},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15447},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15452},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15457},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15465},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15471},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15484},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15490},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15495},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15503},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15509},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15513},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15530},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15540},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15545},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15523},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15528},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15534},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15538},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15542},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15546},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15551},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15557},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15563},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15568},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15576},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15584},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15587},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6526},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15592}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15556},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15561},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15567},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15573},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15579},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15584},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15592},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15600},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6586},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15608}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76415,7 +76979,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15596,
+				ts+15612,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -77075,8 +77639,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6392, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6388, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6452, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6448, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77577,7 +78141,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7910, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78045,7 +78609,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15641,
+		ts+15657,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78070,7 +78634,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15682,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -78219,7 +78783,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15714,
+		ts+15730,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78229,7 +78793,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15766, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78281,7 +78845,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15791,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78289,7 +78853,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15837, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -78701,7 +79265,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15858)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
 __125:
 	;
 insert_cleanup:
@@ -79017,8 +79581,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 								onError, iReg)
 							Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -80108,7 +80673,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -80554,6 +81119,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80592,7 +81158,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12038, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -80601,7 +81167,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15872
+		zEntry = ts + 15888
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -80616,7 +81182,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -80652,7 +81218,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15895, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -80666,7 +81232,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15904, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -80690,7 +81256,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15908, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -80708,7 +81274,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15914, libc.VaList(bp+16, zEntry, zFile))
+		ts+15930, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80735,7 +81301,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15957, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80773,7 +81339,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15989, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80783,7 +81349,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16026,
+	ts + 16042,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80939,7 +81505,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16029, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80948,62 +81514,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5057,
-	ts + 16068,
-	ts + 8814,
-	ts + 16072,
-	ts + 16077,
-	ts + 16080,
-	ts + 16090,
-	ts + 16100,
+	ts + 16084,
+	ts + 8876,
+	ts + 16088,
+	ts + 16093,
+	ts + 16096,
 	ts + 16106,
-	ts + 16110,
-	ts + 16115,
-	ts + 16120,
-	ts + 16128,
-	ts + 16139,
-	ts + 16142,
-	ts + 16149,
-	ts + 16110,
-	ts + 16115,
-	ts + 16156,
-	ts + 16161,
-	ts + 16164,
-	ts + 16171,
-	ts + 16106,
-	ts + 16110,
+	ts + 16116,
+	ts + 16122,
+	ts + 16126,
+	ts + 16131,
+	ts + 16136,
+	ts + 16144,
+	ts + 16155,
+	ts + 16158,
+	ts + 16165,
+	ts + 16126,
+	ts + 16131,
+	ts + 16172,
 	ts + 16177,
-	ts + 16182,
+	ts + 16180,
 	ts + 16187,
-	ts + 16110,
-	ts + 16191,
-	ts + 16115,
-	ts + 16199,
+	ts + 16122,
+	ts + 16126,
+	ts + 16193,
+	ts + 16198,
 	ts + 16203,
-	ts + 16208,
-	ts + 11430,
-	ts + 11426,
-	ts + 16214,
+	ts + 16126,
+	ts + 16207,
+	ts + 16131,
+	ts + 16215,
 	ts + 16219,
 	ts + 16224,
-	ts + 16068,
-	ts + 16110,
-	ts + 16229,
-	ts + 16236,
-	ts + 16243,
-	ts + 8814,
-	ts + 16251,
-	ts + 5060,
-	ts + 16257,
-	ts + 16068,
-	ts + 16110,
-	ts + 16262,
+	ts + 11492,
+	ts + 11488,
+	ts + 16230,
+	ts + 16235,
+	ts + 16240,
+	ts + 16084,
+	ts + 16126,
+	ts + 16245,
+	ts + 16252,
+	ts + 16259,
+	ts + 8876,
 	ts + 16267,
-	ts + 15464,
-	ts + 16272,
-	ts + 16285,
-	ts + 16294,
+	ts + 5060,
+	ts + 16273,
+	ts + 16084,
+	ts + 16126,
+	ts + 16278,
+	ts + 16283,
+	ts + 15480,
+	ts + 16288,
 	ts + 16301,
-	ts + 16312,
+	ts + 16310,
+	ts + 16317,
+	ts + 16328,
 }
 
 // Definitions of all built-in pragmas
@@ -81021,238 +81587,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16320,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16335,
+	{FzName: ts + 16351,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16350,
+	{FzName: ts + 16366,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16362,
+	{FzName: ts + 16378,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16394,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16301,
+	{FzName: ts + 16317,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16391,
+	{FzName: ts + 16407,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16403,
+	{FzName: ts + 16419,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16423,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16439,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16455,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16460,
+	{FzName: ts + 16476,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16475,
+	{FzName: ts + 16491,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16507,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16505,
+	{FzName: ts + 16521,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16518,
+	{FzName: ts + 16534,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16532,
+	{FzName: ts + 16548,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16551,
+	{FzName: ts + 16567,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16570,
+	{FzName: ts + 16586,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16593,
+	{FzName: ts + 16609,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16618,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16620,
+	{FzName: ts + 16636,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16637,
+	{FzName: ts + 16653,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16650,
+	{FzName: ts + 16666,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16665,
+	{FzName: ts + 16681,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16683,
+	{FzName: ts + 16699,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16693,
+	{FzName: ts + 16709,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16723,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16739,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16748,
+	{FzName: ts + 16764,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16767,
+	{FzName: ts + 16783,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16778,
+	{FzName: ts + 16794,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16789,
+	{FzName: ts + 16805,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16801,
+	{FzName: ts + 16817,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16833,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16830,
+	{FzName: ts + 16846,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16849,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16868,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16881,
+	{FzName: ts + 16897,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16896,
+	{FzName: ts + 16912,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16906,
+	{FzName: ts + 16922,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16918,
+	{FzName: ts + 16934,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16943,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16938,
+	{FzName: ts + 16954,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16948,
+	{FzName: ts + 16964,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16960,
+	{FzName: ts + 16976,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16971,
+	{FzName: ts + 16987,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16983,
+	{FzName: ts + 16999,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17000,
+	{FzName: ts + 17016,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17019,
+	{FzName: ts + 17035,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17045,
+	{FzName: ts + 17061,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17060,
+	{FzName: ts + 17076,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17074,
+	{FzName: ts + 17090,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17093,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17107,
+	{FzName: ts + 17123,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17139,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17135,
+	{FzName: ts + 17151,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17146,
+	{FzName: ts + 17162,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17157,
+	{FzName: ts + 17173,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17169,
+	{FzName: ts + 17185,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17180,
+	{FzName: ts + 17196,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17201,
+	{FzName: ts + 17217,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17209,
+	{FzName: ts + 17225,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17224,
+	{FzName: ts + 17240,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17237,
+	{FzName: ts + 17253,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17256,
+	{FzName: ts + 17272,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17271,
+	{FzName: ts + 17287,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81274,7 +81840,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17287))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17303))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -81286,10 +81852,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17312) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17328) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81298,13 +81864,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7958) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8026) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17329) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17334) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81319,9 +81885,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*int8)(unsafe.Pointer(z))) >= '0' && int32(*(*int8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*int8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16262) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16278) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17346) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81335,7 +81901,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17353, 0)
+				ts+17369, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -81426,19 +81992,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17415
+		zName = ts + 17431
 		break
 	case OE_SetDflt:
-		zName = ts + 17424
+		zName = ts + 17440
 		break
 	case OE_Cascade:
-		zName = ts + 17436
+		zName = ts + 17452
 		break
 	case OE_Restrict:
-		zName = ts + 17444
+		zName = ts + 17460
 		break
 	default:
-		zName = ts + 17453
+		zName = ts + 17469
 		break
 	}
 	return zName
@@ -81455,7 +82021,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17463, ts + 17470, ts + 17478, ts + 17482, ts + 17346, ts + 17491,
+	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81502,13 +82068,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17495
+			zType = ts + 17511
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17497
+			zType = ts + 17513
 		} else {
-			zType = ts + 7468
+			zType = ts + 7528
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17499,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -81516,7 +82082,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17506, ts + 17511, ts + 17519}
+var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -81667,14 +82233,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -81761,7 +82329,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17527, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82022,7 +82590,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17531) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82094,7 +82662,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17322
+	zRet = ts + 17338
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82132,7 +82700,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17312
+	zRet = ts + 17328
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82419,7 +82987,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17536, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82460,7 +83028,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17561, 0)
+		ts+17577, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82514,7 +83082,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17614) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
 		goto __142
 	}
 
@@ -82611,9 +83179,9 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17620
+			return ts + 17636
 		}
-		return ts + 17628
+		return ts + 17644
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -82682,7 +83250,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17635, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82728,29 +83296,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10429
+	zType = ts + 10491
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12711
+	zType = ts + 12721
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17651
+	zType = ts + 17667
 	goto __183
 __182:
-	zType = ts + 8814
+	zType = ts + 8876
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82816,7 +83384,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17665, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82826,7 +83394,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17670,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -82863,8 +83431,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17675, ts + 17677, ts + 16139}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17679,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82897,7 +83465,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -82919,7 +83487,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17689, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82983,7 +83551,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82999,7 +83567,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83034,7 +83602,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17692,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83042,7 +83610,7 @@ __226:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+17701))
+			ts+17717))
 	goto __227
 __227:
 	j2++
@@ -83231,7 +83799,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17706, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 600)))
@@ -83448,7 +84016,7 @@ __284:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17710, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -83509,262 +84077,284 @@ __299:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 612)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__300:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __301
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __300
+	}
+	mxCol = -1
+	j4 = 0
+__302:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __304
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __305
+	}
+	mxCol++
+__305:
+	;
+	goto __303
+__303:
+	j4++
+	goto __302
+	goto __304
+__304:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __306
 	}
 	mxCol--
-	goto __300
+__306:
+	;
+	goto __301
+__300:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __301:
 	;
 	if !(mxCol >= 0) {
-		goto __302
+		goto __307
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__302:
+__307:
 	;
 	if !!(isQuick != 0) {
-		goto __303
+		goto __308
 	}
 	if !(pPk1 != 0) {
-		goto __304
+		goto __309
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 612)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17734,
+		ts+17750,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__305:
+__310:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __307
+		goto __312
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 612)), j4, r2+j4)
-	goto __306
-__306:
+	goto __311
+__311:
 	j4++
-	goto __305
-	goto __307
-__307:
+	goto __310
+	goto __312
+__312:
 	;
-__304:
+__309:
 	;
-__303:
+__308:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__308:
+__313:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __310
+		goto __315
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __311
+		goto __316
 	}
-	goto __309
-__311:
+	goto __314
+__316:
 	;
 	if !(bStrict != 0) {
-		goto __312
+		goto __317
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __313
-__312:
+	goto __318
+__317:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__313:
+__318:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __314
+		goto __319
 	}
-	goto __309
-__314:
+	goto __314
+__319:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __316
-__315:
+	goto __321
+__320:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __317
+		goto __322
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 624)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		uint8((*Column)(unsafe.Pointer(pCol1)).Faffinity), bp+624)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 624)) != 0) {
-		goto __318
+		goto __323
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
-__318:
+__323:
 	;
-__317:
+__322:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 612))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __319
+		goto __324
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __320
-__319:
+	goto __325
+__324:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__320:
+__325:
 	;
-__316:
+__321:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __321
+		goto __326
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17770, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __323
-__322:
+	goto __328
+__327:
 	;
-__323:
+__328:
 	;
-__321:
+__326:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __324
+		goto __329
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17790,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __325
-__324:
+	goto __330
+__329:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __326
+		goto __331
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17812,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __327
-__326:
+	goto __332
+__331:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __328
+		goto __333
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
-__329:
+__334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17835, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17837,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__328:
+__333:
 	;
-__327:
+__332:
 	;
-__325:
+__330:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __309
-__309:
+	goto __314
+__314:
 	j4++
-	goto __308
-	goto __310
-__310:
+	goto __313
+	goto __315
+__315:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __330
+		goto __335
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __331
+		goto __336
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 612)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__332:
+__337:
 	if !(k3 > 0) {
-		goto __334
+		goto __339
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __333
-__333:
+	goto __338
+__338:
 	k3--
-	goto __332
-	goto __334
-__334:
+	goto __337
+	goto __339
+__339:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17857,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__331:
+__336:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__330:
+__335:
 	;
 	if !!(isQuick != 0) {
-		goto __335
+		goto __340
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__336:
+__341:
 	if !(pIdx5 != 0) {
-		goto __338
+		goto __343
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __339
+		goto __344
 	}
-	goto __337
-__339:
+	goto __342
+__344:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 612)), 0, 0, bp+632,
 		pPrior, r1)
@@ -83773,80 +84363,119 @@ __339:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 616))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17892)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__345:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __347
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __348
+	}
+	goto __346
+__348:
+	;
+	if !(label6 == 0) {
+		goto __349
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__349:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 616))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	if !(label6 != 0) {
+		goto __350
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__350:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __340
+		goto __351
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__341:
+__352:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __343
+		goto __354
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __344
+		goto __355
 	}
-	goto __342
-__344:
+	goto __353
+__355:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17956)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__351:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
 	goto __342
 __342:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __341
 	goto __343
 __343:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17913)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __340:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
-	goto __337
-__337:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __336
-	goto __338
-__338:
-	;
-__335:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __345
+		goto __356
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17940)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__346:
+__357:
 	if !(pIdx5 != 0) {
-		goto __348
+		goto __359
 	}
 	if !(pPk1 == pIdx5) {
-		goto __349
+		goto __360
 	}
-	goto __347
-__349:
+	goto __358
+__360:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83855,21 +84484,21 @@ __349:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __347
-__347:
+	goto __358
+__358:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __346
-	goto __348
-__348:
+	goto __357
+	goto __359
+__359:
 	;
 	if !(pPk1 != 0) {
-		goto __350
+		goto __361
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__350:
+__361:
 	;
-__345:
+__356:
 	;
 	goto __291
 __291:
@@ -83887,14 +84516,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __351
+		goto __362
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 608))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 17969
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18012
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__351:
+__362:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83902,27 +84531,27 @@ __351:
 
 __45:
 	if !!(zRight != 0) {
-		goto __352
+		goto __363
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __354
+		goto __365
 	}
 	goto pragma_out
-__354:
+__365:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __353
-__352:
+	goto __364
+__363:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __355
+		goto __366
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__356:
+__367:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __358
+		goto __369
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __359
+		goto __370
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83931,25 +84560,25 @@ __356:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __358
-__359:
+	goto __369
+__370:
 	;
-	goto __357
-__357:
+	goto __368
+__368:
 	pEnc += 16
-	goto __356
-	goto __358
-__358:
+	goto __367
+	goto __369
+__369:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __360
+		goto __371
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17972, libc.VaList(bp+456, zRight))
-__360:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+__371:
 	;
-__355:
+__366:
 	;
-__353:
+__364:
 	;
 	goto __15
 
@@ -83957,15 +84586,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __361
+		goto __372
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __363
+		goto __374
 	}
 	goto __15
-__363:
+__374:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -83973,41 +84602,41 @@ __363:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __364
+		goto __375
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__364:
+__375:
 	;
-	goto __362
-__361:
+	goto __373
+__372:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __365
+		goto __376
 	}
 	goto __15
-__365:
+__376:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__362:
+__373:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__366:
+__377:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __366
-__367:
+	goto __377
+__378:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84022,31 +84651,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17329) == 0) {
-		goto __369
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
+		goto __380
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __370
-__369:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17997) == 0) {
-		goto __371
+	goto __381
+__380:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
+		goto __382
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __372
-__371:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17482) == 0) {
-		goto __373
+	goto __383
+__382:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
+		goto __384
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__373:
+__384:
 	;
-__372:
+__383:
 	;
-__370:
+__381:
 	;
-__368:
+__379:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84056,10 +84685,10 @@ __368:
 
 __49:
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__374:
+__385:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84079,19 +84708,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __377
+		goto __388
 	}
 	goto __15
-__377:
+__388:
 	;
-	goto __376
-__375:
+	goto __387
+__386:
 	opMask = U32(0xfffe)
-__376:
+__387:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84100,86 +84729,86 @@ __376:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__378:
+__389:
 	if !(iDb <= iDbLast) {
-		goto __380
+		goto __391
 	}
 	if !(iDb == 1) {
-		goto __381
+		goto __392
 	}
-	goto __379
-__381:
+	goto __390
+__392:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__382:
+__393:
 	if !(k4 != 0) {
-		goto __384
+		goto __395
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __385
+		goto __396
 	}
-	goto __383
-__385:
+	goto __394
+__396:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__386:
+__397:
 	if !(pIdx6 != 0) {
-		goto __388
+		goto __399
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __389
+		goto __400
 	}
 	szThreshold = int16(0)
-	goto __388
-__389:
+	goto __399
+__400:
 	;
-	goto __387
-__387:
+	goto __398
+__398:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __386
-	goto __388
-__388:
+	goto __397
+	goto __399
+__399:
 	;
 	if !(szThreshold != 0) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__390:
+__401:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18005,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __391
+		goto __402
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __392
-__391:
+	goto __403
+__402:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__392:
+__403:
 	;
-	goto __383
-__383:
+	goto __394
+__394:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __382
-	goto __384
-__384:
+	goto __393
+	goto __395
+__395:
 	;
-	goto __379
-__379:
+	goto __390
+__390:
 	iDb++
-	goto __378
-	goto __380
-__380:
+	goto __389
+	goto __391
+__391:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84187,36 +84816,36 @@ __380:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __393
+		goto __404
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__393:
+__404:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __394
+		goto __405
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__394:
+__405:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __395
+		goto __406
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 648)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__396:
+__407:
 	;
-__395:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84225,10 +84854,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__397:
+__408:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84237,10 +84866,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __398
+		goto __409
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__398:
+__409:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84248,10 +84877,10 @@ __398:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __399
+		goto __410
 	}
 
-__399:
+__410:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84303,14 +84932,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18023, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18028, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18034, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18043, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18052, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18060, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18068},
-	{FzName: ts + 18075},
+	{FzName: ts + 18066, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18071, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18077, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18086, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18095, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18103, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18111},
+	{FzName: ts + 18118},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84362,7 +84991,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18081)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18124)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84370,7 +84999,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18096, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -84383,16 +85012,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18103, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18109)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18152)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18121)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
@@ -84575,13 +85204,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18136)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18179)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18144, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18148, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -84658,12 +85287,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18152, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -84672,19 +85301,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5008
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18180, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18211, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18219,
-	ts + 18226,
-	ts + 18238,
+	ts + 18262,
+	ts + 18269,
+	ts + 18281,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84744,7 +85373,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -84776,13 +85405,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18249)
+			corruptSchema(tls, pData, argv, ts+18292)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 	}
@@ -84815,16 +85444,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8814
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8876
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7878
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18262
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7938
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18305
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -84902,17 +85531,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11713)
+		ts+11775)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -84921,44 +85559,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18334)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18377)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18358,
+		ts+18401,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -84969,57 +85607,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -85108,8 +85746,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -85222,8 +85862,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -85234,8 +85874,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -85247,8 +85887,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -85288,7 +85928,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18392, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85318,7 +85958,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18422, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85414,7 +86054,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -85513,7 +86153,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85831,8 +86471,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10858
-		var zSp2 uintptr = ts + 10858
+		var zSp1 uintptr = ts + 10920
+		var zSp2 uintptr = ts + 10920
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85840,13 +86480,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18441, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18471))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18514))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86021,7 +86661,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18505, libc.VaList(bp, 0))
+					ts+18548, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86066,7 +86706,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18555, libc.VaList(bp+8, zName))
+						ts+18598, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86077,7 +86717,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18619,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18662,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86121,7 +86761,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6526, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -86468,9 +87108,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -86708,16 +87345,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18656
+		z = ts + 18699
 		break
 	case TK_INTERSECT:
-		z = ts + 18666
+		z = ts + 18709
 		break
 	case TK_EXCEPT:
-		z = ts + 18676
+		z = ts + 18719
 		break
 	default:
-		z = ts + 18683
+		z = ts + 18726
 		break
 	}
 	return z
@@ -86727,10 +87364,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18689, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -86750,6 +87390,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18755, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18786
+		}
+		return ts + 1554
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -86816,6 +87463,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -86880,6 +87528,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -86934,7 +87583,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16251
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16267
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -87073,13 +87722,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16251
+				zCol = ts + 16267
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -87087,7 +87736,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87152,7 +87801,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -87177,7 +87826,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16251
+					zName = ts + 16267
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87187,7 +87836,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87203,7 +87852,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18721, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -87228,45 +87878,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -87276,14 +87929,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18818
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -87293,9 +87978,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -87339,7 +88021,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -87490,7 +88172,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18729, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
 	return
 __1:
 	;
@@ -87581,7 +88263,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18778, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -87601,7 +88283,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18820, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -87638,7 +88320,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18826, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -87672,11 +88354,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18841, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18934, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1554
 		}
-		return ts + 18864
+		return ts + 18957
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87777,8 +88459,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18866, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18881, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87825,7 +88507,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18656, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87892,7 +88574,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -87954,7 +88636,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88107,10 +88789,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19014, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18967,
+			ts+19060,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88364,8 +89046,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7174)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88392,13 +89074,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19049, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19060, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19153, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88410,7 +89092,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19065, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19158, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88825,6 +89507,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff int8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -88944,15 +89645,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff int8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -89328,16 +90022,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -89397,12 +90108,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15154) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15158) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15168) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -89468,7 +90179,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19071, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19164, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -89551,7 +90262,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19089, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89680,15 +90391,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19112, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -89706,7 +90414,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19132, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89722,7 +90430,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19175
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -89748,7 +90456,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19198,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19291,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -89759,9 +90467,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19236
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19329
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19270
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89808,7 +90516,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19308, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19401, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89920,7 +90628,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19312,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89939,7 +90647,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19351,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19444,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -89947,7 +90655,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90048,7 +90756,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6386
+							zSchemaName = ts + 6446
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90063,7 +90771,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19382, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19475, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -90128,7 +90836,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19387,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19480,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90140,7 +90848,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -90159,9 +90867,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19396, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19414, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
 					}
 				}
 			}
@@ -90171,7 +90879,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19434, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19527, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90230,11 +90938,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, int8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -90293,6 +90997,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -90308,7 +91087,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -90321,13 +91101,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19465, 0)
+					ts+19558, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19516, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -90335,7 +91115,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -90355,19 +91135,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -90381,6 +91164,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -90455,7 +91241,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -90467,7 +91255,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -90485,13 +91273,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -90508,11 +91296,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19549,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19642,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19561
+						return ts + 19654
 					}
 					return ts + 1554
 				}(),
@@ -90533,7 +91321,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90565,14 +91353,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -90626,6 +91415,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -90690,7 +91530,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -90789,7 +91628,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19584,
+		ts+19677,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90850,7 +91689,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19638,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -90964,7 +91803,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -90981,11 +91820,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -90996,7 +91831,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19678, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19771, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -91022,7 +91857,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -91054,11 +91889,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19693, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -91092,7 +91925,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -91401,12 +92234,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -91435,39 +92267,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -91478,24 +92286,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -91528,27 +92336,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19709
+				return ts + 19802
 			}
-			return ts + 19718
+			return ts + 19811
 		}())
 
 	groupBySort = 1
@@ -91556,47 +92371,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -91612,45 +92427,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -91669,16 +92490,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -91709,16 +92530,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -91731,98 +92552,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -91831,79 +92655,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19709)
-__148:
+	explainTempTable(tls, pParse, ts+19802)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19727
-			}
-			return ts + 19750
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -92000,7 +92819,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19759, 0)
+		ts+19820, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92233,7 +93052,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19824, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19885, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92277,7 +93096,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19870, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -92295,7 +93114,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19878, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -92307,7 +93126,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19870, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -92322,7 +93141,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19919, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -92334,22 +93153,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19945, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19983,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20020
+				return ts + 20081
 			}
-			return ts + 20027
+			return ts + 20088
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -92358,7 +93177,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20033, libc.VaList(bp+24, pTableName+8))
+		ts+20094, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -92387,9 +93206,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -92507,7 +93326,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19870, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19931, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -92540,7 +93359,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20079,
+		ts+20140,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92565,13 +93384,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20127,
+		ts+20188,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20202, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20263, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92827,7 +93646,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20231, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92866,9 +93685,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12086
+				return ts + 6389
 			}
-			return ts + 5893
+			return ts + 5883
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92880,7 +93699,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20251,
+			ts+20312,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -92994,12 +93813,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20313,
+		ts+20374,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20361
+				return ts + 20422
 			}
-			return ts + 20368
+			return ts + 20429
 		}()))
 __15:
 	;
@@ -93113,7 +93932,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20375, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20436, 0)
 	return 1
 }
 
@@ -93296,8 +94115,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -93330,8 +94149,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -93343,13 +94162,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20417, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -93665,7 +94484,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -93935,7 +94755,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20431,
+		ts+20492,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -93967,7 +94787,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20467, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -93977,7 +94797,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7653
+				return ts + 7713
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -94847,7 +95667,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20486)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
 __169:
 	;
 update_cleanup:
@@ -95153,10 +95973,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*int8)(unsafe.Pointer(bp + 216)) = int8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20499, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20560, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20503, libc.VaList(bp+8, bp+216))
+				ts+20564, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -95247,7 +96067,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12140, -1)
+				ts+12150, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95279,7 +96099,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20576, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20580, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20637, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -95427,14 +96247,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20584)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20645)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20624)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
 	return SQLITE_ERROR
 __2:
 	;
@@ -95445,7 +96265,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20667)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
 	return SQLITE_ERROR
 __5:
 	;
@@ -95473,7 +96293,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20685, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -95493,7 +96313,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20708)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
 	goto end_of_vacuum
 __8:
 	;
@@ -95508,7 +96328,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14493)
+	rc = execSql(tls, db, pzErrMsg, ts+14503)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -95553,7 +96373,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20735,
+		ts+20796,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95562,7 +96382,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20843,
+		ts+20904,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95573,7 +96393,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20897,
+		ts+20958,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95584,7 +96404,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21048,
+		ts+21109,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95806,12 +96626,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -95929,7 +96749,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96013,11 +96833,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21178, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21239, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21202,
+			ts+21263,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -96027,7 +96847,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21301, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96061,7 +96881,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -96088,7 +96908,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21320, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96126,7 +96946,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21423, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -96138,7 +96958,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21392
+			var zFormat uintptr = ts + 21453
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96155,7 +96975,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16142, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -96212,7 +97032,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21438, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21499, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -96270,7 +97090,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21438, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21499, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -96290,8 +97110,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -96304,7 +97124,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96757,7 +97577,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -96784,7 +97604,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -97015,10 +97835,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21457
+		return ts + 21518
 	}
 	if i == -1 {
-		return ts + 16251
+		return ts + 16267
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97027,15 +97847,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -97046,11 +97866,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
 	}
@@ -97072,27 +97892,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21472, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21533, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21475
+				return ts + 21536
 			}
-			return ts + 21480
+			return ts + 21541
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21488)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21549)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21490)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21551)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
 }
@@ -97135,11 +97955,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21492, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21553, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21498
+				return ts + 21559
 			}
-			return ts + 21505
+			return ts + 21566
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97149,43 +97969,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10914
+					zFmt = ts + 10976
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21510
+				zFmt = ts + 21571
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21543
+				zFmt = ts + 21604
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21568
+				zFmt = ts + 21629
 			} else {
-				zFmt = ts + 21586
+				zFmt = ts + 21647
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21595, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp int8
-			var zRowid uintptr = ts + 16251
-			Xsqlite3_str_appendf(tls, bp+64, ts+21603, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16267
+			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = int8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21634, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21695, libc.VaList(bp+32, zRowid))
 				cRangeOp = int8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = int8('>')
 			} else {
 				cRangeOp = int8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21644, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21705, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21649,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21676, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21737, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97217,28 +98037,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21687, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21748, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21708, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21769, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21464, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21525, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -97299,52 +98120,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -98822,7 +99649,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21716, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98850,7 +99677,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21731, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -99368,7 +100195,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21740, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99726,10 +100553,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16100, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15431, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14957, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21754, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16116, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15447, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14967, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21815, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100106,49 +100933,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -100156,13 +100972,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -100227,12 +101046,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -100256,7 +101075,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -100266,7 +101085,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -100311,7 +101130,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -100405,7 +101224,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21802
+				return ts + 21863
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100416,7 +101235,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -100424,6 +101242,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -100457,7 +101276,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -100610,6 +101429,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -100778,7 +101600,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21809,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101512,7 +102334,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21845, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101583,7 +102405,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21871
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102090,7 +102912,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -102110,7 +102932,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -102121,10 +102943,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -102135,29 +102957,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -102259,8 +103081,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -102272,7 +103094,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -102282,17 +103104,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -102312,19 +103134,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -102336,19 +103158,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -102358,10 +103180,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -102375,9 +103197,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -102402,8 +103224,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -102415,7 +103237,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -102429,23 +103251,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -102456,7 +103278,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -102778,6 +103600,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -102871,8 +103694,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -102896,8 +103719,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -103049,7 +103873,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -103068,7 +103892,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -103082,7 +103906,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -103091,9 +103915,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -103112,6 +103940,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -103239,30 +104070,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -103270,20 +104120,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -103292,9 +104147,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -103335,7 +104196,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -103375,7 +104236,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -103441,19 +104303,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -103634,7 +104501,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103692,7 +104559,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104090,7 +104957,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21908, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21969, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104301,8 +105168,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -104421,14 +105288,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -104580,7 +105456,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -104688,7 +105564,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21943, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104950,19 +105826,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -104974,9 +105852,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -105009,13 +105887,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -105167,7 +106045,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21961, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105231,7 +106109,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21989, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
 	goto __5
 __4:
 	ii = 0
@@ -105932,7 +106810,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -106113,7 +106991,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22007, -1)
+		pCtx, ts+22068, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -106246,7 +107124,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22063, -1)
+					pCtx, ts+22124, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -106336,17 +107214,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22108))
-var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22119))
-var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22130))
-var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22135))
-var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22148))
-var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22158))
-var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22164))
-var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22175))
-var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22185))
-var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22197))
-var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22202))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22169))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22180))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22191))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22196))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22209))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22219))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22225))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22236))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22246))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22258))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22263))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -106392,7 +107270,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22206, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -106436,12 +107314,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22225, 0)
+			ts+22286, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22296, 0)
+				ts+22357, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -106464,7 +107342,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 					}
 					break
 				}
@@ -106670,7 +107548,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22359, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106786,7 +107664,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106797,6 +107675,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, int8(SQLITE_AFF_NONE))
@@ -106900,7 +107779,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22385, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -106965,15 +107844,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22417
+				zErr = ts + 22478
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22434
+				zErr = ts + 22495
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22450
+				zErr = ts + 22511
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22470, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -106994,7 +107873,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22503, 0)
+				ts+22564, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107150,11 +108029,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22550,
-	ts + 22603,
-	ts + 22007,
-	ts + 22654,
-	ts + 22706,
+	ts + 22611,
+	ts + 22664,
+	ts + 22068,
+	ts + 22715,
+	ts + 22767,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108351,8 +109230,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -108363,13 +109241,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -108553,19 +109428,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22756,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22817,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19750
+							return ts + 22859
 						}
-						return ts + 22798
+						return ts + 22868
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22804, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22874, 0)
 		}
 	}
 
@@ -108633,7 +109508,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22838,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22908,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109730,7 +110605,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22876, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110705,21 +111580,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16251, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16267, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16164, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16180, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -111462,7 +112337,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22925)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22995)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -111626,7 +112501,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -111843,9 +112718,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 6704
+							return ts + 6764
 						}
-						return ts + 6709
+						return ts + 6769
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -111857,6 +112732,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -112124,19 +113004,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22958, 0)
+					ts+23028, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23053, 0)
+					ts+23123, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23137, 0)
+					ts+23207, 0)
 			}
 			break
 		case uint32(273):
@@ -112515,9 +113395,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23222, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -113285,7 +114165,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23239, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23309, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -113308,7 +114188,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23264, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -113481,7 +114361,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23275, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -113494,11 +114374,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19870, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23282, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23287, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113511,9 +114391,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23297, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23301, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113747,7 +114627,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -114322,7 +115202,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -114337,7 +115217,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23309, 0)
+			ts+23379, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114528,23 +115408,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23377
+	var zErr uintptr = ts + 23447
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23391
+			zErr = ts + 23461
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23413
+			zErr = ts + 23483
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23435
+			zErr = ts + 23505
 			break
 
 		}
@@ -114562,35 +115442,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23458,
-	ts + 23471,
+	ts + 23528,
+	ts + 23541,
 	uintptr(0),
-	ts + 23487,
-	ts + 23512,
-	ts + 23526,
-	ts + 23545,
+	ts + 23557,
+	ts + 23582,
+	ts + 23596,
+	ts + 23615,
 	ts + 1490,
-	ts + 23570,
-	ts + 23607,
-	ts + 23619,
-	ts + 23634,
-	ts + 23667,
-	ts + 23685,
-	ts + 23710,
-	ts + 23739,
+	ts + 23640,
+	ts + 23677,
+	ts + 23689,
+	ts + 23704,
+	ts + 23737,
+	ts + 23755,
+	ts + 23780,
+	ts + 23809,
 	uintptr(0),
-	ts + 5848,
+	ts + 5838,
 	ts + 5334,
-	ts + 23756,
-	ts + 23774,
-	ts + 23792,
-	uintptr(0),
 	ts + 23826,
+	ts + 23844,
+	ts + 23862,
 	uintptr(0),
-	ts + 23847,
-	ts + 23873,
 	ts + 23896,
+	uintptr(0),
 	ts + 23917,
+	ts + 23943,
+	ts + 23966,
+	ts + 23987,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114691,6 +115571,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	libc.AtomicStoreNInt32(db+432, int32(1), 0)
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(libc.AtomicLoadNInt32(db+432, 0) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -114705,7 +115591,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114750,7 +115636,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23933, 0)
+				ts+24003, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114867,7 +115753,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23996, libc.VaList(bp, zName))
+		ts+24066, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115103,7 +115989,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24047, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24117, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115196,7 +116082,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -115266,7 +116152,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115276,7 +116162,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115308,14 +116194,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24068, 0)
+				ts+24138, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -115445,7 +116331,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24136, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24206, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -115490,10 +116376,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24142, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24152,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115598,7 +116484,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24180, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115609,17 +116495,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24184, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24184
+	zModeType = ts + 24254
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24190, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -115657,7 +116543,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24195, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115665,7 +116551,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115705,7 +116591,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24239, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115729,15 +116615,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24255, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24262, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24270, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24273, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24276, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17346, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24340, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24343, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24346, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17362, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115883,10 +116769,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21802, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24280, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -115900,7 +116786,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -115951,9 +116837,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6381
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6441
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23282
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23352
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -116058,7 +116944,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24286
+		zFilename = ts + 24356
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -116161,21 +117047,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24289,
+	Xsqlite3_log(tls, iErr, ts+24359,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24314)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24384)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24334)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24341)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -116333,7 +117219,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24358, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -116989,7 +117875,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24386, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117107,7 +117993,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24394
+			return ts + 24464
 		}
 		return uintptr(0)
 	}(), 0)
@@ -117285,7 +118171,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6704, ts + 6709, ts + 6191, ts + 6186, ts + 7945, ts + 24417, ts + 24423,
+	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -117438,7 +118324,7 @@ __10:
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0' + int32(c)>>4)
-	c = uint8(*(*int8)(unsafe.Pointer(ts + 24430 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24500 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -117493,7 +118379,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24447, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24517, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117557,13 +118443,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6704, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6709, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
 			break
 
 		}
@@ -118113,12 +118999,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6704, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6764, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6709, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6769, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(5)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -118219,7 +119105,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24476, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24546, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118525,7 +119411,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*int8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24491, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24561, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118540,7 +119426,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24495, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118594,7 +119480,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24521,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24591,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118699,11 +119585,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*int8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zPath)))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24564, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24634, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24567, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -118860,14 +119746,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24570, -1)
+			ts+24640, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, int8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24621, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24691, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -118962,7 +119848,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15364)
+	jsonWrongNumArgs(tls, ctx, ts+15380)
 	return
 __2:
 	;
@@ -119037,9 +119923,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24655
+			return ts + 24725
 		}
-		return ts + 24659
+		return ts + 24729
 	}())
 	return
 __2:
@@ -119172,7 +120058,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24666, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119269,7 +120155,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24669, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119313,7 +120199,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24672)
+		ts+24742)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -119444,7 +120330,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24755, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -119463,7 +120349,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24761, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -119559,7 +120445,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, int8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24761, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119583,7 +120469,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24766
+				zRoot = ts + 24836
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119648,6 +120534,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -119699,7 +120591,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24476, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24546, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119794,25 +120686,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24768},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24773},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24802},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24815},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24818},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24822},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24834},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24846},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24857},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24868},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24880},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24893},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24912},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24923},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24940}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24838},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24843},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24872},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24885},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24888},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24892},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24904},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24916},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24927},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24938},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24950},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24963},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24982},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24993},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25010}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119831,8 +120723,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24958, FpModule: 0},
-	{FzName: ts + 24968, FpModule: 0},
+	{FzName: ts + 25028, FpModule: 0},
+	{FzName: ts + 25038, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120092,11 +120984,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24978, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24986, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25056, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -120307,7 +121199,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24991,
+		ts+25061,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -121005,7 +121897,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25073)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122346,7 +123238,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25087, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -122358,12 +123250,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25107, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25139, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122589,7 +123481,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25176, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25246, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -122612,14 +123504,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25321
+	var zFmt uintptr = ts + 25391
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11286, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -122660,7 +123552,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25377, ts + 5060, ts + 16251,
+	ts + 25447, ts + 5060, ts + 16267,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122703,19 +123595,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25382,
+			ts+25452,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25444, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25449,
+			ts+25519,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25513,
+			ts+25583,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25653,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122744,7 +123636,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25632
+			zFormat = ts + 25702
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122756,7 +123648,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25740,
+			ts+25810,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122764,18 +123656,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25785, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25855, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12757, 1)
+					Xsqlite3_str_append(tls, p, ts+12767, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25812, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25834, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25842, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122790,14 +123682,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25858,
-	ts + 25911,
-	ts + 25956,
-	ts + 26008,
-	ts + 26062,
-	ts + 26107,
-	ts + 26165,
-	ts + 26220,
+	ts + 25928,
+	ts + 25981,
+	ts + 26026,
+	ts + 26078,
+	ts + 26132,
+	ts + 26177,
+	ts + 26235,
+	ts + 26290,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122826,7 +123718,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26267, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -122838,7 +123730,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26287,
+			ts+26357,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -122846,7 +123738,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26344,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122888,10 +123780,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26379,
-		ts + 26422,
-		ts + 26457,
-		ts + 26493,
+		ts + 26449,
+		ts + 26492,
+		ts + 26527,
+		ts + 26563,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -122922,7 +123814,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26530,
+	Xsqlite3_str_appendf(tls, pSql, ts+26600,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -122934,7 +123826,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26554, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -122957,7 +123849,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123053,7 +123945,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26563, ts + 26574}
+var azFormat = [2]uintptr{ts + 26633, ts + 26644}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -123091,13 +123983,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10858, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10920, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26584, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26590, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26594, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -123108,7 +124000,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26596, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26666, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123186,7 +124078,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26629,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26699,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4062
@@ -123210,7 +124102,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26636,
+			ts+26706,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123229,7 +124121,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26681, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26751, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -123243,8 +124135,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26713,
-		ts + 26767,
+		ts + 26783,
+		ts + 26837,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -123259,23 +124151,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26815,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26885,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26860
+					return ts + 26930
 				}
-				return ts + 26868
+				return ts + 26938
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26877,
+				ts+26947,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26860
+						return ts + 26930
 					}
-					return ts + 26868
+					return ts + 26938
 				}(), iKey, iVal))
 		}
 	}
@@ -123299,7 +124191,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26935, libc.VaList(bp, i, iCell, iNode))
+				ts+27005, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -123319,7 +124211,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26983, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27053, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -123336,14 +124228,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27050, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27084, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27154, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -123351,7 +124243,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27114,
+					ts+27184,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -123380,14 +124272,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27169,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27239,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27200, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -123409,12 +124301,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14493, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14503, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27267, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -123423,12 +124315,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25087, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27295, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27365, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -123442,8 +124334,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27326, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27333, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -123451,7 +124343,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27341, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27411, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -123466,7 +124358,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27345, -1)
+			ts+27415, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -123474,7 +124366,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6381
+			zDb = ts + 6441
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -123484,7 +124376,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17969
+				return ts + 18012
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123779,7 +124671,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -123837,6 +124729,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123849,15 +124742,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27396, 1)
+		Xsqlite3_str_append(tls, x, ts+27466, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27398, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27468, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27409, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123877,19 +124771,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep int8 = int8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27420, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27490, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27438, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27508, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = int8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27446, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*int8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27454, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27524, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27458, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123908,6 +124802,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -123939,6 +124834,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -123947,6 +124843,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -124005,6 +124902,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -124173,6 +125071,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -124194,6 +125093,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -124278,6 +125178,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -124306,6 +125208,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124744,6 +125647,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124757,6 +125661,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -124771,6 +125678,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -124795,7 +125703,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27471, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27541, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124804,7 +125712,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27493, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -124812,7 +125720,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124891,6 +125799,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -125019,6 +125928,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -125037,7 +125947,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16251
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16267
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -125047,7 +125957,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27497
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27567
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -125055,7 +125965,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27503
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27573
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125167,7 +126077,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27512, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -125297,14 +126207,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27552) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27568) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27638) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -125341,8 +126253,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -125359,7 +126271,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -125369,7 +126281,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27583, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -125381,25 +126293,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27591},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27604},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27617},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27630},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27568},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27642},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27552},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27665},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27679},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27692},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27706},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27722},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27661},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27674},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27687},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27700},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27638},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27712},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27622},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27735},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27749},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27762},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27776},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27792},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27734},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -125409,26 +126321,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27753, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27763, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27774, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27497, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27785, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125482,7 +126394,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25073, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125809,7 +126721,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27795, -1)
+		Xsqlite3_result_error(tls, context, ts+27865, -1)
 		return
 	}
 
@@ -125820,7 +126732,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27795, -1)
+			Xsqlite3_result_error(tls, context, ts+27865, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125921,7 +126833,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27816, uintptr(0), uintptr(0), p+64)
+				ts+27886, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -125985,7 +126897,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+24986, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25056, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -126006,16 +126918,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+27987, libc.VaList(bp, func() uintptr {
+			ts+28057, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28137
+					return ts + 28207
 				}
 				return ts + 1554
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28178)
+			ts+28248)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126131,7 +127043,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28303, libc.VaList(bp, zTab)))
+			ts+28373, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126149,7 +127061,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28422, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28492, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126167,7 +127079,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28443, libc.VaList(bp+16, zIdx)))
+			ts+28513, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126190,7 +127102,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28494, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28564, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126236,7 +127148,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -126251,7 +127163,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -126291,7 +127203,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19396, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -126301,18 +127213,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+28572, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+28591, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28661, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28596, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28666, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -126324,18 +127236,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28606, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28635
+							return ts + 28705
 						}
-						return ts + 28648
+						return ts + 28718
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+28657, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -126349,7 +127261,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28679,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28749,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -126396,8 +127308,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+28706, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14604
+		zList = rbuMPrintf(tls, p, ts+28776, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14614
 	}
 	return zList
 }
@@ -126414,7 +127326,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+28715, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -126436,25 +127348,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+28728, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28760, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28830, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+28783)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28789, ts+28796, ts+4957)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+28853)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28859, ts+28866, ts+4957)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+28804,
+					ts+28874,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28846, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28916, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126496,7 +127408,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -126531,7 +127443,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28866
+	zCol = ts + 28936
 __7:
 	;
 	goto __5
@@ -126539,13 +127451,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28874,
+	zLhs = rbuMPrintf(tls, p, ts+28944,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28895,
+	zOrder = rbuMPrintf(tls, p, ts+28965,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28931,
+	zSelect = rbuMPrintf(tls, p, ts+29001,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14604
+	zSep = ts + 14614
 	iCol++
 	goto __1
 __2:
@@ -126563,7 +127475,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+28958,
+		Xsqlite3_mprintf(tls, ts+29028,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -126590,8 +127502,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29006, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14604
+	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14614
 	goto __15
 __15:
 	iCol++
@@ -126602,7 +127514,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29013, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126635,7 +127547,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126647,7 +127559,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29025, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29095, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1554
 		} else {
@@ -126659,37 +127571,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28866
+					zCol = ts + 28936
 				} else {
-					zCol = ts + 28596
+					zCol = ts + 28666
 				}
 				zType = ts + 1119
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29047, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28783
+					return ts + 28853
 				}
 				return ts + 1554
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29067,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29088,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29121, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14604
-		zAnd = ts + 21464
+		zCom = ts + 14614
+		zAnd = ts + 21525
 		nBind++
 	}
 
@@ -126728,11 +127640,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+29145, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29215, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29157, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14604
+			zS = ts + 14614
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126740,7 +127652,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29166, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29236, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126752,18 +127664,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29181, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1554
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29195, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21525
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29207, libc.VaList(bp+40, zList))
+			ts+29277, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1554
@@ -126771,8 +127683,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29257, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21525
 			}
 		}
 	}
@@ -126781,7 +127693,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29270, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29340, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126799,17 +127711,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c int8 = *(*int8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29257,
+					zList = rbuMPrintf(tls, p, ts+29327,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29296,
+					zList = rbuMPrintf(tls, p, ts+29366,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29326,
+					zList = rbuMPrintf(tls, p, ts+29396,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				}
 			}
 		}
@@ -126844,19 +127756,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29363
+		var zSep uintptr = ts + 29433
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16139) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16155) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126868,15 +127780,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 28783
+					zDesc = ts + 28853
 				} else {
 					zDesc = ts + 1554
 				}
-				z = rbuMPrintf(tls, p, ts+29376, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14604
+				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14614
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29387, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -126896,7 +127808,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29391)
+			ts+29461)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -126905,7 +127817,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -126915,25 +127827,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29441, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29511, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29463, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28783
+						return ts + 28853
 					}
 					return ts + 1554
 				}()))
-				zComma = ts + 14604
+				zComma = ts + 14614
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29473, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29488,
+			ts+29558,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -126946,7 +127858,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1554
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1554
@@ -126954,39 +127866,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29550
+				zPk = ts + 29620
 			}
-			zSql = rbuMPrintf(tls, p, ts+29563,
+			zSql = rbuMPrintf(tls, p, ts+29633,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29590
+							return ts + 29660
 						}
 						return ts + 1554
 					}()))
-			zComma = ts + 14604
+			zComma = ts + 14614
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29600, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29670, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29607,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29677,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29639
+						return ts + 29709
 					}
 					return ts + 1554
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -126999,7 +127911,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+29654,
+				ts+29724,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127036,7 +127948,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+29711)
+			ts+29781)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -127141,7 +128053,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29777, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29847, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127161,24 +128073,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29797,
+				ts+29867,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+29862, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29932, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+29898, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127194,7 +128106,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29932,
+						ts+30002,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127202,9 +128114,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29993
+											return ts + 30063
 										}
-										return ts + 29997
+										return ts + 30067
 									}()
 								}
 								return ts + 1554
@@ -127213,20 +128125,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30003,
+						ts+30073,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30064,
+						ts+30134,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29993
+									return ts + 30063
 								}
-								return ts + 29997
+								return ts + 30067
 							}(),
 							zCollist, zLimit))
 				}
@@ -127251,8 +128163,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6392)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6388)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6452)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -127263,16 +128175,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1554
 				}
-				return ts + 30223
+				return ts + 30293
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30232,
+						ts+30302,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30268
+								return ts + 30338
 							}
 							return ts + 1554
 						}(), zBindings)))
@@ -127281,32 +128193,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30278, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1554
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30306
+					zRbuRowid = ts + 30376
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30318, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30388, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30394
+							return ts + 30464
 						}
 						return ts + 1554
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30411,
+					ts+30481,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30710,
+						ts+30780,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -127319,9 +128231,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30809
+						zRbuRowid = ts + 30879
 					} else {
-						zRbuRowid = ts + 30819
+						zRbuRowid = ts + 30889
 					}
 				}
 
@@ -127334,20 +128246,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28866, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30830,
+							ts+30900,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30878
+										return ts + 30948
 									}
 									return ts + 1554
 								}(),
@@ -127360,7 +128272,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19750
+										return ts + 22859
 									}
 									return ts + 1554
 								}(), zOrder,
@@ -127428,9 +128340,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1554
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30223
+				zPrefix = ts + 30293
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30884,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -127489,7 +128401,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+30914, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+30984, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -127559,28 +128471,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30944, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30972, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31042, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+48, ts+3286, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6381, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6441, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30990, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127613,11 +128525,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31056, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31126, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24136, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*int8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -127629,13 +128541,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31088,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381),
+			zTarget = Xsqlite3_mprintf(tls, ts+31158,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
 						}
-						return ts + 31120
+						return ts + 31190
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
@@ -127654,37 +128566,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31122, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31137, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31154, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31198, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31268, 0)
 	}
 }
 
@@ -127713,15 +128625,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31216, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31286, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -127769,7 +128681,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -127829,7 +128741,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127846,23 +128758,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31251, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31321, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31276, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31283, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -127979,7 +128891,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23774, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23844, 0)
 			return
 		}
 
@@ -128072,7 +128984,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+31290)
+			ts+31360)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -128080,7 +128992,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31312, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31382, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -128101,7 +129013,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+31339,
+				ts+31409,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128131,9 +129043,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+31497, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31567, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31512,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31582,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128147,10 +129059,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31532, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31602, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31557)
+			ts+31627)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128164,12 +129076,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31665)
+			ts+31735)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+31730)
+			ts+31800)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128181,7 +129093,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31774, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31844, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128201,15 +129113,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17224)
-					rbuCopyPragma(tls, p, ts+16335)
+					rbuCopyPragma(tls, p, ts+17240)
+					rbuCopyPragma(tls, p, ts+16351)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31799, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31869, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128233,10 +129145,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -128331,7 +129243,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31827, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31897, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -128344,16 +129256,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31276, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -128363,7 +129276,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31852, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -128397,7 +129310,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31863, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -128427,13 +129340,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31935, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31949)
+				ts+32019)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -128444,7 +129357,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+32006)
+				ts+32076)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -128518,7 +129431,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32080, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32150, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -128536,12 +129449,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32112,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32182,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32144
+							return ts + 32214
 						}
-						return ts + 32151
+						return ts + 32221
 					}()))
 			}
 		}
@@ -128549,7 +129462,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14493, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14503, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -128560,19 +129473,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16938)
-						rbuCopyPragma(tls, p, ts+16350)
+						rbuCopyPragma(tls, p, ts+16954)
+						rbuCopyPragma(tls, p, ts+16366)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32158, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32174, uintptr(0), uintptr(0), p+64)
+								db, ts+32244, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -128626,7 +129539,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32198, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32268, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128653,7 +129566,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30223, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30293, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -128670,7 +129583,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128683,13 +129596,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32206, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32276, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128784,7 +129697,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128801,19 +129714,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14493
+				zBegin = ts + 14503
 			} else {
-				zBegin = ts + 32158
+				zBegin = ts + 32228
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32158, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32228, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128936,11 +129849,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -129079,7 +129995,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -129156,7 +130072,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32233, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32303, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129181,7 +130097,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32256, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129326,7 +130242,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6381)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6441)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -129341,7 +130257,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32267, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32337, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129352,7 +130268,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -129382,6 +130304,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -130145,11 +131082,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11286, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11348, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32278, 0)
+				ts+32348, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
 		} else {
@@ -130162,7 +131099,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32399, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -130260,7 +131197,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11286, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130727,6 +131664,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -130809,6 +131749,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -130838,9 +131779,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32428,
+			zRet = Xsqlite3_mprintf(tls, ts+32498,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 21464
+			zSep = ts + 21525
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130863,9 +131804,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32462,
+				ts+32532,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 32503
+			zSep = ts + 32573
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130873,18 +131814,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7470, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32508,
+		ts+32578,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130894,7 +131835,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -130927,7 +131868,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32586,
+			ts+32656,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -131054,7 +131995,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32639, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -131528,9 +132469,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11286, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11348, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32666, libc.VaList(bp, zDb))
+			ts+32736, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -131539,18 +132480,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1554
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32776, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32846, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1567, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32791, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32861, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+32799, bp+24)
+				sessionAppendStr(tls, bp+8, ts+32869, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21464
+				zSep = ts + 21525
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131659,7 +132600,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32805, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32875, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -131751,7 +132692,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32825, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -132014,7 +132955,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132037,7 +132978,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -132079,7 +133020,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132140,7 +133081,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -132214,13 +133155,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -132282,7 +133223,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -132655,7 +133596,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -132823,7 +133764,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11286) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11348) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -132834,34 +133775,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32843, bp+16)
+				sessionAppendStr(tls, bp, ts+32913, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32856, bp+16)
+				sessionAppendStr(tls, bp, ts+32926, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+32862, bp+16)
+						sessionAppendStr(tls, bp, ts+32932, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14604
+						zSep = ts + 14614
 					}
 				}
 
 				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32791, bp+16)
+				sessionAppendStr(tls, bp, ts+32861, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32867, bp+16)
+								ts+32937, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32799, bp+16)
+							sessionAppendStr(tls, bp, ts+32869, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21464
+						zSep = ts + 21525
 					}
 				}
 
@@ -132913,34 +133854,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32942, bp+16)
+	sessionAppendStr(tls, bp, ts+33012, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32791, bp+16)
+	sessionAppendStr(tls, bp, ts+32861, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+32862, bp+16)
+			sessionAppendStr(tls, bp, ts+32932, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21464
+			zSep = ts + 21525
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32960, bp+16)
+		sessionAppendStr(tls, bp, ts+33030, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32503, bp+16)
+		sessionAppendStr(tls, bp, ts+32573, bp+16)
 
 		zSep = ts + 1554
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+32799, bp+16)
+				sessionAppendStr(tls, bp, ts+32869, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 32968
+				zSep = ts + 33038
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4957, bp+16)
@@ -132956,7 +133897,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6381, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -132967,19 +133908,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32973, bp+16)
+	sessionAppendStr(tls, bp, ts+33043, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21470, bp+16)
+	sessionAppendStr(tls, bp, ts+21531, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14604, bp+16)
+			sessionAppendStr(tls, bp, ts+14614, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+32991, bp+16)
+	sessionAppendStr(tls, bp, ts+33061, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33002, bp+16)
+		sessionAppendStr(tls, bp, ts+33072, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+4957, bp+16)
 
@@ -132995,14 +133936,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11286, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11348, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33006)
+			ts+33076)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33119)
+			ts+33189)
 	}
 	return rc
 }
@@ -133030,7 +133971,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -133039,7 +133980,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -133116,7 +134057,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -133242,7 +134183,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -133283,7 +134224,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33263, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33333, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -133299,7 +134240,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33284, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33354, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -133372,10 +134313,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33303, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33373, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33329, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -133421,7 +134362,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6381, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6441, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -133434,19 +134375,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33359, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33403,
+						ts+33473,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33474, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11286) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11348) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133497,14 +134438,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33534, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33588, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134752,7 +135693,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33616, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135040,7 +135981,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33644, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135227,7 +136168,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33675, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -135295,7 +136236,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33682
+		var zErr uintptr = ts + 33752
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135477,7 +136418,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33732
+		var zErr uintptr = ts + 33802
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135801,13 +136742,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33780, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33788, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33798, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136358,7 +137299,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33803, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33873, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -136385,14 +137326,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*int8)(unsafe.Pointer(p))) < '0' || int32(*(*int8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33810, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33880, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33841, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136403,7 +137344,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33874, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136416,7 +137357,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33911, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -136425,7 +137366,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33920, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33990, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136444,7 +137385,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33953, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136459,14 +137400,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33987, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33995, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*int8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34027, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136474,9 +137415,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34033, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34047, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136484,9 +137425,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34085, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
 		if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || int32(*(*int8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34096, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34166, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -136496,19 +137437,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 7958, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17329},
-			{FzName: ts + 34131, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17345},
+			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34139, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34209, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34170, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136555,15 +137496,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22130) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16251) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34198, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22191) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34228) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34238, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34308, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136580,13 +137521,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34269, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34274, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34281, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34351, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136624,8 +137565,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22130) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34289, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22191) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136657,7 +137598,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34318, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34388, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136694,19 +137635,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33987
+			zTail = ts + 34057
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34338
+			zTail = ts + 34408
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34346, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16251, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16267, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136750,18 +137691,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34357, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34427, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1554
 			}
-			return ts + 14604
+			return ts + 14614
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34373, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34443, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34380,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22130))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136871,7 +137812,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34406) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136881,7 +137822,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34411) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34481) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136891,7 +137832,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34420) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34490) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -136904,7 +137845,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34430) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34500) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -136914,7 +137855,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34440) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34510) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -136930,7 +137871,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22130) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22191) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -136953,7 +137894,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34452
+	var zSelect uintptr = ts + 34522
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -136975,7 +137916,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34484) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34554) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -136989,7 +137930,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34492,
+				ts+34562,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -137087,7 +138028,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34557, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
 					return FTS5_EOF
 				}
 			}
@@ -137100,20 +138041,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34577, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34647, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34608, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34678, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34611, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29993, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -137199,6 +138140,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*int8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -137227,7 +138179,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 1))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*int8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = int8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -138880,9 +139832,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34615, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33644, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -138898,7 +139850,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c int8 = *(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34620, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -138985,7 +139937,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20467, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -139066,7 +140018,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34649, 0)
+			ts+34719, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -139236,12 +140188,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34702,
+								ts+34772,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34752
+										return ts + 34822
 									}
-									return ts + 34615
+									return ts + 34685
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140184,7 +141136,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34759, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34829, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -140263,7 +141215,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+34765,
+			ts+34835,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -140288,7 +141240,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34816,
+			ts+34886,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -140311,7 +141263,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+34865,
+			ts+34935,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140550,7 +141502,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+34905, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141749,7 +142701,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+34928,
+			ts+34998,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143215,7 +144167,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+35012,
+			ts+35082,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -143706,10 +144658,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -144292,13 +145249,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35069, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24986, ts+35077, 0, pzErr)
+				pConfig, ts+25056, ts+35147, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11426,
-					ts+35112,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
+					ts+35182,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144551,7 +145508,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34759, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -144665,7 +145622,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35156,
+		ts+35226,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -144835,7 +145792,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35242)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35312)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -145106,7 +146063,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35247, 0)
+			ts+35317, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145530,11 +146487,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35286,
+		ts+35356,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14604
+					return ts + 14614
 				}
 				return ts + 1554
 			}(),
@@ -145546,9 +146503,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35341
+					return ts + 35411
 				}
-				return ts + 35346
+				return ts + 35416
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145594,12 +146551,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35350, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35420, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5057, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35356, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145630,7 +146587,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35384, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35454, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -145661,7 +146618,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35394, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35464, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145693,14 +146650,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35415, libc.VaList(bp, z))
+				ts+35485, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33798
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33868
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145756,7 +146713,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35247, 0)
+		ts+35317, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145973,7 +146930,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35448, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -146118,28 +147075,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35484, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35554, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35495, 0)
+				ts+35565, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35575, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35583, 0)
+				ts+35653, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16918, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35639, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35715, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146197,7 +147154,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17463, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17479, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -146210,12 +147167,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35661,
+				ts+35731,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20368
+						return ts + 20429
 					}
-					return ts + 35698
+					return ts + 35768
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146845,7 +147802,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35710, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35780, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -147089,7 +148046,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35731, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -147108,7 +148065,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35753, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35823, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147155,7 +148112,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35784)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35854)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147164,7 +148121,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35797, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35867, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -147178,7 +148135,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35888, ts + 33987, ts + 24986, ts + 34338, ts + 11426,
+	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147202,7 +148159,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35895, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147220,13 +148177,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35895, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35900, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35970, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -147281,17 +148240,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35915,
-			ts + 35983,
-			ts + 36052,
-			ts + 36085,
-			ts + 36124,
-			ts + 36164,
-			ts + 36203,
-			ts + 36244,
-			ts + 36283,
-			ts + 36325,
-			ts + 36365,
+			ts + 35985,
+			ts + 36053,
+			ts + 36122,
+			ts + 36155,
+			ts + 36194,
+			ts + 36234,
+			ts + 36273,
+			ts + 36314,
+			ts + 36353,
+			ts + 36395,
+			ts + 36435,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -147393,18 +148352,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36388,
+		ts+36458,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36492,
+			ts+36562,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36530,
+			ts+36600,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -147416,7 +148375,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36568,
+			ts+36638,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147428,14 +148387,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24986, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11426, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35888, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25056, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34338, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33987, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147447,17 +148406,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36610,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36680,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29639
+					return ts + 29709
 				}
 				return ts + 1554
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36640,
+			ts+36710,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147494,27 +148453,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36684, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36707, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36777, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33987, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34338, ts+36713, 0, pzErr)
+				pConfig, ts+34408, ts+36783, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35888, ts+36745, 1, pzErr)
+				pConfig, ts+35958, ts+36815, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147720,12 +148679,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36762,
+		ts+36832,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36812,
+			ts+36882,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147733,7 +148692,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -147909,7 +148868,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36841,
+	zSql = Xsqlite3_mprintf(tls, ts+36911,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -148091,14 +149050,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33987, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34057, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34338, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34408, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -148293,9 +149252,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36873) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36943) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148510,7 +149469,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36895
+			var zCat uintptr = ts + 36965
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148522,7 +149481,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36904) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -148533,18 +149492,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36915) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36985) {
 					if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' && int32(*(*int8)(unsafe.Pointer(zArg))) != '2' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*int8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36873) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36943) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36904) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148820,7 +149779,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36933
+	var zBase uintptr = ts + 37003
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -148962,7 +149921,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36943, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148970,11 +149929,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36946, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36951, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148982,7 +149941,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36956, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148990,7 +149949,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36959, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148998,11 +149957,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36962, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36967, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37037, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149010,19 +149969,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36972, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36976, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37046, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36982, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37052, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36987, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37057, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149030,11 +149989,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36991, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36995, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149042,7 +150001,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36998, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149050,11 +150009,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37002, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37076, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149062,7 +150021,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37010, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149070,7 +150029,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37014, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149078,7 +150037,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37018, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149094,24 +150053,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37002, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37092, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37028, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37098, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37018, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37088, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -149126,137 +150085,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37105, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37043, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37050, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37055, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36951, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37060, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36946, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37018, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37070, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15464, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37075, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37028, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37079, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37154, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36987, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37090, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37094, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37096, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37010, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37018, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37110, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37116, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37121, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37127, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37014, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37143, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37010, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37155, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37161, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37014, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37167, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37028, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -149271,16 +150230,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37174, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37244, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149288,21 +150247,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37143, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149310,7 +150269,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37196, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -149318,9 +150277,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37202, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -149335,12 +150294,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37208, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37212, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37215, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -149349,7 +150308,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149505,7 +150464,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37222) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37292) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149685,22 +150644,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36933, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37237, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37243, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37250, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -150843,14 +151802,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37258) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37328) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37262) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37266) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37275, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150876,19 +151835,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 37309,
-		ts + 37349,
-		ts + 37384,
+		ts + 37379,
+		ts + 37419,
+		ts + 37454,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23282, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23352, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37427, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151021,11 +151980,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37460, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37491,
+		ts+37561,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -151049,7 +152008,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37542, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -151444,7 +152403,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37568, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151466,7 +152425,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37578
+	return ts + 37648
 }
 
 func init() {
@@ -151521,114 +152480,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -152089,6 +153050,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -152407,6 +153380,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -152428,5 +153402,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_linux_arm.go b/vendor/modernc.org/sqlite/lib/sqlite_linux_arm.go
index f98a2145..fed30522 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_linux_arm.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_linux_arm.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_arm.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_arm.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -495,6 +495,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -610,6 +611,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -958,6 +960,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1445,6 +1448,7 @@ const (
 	SF_Recursive                          = 0x0002000
 	SF_Resolved                           = 0x0000004
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1529,6 +1533,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1647,6 +1652,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -2013,6 +2019,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -2110,11 +2117,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -2129,7 +2139,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2237,8 +2247,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2718,6 +2728,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -4130,6 +4141,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -5734,10 +5746,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -5792,12 +5802,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -6044,7 +6052,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -6160,7 +6167,7 @@ type Parse1 = struct {
 	FnLabelAlloc      int32
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -6179,6 +6186,7 @@ type Parse1 = struct {
 	FnQueryLoop       U32
 	Foldmask          U32
 	Fnewmask          U32
+	FnProgressSteps   U32
 	FeTriggerOp       U8
 	FbReturning       U8
 	FeOrconf          U8
@@ -6825,7 +6833,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	F__ccgo_pad3        [4]byte
@@ -6954,7 +6962,6 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
 }
@@ -6973,7 +6980,6 @@ type AggInfo_col = struct {
 type AggInfo_func = struct {
 	FpFExpr    uintptr
 	FpFunc     uintptr
-	FiMem      int32
 	FiDistinct int32
 	FiDistAddr int32
 }
@@ -7156,9 +7162,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
-	FpIdx    uintptr
-	FiTabCur int32
+type CoveringIndexCheck1 = struct {
+	FpIdx        uintptr
+	FiTabCur     int32
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -7362,7 +7371,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1099))
@@ -7512,11 +7521,11 @@ type VdbeFrame1 = struct {
 	Fv           uintptr
 	FpParent     uintptr
 	FaOp         uintptr
-	FanExec      uintptr
 	FaMem        uintptr
 	FapCsr       uintptr
 	FaOnce       uintptr
 	Ftoken       uintptr
+	F__ccgo_pad1 [4]byte
 	FlastRowid   I64
 	FpAuxData    uintptr
 	FnCursor     int32
@@ -7525,7 +7534,7 @@ type VdbeFrame1 = struct {
 	FnMem        int32
 	FnChildMem   int32
 	FnChildCsr   int32
-	F__ccgo_pad1 [4]byte
+	F__ccgo_pad2 [4]byte
 	FnChange     I64
 	FnDbChange   I64
 }
@@ -7562,8 +7571,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -7574,6 +7593,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -7690,7 +7718,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint32(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint32(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8537,14 +8565,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = uint8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -8552,7 +8580,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -10364,7 +10392,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = (int32(zEnd) - int32(zStart)) / 1
-	for n > 0 && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -10620,6 +10648,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -11606,6 +11636,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -11614,11 +11645,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -11630,30 +11685,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1554
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -11662,83 +11717,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 21)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = (int32(z) - int32(bufpt)) / 1
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = (int32(z) - int32(bufpt)) / 1
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -11752,17 +11807,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -11770,90 +11825,90 @@ __219:
 		}
 		return ts + 1560
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(j))) = uint8(0)
 	length = int32(j)
@@ -11861,89 +11916,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -11956,32 +12011,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -12040,7 +12095,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -12056,8 +12111,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -12086,12 +12140,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -12100,7 +12155,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint32(N))
 		*(*U32)(unsafe.Pointer(p + 16)) += U32(N)
@@ -13220,6 +13275,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if libc.AtomicLoadNInt32(db+312, 0) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -13825,10 +13898,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13854,6 +13930,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = uint8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint32(unsafe.Sizeof([22]uint8{}))-uint32(1)-uint32(i))
+	return int32(uint32(unsafe.Sizeof([22]uint8{})) - uint32(2) - uint32(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14815,11 +14892,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -15725,7 +15803,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -15948,7 +16026,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -15964,113 +16042,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(1)
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -16202,7 +16280,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16493,7 +16571,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3378, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16510,14 +16588,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*12 + 4)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16537,7 +16615,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16605,7 +16683,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -16832,7 +16910,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16860,7 +16938,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -16959,7 +17037,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3261, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -17089,7 +17167,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -17135,7 +17213,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -17366,7 +17444,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17500,7 +17578,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+8)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17521,7 +17599,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17837,7 +17915,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3261, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -17928,7 +18006,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43337)
 		}
 		return rc
 	}
@@ -17936,9 +18014,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*12 + 4)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -17981,12 +18059,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*uint8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -18005,18 +18080,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*12 + 4)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3459, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3459, zIn, 43443)
 			}
 		} else if (*stat)(unsafe.Pointer(bp)).Fst_mode&X__mode_t(0170000) == X__mode_t(0120000) {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*12 + 4)))(tls, zIn, bp+104, uint32(unsafe.Sizeof([4098]uint8{}))-uint32(2))
 			if got <= 0 || got >= Ssize_t(unsafe.Sizeof([4098]uint8{}))-2 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3450, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3450, zIn, 43454)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 104 + uintptr(got))) = uint8(0)
@@ -18056,14 +18131,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 4100)).FzOut = zOut
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*12 + 4)))(tls, bp, uint32(unsafe.Sizeof([4098]uint8{}))-uint32(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3279, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3279, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+4100, bp)
 	}
 	appendAllPathElements(tls, bp+4100, zPath)
 	*(*uint8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+4100)).FnUsed))) = uint8(0)
 	if (*DbPath)(unsafe.Pointer(bp+4100)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+4100)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4100)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18162,7 +18237,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == EINTR {
 				got = (*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*12 + 4)))(tls, fd, zBuf, uint32(nBuf))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -18170,12 +18245,12 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 }
 
 func unixSleep(tls *libc.TLS, NotUsed uintptr, microseconds int32) int32 {
-	if microseconds >= 1000000 {
-		libc.Xsleep(tls, uint32(microseconds/1000000))
-	}
-	if microseconds%1000000 != 0 {
-		libc.Xusleep(tls, uint32(microseconds%1000000))
-	}
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	(*timespec)(unsafe.Pointer(bp)).Ftv_sec = microseconds / 1000000
+	(*timespec)(unsafe.Pointer(bp)).Ftv_nsec = microseconds % 1000000 * 1000
+	libc.Xnanosleep(tls, bp, uintptr(0))
 	_ = NotUsed
 	return microseconds
 }
@@ -22081,7 +22156,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint32(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint32(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -23133,7 +23208,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -23150,7 +23224,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 8)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -23216,7 +23289,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + Size_t(1))
 	z += uintptr(libc.Xstrlen(tls, z) + Size_t(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -23226,7 +23298,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23417,36 +23489,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -23618,7 +23679,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23742,7 +23803,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23781,7 +23842,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23858,7 +23919,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24770,10 +24831,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0)}
@@ -24859,7 +24922,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 28)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25613,7 +25676,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25712,7 +25775,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -26297,7 +26360,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26572,7 +26635,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27045,7 +27108,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27550,7 +27613,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27785,8 +27848,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27794,23 +27857,24 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt    uintptr
+	FpPager uintptr
+	FaPgRef uintptr
+	FnPage  Pgno
+	FmxErr  int32
+	FnErr   int32
+	Frc     int32
+	FnStep  U32
+	FzPfx   uintptr
+	Fv1     Pgno
+	Fv2     int32
+	FerrMsg StrAccum
+	Fheap   uintptr
+	Fdb     uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -28206,7 +28270,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28343,7 +28407,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -28360,7 +28424,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -28368,7 +28432,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -28411,7 +28475,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28421,7 +28485,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -28671,7 +28735,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28718,7 +28782,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28728,7 +28792,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28741,7 +28805,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28750,14 +28814,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint32(iFree2-(iFree+sz)))
@@ -28767,7 +28831,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -28831,7 +28895,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -28841,7 +28905,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28863,7 +28927,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -28898,7 +28962,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -28911,13 +28975,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -28942,7 +29006,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -28953,7 +29017,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, (int32(pSpace)-int32(data))/1)
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -29005,22 +29069,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29030,7 +29094,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29038,7 +29102,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29046,10 +29110,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29073,13 +29137,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29087,7 +29150,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29095,32 +29197,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -29148,11 +29239,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -29163,15 +29254,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29199,14 +29290,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellOffset+i*2)))))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -29220,7 +29311,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29232,7 +29323,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29335,7 +29426,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29363,7 +29454,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29402,7 +29493,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -30285,7 +30376,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30700,7 +30791,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30726,7 +30817,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -30735,7 +30826,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30746,7 +30837,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30762,7 +30853,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30823,7 +30914,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30858,7 +30949,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 20)))
 				if *(*Pgno)(unsafe.Pointer(bp + 24)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 16)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -30918,7 +31009,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -30957,7 +31048,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -30988,7 +31079,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31329,7 +31420,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31573,14 +31664,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int32(aPayload)-int32((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > (*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31625,7 +31716,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31674,7 +31765,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -31754,7 +31845,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31845,7 +31936,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -31865,7 +31956,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -31929,18 +32020,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -31956,6 +32037,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -32077,7 +32166,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -32281,7 +32370,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32346,7 +32435,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -32394,7 +32483,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -32513,7 +32602,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32673,7 +32762,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32738,7 +32827,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+4, 0)
@@ -32774,7 +32863,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32818,7 +32907,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -32930,7 +33019,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -33088,7 +33177,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33145,7 +33234,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -33161,7 +33250,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -33235,7 +33324,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33247,7 +33336,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 4)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+4)
@@ -33258,7 +33347,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33423,7 +33512,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33447,9 +33536,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -33472,16 +33561,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -33502,9 +33589,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -33637,11 +33730,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*4)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*4)))
 		} else {
 		}
 		idx++
@@ -33694,12 +33790,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int32(pCell)-int32(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -33707,7 +33803,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int32(pData) - int32(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint32(sz))
 
@@ -33767,7 +33863,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*4)), uint32(sz))
@@ -33856,7 +33952,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint32(nCell*2))
@@ -33972,7 +34068,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 80)) = allocateBtreePage(tls, pBt, bp, bp+4, uint32(0), uint8(0))
@@ -34015,8 +34111,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 80)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, (int32(pOut)-int32(pSpace))/1,
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+80)
+			*(*int32)(unsafe.Pointer(bp + 80)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, (int32(pOut)-int32(pSpace))/1,
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 4)))
@@ -34098,6 +34194,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -34290,7 +34388,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 72)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -34301,7 +34399,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -34459,7 +34557,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -34533,7 +34631,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -34559,9 +34657,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -34572,8 +34671,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 136 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -34595,7 +34694,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -34623,7 +34722,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 112)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != 0) {
@@ -34884,11 +34983,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 112)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+112)
+	*(*int32)(unsafe.Pointer(bp + 112)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 112)) != SQLITE_OK) {
 		goto __122
 	}
@@ -35076,7 +35175,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -35114,7 +35213,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 120 + uintptr(iPage-1)*4))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 72 + uintptr(iPage-1)*2)))
@@ -35191,7 +35290,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(4)
 	defer tls.Free(4)
 
@@ -35203,19 +35302,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -35228,7 +35319,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35247,6 +35338,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -35282,7 +35390,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -35291,13 +35398,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 108)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 104)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 104)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 104)) != 0) {
 		goto __2
 	}
@@ -35308,7 +35414,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -35421,7 +35527,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 104)) = btreeComputeFreeSpace(tls, pPage)
@@ -35435,20 +35541,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 104)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 108)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 108)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 108)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 108)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 108)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 108)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -35458,7 +35564,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 108))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+104)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+104)
+	if !(*(*int32)(unsafe.Pointer(bp + 104)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -35466,100 +35578,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 104)) = fillInCell(tls, pPage, newCell, pX, bp+108)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 104)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 104)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 104)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint32(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+112)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+112)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 104)) = clearCellOverflow(tls, pPage, oldCell, bp+112)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 104)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 104)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) == *(*int32)(unsafe.Pointer(bp + 108)) && U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+112)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 108)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 108)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 108))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 108))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint32(*(*int32)(unsafe.Pointer(bp + 108))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize), bp+104)
 	if !(*(*int32)(unsafe.Pointer(bp + 104)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 108)), uintptr(0), uint32(0), bp+104)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 104)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 108)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -35568,30 +35680,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 104)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 104)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint32((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint32((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 104))
@@ -35614,7 +35726,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -35633,13 +35744,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, nIn)
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(nIn + U32((int32(aOut)-int32((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1))
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -35656,7 +35769,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35715,9 +35828,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 12))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 12))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -35757,7 +35870,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -35765,11 +35878,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35844,7 +35957,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35854,7 +35967,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -35913,7 +36026,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -35942,7 +36055,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 24)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+16, bp+20)
 			if int32(*(*U8)(unsafe.Pointer(bp + 16))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 16))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 12)))
@@ -36018,7 +36131,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36032,7 +36145,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36166,7 +36279,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36341,12 +36454,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if libc.AtomicLoadNInt32(db+312, 0) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -36354,15 +36496,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+40, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+44, ts+4062, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+40, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+44, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+40, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+44, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -36386,9 +36528,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if libc.AtomicLoadNInt32((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb+312, 0) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -36402,7 +36541,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
 		return
@@ -36476,7 +36615,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -36561,48 +36702,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4318, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4356, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -36617,29 +36765,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -36647,28 +36795,28 @@ __9:
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(pCellIdx))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4470,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4500, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -36676,97 +36824,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4548, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellStart+i*2)))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -36776,48 +36924,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4610,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -36846,7 +36994,7 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
 	bp := tls.Alloc(216)
 	defer tls.Free(216)
 
@@ -36880,19 +37028,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint32(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+40, uintptr(0), bp+104, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+44, uintptr(0), bp+108, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -36904,7 +37046,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -36912,7 +37054,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -37040,22 +37182,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+40)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+40)
+	Xsqlite3_str_reset(tls, bp+32+44)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+44)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+40)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -37282,8 +37421,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(292)
-	defer tls.Free(292)
+	bp := tls.Alloc(296)
+	defer tls.Free(296)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -37783,7 +37922,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
 		libc.Xmemcpy(tls, bp+8, p, uint32(int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int*2))
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+16, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+16, ts+4925,
@@ -37795,6 +37934,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*uint8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+16)).FnChar))) = uint8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 16)).FnChar)
 	}
 }
 
@@ -37982,7 +38122,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & Size_t(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 16)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -38156,16 +38295,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -38608,7 +38749,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38844,43 +38985,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*4)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -39265,7 +39397,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39280,14 +39412,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39657,7 +39789,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -39669,13 +39803,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -39752,6 +39888,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -40683,7 +40822,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -40725,7 +40863,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*40, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -41478,7 +41616,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -41586,7 +41724,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42137,7 +42275,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -42202,7 +42340,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42236,7 +42374,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 48)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42286,7 +42424,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 48)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -42432,7 +42570,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -42603,7 +42741,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42629,7 +42767,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -42903,7 +43041,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43255,8 +43393,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -43266,15 +43407,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -43462,6 +43603,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -43514,7 +43656,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -43578,6 +43720,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
@@ -43589,9 +43740,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5357)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -43825,7 +43977,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -43849,8 +44001,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*40
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*40
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -44024,15 +44176,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5367, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44143,14 +44295,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -44434,7 +44589,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -44578,7 +44733,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -44750,7 +44905,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*uint8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5407, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5397, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, (int32(zRawSql)-int32(zStart))/1)
 		}
@@ -44805,21 +44960,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 80
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+80)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5418, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5431, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5434, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5424, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5439, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
 			}
 		}
 	}
@@ -44911,11 +45066,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity uint8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -45282,7 +45437,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -45383,593 +45537,597 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 164 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(libc.AtomicLoadNInt32(db+312, 0) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*20
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
+
+	case OP_IfNoHope:
 		goto __100
-	case OP_NotFound:
+	case OP_NoConflict:
 		goto __101
-	case OP_Found:
+	case OP_NotFound:
 		goto __102
+	case OP_Found:
+		goto __103
 
 	case OP_SeekRowid:
-		goto __103
-	case OP_NotExists:
 		goto __104
-
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
 
 check_for_interrupt:
 	if !(libc.AtomicLoadNInt32(db+312, 0) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
@@ -45978,56 +46136,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*20
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*20
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -46035,20 +46193,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64((int32(pOp) - int32(aOp)) / 20)
 
 	pOp = aOp + uintptr(pcDest)*20
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -46056,124 +46215,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*20)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*20
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5441, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5462, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5452, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = (int32(pOp) - int32(aOp)) / 20
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5469, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5459, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 120))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -46181,10 +46340,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -46195,9 +46354,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 40
 
@@ -46205,171 +46364,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*40
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*40
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint32(uintptr(0)+20))
 	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*40
 	pOut = aMem + uintptr(p2)*40
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 40
 	pOut += 40
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 40
 	pIn1 += 40
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 216))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp)-int32(aOp))/20 + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
@@ -46377,95 +46536,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 120)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint32((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint32((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = uint8(0)
@@ -46473,231 +46632,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -46706,95 +46865,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint32(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint32(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
@@ -46804,189 +46963,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -46995,38 +47158,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*20 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -47034,9 +47197,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -47047,298 +47210,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 20 + uintptr(i)*4))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*40, aMem+uintptr(U32(p21)+idx)*40, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*40)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*40)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*20
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*20
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*20
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*20
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*20
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32((int32(pOp) - int32((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 20)
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 80 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 36))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -47348,144 +47512,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*40
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+76, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 36))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 12)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 12)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+76)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint32(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -47493,353 +47657,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+80+uintptr(i1)*4, libc.AssignPtrUint32(bp+272, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 272)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+272))
 	*(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 272))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 272))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int32(zHdr) - int32(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 272)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int32(zHdr) - int32(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 272)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 272)) = *(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 272)) = *(*U32)(unsafe.Pointer(pC3 + 80 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 272)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 272)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 272))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 120))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint32(len))
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = uint8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 272))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 272)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 272))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 272))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 272)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 120))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 36)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 272)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*20
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 40
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 40
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*16 + 4)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 40
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5493,
+	Xsqlite3VdbeError(tls, p, ts+5483,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*16 + 4))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*16)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*uint8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 40
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -47853,319 +48017,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*uint8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 16)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 40
 
-	goto __455
-__455:
-	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 16)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 40
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 120)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 16)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+280, pRec, uint32(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 280)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 280)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 280)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 280)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 280)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint32((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -48173,467 +48326,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint32((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 40
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 40
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)) + 36))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 288)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 288)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+288)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 288))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5534, 0)
+	Xsqlite3VdbeError(tls, p, ts+5524, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(unsafe.Sizeof(Savepoint{}))+uint32(nName)+uint32(1)))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint32(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5585, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5607, 0)
+		ts+5597, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*16)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*16)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5661, 0)
+		ts+5651, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5716
+				return ts + 5706
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5764
+					return ts + 5754
 				}
-				return ts + 5807
+				return ts + 5797
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 296)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+296)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = (int32(pOp) - int32(aOp)) / 20
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 152))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 296)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5848)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 296))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+152, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -48641,67 +48805,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt, iCookie, bp+300)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 300)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 36)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 152))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -48712,24 +48876,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*40
@@ -48737,30 +48901,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -48776,22 +48940,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 36)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*4))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -48805,133 +48969,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 12)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 36)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)).Fz = ts + 1554
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+12,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+40, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), pCx1+48,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 36)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 36)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 12)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -48939,18 +49103,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 36)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -48961,92 +49125,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), bp+304)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), int64(U64(iKey)), 0, bp+304)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -49064,106 +49228,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 312)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), bp+312, bp+304)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+312)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 304)) < 0 || *(*int32)(unsafe.Pointer(bp + 304)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 304)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 304)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 304)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 304)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 304)) > 0 || *(*int32)(unsafe.Pointer(bp + 304)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 304)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 304)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 36)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 304)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 20
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*20)).Fp1)*4))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 36))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -49172,108 +49336,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 344)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 344)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*20)).Fp3)*40
 	*(*int32)(unsafe.Pointer(bp + 376)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+344, bp+376)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 376)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 20
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 376)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 376)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 36)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49281,14 +49445,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 384)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+384)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 384)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 384)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 36)), bp+384, pC9+28)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+384)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -49298,108 +49462,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+384)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+384)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 36)), pIdxKey, pC9+28)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+384)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+384)).FaMem+uintptr(ii1)*40)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 416)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+416, uint8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+416)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 416)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -49418,35 +49582,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 456))
 	if !(*(*int32)(unsafe.Pointer(bp + 456)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 464)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 460)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -49454,123 +49618,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)), bp+460)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 460)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 464)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 460)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 464)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 464)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)))
 	if !(*(*I64)(unsafe.Pointer(bp + 464)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 464))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 464))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 464)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 464)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 464)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 464)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 464))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+464)
 	*(*I64)(unsafe.Pointer(bp + 464)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 464))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 36)), int64(U64(*(*I64)(unsafe.Pointer(bp + 464)))),
 		0, bp+460)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 460)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 460)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 460)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 464))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -49580,52 +49744,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 472)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*16)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+472)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 472)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 472)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -49637,15 +49801,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 472)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 472)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 472)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 472)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 36)), bp+472,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -49653,13 +49818,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -49672,11 +49837,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+472)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*4))
@@ -49687,38 +49852,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 36)), *(*uintptr)(unsafe.Pointer(pSrc + 36)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*16)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 36)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -49730,47 +49895,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 36)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
@@ -49779,35 +49944,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+512)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -49816,51 +49981,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 120)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 520)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 36)))).FpVtab
@@ -49870,72 +50035,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)), bp+520)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 36)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 36)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 36)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49943,43 +50108,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 528)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+528)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 528)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 528)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -49987,84 +50152,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+532)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 532)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 532)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 532)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 532)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 532)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 164 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	*(*int32)(unsafe.Pointer(bp + 536)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+536)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 36))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+536)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 536)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 536)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 536)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 536)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 36)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -50074,34 +50244,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 164 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -50110,10 +50280,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 544)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 544)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -50130,14 +50300,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -50150,21 +50320,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
@@ -50176,62 +50346,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 584)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+584, bp+616)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 616)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5876)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 624)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 36)), bp+624)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
@@ -50244,56 +50414,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 12)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 624))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 672)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 672)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 672)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 672)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 672)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
@@ -50304,54 +50474,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+632, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+632)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+632)).Fn, (*Mem)(unsafe.Pointer(bp+632)).Fz, bp+672, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+632)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 704)) = 0
@@ -50359,72 +50529,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 704)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 704)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 704))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 712)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*16)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+712)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 40)) += *(*I64)(unsafe.Pointer(bp + 712))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40)) += *(*I64)(unsafe.Pointer(bp + 712))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 36)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 36)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 720)) = Pgno(0)
@@ -50433,55 +50603,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+720, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 720)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+124, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5893
+	goto __799
+__798:
+	zSchema = ts + 5883
 	(*InitData)(unsafe.Pointer(bp + 724)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 724)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 724)).FpzErrMsg = p + 124
 	(*InitData)(unsafe.Pointer(bp + 724)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 724)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5907,
+		ts+5897,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*16)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 724)).Frc = SQLITE_OK
@@ -50491,66 +50661,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+724, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 724)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+724)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -50559,151 +50729,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*16)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+752)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*16)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+752, bp+756)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 752)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 756)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 752)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 756)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
 		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+760) == 0) {
-		goto __811
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40, *(*I64)(unsafe.Pointer(bp + 760)))
-__812:
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 120 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5950, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 120 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint32(unsafe.Sizeof(VdbeFrame{}))+uint32(7))&libc.Uint32FromInt32(libc.CplInt32(7)) +
 		uint32(nMem)*uint32(unsafe.Sizeof(Mem{})) +
@@ -50711,10 +50882,10 @@ __826:
 		uint32(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -50736,24 +50907,24 @@ __827:
 
 	pEnd = pFrame2 + 88 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*40
 	pMem1 = pFrame2 + 88
-__828:
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 40
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -50776,103 +50947,103 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*20
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*20)).Fp1)*40
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 536)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 528)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 64)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 536)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 528)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 64)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*40
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pOut = out2Prerelease(tls, p, pOp)
@@ -50884,62 +51055,62 @@ __155:
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
+	goto __849
+__848:
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 768))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(n4)*uint32(unsafe.Sizeof(uintptr(0)))+(uint32(unsafe.Sizeof(Sqlite3_context{}))+uint32(unsafe.Sizeof(Mem{}))-uint32(unsafe.Sizeof(uintptr(0))))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 28 + uintptr(n4)*4
@@ -50956,146 +51127,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 28 + uintptr(i5)*4)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*40
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+28)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+28)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*20)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*40, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
 	*(*int32)(unsafe.Pointer(bp + 776)) = 0
 	*(*int32)(unsafe.Pointer(bp + 776 + 1*4)) = libc.AssignPtrInt32(bp+776+2*4, -1)
 
 	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+776+1*4, bp+776+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 776)) = 1
-__867:
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
 	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 776 + uintptr(i6)*4))))
-	goto __870
-__870:
+	goto __872
+__872:
 	i6++
 	pMem4 += 40
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -51103,70 +51274,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5987,
+		ts+5977,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6039
+				return ts + 6029
 			}
-			return ts + 6044
+			return ts + 6034
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -51174,17 +51345,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -51194,14 +51365,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+124, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -51211,103 +51382,103 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+152, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+152, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 36)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 36)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*16)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6051, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
+		goto __895
 	}
 	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
+__895:
 	;
 	if !(rc != 0) {
-		goto __894
+		goto __896
 	}
 	goto abort_due_to_error
-__894:
+__896:
 	;
-	goto __8
+	goto __9
 
-__172:
+__173:
 	libc.Xmemset(tls, bp+792, 0, uint32(unsafe.Sizeof(Mem{})))
 	(*Mem)(unsafe.Pointer(bp + 792)).Fdb = db
 
@@ -51316,44 +51487,44 @@ __172:
 	zTab = Xsqlite3_value_text(tls, bp+792)
 
 	if !(zTab != 0) {
-		goto __895
+		goto __897
 	}
 	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+124)
-__895:
+__897:
 	;
 	Xsqlite3VdbeMemRelease(tls, bp+792)
 	if !(rc != 0) {
-		goto __896
+		goto __898
 	}
 	goto abort_due_to_error
-__896:
+__898:
 	;
-	goto __8
+	goto __9
 
-__173:
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
 	if !(rc != 0) {
-		goto __897
+		goto __899
 	}
 	goto abort_due_to_error
-__897:
+__899:
 	;
-	goto __8
+	goto __9
 
-__174:
+__175:
 	;
 	pCur3 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 832)) = uintptr(0)
 	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
+		goto __900
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__898:
+__900:
 	;
 	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
 	rc = (*struct {
@@ -51361,47 +51532,47 @@ __898:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+832)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
-		goto __899
+		goto __901
 	}
 	goto abort_due_to_error
-__899:
+__901:
 	;
 	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 832)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
 	*(*uintptr)(unsafe.Pointer(pCur3 + 36)) = *(*uintptr)(unsafe.Pointer(bp + 832))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 832)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 36))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5357, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	pArgc = pQuery + 1*40
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
@@ -51415,27 +51586,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*4)) = pArgc + uintptr(i7+1)*40
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -51443,24 +51614,24 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 36)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
@@ -51470,45 +51641,45 @@ __908:
 	(*Sqlite3_context)(unsafe.Pointer(bp + 836)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 36)), bp+836, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
 	if !((*Sqlite3_context)(unsafe.Pointer(bp+836)).FisError > 0) {
-		goto __911
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 836)).FisError
-__911:
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*4))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 36)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -51518,96 +51689,96 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 36)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 36)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 32)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 32)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
+		goto __919
+	}
+	*(*U64)(unsafe.Pointer(db + 32)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
+__919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+152, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
 
-__180:
+__181:
 	*(*Sqlite_int64)(unsafe.Pointer(bp + 872)) = int64(0)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __919
+		goto __921
 	}
 	goto no_mem
-__919:
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*4)) = pX1
 	pX1 += 40
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
@@ -51616,94 +51787,94 @@ __924:
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 872))
-__925:
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*16)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*40
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 28 + uintptr(i9)*4)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*40
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -51712,63 +51883,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+28)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+228, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
-	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
+	*(*U16)(unsafe.Pointer(pIn1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= uint8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*40
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 164 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 164 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -51778,104 +51949,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 216))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 216))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 216))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*20)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*20)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 164 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 20
-	goto __5
 	goto __7
 __7:
+	pOp += 20
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -51883,52 +52054,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6086,
 		libc.VaList(bp+184, (int32(pOp)-int32(aOp))/20, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 32)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 32)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 164 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -52047,8 +52222,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(328)
-	defer tls.Free(328)
+	bp := tls.Alloc(332)
+	defer tls.Free(332)
 
 	var nAttempt int32
 	var iCol int32
@@ -52068,7 +52243,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -52088,8 +52263,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -52120,8 +52295,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -52154,8 +52329,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52235,8 +52410,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
-	*(*uintptr)(unsafe.Pointer(bp + 324)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
+	*(*uintptr)(unsafe.Pointer(bp + 328)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52305,7 +52480,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+324)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+328)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -52333,12 +52508,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 324)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 328)) != 0 {
 			return ts + 3663
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 324))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 324)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 328))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 328)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52382,7 +52557,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52465,7 +52640,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -55002,6 +55177,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6381, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6389+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6408+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(100)
 	defer tls.Free(100)
@@ -55021,7 +55224,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -55076,7 +55278,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6381, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
 		goto __8
 	}
 
@@ -55197,7 +55399,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6386) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55205,73 +55407,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+44)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 48)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -55283,28 +55503,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 16
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -55315,160 +55535,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6388, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6392, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6396, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 8))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 16
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 8)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 44)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 8)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 144)) |= func() uint32 {
@@ -55477,8 +55698,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 148)) |= func() uint32 {
 		if iCol >= 32 {
@@ -55486,19 +55707,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -55506,81 +55727,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 8))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*20)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*20 + 8 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*20)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6405, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6436, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -55593,144 +55814,144 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6491, libc.VaList(bp+16, zCol))
+		ts+6551, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+44, 0, uint32(unsafe.Sizeof(struct {
 		FpTab        uintptr
 		F__ccgo_pad1 [4]byte
 	}{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6526
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6586
 	*(*uintptr)(unsafe.Pointer(pExpr + 20)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6535
+		zErr = ts + 6595
 	} else {
-		zErr = ts + 6550
+		zErr = ts + 6610
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6572, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 56)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -55774,15 +55995,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6602
+	var zIn uintptr = ts + 6662
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6630
+		zIn = ts + 6690
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6648
+		zIn = ts + 6708
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6666
+		zIn = ts + 6726
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6684, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55861,10 +56082,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6704
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6764
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -55911,7 +56132,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6715, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6775, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -55975,7 +56196,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*20)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6732, libc.VaList(bp, pExpr))
+								ts+6792, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -55991,7 +56212,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6796,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6856,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56005,7 +56226,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6832, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6892, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56028,30 +56249,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6860, libc.VaList(bp+16, pExpr))
+						ts+6920, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6903
+						zType = ts + 6963
 					} else {
-						zType = ts + 6910
+						zType = ts + 6970
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6920, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6948, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7008, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6970,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7014,
+						ts+7074,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56123,7 +56344,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7062, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7122, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
 				}
@@ -56139,7 +56360,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7073, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7133, pExpr, pExpr)
 			}
 
 			break
@@ -56195,7 +56416,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56270,7 +56491,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7084, libc.VaList(bp, i, zType, mx))
+		ts+7144, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56290,7 +56511,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 120 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7140, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7200, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56325,7 +56546,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7174, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56382,7 +56603,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 8 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7180, libc.VaList(bp, i+1))
+				ts+7240, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56410,7 +56631,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 120 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7241, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7301, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56624,7 +56845,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 24)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7272, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7332, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56664,7 +56885,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56675,7 +56896,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7311) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56687,7 +56908,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7317, 0)
+						ts+7377, 0)
 					return WRC_Abort
 				}
 
@@ -56787,12 +57008,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 24)) |= savedHasAgg
@@ -56828,12 +57049,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 220)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 224)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -56943,33 +57164,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) uint8
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) uint8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 20)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*20)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 44)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 20)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*20)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 20))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*20)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -57039,7 +57361,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 44)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -57374,7 +57697,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 		return
 	}
 
@@ -57449,7 +57772,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 120 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7376, libc.VaList(bp, mxHeight))
+			ts+7436, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57698,10 +58021,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7424,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7468
+						return ts + 7528
 					}
 					return ts + 1554
 				}(), nElem))
@@ -57742,7 +58065,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57768,7 +58091,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 120 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7472, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7532, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 20)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57796,7 +58119,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7506, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7566, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57843,7 +58166,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 120 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7526,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7586,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 120 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57868,7 +58191,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 120 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7569, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7629, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58443,7 +58766,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58566,7 +58889,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 120 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7622, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7682, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58622,10 +58945,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6704) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6764) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6709) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59055,13 +59378,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff uint8) int3
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7645) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7705) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7653) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7659) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
 		return 1
 	}
 	return 0
@@ -59265,7 +59588,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7663, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59343,7 +59666,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7710, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -59437,7 +59760,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7741
+		var zFmt uintptr = ts + 7801
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59455,7 +59778,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	}
 }
 
@@ -59496,7 +59819,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7785, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
@@ -59526,11 +59849,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7808, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7868, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1554
 			}
-			return ts + 7827
+			return ts + 7887
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59657,7 +59980,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7839, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 44 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 44)))
@@ -59672,12 +59995,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7857, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1554
 		}
-		return ts + 7827
+		return ts + 7887
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -59698,7 +60022,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59707,7 +60031,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7878)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7938)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60093,8 +60417,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7880, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7883,
+			if Xsqlite3_strnicmp(tls, z, ts+7940, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4932
@@ -60170,7 +60494,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60256,8 +60580,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(72)
-	defer tls.Free(72)
+	bp := tls.Alloc(76)
+	defer tls.Free(76)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -60343,14 +60667,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 52)) = [5]uintptr{ts + 7940, ts + 7945, ts + 7950, ts + 6191, ts + 6186}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 52)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
+				ts + 6186, ts + 8018}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7958
+						return ts + 8026
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 52 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*4))
 				}())
@@ -60364,7 +60690,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60387,10 +60713,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -60490,7 +60816,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -60620,12 +60946,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -60634,110 +60961,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*16)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*16)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 44)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 44)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 44))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*16
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 12)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 12)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 44)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -60780,13 +61120,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*uint8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -60796,11 +61136,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -60823,11 +61163,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -60836,15 +61176,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -60871,20 +61211,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -60893,9 +61233,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -60933,14 +61273,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -60951,17 +61293,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 20))
 	if pFarg != 0 {
@@ -60973,128 +61315,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7990, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*20)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*20)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 44)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*20)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*20)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -61102,42 +61444,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -61160,23 +61502,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -61193,42 +61535,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*16)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*20)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -61249,15 +61593,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61267,22 +61611,22 @@ __128:
 	pTest = bp + 100
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 100)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*20)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61291,21 +61635,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*20)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*20)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61315,27 +61659,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8014, 0)
+		ts+8082, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61344,7 +61688,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -61355,7 +61699,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]uint8)(unsafe.Pointer(ts + 8064))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8132))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62727,18 +63071,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*20)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*16)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*20)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*16)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*20)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*16)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*20)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*16)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -62768,7 +63112,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+32,
+		pInfo+24,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -62781,12 +63125,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+44,
+		pInfo+36,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 16
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*16
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 44))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 20
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(52)
+	defer tls.Free(52)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 24))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -62794,6 +63236,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 8))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*16)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -62808,81 +63290,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 20
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*20
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 44))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 20
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -62904,34 +63313,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 20
-				goto __10
-				goto __12
-			__12:
+				pItem += 16
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*20
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*16
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -63021,7 +63429,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 156 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 160 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -63029,7 +63437,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint32(unsafe.Sizeof([8]int32{}))/uint32(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 156 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 160 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -63080,11 +63488,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63096,13 +63504,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8108,
+		ts+8170,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8283,
+			ts+8345,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63112,10 +63520,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8457, libc.VaList(bp, zDb, zDb))
+		ts+8519, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8604, 0)
+			ts+8666, 0)
 	}
 }
 
@@ -63179,7 +63587,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8755, libc.VaList(bp, zName))
+		ts+8817, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63189,7 +63597,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8814, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63198,7 +63606,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8820, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63239,19 +63647,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8847, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9031,
+		ts+9093,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9336, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9352,
+		ts+9414,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63259,7 +63667,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9410, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63271,7 +63679,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9675, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63283,7 +63691,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9688,
+		ts+9750,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63329,12 +63737,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9726, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9758, 0)
+			ts+9820, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63344,11 +63752,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 44 + 4)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9785)
+				ts+9847)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9844)
+				ts+9906)
 		}
 
 		if pDflt != 0 {
@@ -63361,12 +63769,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9897)
+					ts+9959)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9943)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63377,7 +63785,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9970,
+			ts+10032,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 44)), zCol, *(*int32)(unsafe.Pointer(pNew + 44)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63399,7 +63807,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10116,
+				ts+10178,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63447,14 +63855,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10346, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10380, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63482,7 +63890,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(uint32(unsafe.Sizeof(Column{}))*uint32(nAlloc)))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10410, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -63522,18 +63930,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10429
+		zType = ts + 10491
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10434
+		zType = ts + 10496
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10448,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10466
+					return ts + 10528
 				}
-				return ts + 10483
+				return ts + 10545
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -63617,7 +64025,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -63634,17 +64042,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10522,
+		ts+10584,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10704,
+		ts+10766,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9675, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9737, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63839,7 +64247,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 272; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 12 {
+	for pp = pParse + 276; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 12 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -63902,10 +64310,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10835,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10897,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10858
+				return ts + 10920
 			}
 			return ts + 1554
 		}(), zWhen,
@@ -63947,8 +64355,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10860, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10922, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -63965,7 +64373,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -63987,7 +64395,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10868, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10930, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64027,10 +64435,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)
 				*(*uint8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = uint8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10874, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10936, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*uint8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10858
+							return ts + 10920
 						}
 						return ts + 1554
 					}()))
@@ -64206,8 +64614,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(324)
-	defer tls.Free(324)
+	bp := tls.Alloc(328)
+	defer tls.Free(328)
 
 	var db uintptr
 
@@ -64290,15 +64698,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+20, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+296, 0, uint32(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 296)).FpParse = bp + 20
-	(*Walker)(unsafe.Pointer(bp + 296)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+300, 0, uint32(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 300)).FpParse = bp + 20
+	(*Walker)(unsafe.Pointer(bp + 300)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 296)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 300)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 296 + 24)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 300 + 24)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -64326,7 +64734,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+296, pSelect)
+	Xsqlite3WalkSelect(tls, bp+300, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -64359,13 +64767,13 @@ __15:
 	renameTokenFind(tls, bp+20, bp, (*Parse)(unsafe.Pointer(bp+20)).FpNewTable+32)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+296, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+300, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 20)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64378,7 +64786,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64393,7 +64801,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+20)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTable)).FaCol+uintptr(i)*16)
-	Xsqlite3WalkExpr(tls, bp+296, pExpr)
+	Xsqlite3WalkExpr(tls, bp+300, pExpr)
 	goto __24
 __24:
 	i++
@@ -64449,8 +64857,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+20)
@@ -64498,7 +64906,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+20, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+296, (*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+300, (*Parse)(unsafe.Pointer(bp+20)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -64566,8 +64974,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(356)
-	defer tls.Free(356)
+	bp := tls.Alloc(360)
+	defer tls.Free(360)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64609,11 +65017,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 44))
 
-						libc.Xmemset(tls, bp+324, 0, uint32(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 324)).FpParse = bp + 48
+						libc.Xmemset(tls, bp+328, 0, uint32(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 328)).FpParse = bp + 48
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+48, *(*uintptr)(unsafe.Pointer(pTab + 44)), bp+324)
+						Xsqlite3SelectPrep(tls, bp+48, *(*uintptr)(unsafe.Pointer(pTab + 44)), bp+328)
 						if (*Parse)(unsafe.Pointer(bp+48)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 48)).Frc
 						} else {
@@ -64706,8 +65114,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(324)
-	defer tls.Free(324)
+	bp := tls.Alloc(328)
+	defer tls.Free(328)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64725,16 +65133,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+276, 0, uint32(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+296, 0, uint32(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 296)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 296)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+280, 0, uint32(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+300, 0, uint32(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 300)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 300)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 296)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 300)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 296 + 24)) = bp + 276
+			*(*uintptr)(unsafe.Pointer(bp + 300 + 24)) = bp + 280
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -64749,31 +65157,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+296, pSelect)
+						Xsqlite3WalkSelect(tls, bp+300, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+296, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+300, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+296,
+						Xsqlite3WalkExpr(tls, bp+300,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*16))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+296, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+300, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+296, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+300, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+276, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+280, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+276)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+280)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -64791,8 +65199,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(308)
-	defer tls.Free(308)
+	bp := tls.Alloc(312)
+	defer tls.Free(312)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64818,9 +65226,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 32)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+276, 0, uint32(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 276)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 44)), bp+276)
+				libc.Xmemset(tls, bp+280, 0, uint32(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 280)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 44)), bp+280)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -64848,8 +65256,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(300)
-	defer tls.Free(300)
+	bp := tls.Alloc(304)
+	defer tls.Free(304)
 
 	var db uintptr
 	var iSchema int32
@@ -64886,7 +65294,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -64910,7 +65318,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10879, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int32((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int32(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -64991,17 +65399,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10886,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10948,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10914
+				return ts + 10976
 			}
 			return ts + 6127
 		}(),
@@ -65012,7 +65420,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10926, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65029,10 +65437,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10974, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11095, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11157, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -65150,11 +65558,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11113},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11134},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11154},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11173},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11192}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11175},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11196},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11216},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65188,7 +65596,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11215, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -65197,10 +65605,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11238,
+					ts+11300,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11268, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -65218,9 +65626,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11286, FzCols: ts + 11299},
-	{FzName: ts + 11312, FzCols: ts + 11325},
-	{FzName: ts + 11353},
+	{FzName: ts + 11348, FzCols: ts + 11361},
+	{FzName: ts + 11374, FzCols: ts + 11387},
+	{FzName: ts + 11415},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65228,13 +65636,14 @@ var aTable = [3]struct {
 // information.
 type StatAccum1 = struct {
 	Fdb          uintptr
+	F__ccgo_pad1 [4]byte
 	FnEst        TRowcnt
 	FnRow        TRowcnt
 	FnLimit      int32
 	FnCol        int32
 	FnKeyCol     int32
 	FnSkipAhead  U8
-	F__ccgo_pad1 [7]byte
+	F__ccgo_pad2 [3]byte
 	Fcurrent     StatSample
 	FnPSample    TRowcnt
 	FmxSample    int32
@@ -65245,7 +65654,6 @@ type StatAccum1 = struct {
 	FnMaxEqZero  int32
 	FiGet        int32
 	Fa           uintptr
-	F__ccgo_pad2 [4]byte
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65319,7 +65727,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*40)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -65365,13 +65773,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*112
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*120
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -65384,11 +65792,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*40
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*40
 		for i = 0; i < mxSample+nCol; i++ {
@@ -65412,17 +65820,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11366}
+	FzName:     ts + 11428}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -65433,8 +65841,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -65477,7 +65885,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*40
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -65505,7 +65913,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -65572,7 +65980,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*40
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*40) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -65588,8 +65996,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*40)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*40)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*40)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*40)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -65606,9 +66014,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -65616,14 +66024,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -65631,31 +66039,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*4))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+80, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+92, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*40) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*40, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*40) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*40, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -65663,7 +66071,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11376}
+	FzName:     ts + 11438}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(72)
@@ -65677,20 +66085,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11386,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11448,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11391, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65732,7 +66140,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+48, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+48, ts+11397, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+48, ts+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+48)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+48)).FnChar--
@@ -65746,7 +66154,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11403}
+	FzName:     ts + 11465}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -65790,7 +66198,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11412, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65807,7 +66215,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*64
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11286, uint32(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11348, uint32(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -65963,7 +66371,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66020,7 +66428,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66067,9 +66475,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 40)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11426)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11488)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11430)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66155,16 +66563,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1554
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*uint8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -66174,15 +66582,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(0), 6, 0x40)
 		for *(*uint8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11434, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11496, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11445, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11455, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11517, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+56, uint32(1), 6, 0x40)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -66262,7 +66670,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -66276,42 +66684,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*20)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*20)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -66385,15 +66793,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*20
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 28)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*20)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -66458,11 +66866,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11312, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11374, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11467,
-			ts+11521,
+			ts+11529,
+			ts+11583,
 			zDb)
 	}
 	return rc
@@ -66509,10 +66917,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11286, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11573, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66570,12 +66978,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6381, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6441, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(44)
-	defer tls.Free(44)
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
 
 	var i int32
 	var rc int32
@@ -66586,13 +66994,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -66613,128 +67024,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 28)) = Xsqlite3_vfs_find(tls, ts+3835)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 28)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3835)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*16
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*16
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 28)), ts+11614, db, pNew+4, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 120 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11617,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 120 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11654, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11679,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 120 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+476) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(uint32(unsafe.Sizeof(Db{}))*uint32(3)))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint32(unsafe.Sizeof(Db{}))*uint32(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(uint32(unsafe.Sizeof(Db{}))*uint32((*Sqlite3)(unsafe.Pointer(db)).FnDb+1)))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*16
 	libc.Xmemset(tls, pNew, 0, uint32(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+28, bp+32, bp+36)
+	*(*uint32)(unsafe.Pointer(bp + 28)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+28, bp+32, bp+36, bp+40)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 36)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 36)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 40)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 28)), *(*uintptr)(unsafe.Pointer(bp + 32)), db, pNew+4, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 28)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 36)), db, pNew+4, 0, int32(*(*uint32)(unsafe.Pointer(bp + 28))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11684, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db,
-		ts+11713, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db,
+		ts+11775, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -66744,89 +67178,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 36)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 172 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+40)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+44)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 172 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 40)))
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3MPrintf(tls, db, ts+11781, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 44)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 44)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 40)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 40)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 44)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 44)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66880,14 +67314,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11809, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11871, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11830, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66895,7 +67329,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11856, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -66937,42 +67371,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -66981,13 +67421,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -67006,7 +67446,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11878}
+	FzName:     ts + 11940}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67019,7 +67459,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11892}
+	FzName:     ts + 11954}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67033,7 +67473,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11906, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67065,7 +67505,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11930,
+						ts+11992,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67240,7 +67680,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11976, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67266,11 +67706,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12005, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12011, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67317,7 +67757,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName
 	} else {
-		zCol = ts + 7653
+		zCol = ts + 7713
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67341,7 +67781,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12100, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -67566,6 +68006,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -67578,13 +68021,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint32(uintptr(0)+200)), uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint32(uintptr(0)+204)), uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint32(uintptr(0)+200)), bp, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemcpy(tls, pParse+uintptr(uint32(uintptr(0)+204)), bp, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -67609,25 +68052,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6381) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-						ts+12086)
+						ts+6389)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*16)).FpSchema+8,
-						ts+5893)
+						ts+5883)
 				}
 			}
 		}
@@ -67648,12 +68091,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5893)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5883)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema+8,
-					ts+12086)
+					ts+6389)
 			}
 		}
 	}
@@ -67684,7 +68127,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+404, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12105, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12115, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67702,14 +68145,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12113
+			zMsg = ts + 12123
 		} else {
-			zMsg = ts + 12126
+			zMsg = ts + 12136
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67739,12 +68182,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
-			return ts + 12072
+	if Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
+			return ts + 6427
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12086+7) == 0 {
-			return ts + 12053
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
+			return ts + 6408
 		}
 	}
 	return zName
@@ -68102,7 +68545,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5893)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5883)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68128,7 +68571,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6381, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
 				goto __3
 			}
 
@@ -68181,13 +68624,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12140, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12150, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12157, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68229,9 +68672,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8072, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12177,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68391,9 +68834,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68409,7 +68852,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12219, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
 	return
 __4:
 	;
@@ -68437,9 +68880,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10429
+			return ts + 10491
 		}
-		return ts + 8814
+		return ts + 8876
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68455,9 +68898,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68488,12 +68931,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12260,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10429
+				return ts + 10491
 			}
-			return ts + 8814
+			return ts + 8876
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68508,7 +68951,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12281, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -68595,7 +69038,7 @@ var nullRow = [6]uint8{uint8(6), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema + 40
-	Xsqlite3HashInsert(tls, pHash, ts+12316, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12326, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -68619,7 +69062,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12333, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12343, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68639,7 +69082,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12316
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12326
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -68651,7 +69094,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema + 40
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12316, pRet+8) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12326, pRet+8) ==
 		pRet+8 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68685,7 +69128,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 120 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68693,13 +69136,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+24)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12390, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(6)), ts+12400, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 24 + 4)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+24)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+24)).Fz + uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(1))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+24)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+24)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12397, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+24)).Fz+uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(9)), ts+12407, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 24 + 4)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+24)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+24)).Fz + uintptr((*Token)(unsafe.Pointer(bp+24)).Fn-uint32(1))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+24)).Fn--
@@ -68736,7 +69179,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*16)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*16)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12407, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12417, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -68900,10 +69343,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*16
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12433,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12443,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12478, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint32(unsafe.Sizeof(Expr{})))
@@ -68934,7 +69377,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 12)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12519, 0)
+			ts+12529, 0)
 	}
 }
 
@@ -68979,7 +69422,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12571, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69068,7 +69511,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12612, 0)
+		ts+12622, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69163,7 +69606,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12668, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
 	goto generated_done
 __2:
 	;
@@ -69176,13 +69619,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12711, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12719, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69209,13 +69652,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12726,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69337,12 +69787,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1554
-		zSep2 = ts + 12757
+		zSep2 = ts + 12767
 		zEnd = ts + 4957
 	} else {
-		zSep = ts + 12759
-		zSep2 = ts + 12763
-		zEnd = ts + 12768
+		zSep = ts + 12769
+		zSep2 = ts + 12773
+		zEnd = ts + 12778
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69350,7 +69800,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12771, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*uint8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = uint8('(')
@@ -69388,11 +69838,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1554,
-	ts + 12785,
-	ts + 12791,
-	ts + 12796,
+	ts + 12795,
+	ts + 12801,
+	ts + 12806,
+	ts + 12811,
 	ts + 12801,
 }
 
@@ -69800,10 +70251,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 4))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12807,
+						ts+12817,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12840,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69822,11 +70273,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12867, 0)
+				ts+12877, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12917, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 28)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69860,7 +70311,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12949, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
 			return
 		}
 	}
@@ -69885,11 +70336,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8814
-			zType2 = ts + 12993
+			zType = ts + 8876
+			zType2 = ts + 13003
 		} else {
-			zType = ts + 10429
-			zType2 = ts + 12999
+			zType = ts + 10491
+			zType2 = ts + 13009
 		}
 
 		if pSelect != 0 {
@@ -69951,7 +70402,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 200
+				pEnd2 = pParse + 204
 			} else {
 				pEnd2 = pEnd
 			}
@@ -69960,11 +70411,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+13004, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13019,
+			ts+13029,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -69980,13 +70431,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13117,
+					ts+13127,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13159, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70001,7 +70452,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 24)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9336) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9398) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70031,7 +70482,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13193, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13203, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70047,7 +70498,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10429, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+4, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+4, pSelect) != 0) {
 		goto __3
 	}
@@ -70129,7 +70580,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13229, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70157,8 +70608,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+34, pTable+4)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -70255,13 +70705,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13259, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13269, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13274,
+		ts+13284,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*16)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -70302,10 +70752,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*16)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13341, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13351, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11238,
+				ts+11300,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70337,12 +70787,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13355,
+			ts+13365,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13400,
+		ts+13410,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -70370,11 +70820,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7073, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70452,9 +70902,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70513,21 +70963,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13467, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13495, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13529, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70539,7 +70989,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11430, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -70603,7 +71053,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13561,
+		ts+13571,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*16)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -70615,7 +71065,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13624, 0)
+		ts+13634, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70700,7 +71150,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13718,
+		ts+13728,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*20)).FzEName))
 	goto fk_end
 __23:
@@ -70927,12 +71377,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*20 + 8 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*20)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13764,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13774,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13792
+							return ts + 13802
 						}
-						return ts + 13798
+						return ts + 13808
 					}()))
 				return 1
 			}
@@ -71053,7 +71503,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13803, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+132, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+132, pTblName) != 0) {
 		goto __10
 	}
@@ -71072,7 +71522,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13809,
+		ts+13819,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71098,26 +71548,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13859, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13887, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13897, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13912, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71131,7 +71581,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13803, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71146,7 +71596,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13946, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71158,7 +71608,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13980, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71187,7 +71637,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14004, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71208,9 +71658,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71249,7 +71699,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13803)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71350,7 +71800,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14027, 0)
+		ts+14037, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71567,7 +72017,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14088, libc.VaList(bp+48, 0))
+		ts+14098, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -71619,8 +72069,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14130, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -71666,12 +72116,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14147,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1554
 			}
-			return ts + 14167
+			return ts + 14177
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71679,7 +72129,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14175,
+		ts+14185,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -71693,7 +72143,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14234, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71854,7 +72304,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14261, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71869,7 +72319,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14279, libc.VaList(bp+8, 0))
+		ts+14289, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71880,9 +72330,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -71908,9 +72358,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14352,
+		ts+14362,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11426, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -72045,7 +72495,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14412,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14422,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72253,12 +72703,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14448,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14458,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14484
+				return ts + 14494
 			}
-			return ts + 14487
+			return ts + 14497
 		}()))
 	goto append_from_error
 __1:
@@ -72427,7 +72877,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14493, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72463,9 +72913,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14499
+				return ts + 14509
 			}
-			return ts + 14508
+			return ts + 14518
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72490,7 +72940,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14493, ts + 14515, ts + 14499}
+var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72505,7 +72955,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14523, 0)
+				ts+14533, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72642,14 +73092,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 120)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14593, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*16)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14604, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14614, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
@@ -72675,11 +73125,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14607, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72809,7 +73259,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14616, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -72905,7 +73355,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+12+uintptr(i)*24)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14662, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14672, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73098,7 +73548,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14692, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73378,7 +73828,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73410,11 +73860,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14756, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14785, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -73918,7 +74368,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14823)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
 __62:
 	;
 delete_from_cleanup:
@@ -74033,7 +74483,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11286) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11348) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74263,7 +74713,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 7945, ts + 7940, ts + 6181}
+var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 8005, ts + 8000, ts + 6181}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74322,7 +74772,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14836, -1)
+					Xsqlite3_result_error(tls, context, ts+14846, -1)
 					return
 				}
 				iVal = -iVal
@@ -74626,7 +75076,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14853, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -74972,7 +75422,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 120 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14858, -1)
+		Xsqlite3_result_error(tls, context, ts+14868, -1)
 		return
 	}
 	if argc == 3 {
@@ -74982,7 +75432,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14891, -1)
+				ts+14901, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75081,7 +75531,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14936, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14946, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75096,21 +75546,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = uint8('\'')
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = uint8(0)
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = uint8('\'')
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = uint8(0)
 				*(*uint8)(unsafe.Pointer(zText)) = uint8('X')
 				*(*uint8)(unsafe.Pointer(zText + 1)) = uint8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -75118,7 +75568,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14943, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14953, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -75232,6 +75682,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(4)
+	defer tls.Free(4)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1554
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, (int32(p)-int32(pBlob))/1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -75434,7 +75997,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10858}
+var azOne = [1]uintptr{ts + 10920}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75470,7 +76033,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(j))) = uint8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14946, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14956, 4, uintptr(0))
 	}
 }
 
@@ -75495,7 +76058,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12038, -1)
+		Xsqlite3_result_error(tls, context, ts+12100, -1)
 		return
 	}
 
@@ -75573,7 +76136,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14836, -1)
+			Xsqlite3_result_error(tls, context, ts+14846, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75835,7 +76398,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14951, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14961, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75855,14 +76418,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14957, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14957, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -75992,17 +76555,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -76061,6 +76624,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -76101,108 +76665,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_implies_nonnull_row), FxSFunc: 0, FzName: ts + 14962},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_compare), FxSFunc: 0, FzName: ts + 14982},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_implies_expr), FxSFunc: 0, FzName: ts + 14995},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_affinity), FxSFunc: 0, FzName: ts + 15013},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15022},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15045},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15071},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15096},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15105},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15116},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_sqlite_offset), FxSFunc: 0, FzName: ts + 15123},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15154},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15154},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15154},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15158},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(1), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15162},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15169},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15177},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15184},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15190},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15197},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15204},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15212},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15217},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_implies_nonnull_row), FxSFunc: 0, FzName: ts + 14972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_compare), FxSFunc: 0, FzName: ts + 14992},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_expr_implies_expr), FxSFunc: 0, FzName: ts + 15005},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_affinity), FxSFunc: 0, FzName: ts + 15023},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15032},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15055},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15081},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15106},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15115},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(INLINEFUNC_unlikely), FxSFunc: 0, FzName: ts + 15126},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_sqlite_offset), FxSFunc: 0, FzName: ts + 15133},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(3), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15164},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15164},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15164},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15168},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(1), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15179},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15187},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15194},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15200},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15207},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15222},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15227},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15233},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15239},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15243},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15257},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15275},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15290},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15307},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15318},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15324},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15350},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15364},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15398},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15402},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15408},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15237},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15249},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15259},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15266},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15273},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15284},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15291},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15306},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15323},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15334},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15340},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15358},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15366},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15380},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15414},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15431},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15436},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15441},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15449},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15455},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15461},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15468},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15474},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15479},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15483},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15487},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15493},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15497},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15507},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15512},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15424},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15447},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15452},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15457},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15465},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15471},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(1), FxSFunc: 0, FzName: ts + 15484},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(2), FxSFunc: 0, FzName: ts + 15490},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15495},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15503},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15509},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15513},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15530},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15540},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15545},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15523},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15528},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15534},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15538},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15542},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15546},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15551},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15557},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15563},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15568},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15576},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15584},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15587},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6526},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_iif), FxSFunc: 0, FzName: ts + 15592}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15556},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15561},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15567},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15573},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15579},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15584},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15592},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15600},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6586},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(INLINEFUNC_iif), FxSFunc: 0, FzName: ts + 15608}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76323,7 +76889,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15596,
+				ts+15612,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -76983,8 +77549,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6392, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6388, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 24)) = Token{Fz: ts + 6452, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 32)) = Token{Fz: ts + 6448, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77485,7 +78051,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7910, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -77953,7 +78519,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15641,
+		ts+15657,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -77978,7 +78544,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15682,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*8)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -78127,7 +78693,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15714,
+		ts+15730,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78137,7 +78703,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15766, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78189,7 +78755,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15791,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78197,7 +78763,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15837, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -78609,7 +79175,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15858)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
 __125:
 	;
 insert_cleanup:
@@ -78924,8 +79490,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 								onError, iReg)
 							Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -80015,7 +80582,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -80461,6 +81028,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80499,7 +81067,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12038, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -80508,7 +81076,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15872
+		zEntry = ts + 15888
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -80523,7 +81091,7 @@ __5:
 	if !(ii < int32(uint32(unsafe.Sizeof(azEndings))/uint32(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -80559,7 +81127,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15895, uint32(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint32(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -80573,7 +81141,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15904, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -80597,7 +81165,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15908, uint32(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint32(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -80615,7 +81183,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15914, libc.VaList(bp+16, zEntry, zFile))
+		ts+15930, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80642,7 +81210,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15957, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80680,7 +81248,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15989, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80690,7 +81258,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16026,
+	ts + 16042,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80845,7 +81413,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16029, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80854,62 +81422,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5057,
-	ts + 16068,
-	ts + 8814,
-	ts + 16072,
-	ts + 16077,
-	ts + 16080,
-	ts + 16090,
-	ts + 16100,
+	ts + 16084,
+	ts + 8876,
+	ts + 16088,
+	ts + 16093,
+	ts + 16096,
 	ts + 16106,
-	ts + 16110,
-	ts + 16115,
-	ts + 16120,
-	ts + 16128,
-	ts + 16139,
-	ts + 16142,
-	ts + 16149,
-	ts + 16110,
-	ts + 16115,
-	ts + 16156,
-	ts + 16161,
-	ts + 16164,
-	ts + 16171,
-	ts + 16106,
-	ts + 16110,
+	ts + 16116,
+	ts + 16122,
+	ts + 16126,
+	ts + 16131,
+	ts + 16136,
+	ts + 16144,
+	ts + 16155,
+	ts + 16158,
+	ts + 16165,
+	ts + 16126,
+	ts + 16131,
+	ts + 16172,
 	ts + 16177,
-	ts + 16182,
+	ts + 16180,
 	ts + 16187,
-	ts + 16110,
-	ts + 16191,
-	ts + 16115,
-	ts + 16199,
+	ts + 16122,
+	ts + 16126,
+	ts + 16193,
+	ts + 16198,
 	ts + 16203,
-	ts + 16208,
-	ts + 11430,
-	ts + 11426,
-	ts + 16214,
+	ts + 16126,
+	ts + 16207,
+	ts + 16131,
+	ts + 16215,
 	ts + 16219,
 	ts + 16224,
-	ts + 16068,
-	ts + 16110,
-	ts + 16229,
-	ts + 16236,
-	ts + 16243,
-	ts + 8814,
-	ts + 16251,
-	ts + 5060,
-	ts + 16257,
-	ts + 16068,
-	ts + 16110,
-	ts + 16262,
+	ts + 11492,
+	ts + 11488,
+	ts + 16230,
+	ts + 16235,
+	ts + 16240,
+	ts + 16084,
+	ts + 16126,
+	ts + 16245,
+	ts + 16252,
+	ts + 16259,
+	ts + 8876,
 	ts + 16267,
-	ts + 15464,
-	ts + 16272,
-	ts + 16285,
-	ts + 16294,
+	ts + 5060,
+	ts + 16273,
+	ts + 16084,
+	ts + 16126,
+	ts + 16278,
+	ts + 16283,
+	ts + 15480,
+	ts + 16288,
 	ts + 16301,
-	ts + 16312,
+	ts + 16310,
+	ts + 16317,
+	ts + 16328,
 }
 
 // Definitions of all built-in pragmas
@@ -80926,238 +81494,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16320,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16335,
+	{FzName: ts + 16351,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16350,
+	{FzName: ts + 16366,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16362,
+	{FzName: ts + 16378,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16394,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16301,
+	{FzName: ts + 16317,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16391,
+	{FzName: ts + 16407,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16403,
+	{FzName: ts + 16419,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16423,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16439,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16455,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16460,
+	{FzName: ts + 16476,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16475,
+	{FzName: ts + 16491,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16507,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16505,
+	{FzName: ts + 16521,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16518,
+	{FzName: ts + 16534,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16532,
+	{FzName: ts + 16548,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16551,
+	{FzName: ts + 16567,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16570,
+	{FzName: ts + 16586,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16593,
+	{FzName: ts + 16609,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16618,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16620,
+	{FzName: ts + 16636,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16637,
+	{FzName: ts + 16653,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16650,
+	{FzName: ts + 16666,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16665,
+	{FzName: ts + 16681,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16683,
+	{FzName: ts + 16699,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16693,
+	{FzName: ts + 16709,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16723,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16739,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16748,
+	{FzName: ts + 16764,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16767,
+	{FzName: ts + 16783,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16778,
+	{FzName: ts + 16794,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16789,
+	{FzName: ts + 16805,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16801,
+	{FzName: ts + 16817,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16833,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16830,
+	{FzName: ts + 16846,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16849,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16868,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16881,
+	{FzName: ts + 16897,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16896,
+	{FzName: ts + 16912,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16906,
+	{FzName: ts + 16922,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16918,
+	{FzName: ts + 16934,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16943,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16938,
+	{FzName: ts + 16954,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16948,
+	{FzName: ts + 16964,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16960,
+	{FzName: ts + 16976,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16971,
+	{FzName: ts + 16987,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16983,
+	{FzName: ts + 16999,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17000,
+	{FzName: ts + 17016,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17019,
+	{FzName: ts + 17035,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17045,
+	{FzName: ts + 17061,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17060,
+	{FzName: ts + 17076,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17074,
+	{FzName: ts + 17090,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17093,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17107,
+	{FzName: ts + 17123,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17139,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17135,
+	{FzName: ts + 17151,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17146,
+	{FzName: ts + 17162,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17157,
+	{FzName: ts + 17173,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17169,
+	{FzName: ts + 17185,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17180,
+	{FzName: ts + 17196,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17201,
+	{FzName: ts + 17217,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17209,
+	{FzName: ts + 17225,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17224,
+	{FzName: ts + 17240,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17237,
+	{FzName: ts + 17253,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17256,
+	{FzName: ts + 17272,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17271,
+	{FzName: ts + 17287,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81179,7 +81747,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17287))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17303))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -81191,10 +81759,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17312) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17328) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81203,13 +81771,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7958) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8026) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17329) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17334) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81224,9 +81792,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*uint8)(unsafe.Pointer(z))) >= '0' && int32(*(*uint8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*uint8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16262) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16278) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17346) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81240,7 +81808,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17353, 0)
+				ts+17369, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpBt)
@@ -81331,19 +81899,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17415
+		zName = ts + 17431
 		break
 	case OE_SetDflt:
-		zName = ts + 17424
+		zName = ts + 17440
 		break
 	case OE_Cascade:
-		zName = ts + 17436
+		zName = ts + 17452
 		break
 	case OE_Restrict:
-		zName = ts + 17444
+		zName = ts + 17460
 		break
 	default:
-		zName = ts + 17453
+		zName = ts + 17469
 		break
 	}
 	return zName
@@ -81360,7 +81928,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17463, ts + 17470, ts + 17478, ts + 17482, ts + 17346, ts + 17491,
+	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81407,13 +81975,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17495
+			zType = ts + 17511
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17497
+			zType = ts + 17513
 		} else {
-			zType = ts + 7468
+			zType = ts + 7528
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17499,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -81421,7 +81989,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17506, ts + 17511, ts + 17519}
+var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -81572,14 +82140,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -81666,7 +82236,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17527, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -81927,7 +82497,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17531) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
 		goto __64
 	}
 	b = 2
@@ -81999,7 +82569,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17322
+	zRet = ts + 17338
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82037,7 +82607,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17312
+	zRet = ts + 17328
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82324,7 +82894,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 536)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17536, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82365,7 +82935,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17561, 0)
+		ts+17577, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82419,7 +82989,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17614) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
 		goto __142
 	}
 
@@ -82516,9 +83086,9 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17620
+			return ts + 17636
 		}
-		return ts + 17628
+		return ts + 17644
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -82587,7 +83157,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17635, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82633,29 +83203,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10429
+	zType = ts + 10491
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12711
+	zType = ts + 12721
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17651
+	zType = ts + 17667
 	goto __183
 __182:
-	zType = ts + 8814
+	zType = ts + 8876
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*16)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82721,7 +83291,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17665, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82731,7 +83301,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17670,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*4)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -82768,8 +83338,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 544)) = [3]uintptr{ts + 17675, ts + 17677, ts + 16139}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17679,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 544)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82802,7 +83372,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*16)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*16)).FpBt)))
@@ -82824,7 +83394,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17689, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82888,7 +83458,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -82904,7 +83474,7 @@ __218:
 	if !(i6 < int32(uint32(unsafe.Sizeof(aPragmaName))/uint32(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -82939,7 +83509,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17692,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -82947,7 +83517,7 @@ __226:
 			(*sColMap)(unsafe.Pointer(pFK+36+uintptr(j2)*8)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 25 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 25))),
-			ts+17701))
+			ts+17717))
 	goto __227
 __227:
 	j2++
@@ -83136,7 +83706,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17706, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 560)))
@@ -83353,7 +83923,7 @@ __284:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17710, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*16)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -83414,262 +83984,284 @@ __299:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 568)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__300:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*16)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __301
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __300
+	}
+	mxCol = -1
+	j4 = 0
+__302:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __304
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __305
+	}
+	mxCol++
+__305:
+	;
+	goto __303
+__303:
+	j4++
+	goto __302
+	goto __304
+__304:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __306
 	}
 	mxCol--
-	goto __300
+__306:
+	;
+	goto __301
+__300:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __301:
 	;
 	if !(mxCol >= 0) {
-		goto __302
+		goto __307
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 568)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 568)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__302:
+__307:
 	;
 	if !!(isQuick != 0) {
-		goto __303
+		goto __308
 	}
 	if !(pPk1 != 0) {
-		goto __304
+		goto __309
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 568)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17734,
+		ts+17750,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__305:
+__310:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __307
+		goto __312
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 568)), j4, r2+j4)
-	goto __306
-__306:
+	goto __311
+__311:
 	j4++
-	goto __305
-	goto __307
-__307:
+	goto __310
+	goto __312
+__312:
 	;
-__304:
+__309:
 	;
-__303:
+__308:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__308:
+__313:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __310
+		goto __315
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*16
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __311
+		goto __316
 	}
-	goto __309
-__311:
+	goto __314
+__316:
 	;
 	if !(bStrict != 0) {
-		goto __312
+		goto __317
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4) > COLTYPE_ANY)
-	goto __313
-__312:
+	goto __318
+__317:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__313:
+__318:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __314
+		goto __319
 	}
-	goto __309
-__314:
+	goto __314
+__319:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 568)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __316
-__315:
+	goto __321
+__320:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __317
+		goto __322
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 576)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		(*Column)(unsafe.Pointer(pCol1)).Faffinity, bp+576)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 576)) != 0) {
-		goto __318
+		goto __323
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 576)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 576)))
-__318:
+__323:
 	;
-__317:
+__322:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 568))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __319
+		goto __324
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __320
-__319:
+	goto __325
+__324:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__320:
+__325:
 	;
-__316:
+__321:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf>>0)) != 0) {
-		goto __321
+		goto __326
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17770, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __323
-__322:
+	goto __328
+__327:
 	;
-__323:
+__328:
 	;
-__321:
+__326:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __324
+		goto __329
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17790,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 4))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __325
-__324:
+	goto __330
+__329:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __326
+		goto __331
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17812,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __327
-__326:
+	goto __332
+__331:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __328
+		goto __333
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 568)), j4, 3)
-__329:
+__334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17835, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17837,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*16)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__328:
+__333:
 	;
-__327:
+__332:
 	;
-__325:
+__330:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __309
-__309:
+	goto __314
+__314:
 	j4++
-	goto __308
-	goto __310
-__310:
+	goto __313
+	goto __315
+__315:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __330
+		goto __335
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __331
+		goto __336
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 568)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__332:
+__337:
 	if !(k3 > 0) {
-		goto __334
+		goto __339
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*20)).FpExpr, addrCkFault, 0)
-	goto __333
-__333:
+	goto __338
+__338:
 	k3--
-	goto __332
-	goto __334
-__334:
+	goto __337
+	goto __339
+__339:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17857,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__331:
+__336:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__330:
+__335:
 	;
 	if !!(isQuick != 0) {
-		goto __335
+		goto __340
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__336:
+__341:
 	if !(pIdx5 != 0) {
-		goto __338
+		goto __343
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __339
+		goto __344
 	}
-	goto __337
-__339:
+	goto __342
+__344:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 568)), 0, 0, bp+580,
 		pPrior, r1)
@@ -83678,80 +84270,119 @@ __339:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 572))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17892)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__345:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __347
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*4)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __348
+	}
+	goto __346
+__348:
+	;
+	if !(label6 == 0) {
+		goto __349
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__349:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 572))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	if !(label6 != 0) {
+		goto __350
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__350:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __340
+		goto __351
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__341:
+__352:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __343
+		goto __354
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*16 + 4))&0xf>>0)) != 0) {
-		goto __344
+		goto __355
 	}
-	goto __342
-__344:
+	goto __353
+__355:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 572))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 572))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17956)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__351:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 580)))
 	goto __342
 __342:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __341
 	goto __343
 __343:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 572))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 572))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17913)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __340:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 580)))
-	goto __337
-__337:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __336
-	goto __338
-__338:
-	;
-__335:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 568)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __345
+		goto __356
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17940)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__346:
+__357:
 	if !(pIdx5 != 0) {
-		goto __348
+		goto __359
 	}
 	if !(pPk1 == pIdx5) {
-		goto __349
+		goto __360
 	}
-	goto __347
-__349:
+	goto __358
+__360:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 572))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83760,21 +84391,21 @@ __349:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __347
-__347:
+	goto __358
+__358:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __346
-	goto __348
-__348:
+	goto __357
+	goto __359
+__359:
 	;
 	if !(pPk1 != 0) {
-		goto __350
+		goto __361
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__350:
+__361:
 	;
-__345:
+__356:
 	;
 	goto __291
 __291:
@@ -83792,14 +84423,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(endCode))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __351
+		goto __362
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 564))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*20)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 17969
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*20 + 16)) = ts + 18012
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*20)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*20 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__351:
+__362:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83807,27 +84438,27 @@ __351:
 
 __45:
 	if !!(zRight != 0) {
-		goto __352
+		goto __363
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __354
+		goto __365
 	}
 	goto pragma_out
-__354:
+__365:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __353
-__352:
+	goto __364
+__363:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __355
+		goto __366
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__356:
+__367:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __358
+		goto __369
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __359
+		goto __370
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83836,25 +84467,25 @@ __356:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __358
-__359:
+	goto __369
+__370:
 	;
-	goto __357
-__357:
+	goto __368
+__368:
 	pEnc += 8
-	goto __356
-	goto __358
-__358:
+	goto __367
+	goto __369
+__369:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __360
+		goto __371
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17972, libc.VaList(bp+456, zRight))
-__360:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+__371:
 	;
-__355:
+__366:
 	;
-__353:
+__364:
 	;
 	goto __15
 
@@ -83862,15 +84493,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __361
+		goto __372
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(setCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __363
+		goto __374
 	}
 	goto __15
-__363:
+__374:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp1 = iDb
@@ -83878,41 +84509,41 @@ __363:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __364
+		goto __375
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*20)).Fopcode = U8(OP_Noop)
-__364:
+__375:
 	;
-	goto __362
-__361:
+	goto __373
+__372:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint32(unsafe.Sizeof(readCookie))/uint32(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __365
+		goto __376
 	}
 	goto __15
-__365:
+__376:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*20)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*20)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__362:
+__373:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__366:
+__377:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __366
-__367:
+	goto __377
+__378:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -83927,31 +84558,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17329) == 0) {
-		goto __369
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
+		goto __380
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __370
-__369:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17997) == 0) {
-		goto __371
+	goto __381
+__380:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
+		goto __382
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __372
-__371:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17482) == 0) {
-		goto __373
+	goto __383
+__382:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
+		goto __384
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__373:
+__384:
 	;
-__372:
+__383:
 	;
-__370:
+__381:
 	;
-__368:
+__379:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -83961,10 +84592,10 @@ __368:
 
 __49:
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__374:
+__385:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -83984,19 +84615,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __377
+		goto __388
 	}
 	goto __15
-__377:
+__388:
 	;
-	goto __376
-__375:
+	goto __387
+__386:
 	opMask = U32(0xfffe)
-__376:
+__387:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84005,86 +84636,86 @@ __376:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__378:
+__389:
 	if !(iDb <= iDbLast) {
-		goto __380
+		goto __391
 	}
 	if !(iDb == 1) {
-		goto __381
+		goto __392
 	}
-	goto __379
-__381:
+	goto __390
+__392:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__382:
+__393:
 	if !(k4 != 0) {
-		goto __384
+		goto __395
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __385
+		goto __396
 	}
-	goto __383
-__385:
+	goto __394
+__396:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__386:
+__397:
 	if !(pIdx6 != 0) {
-		goto __388
+		goto __399
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 56))&0x80>>7) != 0) {
-		goto __389
+		goto __400
 	}
 	szThreshold = int16(0)
-	goto __388
-__389:
+	goto __399
+__400:
 	;
-	goto __387
-__387:
+	goto __398
+__398:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __386
-	goto __388
-__388:
+	goto __397
+	goto __399
+__399:
 	;
 	if !(szThreshold != 0) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__390:
+__401:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18005,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __391
+		goto __402
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __392
-__391:
+	goto __403
+__402:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__392:
+__403:
 	;
-	goto __383
-__383:
+	goto __394
+__394:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __382
-	goto __384
-__384:
+	goto __393
+	goto __395
+__395:
 	;
-	goto __379
-__379:
+	goto __390
+__390:
 	iDb++
-	goto __378
-	goto __380
-__380:
+	goto __389
+	goto __391
+__391:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84092,36 +84723,36 @@ __380:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __393
+		goto __404
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__393:
+__404:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+584) == SQLITE_OK) {
-		goto __394
+		goto __405
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 584)))
-__394:
+__405:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+592) == SQLITE_OK) {
-		goto __395
+		goto __406
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 592)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 592)))) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 592)))
-__396:
+__407:
 	;
-__395:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84130,10 +84761,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+600) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 600)) >= int64(0)) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 600))&int64(0x7fffffff)))
-__397:
+__408:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84142,10 +84773,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+608) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 608)) >= int64(0)) {
-		goto __398
+		goto __409
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 608)) & int64(0x7fffffff))
-__398:
+__409:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84153,10 +84784,10 @@ __398:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __399
+		goto __410
 	}
 
-__399:
+__410:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84208,14 +84839,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18023, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18028, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18034, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18043, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18052, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18060, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18068},
-	{FzName: ts + 18075},
+	{FzName: ts + 18066, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18071, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18077, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18086, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18095, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18103, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18111},
+	{FzName: ts + 18118},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84267,7 +84898,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+56, int32(unsafe.Sizeof([200]uint8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18081)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18124)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84275,7 +84906,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18096, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -84288,16 +84919,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18103, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18109)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18152)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18121)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
@@ -84480,13 +85111,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 120 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18136)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18179)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18144, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 16 + 1*4))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 16)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18148, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 16))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -84563,12 +85194,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18152, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
+			ts+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*4)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -84577,19 +85208,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5008
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18180, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18211, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18219,
-	ts + 18226,
-	ts + 18238,
+	ts + 18262,
+	ts + 18269,
+	ts + 18281,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84649,7 +85280,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)), db+172) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+172+8, uint32(0), 0, 0x1)
@@ -84681,13 +85312,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*4)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18249)
+			corruptSchema(tls, pData, argv, ts+18292)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)), pIndex+44) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 	}
@@ -84720,16 +85351,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8814
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8876
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*4)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*4)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*4))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7878
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18262
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*4)) = ts + 7938
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*4)) = ts + 18305
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*4)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 40)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 40)).FiDb = iDb
@@ -84807,17 +85438,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 68 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11713)
+		ts+11775)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -84826,44 +85466,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 68 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 68 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18334)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 68 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 32)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18377)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 68 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 32)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 40)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18358,
+		ts+18401,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -84874,57 +85514,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 40)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema + 78)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -85013,8 +85653,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -85127,8 +85769,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+156)-uint32(uintptr(0)+4))
-	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+160)-uint32(uintptr(0)+4))
+	libc.Xmemset(tls, pParse+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -85139,8 +85781,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(292)
-	defer tls.Free(292)
+	bp := tls.Alloc(296)
+	defer tls.Free(296)
 
 	var rc int32
 	var i int32
@@ -85152,8 +85794,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+156)-uint32(uintptr(0)+4))
-	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+200)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+200))
+	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+4)), 0, uint32(uintptr(0)+160)-uint32(uintptr(0)+4))
+	libc.Xmemset(tls, bp+16+uintptr(uint32(uintptr(0)+204)), 0, uint32(unsafe.Sizeof(Parse{}))-uint32(uintptr(0)+204))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -85193,7 +85835,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*16)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18392, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85223,7 +85865,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18422, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85319,7 +85961,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -85418,7 +86060,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85736,8 +86378,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10858
-		var zSp2 uintptr = ts + 10858
+		var zSp1 uintptr = ts + 10920
+		var zSp2 uintptr = ts + 10920
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85745,13 +86387,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18441, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18471))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18514))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -85926,7 +86568,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 48)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18505, libc.VaList(bp, 0))
+					ts+18548, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -85971,7 +86613,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18555, libc.VaList(bp+8, zName))
+						ts+18598, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -85982,7 +86624,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 36 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*72 + 36 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*72 + 48)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18619,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18662,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86026,7 +86668,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6526, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -86373,9 +87015,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -86613,16 +87252,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18656
+		z = ts + 18699
 		break
 	case TK_INTERSECT:
-		z = ts + 18666
+		z = ts + 18709
 		break
 	case TK_EXCEPT:
-		z = ts + 18676
+		z = ts + 18719
 		break
 	default:
-		z = ts + 18683
+		z = ts + 18726
 		break
 	}
 	return z
@@ -86632,10 +87271,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18689, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -86655,6 +87297,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18755, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18786
+		}
+		return ts + 1554
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -86721,6 +87370,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -86785,6 +87435,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -86839,7 +87490,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16251
+					*(*uintptr)(unsafe.Pointer(bp + 40)) = ts + 16267
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 40)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*16, uintptr(0))
@@ -86978,13 +87629,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16251
+				zCol = ts + 16267
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -86992,7 +87643,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*20)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87057,7 +87708,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -87082,7 +87733,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*16)).FzCnName
 				} else {
-					zName = ts + 16251
+					zName = ts + 16267
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87092,7 +87743,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 48)) = U32(0)
@@ -87108,7 +87759,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18721, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 48)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 48)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+48)
 			}
@@ -87133,45 +87785,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*16)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
 	bp := tls.Alloc(32)
 	defer tls.Free(32)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -87181,14 +87836,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*20)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*20)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18818
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -87198,9 +87885,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 12)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -87244,7 +87928,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+34, pTab+4)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -87395,7 +88079,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18729, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
 	return
 __1:
 	;
@@ -87486,7 +88170,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18778, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -87506,7 +88190,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18820, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -87543,7 +88227,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18826, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -87577,11 +88261,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18841, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18934, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1554
 		}
-		return ts + 18864
+		return ts + 18957
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87682,8 +88366,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18866, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18881, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87730,7 +88414,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18656, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87797,7 +88481,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 48)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+48)
 
@@ -87859,7 +88543,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 76)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+76)
 
@@ -88012,10 +88696,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19014, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18967,
+			ts+19060,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88269,8 +88953,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7174)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88297,13 +88981,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+36, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19049, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19060, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19153, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88315,7 +88999,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19065, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19158, 0)
 	Xsqlite3Select(tls, pParse, p, bp+36)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88729,6 +89413,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff uint8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*20)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
@@ -88848,15 +89551,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff uint8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*20)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*20)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -89232,16 +89928,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*20)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -89301,12 +90014,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15154) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15158) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15168) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -89372,7 +90085,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19071, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19164, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -89455,7 +90168,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19089, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89584,15 +90297,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19112, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 64))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 64))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+36+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 68)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -89610,7 +90320,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+36+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19132, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89626,7 +90336,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19175
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -89652,7 +90362,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19198,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19291,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -89663,9 +90373,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+34, pTab+4)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19236
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19329
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19270
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89712,7 +90422,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19308, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19401, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89824,7 +90534,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19312,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89843,7 +90553,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*16)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19351,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19444,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 44)), 0)
@@ -89851,7 +90561,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 36 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 8)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -89952,7 +90662,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 						} else {
-							zSchemaName = ts + 6386
+							zSchemaName = ts + 6446
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -89967,7 +90677,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*20
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19382, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19475, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 7, 0x80)
 							}
@@ -90032,7 +90742,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*20)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19387,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19480,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90044,7 +90754,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+8+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -90063,9 +90773,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19396, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19414, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
 					}
 				}
 			}
@@ -90075,7 +90785,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 120 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19434, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19527, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90134,11 +90844,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -90197,6 +90903,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 24)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*16)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 24)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*16)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*16
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(28)
+	defer tls.Free(28)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 44)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -90212,7 +90993,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -90225,13 +91007,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 20)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 20)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19465, 0)
+					ts+19558, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 20)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19516, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -90239,7 +91021,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 20
+	pFunc += 16
 	goto __1
 	goto __3
 __3:
@@ -90259,19 +91041,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 20))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 20
+	pF += 16
 	goto __1
 	goto __3
 __3:
@@ -90285,6 +91070,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -90359,7 +91147,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -90371,7 +91161,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 20
+	pF += 16
 	goto __1
 	goto __3
 __3:
@@ -90389,13 +91179,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 20
+	pC += 16
 	goto __7
 	goto __9
 __9:
@@ -90412,11 +91202,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19549,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19642,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19561
+						return ts + 19654
 					}
 					return ts + 1554
 				}(),
@@ -90437,7 +91227,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90469,14 +91259,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 72 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*72
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -90530,6 +91321,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*72
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 36 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 68))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*72)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 72
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -90594,7 +91436,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -90693,7 +91534,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19584,
+		ts+19677,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90754,7 +91595,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19638,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -90868,7 +91709,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 220)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 224)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 36 + 4))&0x100>>8) == 0 ||
@@ -90885,11 +91726,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*72)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 36 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 68)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -90900,7 +91737,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19678, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19771, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+36+4, uint32(1), 5, 0x20)
@@ -90926,7 +91763,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -90958,11 +91795,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+88, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19693, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 88)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+88)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+88)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 88)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -90996,7 +91831,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 220)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 224)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -91305,12 +92140,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 128)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 128 + 8)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+128, pEList)
@@ -91339,39 +92173,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*20)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 128 + 24)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+128, *(*uintptr)(unsafe.Pointer(pExpr + 20)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+128, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 44)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 128 + 24)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+128)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -91382,24 +92192,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -91432,27 +92242,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+128)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+116)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19709
+				return ts + 19802
 			}
-			return ts + 19718
+			return ts + 19811
 		}())
 
 	groupBySort = 1
@@ -91460,47 +92277,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*20)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*16)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*20
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*16
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -91516,45 +92333,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*20)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -91573,16 +92396,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -91613,16 +92436,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -91635,98 +92458,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 36 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*16)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*20)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*20)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 20))
@@ -91735,79 +92561,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 160)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+116)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19709)
-__148:
+	explainTempTable(tls, pParse, ts+19802)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19727
-			}
-			return ts + 19750
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -91903,7 +92724,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19759, 0)
+		ts+19820, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92136,7 +92957,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19824, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19885, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92180,7 +93001,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19870, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+36, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+36, pTableName) != 0) {
 		goto __9
 	}
@@ -92198,7 +93019,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19878, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -92210,7 +93031,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19870, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -92225,7 +93046,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19919, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -92237,22 +93058,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19945, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19983,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20020
+				return ts + 20081
 			}
-			return ts + 20027
+			return ts + 20088
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -92261,7 +93082,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20033, libc.VaList(bp+24, pTableName+8))
+		ts+20094, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -92290,9 +93111,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -92410,7 +93231,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19870, bp+56)
+	Xsqlite3FixInit(tls, bp+64, pParse, iDb, ts+19931, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+64, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+64, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -92443,7 +93264,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20079,
+		ts+20140,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92468,13 +93289,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20127,
+		ts+20188,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20202, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20263, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92730,7 +93551,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20231, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92769,9 +93590,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*16)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12086
+				return ts + 6389
 			}
-			return ts + 5893
+			return ts + 5883
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92783,7 +93604,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20251,
+			ts+20312,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -92897,12 +93718,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20313,
+		ts+20374,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20361
+				return ts + 20422
 			}
-			return ts + 20368
+			return ts + 20429
 		}()))
 __15:
 	;
@@ -93016,7 +93837,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20375, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20436, 0)
 	return 1
 }
 
@@ -93199,8 +94020,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(316)
-	defer tls.Free(316)
+	bp := tls.Alloc(320)
+	defer tls.Free(320)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -93233,8 +94054,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 16 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+284, 0, uint32(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 284)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+288, 0, uint32(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 288)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -93246,13 +94067,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20417, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+284, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+288, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -93568,7 +94389,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -93838,7 +94660,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20431,
+		ts+20492,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*16)).FzCnName))
 	goto update_cleanup
 __27:
@@ -93870,7 +94692,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20467, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*20)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -93880,7 +94702,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7653
+				return ts + 7713
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*16)).FzCnName
 		}(),
@@ -94750,7 +95572,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20486)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
 __169:
 	;
 update_cleanup:
@@ -95056,10 +95878,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*uint8)(unsafe.Pointer(bp + 152)) = uint8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+152, ts+20499, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+152, ts+20560, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20503, libc.VaList(bp+8, bp+152))
+				ts+20564, libc.VaList(bp+8, bp+152))
 			return SQLITE_ERROR
 		}
 
@@ -95150,7 +95972,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12140, -1)
+				ts+12150, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95182,7 +96004,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20576, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20580, uint32(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20637, uint32(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint32(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -95330,14 +96152,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20584)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20645)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20624)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
 	return SQLITE_ERROR
 __2:
 	;
@@ -95348,7 +96170,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20667)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
 	return SQLITE_ERROR
 __5:
 	;
@@ -95376,7 +96198,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20685, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -95396,7 +96218,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20708)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
 	goto end_of_vacuum
 __8:
 	;
@@ -95411,7 +96233,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14493)
+	rc = execSql(tls, db, pzErrMsg, ts+14503)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -95456,7 +96278,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20735,
+		ts+20796,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95465,7 +96287,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20843,
+		ts+20904,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95476,7 +96298,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20897,
+		ts+20958,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 24)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95487,7 +96309,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21048,
+		ts+21109,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95709,12 +96531,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -95832,7 +96654,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint32(unsafe.Sizeof(uintptr(0))) * uint32(2+*(*int32)(unsafe.Pointer(pTable + 44))))
 	if *(*int32)(unsafe.Pointer(pTable + 44))+3 >= *(*int32)(unsafe.Pointer(db + 120 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 44 + 4)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -95916,11 +96738,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32((int32((*Token)(unsafe.Pointer(pEnd)).Fz)-int32((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21178, libc.VaList(bp, pParse+192))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21239, libc.VaList(bp, pParse+196))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21202,
+			ts+21263,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*16)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -95930,7 +96752,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21301, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -95964,7 +96786,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 256
+	var pArg uintptr = pParse + 260
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -95991,7 +96813,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21320, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96029,7 +96851,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21423, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 48))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
@@ -96041,7 +96863,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21392
+			var zFormat uintptr = ts + 21453
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96058,7 +96880,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16142, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -96115,7 +96937,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 44 + 4))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21438, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21499, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -96173,7 +96995,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+404, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21438, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21499, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -96193,8 +97015,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(284)
-	defer tls.Free(284)
+	bp := tls.Alloc(288)
+	defer tls.Free(288)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -96207,7 +97029,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96660,7 +97482,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -96687,7 +97509,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -96919,10 +97741,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21457
+		return ts + 21518
 	}
 	if i == -1 {
-		return ts + 16251
+		return ts + 16267
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*16)).FzCnName
 }
@@ -96931,15 +97753,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -96950,11 +97772,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
 	}
@@ -96976,27 +97798,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21472, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21533, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21475
+				return ts + 21536
 			}
-			return ts + 21480
+			return ts + 21541
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21488)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21549)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21490)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21551)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
 }
@@ -97039,11 +97861,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+88, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21492, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21553, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21498
+				return ts + 21559
 			}
-			return ts + 21505
+			return ts + 21566
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97053,43 +97875,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10914
+					zFmt = ts + 10976
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21510
+				zFmt = ts + 21571
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21543
+				zFmt = ts + 21604
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21568
+				zFmt = ts + 21629
 			} else {
-				zFmt = ts + 21586
+				zFmt = ts + 21647
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21595, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp uint8
-			var zRowid uintptr = ts + 16251
-			Xsqlite3_str_appendf(tls, bp+64, ts+21603, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16267
+			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = uint8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21634, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21695, libc.VaList(bp+32, zRowid))
 				cRangeOp = uint8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = uint8('>')
 			} else {
 				cRangeOp = uint8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21644, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21705, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21649,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 12))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21676, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21737, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97121,28 +97943,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+48, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21687, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21748, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*16)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21708, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21769, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21464, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21525, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -97203,52 +98026,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 20)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 20)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 20)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)) + 24 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*4)) + 24 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*20)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*20)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*20)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*20)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 20)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 20))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 16)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 20)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*20 + 16)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -98726,7 +99555,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21716, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98754,7 +99583,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21731, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -99272,7 +100101,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21740, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99630,10 +100459,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16100, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15431, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14957, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21754, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16116, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15447, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14967, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21815, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100010,49 +100839,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*72)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*72)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*72)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*72)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -100060,13 +100878,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*72)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -100131,12 +100952,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -100160,7 +100981,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 20)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 24 + 4))-1)*20)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 24)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -100170,7 +100991,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 10)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -100215,7 +101036,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -100309,7 +101130,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
-				return ts + 21802
+				return ts + 21863
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100320,7 +101141,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -100328,6 +101148,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*48
 		if *(*int32)(unsafe.Pointer(bp + 12)) != 0 {
@@ -100361,7 +101182,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 24 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 20)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -100514,6 +101335,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*48)).FleftCursor != iCsr {
 				return
 			}
@@ -100682,7 +101506,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21809,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101415,7 +102239,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21845, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*16)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101486,7 +102310,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21871
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -101993,7 +102817,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -102013,7 +102837,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*20)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*20)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -102024,10 +102848,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*20)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -102038,29 +102862,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*20)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -102162,8 +102986,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(24)
-	defer tls.Free(24)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -102175,7 +102999,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -102185,17 +103009,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -102215,19 +103039,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+12)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 12)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+20)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 12)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -102239,19 +103063,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -102261,10 +103085,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -102278,9 +103102,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 20)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+20)
-			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 28)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+28)
+			if *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 				return rc
 			}
 		}
@@ -102305,8 +103129,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(16)
-	defer tls.Free(16)
+	bp := tls.Alloc(24)
+	defer tls.Free(24)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -102318,7 +103142,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -102334,21 +103158,21 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 
 	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+8)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 8 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 8 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -102359,7 +103183,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -102681,6 +103505,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*72)).Ffg.Fjointype)&
@@ -102774,8 +103599,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(100)
-	defer tls.Free(100)
+	bp := tls.Alloc(104)
+	defer tls.Free(104)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -102799,8 +103624,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -102952,7 +103778,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 96)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 96)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -102971,7 +103797,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 96)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 96))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 96)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 10)) |= U16(TERM_HIGHTRUTH)
@@ -102985,7 +103811,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 96)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 96)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -102994,9 +103820,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -103015,6 +103845,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -103142,51 +103975,75 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*20)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 24))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 24)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
-	bp := tls.Alloc(36)
-	defer tls.Free(36)
+	bp := tls.Alloc(40)
+	defer tls.Free(40)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 28)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 28)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 28)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint32(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -103195,9 +104052,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = bp + 28
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+28)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+28)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -103238,7 +104101,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 98
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+56, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 98)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 98 + 1*2)) = int16(0)
@@ -103278,7 +104141,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -103344,19 +104208,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 56))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 44)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -103536,7 +104405,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*4)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103594,7 +104463,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*4)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -103992,7 +104861,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21908, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21969, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104203,8 +105072,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*20)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*20)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -104323,14 +105192,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -104482,7 +105360,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -104590,7 +105468,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21943, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104852,19 +105730,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 760)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 760 + uintptr(i)*88)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*72
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*72
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 28)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 44)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 44)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -104876,9 +105756,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -104911,13 +105791,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -105069,7 +105949,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21961, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint32(unsafe.Sizeof(Bitmask(0)))*uint32(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105133,7 +106013,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21989, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
 	goto __5
 __4:
 	ii = 0
@@ -105834,7 +106714,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 56))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -106016,7 +106896,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22007, -1)
+		pCtx, ts+22068, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -106149,7 +107029,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22063, -1)
+					pCtx, ts+22124, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -106238,17 +107118,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22108))
-var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22119))
-var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22130))
-var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22135))
-var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22148))
-var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22158))
-var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22164))
-var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22175))
-var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22185))
-var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22197))
-var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22202))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22169))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22180))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22191))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22196))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22209))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22219))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22225))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22236))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22246))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22258))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22263))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -106294,7 +107174,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22206, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -106338,12 +107218,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22225, 0)
+			ts+22286, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22296, 0)
+				ts+22357, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -106366,7 +107246,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*16)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 					}
 					break
 				}
@@ -106571,7 +107451,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22359, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106687,7 +107567,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 28)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 28)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106698,6 +107578,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+36+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, uint8(SQLITE_AFF_NONE))
@@ -106801,7 +107682,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22385, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -106866,15 +107747,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22417
+				zErr = ts + 22478
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22434
+				zErr = ts + 22495
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22450
+				zErr = ts + 22511
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22470, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -106895,7 +107776,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22503, 0)
+				ts+22564, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107051,11 +107932,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22550,
-	ts + 22603,
-	ts + 22007,
-	ts + 22654,
-	ts + 22706,
+	ts + 22611,
+	ts + 22664,
+	ts + 22068,
+	ts + 22715,
+	ts + 22767,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108251,8 +109132,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -108263,13 +109143,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -108451,19 +109328,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22756,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22817,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19750
+							return ts + 22859
 						}
-						return ts + 22798
+						return ts + 22868
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 120 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22804, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22874, 0)
 		}
 	}
 
@@ -108534,7 +109411,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22838,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22908,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109629,7 +110506,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22876, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110604,21 +111481,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16251, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16267, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16164, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+4)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+4)).Fz, ts+16180, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+4)).Fn, (*Token)(unsafe.Pointer(yymsp+4)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 4)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -111361,7 +112238,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*12 + 4)), yymsp+libc.UintptrFromInt32(-4)*12+4)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+22925)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)), ts+22995)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -111525,7 +112402,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 92)) = *(*Token)(unsafe.Pointer(yymsp + 4))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp+32, bp+92))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp+32, bp+92))
 						*(*uintptr)(unsafe.Pointer(yymsp + 4)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 4)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -111742,9 +112619,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*12 + 4)) != 0 {
-							return ts + 6704
+							return ts + 6764
 						}
-						return ts + 6709
+						return ts + 6769
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)))
@@ -111756,6 +112633,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), *(*uintptr)(unsafe.Pointer(pRHS + 20)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 20)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*12 + 4)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*12 + 4)) == uintptr(0) {
@@ -112023,19 +112905,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*12 + 4)) = *(*Token)(unsafe.Pointer(yymsp + 4))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22958, 0)
+					ts+23028, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23053, 0)
+					ts+23123, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23137, 0)
+					ts+23207, 0)
 			}
 			break
 		case uint32(273):
@@ -112414,9 +113296,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23222, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -113184,7 +114066,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 1248)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 1248)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23239, libc.VaList(bp, bp+1248))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23309, libc.VaList(bp, bp+1248))
 				break
 			}
 		}
@@ -113207,7 +114089,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23264, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -113380,7 +114262,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23275, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -113393,11 +114275,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19870, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23282, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23287, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113410,9 +114292,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23297, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23301, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113646,7 +114528,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -114221,7 +115103,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -114236,7 +115118,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23309, 0)
+			ts+23379, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114427,23 +115309,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23377
+	var zErr uintptr = ts + 23447
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23391
+			zErr = ts + 23461
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23413
+			zErr = ts + 23483
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23435
+			zErr = ts + 23505
 			break
 
 		}
@@ -114461,35 +115343,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23458,
-	ts + 23471,
+	ts + 23528,
+	ts + 23541,
 	uintptr(0),
-	ts + 23487,
-	ts + 23512,
-	ts + 23526,
-	ts + 23545,
+	ts + 23557,
+	ts + 23582,
+	ts + 23596,
+	ts + 23615,
 	ts + 1490,
-	ts + 23570,
-	ts + 23607,
-	ts + 23619,
-	ts + 23634,
-	ts + 23667,
-	ts + 23685,
-	ts + 23710,
-	ts + 23739,
+	ts + 23640,
+	ts + 23677,
+	ts + 23689,
+	ts + 23704,
+	ts + 23737,
+	ts + 23755,
+	ts + 23780,
+	ts + 23809,
 	uintptr(0),
-	ts + 5848,
+	ts + 5838,
 	ts + 5334,
-	ts + 23756,
-	ts + 23774,
-	ts + 23792,
-	uintptr(0),
 	ts + 23826,
+	ts + 23844,
+	ts + 23862,
 	uintptr(0),
-	ts + 23847,
-	ts + 23873,
 	ts + 23896,
+	uintptr(0),
 	ts + 23917,
+	ts + 23943,
+	ts + 23966,
+	ts + 23987,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114590,6 +115472,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	libc.AtomicStoreNInt32(db+312, int32(1), 0)
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(libc.AtomicLoadNInt32(db+312, 0) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -114604,7 +115492,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114649,7 +115537,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23933, 0)
+				ts+24003, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114766,7 +115654,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23996, libc.VaList(bp, zName))
+		ts+24066, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115002,7 +115890,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24047, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24117, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115095,7 +115983,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -115165,7 +116053,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115175,7 +116063,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115207,14 +116095,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24068, 0)
+				ts+24138, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -115344,7 +116232,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24136, uint32(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24206, uint32(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -115389,10 +116277,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24142, zUri+7, uint32(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint32(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24152,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115497,7 +116385,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24180, zOpt, uint32(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint32(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115508,17 +116396,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24184, zOpt, uint32(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint32(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24184
+	zModeType = ts + 24254
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24190, zOpt, uint32(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint32(4)) == 0) {
 		goto __32
 	}
 
@@ -115556,7 +116444,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24195, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115564,7 +116452,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115604,7 +116492,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24239, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115627,15 +116515,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24255, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24262, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24270, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24273, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24276, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17346, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24340, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24343, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24346, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17362, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115781,10 +116669,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21802, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24280, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -115798,7 +116686,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+12, bp+16)
@@ -115849,9 +116737,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6381
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6441
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23282
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).FzDbSName = ts + 23352
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*16)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -115956,7 +116844,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24286
+		zFilename = ts + 24356
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -116059,21 +116947,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24289,
+	Xsqlite3_log(tls, iErr, ts+24359,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24314)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24384)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24334)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24341)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -116231,7 +117119,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24358, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -116887,7 +117775,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24386, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117005,7 +117893,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24394
+			return ts + 24464
 		}
 		return uintptr(0)
 	}(), 0)
@@ -117182,7 +118070,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6704, ts + 6709, ts + 6191, ts + 6186, ts + 7945, ts + 24417, ts + 24423,
+	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -117335,7 +118223,7 @@ __10:
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0' + int32(c)>>4)
-	c = *(*uint8)(unsafe.Pointer(ts + 24430 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24500 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -117390,7 +118278,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24447, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24517, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117454,13 +118342,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6704, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6709, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
 			break
 
 		}
@@ -118010,12 +118898,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6704, uint32(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6764, uint32(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6709, uint32(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6769, uint32(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(5))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -118116,7 +119004,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24476, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24546, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118422,7 +119310,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24491, uint32(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24561, uint32(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118437,7 +119325,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24495, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118491,7 +119379,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24521,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24591,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118596,11 +119484,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*uint8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zPath))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24564, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24634, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24567, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -118757,14 +119645,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24570, -1)
+			ts+24640, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, uint8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24621, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24691, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -118859,7 +119747,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15364)
+	jsonWrongNumArgs(tls, ctx, ts+15380)
 	return
 __2:
 	;
@@ -118934,9 +119822,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24655
+			return ts + 24725
 		}
-		return ts + 24659
+		return ts + 24729
 	}())
 	return
 __2:
@@ -119069,7 +119957,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24666, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119166,7 +120054,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24669, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119210,7 +120098,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24672)
+		ts+24742)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -119341,7 +120229,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24755, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -119360,7 +120248,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*12
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*12
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24761, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 12
@@ -119456,7 +120344,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, uint8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24761, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119480,7 +120368,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24766
+				zRoot = ts + 24836
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119545,6 +120433,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -119596,7 +120490,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24476, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24546, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119691,25 +120585,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24768},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24773},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24802},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24815},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24818},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24822},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24834},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24846},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24857},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24868},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24880},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 24893},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24912},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24923},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24940}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24838},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24843},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24872},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_JSON), FxSFunc: 0, FzName: ts + 24885},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_SQL), FxSFunc: 0, FzName: ts + 24888},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24892},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24904},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24916},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24927},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24938},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24950},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(JSON_ISSET), FxSFunc: 0, FzName: ts + 24963},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24982},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24993},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25010}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119728,8 +120622,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24958, FpModule: 0},
-	{FzName: ts + 24968, FpModule: 0},
+	{FzName: ts + 25028, FpModule: 0},
+	{FzName: ts + 25038, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -119986,11 +120880,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24978, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24986, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25056, iNode, 0,
 			pRtree+76)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -120201,7 +121095,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24991,
+		ts+25061,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -120899,7 +121793,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25073)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122240,7 +123134,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25087, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -122252,12 +123146,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25107, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25139, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122483,7 +123377,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25176, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25246, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -122506,14 +123400,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(20)
 	defer tls.Free(20)
 
-	var zFmt uintptr = ts + 25321
+	var zFmt uintptr = ts + 25391
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11286, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -122554,7 +123448,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25377, ts + 5060, ts + 16251,
+	ts + 25447, ts + 5060, ts + 16267,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122597,19 +123491,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25382,
+			ts+25452,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25444, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25449,
+			ts+25519,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25513,
+			ts+25583,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25653,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122638,7 +123532,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25632
+			zFormat = ts + 25702
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122650,7 +123544,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25740,
+			ts+25810,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122658,18 +123552,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25785, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25855, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12757, 1)
+					Xsqlite3_str_append(tls, p, ts+12767, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25812, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25834, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25842, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122684,14 +123578,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25858,
-	ts + 25911,
-	ts + 25956,
-	ts + 26008,
-	ts + 26062,
-	ts + 26107,
-	ts + 26165,
-	ts + 26220,
+	ts + 25928,
+	ts + 25981,
+	ts + 26026,
+	ts + 26078,
+	ts + 26132,
+	ts + 26177,
+	ts + 26235,
+	ts + 26290,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122720,7 +123614,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26267, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -122732,7 +123626,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26287,
+			ts+26357,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+16)
 		if rc != SQLITE_OK {
@@ -122740,7 +123634,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26344,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122782,10 +123676,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26379,
-		ts + 26422,
-		ts + 26457,
-		ts + 26493,
+		ts + 26449,
+		ts + 26492,
+		ts + 26527,
+		ts + 26563,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -122816,7 +123710,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*4)), uint32(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26530,
+	Xsqlite3_str_appendf(tls, pSql, ts+26600,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4))), *(*uintptr)(unsafe.Pointer(argv + 3*4))))
 	ii = 4
 __3:
@@ -122828,7 +123722,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26554, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -122851,7 +123745,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -122947,7 +123841,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26563, ts + 26574}
+var azFormat = [2]uintptr{ts + 26633, ts + 26644}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(600)
@@ -122985,13 +123879,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+48, bp+16, ii, bp+552)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10858, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10920, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26584, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+552)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+552)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+48)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26590, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 552 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 552 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26594, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -123002,7 +123896,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26596, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26666, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123078,7 +123972,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26629,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26699,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4062
@@ -123102,7 +123996,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26636,
+			ts+26706,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123121,7 +124015,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26681, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26751, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -123135,8 +124029,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26713,
-		ts + 26767,
+		ts + 26783,
+		ts + 26837,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 24 + uintptr(bLeaf)*4)) == uintptr(0) {
@@ -123151,23 +124045,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26815,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26885,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26860
+					return ts + 26930
 				}
-				return ts + 26868
+				return ts + 26938
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26877,
+				ts+26947,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26860
+						return ts + 26930
 					}
-					return ts + 26868
+					return ts + 26938
 				}(), iKey, iVal))
 		}
 	}
@@ -123191,7 +124085,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26935, libc.VaList(bp, i, iCell, iNode))
+				ts+27005, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -123211,7 +124105,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26983, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27053, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -123228,14 +124122,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27050, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27084, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27154, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -123243,7 +124137,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27114,
+					ts+27184,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -123272,14 +124166,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27169,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27239,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27200, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -123301,12 +124195,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14493, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14503, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27267, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -123315,12 +124209,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25087, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27295, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27365, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -123334,8 +124228,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27326, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27333, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -123343,7 +124237,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 24 + 1*4)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27341, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27411, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -123358,7 +124252,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27345, -1)
+			ts+27415, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -123366,7 +124260,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6381
+			zDb = ts + 6441
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*4)))
 		}
@@ -123376,7 +124270,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17969
+				return ts + 18012
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123670,7 +124564,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint32(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint32(4)+uint32(6)*uint32(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint32(4)+uint32(6)*uint32(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -123728,6 +124622,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123740,15 +124635,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27396, 1)
+		Xsqlite3_str_append(tls, x, ts+27466, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27398, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27468, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27409, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123768,19 +124664,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep uint8 = uint8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27420, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27490, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27438, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27508, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = uint8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27446, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*4)))
 			if z != 0 && *(*uint8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27454, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27524, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27458, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123799,6 +124695,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -123830,6 +124727,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -123838,6 +124736,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -123896,6 +124795,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*4)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -124064,6 +124964,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -124085,6 +124986,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -124169,6 +125071,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -124197,6 +125101,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124634,6 +125539,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124647,6 +125553,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -124661,6 +125570,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -124685,7 +125595,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*4)), uint32(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27471, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27541, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124694,7 +125604,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27493, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*4))))
 	goto __3
 __3:
 	ii++
@@ -124702,7 +125612,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124781,6 +125691,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 20)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -124909,6 +125820,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -124927,7 +125839,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16251
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16267
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -124937,7 +125849,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27497
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27567
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -124945,7 +125857,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27503
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27573
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125057,7 +125969,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27512, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -125187,14 +126099,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27552) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27568) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27638) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -125231,8 +126145,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint32(i) < uint32(unsafe.Sizeof(aFunc))/uint32(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); i < uint32(unsafe.Sizeof(aFunc))/uint32(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -125249,7 +126163,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint32(i) < uint32(unsafe.Sizeof(aAgg))/uint32(unsafe.Sizeof(struct {
+	for i = uint32(0); i < uint32(unsafe.Sizeof(aAgg))/uint32(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -125259,7 +126173,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27583, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -125271,25 +126185,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [2]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27591},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27604},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27617},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27630},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27568},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27642},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27552},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27665},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27679},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27692},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27706},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27722},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27661},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27674},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27687},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27700},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27638},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27712},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27622},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27735},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27749},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27762},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27776},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27792},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27734},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -125299,26 +126213,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27753, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27763, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27774, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27497, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27785, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125372,7 +126286,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25073, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125690,7 +126604,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27795, -1)
+		Xsqlite3_result_error(tls, context, ts+27865, -1)
 		return
 	}
 
@@ -125701,7 +126615,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27795, -1)
+			Xsqlite3_result_error(tls, context, ts+27865, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125802,7 +126716,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27816, uintptr(0), uintptr(0), p+36)
+				ts+27886, uintptr(0), uintptr(0), p+36)
 		}
 
 		if rc == SQLITE_OK {
@@ -125866,7 +126780,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+24986, zIn, uint32(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > Size_t(4) && libc.Xmemcmp(tls, ts+25056, zIn, uint32(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -125887,16 +126801,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+27987, libc.VaList(bp, func() uintptr {
+			ts+28057, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28137
+					return ts + 28207
 				}
 				return ts + 1554
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+4, p+36,
-			ts+28178)
+			ts+28248)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126012,7 +126926,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28303, libc.VaList(bp, zTab)))
+			ts+28373, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126030,7 +126944,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*4, p+36,
-		Xsqlite3_mprintf(tls, ts+28422, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28492, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126048,7 +126962,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*4, p+36,
 		Xsqlite3_mprintf(tls,
-			ts+28443, libc.VaList(bp+16, zIdx)))
+			ts+28513, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126071,7 +126985,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*4, p+36,
-		Xsqlite3_mprintf(tls, ts+28494, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28564, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126117,7 +127031,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint32(unsafe.Sizeof(U8(0)))*uint32((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+36,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -126132,7 +127046,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint32(unsafe.Sizeof(U8(0)))*uint32((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+20, p+36,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 20))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 20)), 1)
 			if iCid >= 0 {
@@ -126172,7 +127086,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+36, bp+56, pIter+60)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19396, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -126182,18 +127096,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+60, p+36,
-			Xsqlite3_mprintf(tls, ts+28572, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 60)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), i)
-			if Xsqlite3_strnicmp(tls, ts+28591, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28661, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+32)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*4)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28596, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28666, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -126205,18 +127119,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28606, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28635
+							return ts + 28705
 						}
-						return ts + 28648
+						return ts + 28718
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+60, p+36,
-				Xsqlite3_mprintf(tls, ts+28657, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 60))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 1)
@@ -126230,7 +127144,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28679,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28749,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 5)
@@ -126277,8 +127191,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-		zList = rbuMPrintf(tls, p, ts+28706, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14604
+		zList = rbuMPrintf(tls, p, ts+28776, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14614
 	}
 	return zList
 }
@@ -126295,7 +127209,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zRet = rbuMPrintf(tls, p, ts+28715, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -126317,25 +127231,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+36,
 			Xsqlite3_mprintf(tls,
-				ts+28728, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28760, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28830, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+28783)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28789, ts+28796, ts+4957)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+28853)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28859, ts+28866, ts+4957)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+36,
 				Xsqlite3_mprintf(tls,
-					ts+28804,
+					ts+28874,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28846, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28916, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126377,7 +127291,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+36,
-		Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -126412,7 +127326,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 	goto __7
 __6:
-	zCol = ts + 28866
+	zCol = ts + 28936
 __7:
 	;
 	goto __5
@@ -126420,13 +127334,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28874,
+	zLhs = rbuMPrintf(tls, p, ts+28944,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28895,
+	zOrder = rbuMPrintf(tls, p, ts+28965,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28931,
+	zSelect = rbuMPrintf(tls, p, ts+29001,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14604
+	zSep = ts + 14614
 	iCol++
 	goto __1
 __2:
@@ -126444,7 +127358,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 180)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+180, p+36,
-		Xsqlite3_mprintf(tls, ts+28958,
+		Xsqlite3_mprintf(tls, ts+29028,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 180)))) {
 		goto __13
@@ -126471,8 +127385,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29006, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14604
+	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14614
 	goto __15
 __15:
 	iCol++
@@ -126483,7 +127397,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29013, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126516,7 +127430,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+36,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126528,7 +127442,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29025, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29095, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*8)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*8)).FzSpan, zCollate))
 			zType = ts + 1554
 		} else {
@@ -126540,37 +127454,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28866
+					zCol = ts + 28936
 				} else {
-					zCol = ts + 28596
+					zCol = ts + 28666
 				}
 				zType = ts + 1119
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*4))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29047, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28783
+					return ts + 28853
 				}
 				return ts + 1554
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29067,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29088,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29121, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14604
-		zAnd = ts + 21464
+		zCom = ts + 14614
+		zAnd = ts + 21525
 		nBind++
 	}
 
@@ -126609,11 +127523,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = Xsqlite3_mprintf(tls, ts+29145, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29215, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29157, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14604
+			zS = ts + 14614
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126621,7 +127535,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29166, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29236, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126633,18 +127547,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29181, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1554
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29195, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21525
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29207, libc.VaList(bp+40, zList))
+			ts+29277, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1554
@@ -126652,8 +127566,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4))
-				zList = rbuMPrintf(tls, p, ts+29257, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21525
 			}
 		}
 	}
@@ -126662,7 +127576,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29270, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29340, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126680,17 +127594,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c uint8 = *(*uint8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29257,
+					zList = rbuMPrintf(tls, p, ts+29327,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29296,
+					zList = rbuMPrintf(tls, p, ts+29366,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29326,
+					zList = rbuMPrintf(tls, p, ts+29396,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*4)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				}
 			}
 		}
@@ -126725,19 +127639,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29363
+		var zSep uintptr = ts + 29433
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 60)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+36,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16139) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16155) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+60, p+36,
-						Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126749,15 +127663,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 60)), 3) != 0 {
-					zDesc = ts + 28783
+					zDesc = ts + 28853
 				} else {
 					zDesc = ts + 1554
 				}
-				z = rbuMPrintf(tls, p, ts+29376, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14604
+				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14614
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29387, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 60)))
 	}
 	return z
@@ -126777,7 +127691,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+36,
-			ts+29391)
+			ts+29461)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -126786,7 +127700,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+172, p+36,
-				Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -126796,25 +127710,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 172)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29441, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29511, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*4)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29463, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28783
+						return ts + 28853
 					}
 					return ts + 1554
 				}()))
-				zComma = ts + 14604
+				zComma = ts + 14614
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29473, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 172)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29488,
+			ts+29558,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -126827,7 +127741,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1554
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1554
@@ -126835,39 +127749,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29550
+				zPk = ts + 29620
 			}
-			zSql = rbuMPrintf(tls, p, ts+29563,
+			zSql = rbuMPrintf(tls, p, ts+29633,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*4)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29590
+							return ts + 29660
 						}
 						return ts + 1554
 					}()))
-			zComma = ts + 14604
+			zComma = ts + 14614
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29600, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29670, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29607,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29677,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29639
+						return ts + 29709
 					}
 					return ts + 1554
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -126880,7 +127794,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+88, p+36, Xsqlite3_mprintf(tls,
-				ts+29654,
+				ts+29724,
 				libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -126917,7 +127831,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 4)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+36,
-			ts+29711)
+			ts+29781)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 4)) == SQLITE_OK {
 		var rc2 int32
@@ -127022,7 +127936,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29777, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29847, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127042,24 +127956,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+604, bp+608, bp+612)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 612)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29797,
+				ts+29867,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 604))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 612))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+80, p+36,
-					Xsqlite3_mprintf(tls, ts+29862, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29932, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+84, p+36,
-					Xsqlite3_mprintf(tls, ts+29898, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
+					Xsqlite3_mprintf(tls, ts+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 608)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127075,7 +127989,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29932,
+						ts+30002,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127083,9 +127997,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29993
+											return ts + 30063
 										}
-										return ts + 29997
+										return ts + 30067
 									}()
 								}
 								return ts + 1554
@@ -127094,20 +128008,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30003,
+						ts+30073,
 						libc.VaList(bp+216, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30064,
+						ts+30134,
 						libc.VaList(bp+264, zCollist, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29993
+									return ts + 30063
 								}
-								return ts + 29997
+								return ts + 30067
 							}(),
 							zCollist, zLimit))
 				}
@@ -127132,8 +128046,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6392)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6388)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6452)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -127144,16 +128058,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1554
 				}
-				return ts + 30223
+				return ts + 30293
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+80, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30232,
+						ts+30302,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30268
+								return ts + 30338
 							}
 							return ts + 1554
 						}(), zBindings)))
@@ -127162,32 +128076,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+84, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30278, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1554
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30306
+					zRbuRowid = ts + 30376
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30318, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30388, libc.VaList(bp+408, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30394
+							return ts + 30464
 						}
 						return ts + 1554
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30411,
+					ts+30481,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30710,
+						ts+30780,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -127200,9 +128114,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30809
+						zRbuRowid = ts + 30879
 					} else {
-						zRbuRowid = ts + 30819
+						zRbuRowid = ts + 30889
 					}
 				}
 
@@ -127215,20 +128129,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28866, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+76, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30830,
+							ts+30900,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30878
+										return ts + 30948
 									}
 									return ts + 1554
 								}(),
@@ -127241,7 +128155,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19750
+										return ts + 22859
 									}
 									return ts + 1554
 								}(), zOrder,
@@ -127309,9 +128223,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1554
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30223
+				zPrefix = ts + 30293
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30884,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+4, p+36, zUpdate)
@@ -127370,7 +128284,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+36,
-		Xsqlite3_mprintf(tls, ts+30914, libc.VaList(bp, p+24)))
+		Xsqlite3_mprintf(tls, ts+30984, libc.VaList(bp, p+24)))
 	for *(*int32)(unsafe.Pointer(bp + 12)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -127440,28 +128354,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30944, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30972, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31042, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+24, ts+3286, uint32(4))
 	} else {
-		libc.Xmemcpy(tls, p+24, ts+6381, uint32(4))
+		libc.Xmemcpy(tls, p+24, ts+6441, uint32(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30990, libc.VaList(bp+24, p+24))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+24))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127494,11 +128408,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31056, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31126, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24136, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= Size_t(5) && 0 == libc.Xmemcmp(tls, ts+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint32(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -127510,13 +128424,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31088,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381),
+			zTarget = Xsqlite3_mprintf(tls, ts+31158,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
 						}
-						return ts + 31120
+						return ts + 31190
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
@@ -127535,37 +128449,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31122, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31137, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31154, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31198, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31268, 0)
 	}
 }
 
@@ -127594,15 +128508,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31216, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31286, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -127650,7 +128564,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -127710,7 +128624,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127727,23 +128641,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31251, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31321, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31276, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31283, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -127860,7 +128774,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23774, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23844, 0)
 			return
 		}
 
@@ -127953,7 +128867,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+36,
-			ts+31290)
+			ts+31360)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -127961,7 +128875,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31312, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31382, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -127982,7 +128896,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+36,
 			Xsqlite3_mprintf(tls,
-				ts+31339,
+				ts+31409,
 				libc.VaList(bp, p+24,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128012,9 +128926,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+36,
-			Xsqlite3_mprintf(tls, ts+31497, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31567, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31512,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31582,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128028,10 +128942,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 4)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31532, uintptr(0), uintptr(0), p+36)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31602, uintptr(0), uintptr(0), p+36)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-			ts+31557)
+			ts+31627)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128045,12 +128959,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-			ts+31665)
+			ts+31735)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+4, p+36,
-			ts+31730)
+			ts+31800)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128062,7 +128976,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 4)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31774, uintptr(0), uintptr(0), p+36)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31844, uintptr(0), uintptr(0), p+36)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128082,15 +128996,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17224)
-					rbuCopyPragma(tls, p, ts+16335)
+					rbuCopyPragma(tls, p, ts+17240)
+					rbuCopyPragma(tls, p, ts+16351)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31799, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31869, libc.VaList(bp, p+24, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128114,10 +129028,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+36)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+36)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -128212,7 +129126,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31827, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31897, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -128225,16 +129139,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(12)
+	defer tls.Free(12)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31276, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -128244,7 +129159,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31852, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -128278,7 +129193,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+12,
 		Xsqlite3_mprintf(tls,
-			ts+31863, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 12)), -1)
 	} else {
@@ -128308,13 +129223,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31935, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-				ts+31949)
+				ts+32019)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -128325,7 +129240,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+36,
-				ts+32006)
+				ts+32076)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -128399,7 +129314,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32080, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32150, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -128417,12 +129332,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32112,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32182,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32144
+							return ts + 32214
 						}
-						return ts + 32151
+						return ts + 32221
 					}()))
 			}
 		}
@@ -128430,7 +129345,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14493, uintptr(0), uintptr(0), p+36)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14503, uintptr(0), uintptr(0), p+36)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+48)
@@ -128441,19 +129356,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16938)
-						rbuCopyPragma(tls, p, ts+16350)
+						rbuCopyPragma(tls, p, ts+16954)
+						rbuCopyPragma(tls, p, ts+16366)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32158, uintptr(0), uintptr(0), p+36)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+36)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32174, uintptr(0), uintptr(0), p+36)
+								db, ts+32244, uintptr(0), uintptr(0), p+36)
 						}
 					}
 
@@ -128507,7 +129422,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32198, zState+uintptr(n-7), uint32(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32268, zState+uintptr(n-7), uint32(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128534,7 +129449,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); i < nErrmsg-Size_t(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30223, uint32(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30293, uint32(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -128551,7 +129466,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+36)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128564,13 +129479,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+36)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+36)
 		}
 
 		rbuObjIterFinalize(tls, p+48)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32206, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32276, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128665,7 +129580,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128682,19 +129597,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14493
+				zBegin = ts + 14503
 			} else {
-				zBegin = ts + 32158
+				zBegin = ts + 32228
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32158, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32228, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128817,11 +129732,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -128960,7 +129878,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -129037,7 +129955,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32233, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32303, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129062,7 +129980,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32256, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129207,7 +130125,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6381)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6441)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -129222,7 +130140,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32267, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32337, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129233,7 +130151,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -129263,6 +130187,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -130022,11 +130961,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11286, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11348, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32278, 0)
+				ts+32348, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
 		} else {
@@ -130039,7 +130978,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32399, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -130137,7 +131076,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11286, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130604,6 +131543,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -130685,6 +131627,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -130714,9 +131657,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32428,
+			zRet = Xsqlite3_mprintf(tls, ts+32498,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4))))
-			zSep = ts + 21464
+			zSep = ts + 21525
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130739,9 +131682,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32462,
+				ts+32532,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4))))
-			zSep = ts + 32503
+			zSep = ts + 32573
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130749,18 +131692,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7470, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32508,
+		ts+32578,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130770,7 +131713,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(4)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -130803,7 +131746,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32586,
+			ts+32656,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -130930,7 +131873,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32639, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -131404,9 +132347,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11286, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11348, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32666, libc.VaList(bp, zDb))
+			ts+32736, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_NOMEM
 		}
@@ -131415,18 +132358,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1554
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32776, bp+20)
+		sessionAppendStr(tls, bp+8, ts+32846, bp+20)
 		sessionAppendIdent(tls, bp+8, zDb, bp+20)
 		sessionAppendStr(tls, bp+8, ts+1567, bp+20)
 		sessionAppendIdent(tls, bp+8, zTab, bp+20)
-		sessionAppendStr(tls, bp+8, ts+32791, bp+20)
+		sessionAppendStr(tls, bp+8, ts+32861, bp+20)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+20)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*4)), bp+20)
-				sessionAppendStr(tls, bp+8, ts+32799, bp+20)
+				sessionAppendStr(tls, bp+8, ts+32869, bp+20)
 				sessionAppendInteger(tls, bp+8, i+1, bp+20)
-				zSep = ts + 21464
+				zSep = ts + 21525
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131535,7 +132478,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32805, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32875, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 24)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 24))
 	}
@@ -131627,7 +132570,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+12)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32825, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 24))
 }
@@ -131890,7 +132833,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -131913,7 +132856,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -131955,7 +132898,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132016,7 +132959,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+44, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -132090,13 +133033,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -132158,7 +133101,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*4)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*4)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+68, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*4)) = uintptr(0)
 				}
@@ -132531,7 +133474,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -132697,7 +133640,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint32(unsafe.Sizeof(SessionUpdate{})) * uint32(nU32) * uint32(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11286) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11348) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_NOMEM
@@ -132708,34 +133651,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*12
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint32(nU32)*uint32(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32843, bp+12)
+				sessionAppendStr(tls, bp, ts+32913, bp+12)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+12)
-				sessionAppendStr(tls, bp, ts+32856, bp+12)
+				sessionAppendStr(tls, bp, ts+32926, bp+12)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*4)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+12)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*4)), bp+12)
-						sessionAppendStr(tls, bp, ts+32862, bp+12)
+						sessionAppendStr(tls, bp, ts+32932, bp+12)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+12)
-						zSep = ts + 14604
+						zSep = ts + 14614
 					}
 				}
 
 				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32791, bp+12)
+				sessionAppendStr(tls, bp, ts+32861, bp+12)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*4)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+12)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32867, bp+12)
+								ts+32937, bp+12)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*4)), bp+12)
-							sessionAppendStr(tls, bp, ts+32799, bp+12)
+							sessionAppendStr(tls, bp, ts+32869, bp+12)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+12)
 						}
-						zSep = ts + 21464
+						zSep = ts + 21525
 					}
 				}
 
@@ -132787,34 +133730,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32942, bp+12)
+	sessionAppendStr(tls, bp, ts+33012, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+32791, bp+12)
+	sessionAppendStr(tls, bp, ts+32861, bp+12)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+12)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
-			sessionAppendStr(tls, bp, ts+32862, bp+12)
+			sessionAppendStr(tls, bp, ts+32932, bp+12)
 			sessionAppendInteger(tls, bp, i+1, bp+12)
-			zSep = ts + 21464
+			zSep = ts + 21525
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32960, bp+12)
+		sessionAppendStr(tls, bp, ts+33030, bp+12)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+12)
-		sessionAppendStr(tls, bp, ts+32503, bp+12)
+		sessionAppendStr(tls, bp, ts+32573, bp+12)
 
 		zSep = ts + 1554
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+12)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
-				sessionAppendStr(tls, bp, ts+32799, bp+12)
+				sessionAppendStr(tls, bp, ts+32869, bp+12)
 				sessionAppendInteger(tls, bp, i+1, bp+12)
-				zSep = ts + 32968
+				zSep = ts + 33038
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4957, bp+12)
@@ -132830,7 +133773,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6381, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
+		db, ts+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+12)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -132841,19 +133784,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32973, bp+12)
+	sessionAppendStr(tls, bp, ts+33043, bp+12)
 	sessionAppendIdent(tls, bp, zTab, bp+12)
-	sessionAppendStr(tls, bp, ts+21470, bp+12)
+	sessionAppendStr(tls, bp, ts+21531, bp+12)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14604, bp+12)
+			sessionAppendStr(tls, bp, ts+14614, bp+12)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*4)), bp+12)
 	}
 
-	sessionAppendStr(tls, bp, ts+32991, bp+12)
+	sessionAppendStr(tls, bp, ts+33061, bp+12)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33002, bp+12)
+		sessionAppendStr(tls, bp, ts+33072, bp+12)
 	}
 	sessionAppendStr(tls, bp, ts+4957, bp+12)
 
@@ -132869,14 +133812,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11286, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11348, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33006)
+			ts+33076)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+4,
-			ts+33119)
+			ts+33189)
 	}
 	return rc
 }
@@ -132904,7 +133847,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -132913,7 +133856,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(12)
 	defer tls.Free(12)
 
@@ -132990,7 +133933,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+4, bp+8, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 12)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 12)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 12)) = SQLITE_OK
 	}
@@ -133116,7 +134059,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -133157,7 +134100,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33263, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33333, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -133173,7 +134116,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33284, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33354, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -133246,10 +134189,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33303, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33373, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33329, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+124, bp+128, bp+132, uintptr(0))
@@ -133295,7 +134238,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+136, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6381, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
+					db, ts+6441, *(*uintptr)(unsafe.Pointer(bp + 124)), bp+48+16, bp+140, bp+48+20, bp+48+24)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -133308,19 +134251,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33359, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 140))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 128)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33403,
+						ts+33473,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 140)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 128))))
 				} else if *(*int32)(unsafe.Pointer(bp + 128)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 136)), uint32(*(*int32)(unsafe.Pointer(bp + 128)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33474, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
+						ts+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 140))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 128))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11286) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 140)), ts+11348) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133371,14 +134314,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33534, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33588, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134615,7 +135558,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33616, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -134903,7 +135846,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33644, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135088,7 +136031,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33675, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -135156,7 +136099,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33682
+		var zErr uintptr = ts + 33752
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135337,7 +136280,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33732
+		var zErr uintptr = ts + 33802
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135661,13 +136604,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(48)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33780, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33788, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33798, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136217,7 +137160,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33803, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33873, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint32(unsafe.Sizeof(int32(0))) * uint32(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -136244,14 +137187,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*uint8)(unsafe.Pointer(p))) < '0' || int32(*(*uint8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33810, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33880, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33841, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136262,7 +137205,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33874, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136275,7 +137218,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33911, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + Size_t(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, Sqlite3_int64(unsafe.Sizeof(uintptr(0)))*nArg)
@@ -136284,7 +137227,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33920, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33990, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136303,7 +137246,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33953, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136318,14 +137261,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33987, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33995, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*uint8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34027, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136333,9 +137276,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34033, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34047, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136343,9 +137286,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34085, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
 		if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || int32(*(*uint8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34096, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34166, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -136355,19 +137298,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 44)) = [4]Fts5Enum{
-			{FzName: ts + 7958, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17329},
-			{FzName: ts + 34131, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17345},
+			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+44, zArg, pConfig+48)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34139, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34209, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34170, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136414,15 +137357,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22130) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16251) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34198, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22191) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34228) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34238, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34308, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136439,13 +137382,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 28)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34269, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34274, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*4))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34281, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+28, ts+34351, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136483,8 +137426,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*4)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22130) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34289, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22191) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136516,7 +137459,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34318, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34388, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136553,19 +137496,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33987
+			zTail = ts + 34057
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34338
+			zTail = ts + 34408
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34346, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16251, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16267, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136609,18 +137552,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34357, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34427, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1554
 			}
-			return ts + 14604
+			return ts + 14614
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34373, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*4))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34443, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*4))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34380,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22130))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136730,7 +137673,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34406) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136740,7 +137683,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34411) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34481) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136750,7 +137693,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34420) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34490) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -136763,7 +137706,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34430) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34500) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -136773,7 +137716,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34440) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34510) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -136789,7 +137732,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22130) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22191) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+4)
@@ -136812,7 +137755,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(44)
 	defer tls.Free(44)
 
-	var zSelect uintptr = ts + 34452
+	var zSelect uintptr = ts + 34522
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 36)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -136834,7 +137777,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 36))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 36)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 36)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34484) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34554) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 40)) = 0
@@ -136848,7 +137791,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34492,
+				ts+34562,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -136946,7 +137889,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34557, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
 					return FTS5_EOF
 				}
 			}
@@ -136959,20 +137902,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34577, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34647, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = (int32(z2) - int32(z)) / 1
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34608, uint32(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34678, uint32(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34611, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint32(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29993, uint32(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint32(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -137058,6 +138001,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*uint8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -137086,7 +138040,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 1))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*uint8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = uint8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -138740,9 +139694,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34615, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint32(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33644, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -138758,7 +139712,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c uint8 = *(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34620, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -138845,7 +139799,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20467, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -138926,7 +139880,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34649, 0)
+			ts+34719, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -139096,12 +140050,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+20)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34702,
+								ts+34772,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34752
+										return ts + 34822
 									}
-									return ts + 34615
+									return ts + 34685
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140050,7 +141004,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34759, iRowid, 0, p+40)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34829, iRowid, 0, p+40)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -140129,7 +141083,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+44, Xsqlite3_mprintf(tls,
-			ts+34765,
+			ts+34835,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -140154,7 +141108,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34816,
+			ts+34886,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+48, zSql) != 0 {
 			return
@@ -140177,7 +141131,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+56, Xsqlite3_mprintf(tls,
-			ts+34865,
+			ts+34935,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140416,7 +141370,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+68,
-				Xsqlite3_mprintf(tls, ts+34905, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141615,7 +142569,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+60, Xsqlite3_mprintf(tls,
-			ts+34928,
+			ts+34998,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143080,7 +144034,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+52, Xsqlite3_mprintf(tls,
-			ts+35012,
+			ts+35082,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -143572,10 +144526,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint32(nSeg) * uint32(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*12
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*12
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+36, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -144158,13 +145117,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35069, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24986, ts+35077, 0, pzErr)
+				pConfig, ts+25056, ts+35147, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11426,
-					ts+35112,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
+					ts+35182,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144417,7 +145376,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34759, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
+		ts+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+4)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 4)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 4)))
@@ -144531,7 +145490,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35156,
+		ts+35226,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -144701,7 +145660,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 8)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+80+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*96, uintptr(0), bp+8)
-			sqlite3Fts5BufferAppendBlob(tls, p+36, bp+8, uint32(4), ts+35242)
+			sqlite3Fts5BufferAppendBlob(tls, p+36, bp+8, uint32(4), ts+35312)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+8)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+8)).Fn, bp+20, bp+24) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 24)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 24)) & int64(0x7FFFFFFF))
@@ -144972,7 +145931,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35247, 0)
+			ts+35317, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145396,11 +146355,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35286,
+		ts+35356,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14604
+					return ts + 14614
 				}
 				return ts + 1554
 			}(),
@@ -145412,9 +146371,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35341
+					return ts + 35411
 				}
-				return ts + 35346
+				return ts + 35416
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145460,12 +146419,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35350, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35420, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5057, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35356, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145496,7 +146455,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35384, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35454, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 20)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -145527,7 +146486,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35394, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35464, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145559,14 +146518,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 60)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35415, libc.VaList(bp, z))
+				ts+35485, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33798
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33868
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145622,7 +146581,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35247, 0)
+		ts+35317, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145839,7 +146798,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35448, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -145984,28 +146943,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35484, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35554, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35495, 0)
+				ts+35565, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35575, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35583, 0)
+				ts+35653, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16918, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35639, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35715, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146063,7 +147022,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*4))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*4)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17463, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17479, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*4)))
@@ -146076,12 +147035,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35661,
+				ts+35731,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20368
+						return ts + 20429
 					}
-					return ts + 35698
+					return ts + 35768
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146711,7 +147670,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35710, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35780, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -146955,7 +147914,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35731, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -146974,7 +147933,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 8
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35753, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35823, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147021,7 +147980,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35784)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35854)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147030,7 +147989,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35797, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35867, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -147044,7 +148003,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35888, ts + 33987, ts + 24986, ts + 34338, ts + 11426,
+	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147068,7 +148027,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35895, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147086,13 +148045,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35895, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35900, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35970, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -147147,17 +148108,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 28 + uintptr(eStmt)*4)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35915,
-			ts + 35983,
-			ts + 36052,
-			ts + 36085,
-			ts + 36124,
-			ts + 36164,
-			ts + 36203,
-			ts + 36244,
-			ts + 36283,
-			ts + 36325,
-			ts + 36365,
+			ts + 35985,
+			ts + 36053,
+			ts + 36122,
+			ts + 36155,
+			ts + 36194,
+			ts + 36234,
+			ts + 36273,
+			ts + 36314,
+			ts + 36353,
+			ts + 36395,
+			ts + 36435,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -147259,18 +148220,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36388,
+		ts+36458,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36492,
+			ts+36562,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36530,
+			ts+36600,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -147282,7 +148243,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36568,
+			ts+36638,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147294,14 +148255,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24986, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11426, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35888, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25056, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34338, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33987, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147313,17 +148274,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36610,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36680,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29639
+					return ts + 29709
 				}
 				return ts + 1554
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36640,
+			ts+36710,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147360,27 +148321,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36684, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36707, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36777, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33987, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34338, ts+36713, 0, pzErr)
+				pConfig, ts+34408, ts+36783, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35888, ts+36745, 1, pzErr)
+				pConfig, ts+35958, ts+36815, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147586,12 +148547,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36762,
+		ts+36832,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36812,
+			ts+36882,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147599,7 +148560,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -147775,7 +148736,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36841,
+	zSql = Xsqlite3_mprintf(tls, ts+36911,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -147957,14 +148918,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 40)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33987, bp+40)
+			rc = fts5StorageCount(tls, p, ts+34057, bp+40)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 40)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34338, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34408, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -148159,9 +149120,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint32(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36873) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36943) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36954) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148375,7 +149336,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36895
+			var zCat uintptr = ts + 36965
 			var i int32
 			libc.Xmemset(tls, p, 0, uint32(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148387,7 +149348,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36904) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36974) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
 				}
 			}
@@ -148398,18 +149359,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36915) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36985) {
 					if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '2' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*uint8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36873) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36943) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36954) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36904) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+36974) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148685,7 +149646,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36933
+	var zBase uintptr = ts + 37003
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -148825,7 +149786,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36943, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37013, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148833,11 +149794,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36946, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36951, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37021, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148845,7 +149806,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36956, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148853,7 +149814,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36959, aBuf+uintptr(nBuf-2), uint32(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148861,11 +149822,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36962, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36967, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37037, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148873,19 +149834,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36972, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36976, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37046, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36982, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37052, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36987, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37057, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148893,11 +149854,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36991, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36995, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148905,7 +149866,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36998, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148913,11 +149874,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37002, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37076, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148925,7 +149886,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37010, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148933,7 +149894,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37014, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148941,7 +149902,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37018, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -148957,24 +149918,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37002, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37092, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37028, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37098, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-2), uint32(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37018, uint32(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-2), uint32(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37088, uint32(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -148989,137 +149950,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37105, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37002, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37043, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37050, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37055, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36951, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37060, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36946, uint32(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint32(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37018, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37070, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15464, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37075, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37028, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37079, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36943, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37154, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36987, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37090, aBuf+uintptr(nBuf-3), uint32(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37094, uint32(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint32(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37096, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37010, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-7), uint32(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37018, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37110, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37002, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37116, aBuf+uintptr(nBuf-4), uint32(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37002, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37121, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37127, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37014, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37143, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-7), uint32(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint32(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37010, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37155, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37161, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37014, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37167, aBuf+uintptr(nBuf-6), uint32(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint32(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37028, uint32(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint32(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -149134,16 +150095,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37174, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37244, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36959, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint32(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint32(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149151,21 +150112,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-5), uint32(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37143, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149173,7 +150134,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37196, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -149181,9 +150142,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37202, aBuf+uintptr(nBuf-5), uint32(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint32(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -149198,12 +150159,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37208, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37212, uint32(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint32(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37215, aBuf+uintptr(nBuf-2), uint32(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint32(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -149212,7 +150173,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-3), uint32(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint32(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149368,7 +150329,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*4))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37222) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*4)), ts+37292) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149548,22 +150509,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(64)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36933, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37237, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37243, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37250, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -150705,14 +151666,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37258) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37328) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37262) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37266) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37275, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150738,19 +151699,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(20)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 4)) = [3]uintptr{
-		ts + 37309,
-		ts + 37349,
-		ts + 37384,
+		ts + 37379,
+		ts + 37419,
+		ts + 37454,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4))) == Size_t(4) && libc.Xmemcmp(tls, ts+23282, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*4))) == Size_t(4) && libc.Xmemcmp(tls, ts+23352, *(*uintptr)(unsafe.Pointer(argv + 1*4)), uint32(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37427, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -150883,11 +151844,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37460, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37491,
+		ts+37561,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+68, uintptr(0))
@@ -150911,7 +151872,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 68)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37542, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -151306,7 +152267,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37568, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151328,7 +152289,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37578
+	return ts + 37648
 }
 
 func init() {
@@ -151383,114 +152344,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1456)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1496)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1536)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1576)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1616)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1656)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1696)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1736)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1776)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1816)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1856)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1896)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1936)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1976)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2016)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2056)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2096)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2136)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1576)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1616)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1656)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1696)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1736)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1776)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1816)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1856)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1896)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1936)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 1976)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2016)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2056)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2096)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2136)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2176)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2216)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2256)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2260)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2264)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2268)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2296)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2300)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2304)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2308)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2256)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2296)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2336)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2340)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2344)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2340)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2344)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2348)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2376)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2380)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2384)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2388)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2416)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2420)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2424)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2428)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2456)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2460)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2464)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2468)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2496)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2500)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2508)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2528)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2536)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2568)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2576)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2608)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2376)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2380)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2384)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2388)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2416)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2420)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2424)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2428)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2456)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2460)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2464)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2468)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2496)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2500)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2508)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2536)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2540)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2544)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2548)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2576)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2580)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2584)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2588)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2608)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2728)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2736)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2768)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2776)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2808)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2648)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2656)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2696)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2808)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2816)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2848)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2848)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2856)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2896)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2936)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2888)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2896)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2928)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2936)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3016)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3056)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3088)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3096)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3128)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3136)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3168)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3176)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3208)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3096)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3136)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3168)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3176)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3208)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3216)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3248)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3256)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3288)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3296)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3328)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3248)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3256)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3288)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3296)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3328)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3368)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3376)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3368)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3376)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3416)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3448)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3456)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3488)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3448)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3456)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3488)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3496)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3528)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3528)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3536)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3568)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3568)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3608)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3608)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3616)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3648)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3648)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3656)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3688)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3688)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3728)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3728)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3736)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3776)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3808)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3808)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3816)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3848)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3848)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3856)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3896)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3936)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3976)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4016)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3888)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3896)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3928)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3936)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3976)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4016)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4096)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 16)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 48)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -151951,6 +152914,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 56)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 60)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 64)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 4)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 12)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 20)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 28)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 36)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 44)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 4)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 12)) = rtreeBestIndex
@@ -152269,6 +153244,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1052)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1056)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1060)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 1064)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 4)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = sqlite3TestExtInit
@@ -152290,5 +153266,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 68)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_linux_arm64.go b/vendor/modernc.org/sqlite/lib/sqlite_linux_arm64.go
index 0d5307e6..9d5370ad 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_linux_arm64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_linux_arm64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -497,6 +497,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -612,6 +613,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -986,6 +988,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1473,6 +1476,7 @@ const (
 	SF_Recursive                          = 0x0002000
 	SF_Resolved                           = 0x0000004
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1557,6 +1561,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1675,6 +1680,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -2041,6 +2047,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -2138,11 +2145,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -2157,7 +2167,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2265,8 +2275,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2746,6 +2756,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -4167,6 +4178,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -5785,10 +5797,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -5844,12 +5854,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -6101,7 +6109,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -6222,7 +6229,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -6246,11 +6253,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -6258,11 +6267,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -6894,7 +6903,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -7032,10 +7041,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -7050,12 +7057,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -7245,10 +7250,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -7452,7 +7459,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1099))
@@ -7604,7 +7611,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -7653,8 +7659,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -7665,6 +7681,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -7781,7 +7806,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8632,14 +8657,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = uint8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -8647,7 +8672,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -10458,7 +10483,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -10714,6 +10739,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -11700,6 +11727,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -11708,11 +11736,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -11724,30 +11776,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1554
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -11756,83 +11808,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -11846,17 +11898,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -11864,90 +11916,90 @@ __219:
 		}
 		return ts + 1560
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(j))) = uint8(0)
 	length = int32(j)
@@ -11955,89 +12007,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -12050,32 +12102,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -12134,7 +12186,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -12150,8 +12202,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -12180,12 +12231,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -12194,7 +12246,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -13314,6 +13366,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -13919,10 +13989,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13948,6 +14021,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = uint8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]uint8{}))-uint64(1)-uint64(i))
+	return int32(uint64(unsafe.Sizeof([22]uint8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14909,11 +14983,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -15816,7 +15891,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -16039,7 +16114,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -16055,113 +16130,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -16293,7 +16368,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16584,7 +16659,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3378, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16601,14 +16676,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16628,7 +16703,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16696,7 +16771,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -16923,7 +16998,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16951,7 +17026,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -17050,7 +17125,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3261, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -17180,7 +17255,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -17226,7 +17301,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -17457,7 +17532,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17591,7 +17666,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+16)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17612,7 +17687,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17928,7 +18003,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3261, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18019,7 +18094,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43337)
 		}
 		return rc
 	}
@@ -18027,9 +18102,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18072,12 +18147,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*uint8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -18096,18 +18168,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*24 + 8)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3459, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3459, zIn, 43443)
 			}
 		} else if (*stat)(unsafe.Pointer(bp)).Fst_mode&X__mode_t(0170000) == X__mode_t(0120000) {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls, zIn, bp+128, uint64(unsafe.Sizeof([4098]uint8{}))-uint64(2))
 			if got <= int64(0) || got >= Ssize_t(unsafe.Sizeof([4098]uint8{}))-int64(2) {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3450, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3450, zIn, 43454)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 128 + uintptr(got))) = uint8(0)
@@ -18147,14 +18219,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 4104)).FzOut = zOut
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, bp, uint64(unsafe.Sizeof([4098]uint8{}))-uint64(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3279, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3279, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+4104, bp)
 	}
 	appendAllPathElements(tls, bp+4104, zPath)
 	*(*uint8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+4104)).FnUsed))) = uint8(0)
 	if (*DbPath)(unsafe.Pointer(bp+4104)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+4104)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4104)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18255,7 +18327,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == EINTR {
 				got = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*24 + 8)))(tls, fd, zBuf, uint64(nBuf)))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -18263,12 +18335,12 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 }
 
 func unixSleep(tls *libc.TLS, NotUsed uintptr, microseconds int32) int32 {
-	if microseconds >= 1000000 {
-		libc.Xsleep(tls, uint32(microseconds/1000000))
-	}
-	if microseconds%1000000 != 0 {
-		libc.Xusleep(tls, uint32(microseconds%1000000))
-	}
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	(*timespec)(unsafe.Pointer(bp)).Ftv_sec = X__time_t(microseconds / 1000000)
+	(*timespec)(unsafe.Pointer(bp)).Ftv_nsec = X__syscall_slong_t(microseconds % 1000000 * 1000)
+	libc.Xnanosleep(tls, bp, uintptr(0))
 	_ = NotUsed
 	return microseconds
 }
@@ -22179,7 +22251,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -23231,7 +23303,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -23248,7 +23319,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -23314,7 +23384,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -23324,7 +23393,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23515,36 +23584,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -23716,7 +23774,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23840,7 +23898,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23879,7 +23937,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23956,7 +24014,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24868,10 +24926,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0)}
@@ -24957,7 +25017,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25714,7 +25774,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25813,7 +25873,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -26399,7 +26459,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26674,7 +26734,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27147,7 +27207,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27652,7 +27712,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27887,8 +27947,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27896,23 +27956,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -28308,7 +28370,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28445,7 +28507,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -28462,7 +28524,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -28470,7 +28532,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -28513,7 +28575,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28523,7 +28585,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -28773,7 +28835,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28820,7 +28882,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28830,7 +28892,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28843,7 +28905,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28852,14 +28914,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28869,7 +28931,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -28933,7 +28995,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -28943,7 +29005,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28965,7 +29027,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -29000,7 +29062,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -29013,13 +29075,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -29044,7 +29106,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -29055,7 +29117,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -29107,22 +29169,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29132,7 +29194,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29140,7 +29202,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29148,10 +29210,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29175,13 +29237,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29189,7 +29250,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29197,32 +29297,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -29250,11 +29339,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -29265,15 +29354,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29301,14 +29390,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellOffset+i*2)))))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -29322,7 +29411,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29334,7 +29423,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29437,7 +29526,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29465,7 +29554,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29504,7 +29593,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -30387,7 +30476,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30802,7 +30891,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30828,7 +30917,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -30837,7 +30926,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30848,7 +30937,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30864,7 +30953,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30925,7 +31014,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30960,7 +31049,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -31020,7 +31109,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31059,7 +31148,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31090,7 +31179,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31431,7 +31520,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31675,14 +31764,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31727,7 +31816,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31776,7 +31865,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -31856,7 +31945,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31947,7 +32036,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -31967,7 +32056,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32031,18 +32120,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -32058,6 +32137,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -32179,7 +32266,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -32383,7 +32470,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32448,7 +32535,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -32496,7 +32583,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -32615,7 +32702,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32775,7 +32862,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32840,7 +32927,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32876,7 +32963,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32920,7 +33007,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -33032,7 +33119,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -33190,7 +33277,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33247,7 +33334,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -33263,7 +33350,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -33337,7 +33424,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33349,7 +33436,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -33360,7 +33447,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33525,7 +33612,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33549,9 +33636,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -33574,16 +33661,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -33604,9 +33689,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -33740,11 +33831,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -33797,12 +33891,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -33810,7 +33904,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33870,7 +33964,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -33959,7 +34053,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -34075,7 +34169,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -34118,8 +34212,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -34201,6 +34295,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -34393,7 +34489,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -34404,7 +34500,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -34562,7 +34658,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -34636,7 +34732,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -34662,9 +34758,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -34675,8 +34772,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -34698,7 +34795,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -34726,7 +34823,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -34987,11 +35084,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -35179,7 +35276,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -35217,7 +35314,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -35294,7 +35391,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -35306,19 +35403,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -35331,7 +35420,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35350,6 +35439,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -35385,7 +35491,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -35394,13 +35499,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -35411,7 +35515,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -35524,7 +35628,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -35538,20 +35642,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -35561,7 +35665,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -35569,100 +35679,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -35671,30 +35781,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -35717,7 +35827,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -35736,13 +35845,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, uint64(nIn))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -35759,7 +35870,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35818,9 +35929,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -35860,7 +35971,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -35868,11 +35979,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35947,7 +36058,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35957,7 +36068,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -36016,7 +36127,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36045,7 +36156,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -36121,7 +36232,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36135,7 +36246,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36269,7 +36380,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36444,12 +36555,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -36457,15 +36597,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4062, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -36489,9 +36629,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if libc.AtomicLoadNInt32((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb+432, 0) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -36505,7 +36642,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
 		return
@@ -36579,7 +36716,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -36664,48 +36803,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4318, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4356, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -36720,29 +36866,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -36750,28 +36896,28 @@ __9:
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(pCellIdx))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4470,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4500, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -36779,97 +36925,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4548, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellStart+i*2)))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -36879,48 +37025,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4610,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -36949,9 +37095,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -36983,19 +37129,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -37007,7 +37147,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -37015,7 +37155,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -37100,7 +37240,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -37143,22 +37283,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -37385,8 +37522,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -37886,7 +38023,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
 		libc.Xmemcpy(tls, bp+8, p, uint64(int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int*2))
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+16, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+16, ts+4925,
@@ -37898,6 +38035,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*uint8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+16)).FnChar))) = uint8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 16)).FnChar)
 	}
 }
 
@@ -38085,7 +38223,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -38259,16 +38396,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -38711,7 +38850,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38948,43 +39087,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -39369,7 +39499,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39384,14 +39514,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39761,7 +39891,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -39773,13 +39905,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -39856,6 +39990,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -40744,7 +40881,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -40753,7 +40890,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -40787,7 +40924,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -40829,7 +40965,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -41581,7 +41717,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -41689,7 +41825,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42240,7 +42376,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -42305,7 +42441,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42339,7 +42475,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42389,7 +42525,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -42535,7 +42671,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -42706,7 +42842,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42732,7 +42868,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -43006,7 +43142,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43358,8 +43494,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -43369,15 +43508,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -43565,6 +43704,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -43617,7 +43757,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -43681,6 +43821,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -43692,9 +43841,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5357)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -43928,7 +44078,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -43952,8 +44102,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -44127,15 +44277,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5367, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44246,14 +44396,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -44537,7 +44690,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -44681,7 +44834,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -44853,7 +45006,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*uint8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5407, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5397, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -44908,21 +45061,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5418, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5431, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5434, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5424, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5439, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
 			}
 		}
 	}
@@ -45014,11 +45167,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity uint8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -45149,8 +45302,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -45385,7 +45538,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -45486,593 +45638,597 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
+
+	case OP_IfNoHope:
 		goto __100
-	case OP_NotFound:
+	case OP_NoConflict:
 		goto __101
-	case OP_Found:
+	case OP_NotFound:
 		goto __102
+	case OP_Found:
+		goto __103
 
 	case OP_SeekRowid:
-		goto __103
-	case OP_NotExists:
 		goto __104
-
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46081,56 +46237,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -46138,20 +46294,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -46159,124 +46316,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5441, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5462, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5452, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5469, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5459, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -46284,10 +46441,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -46298,9 +46455,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -46308,171 +46465,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint64(uintptr(0)+24))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -46480,95 +46637,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = uint8(0)
@@ -46576,231 +46733,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -46809,95 +46966,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46907,189 +47064,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -47098,38 +47259,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -47137,9 +47298,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -47150,298 +47311,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -47451,144 +47613,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -47596,353 +47758,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len))
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = uint8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5493,
+	Xsqlite3VdbeError(tls, p, ts+5483,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*uint8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -47956,319 +48118,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*uint8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -48276,467 +48427,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5534, 0)
+	Xsqlite3VdbeError(tls, p, ts+5524, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5585, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5607, 0)
+		ts+5597, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5661, 0)
+		ts+5651, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5716
+				return ts + 5706
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5764
+					return ts + 5754
 				}
-				return ts + 5807
+				return ts + 5797
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5848)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -48744,67 +48906,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -48815,24 +48977,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -48840,30 +49002,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -48879,22 +49041,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -48908,133 +49070,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1554
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -49042,18 +49204,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49064,92 +49226,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -49167,106 +49329,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -49275,108 +49437,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49384,14 +49546,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -49401,108 +49563,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, uint8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -49521,35 +49683,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -49557,123 +49719,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49683,52 +49845,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -49740,15 +49902,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -49756,13 +49919,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -49775,11 +49938,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -49790,38 +49953,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -49833,47 +49996,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -49882,35 +50045,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49919,51 +50082,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -49973,72 +50136,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50046,43 +50209,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50090,84 +50253,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50177,34 +50345,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -50213,10 +50381,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -50233,14 +50401,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50253,21 +50421,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50279,62 +50447,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5876)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -50347,56 +50515,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -50407,54 +50575,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -50462,72 +50630,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -50536,55 +50704,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5893
+	goto __799
+__798:
+	zSchema = ts + 5883
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5907,
+		ts+5897,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -50594,66 +50762,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -50662,151 +50830,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5950, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -50814,10 +50983,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -50837,26 +51006,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -50868,7 +51037,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -50879,170 +51048,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -51059,146 +51228,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -51206,70 +51375,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5987,
+		ts+5977,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6039
+				return ts + 6029
 			}
-			return ts + 6044
+			return ts + 6034
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -51277,17 +51446,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -51297,14 +51466,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -51314,197 +51483,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6051, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5357, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -51518,27 +51687,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -51546,72 +51715,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.Xmemset(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -51621,192 +51790,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -51815,63 +51984,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= uint8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -51881,104 +52050,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -51986,52 +52155,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6086,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -52150,8 +52323,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -52171,7 +52344,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -52191,8 +52364,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -52223,8 +52396,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -52257,8 +52430,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52338,8 +52511,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52408,7 +52581,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -52436,12 +52609,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 3663
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52485,7 +52658,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52568,7 +52741,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -55107,6 +55280,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6381, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6389+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6408+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -55126,7 +55327,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -55181,7 +55381,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6381, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
 		goto __8
 	}
 
@@ -55302,7 +55502,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6386) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55310,73 +55510,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -55388,28 +55606,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -55420,160 +55638,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6388, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6392, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6396, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -55582,8 +55801,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -55591,19 +55810,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -55611,81 +55830,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6405, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6436, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -55698,141 +55917,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6491, libc.VaList(bp+16, zCol))
+		ts+6551, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6526
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6586
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6535
+		zErr = ts + 6595
 	} else {
-		zErr = ts + 6550
+		zErr = ts + 6610
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6572, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -55876,15 +56095,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6602
+	var zIn uintptr = ts + 6662
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6630
+		zIn = ts + 6690
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6648
+		zIn = ts + 6708
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6666
+		zIn = ts + 6726
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6684, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -55963,10 +56182,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6704
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6764
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -56013,7 +56232,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6715, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6775, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56077,7 +56296,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6732, libc.VaList(bp, pExpr))
+								ts+6792, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56093,7 +56312,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6796,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6856,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56107,7 +56326,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6832, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6892, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56130,30 +56349,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6860, libc.VaList(bp+16, pExpr))
+						ts+6920, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6903
+						zType = ts + 6963
 					} else {
-						zType = ts + 6910
+						zType = ts + 6970
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6920, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6948, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7008, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6970,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7014,
+						ts+7074,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56225,7 +56444,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7062, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7122, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -56241,7 +56460,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7073, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7133, pExpr, pExpr)
 			}
 
 			break
@@ -56297,7 +56516,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56372,7 +56591,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7084, libc.VaList(bp, i, zType, mx))
+		ts+7144, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56392,7 +56611,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7140, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7200, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56427,7 +56646,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7174, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56484,7 +56703,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7180, libc.VaList(bp, i+1))
+				ts+7240, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56512,7 +56731,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7241, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7301, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56726,7 +56945,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7272, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7332, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56766,7 +56985,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56777,7 +56996,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7311) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56789,7 +57008,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7317, 0)
+						ts+7377, 0)
 					return WRC_Abort
 				}
 
@@ -56889,12 +57108,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -56930,12 +57149,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -57045,33 +57264,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) uint8
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) uint8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -57141,7 +57461,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -57476,7 +57797,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 		return
 	}
 
@@ -57551,7 +57872,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7376, libc.VaList(bp, mxHeight))
+			ts+7436, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57800,10 +58121,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7424,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7468
+						return ts + 7528
 					}
 					return ts + 1554
 				}(), nElem))
@@ -57844,7 +58165,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57870,7 +58191,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7472, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7532, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57898,7 +58219,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7506, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7566, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57945,7 +58266,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7526,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7586,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -57970,7 +58291,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7569, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7629, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58545,7 +58866,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58668,7 +58989,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7622, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7682, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58724,10 +59045,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6704) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6764) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6709) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59157,13 +59478,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff uint8) int3
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7645) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7705) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7653) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7659) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
 		return 1
 	}
 	return 0
@@ -59367,7 +59688,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7663, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59445,7 +59766,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7710, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -59539,7 +59860,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7741
+		var zFmt uintptr = ts + 7801
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59557,7 +59878,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	}
 }
 
@@ -59598,7 +59919,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7785, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59628,11 +59949,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7808, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7868, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1554
 			}
-			return ts + 7827
+			return ts + 7887
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59759,7 +60080,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7839, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -59774,12 +60095,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7857, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1554
 		}
-		return ts + 7827
+		return ts + 7887
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -59800,7 +60122,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59809,7 +60131,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7878)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7938)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60195,8 +60517,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7880, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7883,
+			if Xsqlite3_strnicmp(tls, z, ts+7940, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4932
@@ -60272,7 +60594,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60358,8 +60680,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -60445,14 +60767,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 7940, ts + 7945, ts + 7950, ts + 6191, ts + 6186}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
+				ts + 6186, ts + 8018}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7958
+						return ts + 8026
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60466,7 +60790,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60489,10 +60813,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -60592,7 +60916,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -60722,12 +61046,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -60736,110 +61061,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -60882,13 +61220,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*uint8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -60898,11 +61236,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -60925,11 +61263,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -60938,15 +61276,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -60973,20 +61311,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -60995,9 +61333,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -61035,14 +61373,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -61053,17 +61393,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -61075,128 +61415,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7990, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -61204,42 +61544,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -61262,23 +61602,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -61295,42 +61635,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -61351,15 +61693,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61369,22 +61711,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61393,21 +61735,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61417,27 +61759,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8014, 0)
+		ts+8082, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61446,7 +61788,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -61457,7 +61799,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]uint8)(unsafe.Pointer(ts + 8064))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8132))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62829,18 +63171,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -62870,7 +63212,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -62883,12 +63225,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -62896,6 +63336,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -62910,81 +63390,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -63006,34 +63413,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -63123,7 +63529,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -63131,7 +63537,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -63182,11 +63588,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63198,13 +63604,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8108,
+		ts+8170,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8283,
+			ts+8345,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63214,10 +63620,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8457, libc.VaList(bp, zDb, zDb))
+		ts+8519, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8604, 0)
+			ts+8666, 0)
 	}
 }
 
@@ -63281,7 +63687,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8755, libc.VaList(bp, zName))
+		ts+8817, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63291,7 +63697,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8814, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63300,7 +63706,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8820, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63341,19 +63747,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8847, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9031,
+		ts+9093,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9336, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9352,
+		ts+9414,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63361,7 +63767,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9410, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63373,7 +63779,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9675, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63385,7 +63791,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9688,
+		ts+9750,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63431,12 +63837,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9726, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9758, 0)
+			ts+9820, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63446,11 +63852,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9785)
+				ts+9847)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9844)
+				ts+9906)
 		}
 
 		if pDflt != 0 {
@@ -63463,12 +63869,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9897)
+					ts+9959)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9943)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63479,7 +63885,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9970,
+			ts+10032,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63501,7 +63907,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10116,
+				ts+10178,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63549,14 +63955,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10346, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10380, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63584,7 +63990,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10410, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -63624,18 +64030,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10429
+		zType = ts + 10491
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10434
+		zType = ts + 10496
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10448,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10466
+					return ts + 10528
 				}
-				return ts + 10483
+				return ts + 10545
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -63719,7 +64125,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -63736,17 +64142,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10522,
+		ts+10584,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10704,
+		ts+10766,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9675, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9737, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63941,7 +64347,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -64004,10 +64410,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10835,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10897,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10858
+				return ts + 10920
 			}
 			return ts + 1554
 		}(), zWhen,
@@ -64049,8 +64455,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10860, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10922, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64067,7 +64473,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64089,7 +64495,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10868, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10930, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64129,10 +64535,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))
 				*(*uint8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = uint8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10874, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10936, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*uint8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10858
+							return ts + 10920
 						}
 						return ts + 1554
 					}()))
@@ -64308,8 +64714,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -64392,15 +64798,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -64428,7 +64834,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -64461,13 +64867,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64480,7 +64886,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64495,7 +64901,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -64551,8 +64957,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -64600,7 +65006,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -64668,8 +65074,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64711,11 +65117,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.Xmemset(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.Xmemset(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -64808,8 +65214,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64827,16 +65233,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -64851,31 +65257,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -64893,8 +65299,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64920,9 +65326,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -64950,8 +65356,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -64988,7 +65394,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -65012,7 +65418,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10879, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -65093,17 +65499,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10886,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10948,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10914
+				return ts + 10976
 			}
 			return ts + 6127
 		}(),
@@ -65114,7 +65520,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10926, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65131,10 +65537,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10974, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11095, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11157, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -65252,11 +65658,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11113},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11134},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11154},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11173},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11192}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11175},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11196},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11216},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65290,7 +65696,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11215, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -65299,10 +65705,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11238,
+					ts+11300,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11268, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -65320,9 +65726,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11286, FzCols: ts + 11299},
-	{FzName: ts + 11312, FzCols: ts + 11325},
-	{FzName: ts + 11353},
+	{FzName: ts + 11348, FzCols: ts + 11361},
+	{FzName: ts + 11374, FzCols: ts + 11387},
+	{FzName: ts + 11415},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65341,7 +65747,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -65420,7 +65825,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -65466,13 +65871,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -65485,11 +65890,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -65513,17 +65918,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11366}
+	FzName:     ts + 11428}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -65534,8 +65939,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -65578,7 +65983,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -65606,7 +66011,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -65673,7 +66078,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -65689,8 +66094,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -65707,9 +66112,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -65717,14 +66122,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -65732,31 +66137,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -65764,7 +66169,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11376}
+	FzName:     ts + 11438}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -65778,20 +66183,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11386,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11448,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11391, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65833,7 +66238,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+11397, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -65847,7 +66252,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11403}
+	FzName:     ts + 11465}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -65891,7 +66296,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11412, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65908,7 +66313,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11286, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11348, uint64(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -66064,7 +66469,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66121,7 +66526,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66168,9 +66573,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11426)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11488)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11430)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66256,16 +66661,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1554
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*uint8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -66275,15 +66680,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*uint8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11434, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11496, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11445, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11455, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11517, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -66363,7 +66768,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -66377,42 +66782,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -66486,15 +66891,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -66559,11 +66964,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11312, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11374, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11467,
-			ts+11521,
+			ts+11529,
+			ts+11583,
 			zDb)
 	}
 	return rc
@@ -66610,10 +67015,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11286, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11573, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66671,12 +67076,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6381, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6441, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -66687,13 +67092,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -66714,128 +67122,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3835)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3835)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11614, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11617,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11654, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11679,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.Xmemset(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11684, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+11713, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+11775, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -66845,89 +67276,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11781, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -66981,14 +67412,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11809, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11871, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11830, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -66996,7 +67427,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11856, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67038,42 +67469,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -67082,13 +67519,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -67107,7 +67544,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11878}
+	FzName:     ts + 11940}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67120,7 +67557,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11892}
+	FzName:     ts + 11954}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67134,7 +67571,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11906, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67166,7 +67603,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11930,
+						ts+11992,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67341,7 +67778,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11976, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67367,11 +67804,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12005, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12011, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67418,7 +67855,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 7653
+		zCol = ts + 7713
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67442,7 +67879,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12100, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -67667,6 +68104,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -67679,13 +68119,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -67710,25 +68150,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6381) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+12086)
+						ts+6389)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5893)
+						ts+5883)
 				}
 			}
 		}
@@ -67749,12 +68189,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5893)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5883)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+12086)
+					ts+6389)
 			}
 		}
 	}
@@ -67785,7 +68225,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12105, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12115, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67803,14 +68243,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12113
+			zMsg = ts + 12123
 		} else {
-			zMsg = ts + 12126
+			zMsg = ts + 12136
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67840,12 +68280,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
-			return ts + 12072
+	if Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
+			return ts + 6427
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12086+7) == 0 {
-			return ts + 12053
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
+			return ts + 6408
 		}
 	}
 	return zName
@@ -68203,7 +68643,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5893)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5883)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68229,7 +68669,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6381, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
 				goto __3
 			}
 
@@ -68282,13 +68722,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12140, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12150, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12157, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68330,9 +68770,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8072, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12177,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68492,9 +68932,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68510,7 +68950,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12219, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
 	return
 __4:
 	;
@@ -68538,9 +68978,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10429
+			return ts + 10491
 		}
-		return ts + 8814
+		return ts + 8876
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68556,9 +68996,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68589,12 +69029,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12260,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10429
+				return ts + 10491
 			}
-			return ts + 8814
+			return ts + 8876
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68609,7 +69049,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12281, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -68696,7 +69136,7 @@ var nullRow = [6]uint8{uint8(6), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+12316, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12326, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -68720,7 +69160,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12333, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12343, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68740,7 +69180,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12316
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12326
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -68752,7 +69192,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12316, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12326, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68786,7 +69226,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68794,13 +69234,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12390, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12400, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12397, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12407, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -68837,7 +69277,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12407, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12417, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -69001,10 +69441,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12433,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12443,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12478, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -69035,7 +69475,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12519, 0)
+			ts+12529, 0)
 	}
 }
 
@@ -69080,7 +69520,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12571, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69169,7 +69609,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12612, 0)
+		ts+12622, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69264,7 +69704,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12668, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
 	goto generated_done
 __2:
 	;
@@ -69277,13 +69717,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12711, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12719, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69310,13 +69750,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12726,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69438,12 +69885,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1554
-		zSep2 = ts + 12757
+		zSep2 = ts + 12767
 		zEnd = ts + 4957
 	} else {
-		zSep = ts + 12759
-		zSep2 = ts + 12763
-		zEnd = ts + 12768
+		zSep = ts + 12769
+		zSep2 = ts + 12773
+		zEnd = ts + 12778
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69451,7 +69898,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12771, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*uint8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = uint8('(')
@@ -69489,11 +69936,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1554,
-	ts + 12785,
-	ts + 12791,
-	ts + 12796,
+	ts + 12795,
+	ts + 12801,
+	ts + 12806,
+	ts + 12811,
 	ts + 12801,
 }
 
@@ -69901,10 +70349,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12807,
+						ts+12817,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12840,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69923,11 +70371,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12867, 0)
+				ts+12877, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12917, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -69961,7 +70409,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12949, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
 			return
 		}
 	}
@@ -69986,11 +70434,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8814
-			zType2 = ts + 12993
+			zType = ts + 8876
+			zType2 = ts + 13003
 		} else {
-			zType = ts + 10429
-			zType2 = ts + 12999
+			zType = ts + 10491
+			zType2 = ts + 13009
 		}
 
 		if pSelect != 0 {
@@ -70052,7 +70500,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -70061,11 +70509,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+13004, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13019,
+			ts+13029,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70081,13 +70529,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13117,
+					ts+13127,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13159, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70102,7 +70550,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9336) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9398) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70132,7 +70580,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13193, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13203, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70148,7 +70596,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10429, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -70230,7 +70678,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13229, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70258,8 +70706,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -70356,13 +70803,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13259, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13269, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13274,
+		ts+13284,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -70403,10 +70850,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13341, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13351, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11238,
+				ts+11300,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70438,12 +70885,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13355,
+			ts+13365,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13400,
+		ts+13410,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -70471,11 +70918,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7073, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70553,9 +71000,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70614,21 +71061,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13467, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13495, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13529, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70640,7 +71087,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11430, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -70704,7 +71151,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13561,
+		ts+13571,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -70716,7 +71163,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13624, 0)
+		ts+13634, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70801,7 +71248,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13718,
+		ts+13728,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -71028,12 +71475,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13764,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13774,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13792
+							return ts + 13802
 						}
-						return ts + 13798
+						return ts + 13808
 					}()))
 				return 1
 			}
@@ -71154,7 +71601,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13803, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -71173,7 +71620,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13809,
+		ts+13819,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71199,26 +71646,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13859, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13887, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13897, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13912, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71232,7 +71679,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13803, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71247,7 +71694,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13946, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71259,7 +71706,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13980, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71288,7 +71735,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14004, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71309,9 +71756,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71350,7 +71797,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13803)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71451,7 +71898,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14027, 0)
+		ts+14037, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71668,7 +72115,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14088, libc.VaList(bp+48, 0))
+		ts+14098, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -71720,8 +72167,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14130, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -71767,12 +72214,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14147,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1554
 			}
-			return ts + 14167
+			return ts + 14177
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71780,7 +72227,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14175,
+		ts+14185,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -71794,7 +72241,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14234, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71955,7 +72402,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14261, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -71970,7 +72417,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14279, libc.VaList(bp+8, 0))
+		ts+14289, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -71981,9 +72428,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72009,9 +72456,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14352,
+		ts+14362,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11426, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -72146,7 +72593,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14412,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14422,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72354,12 +72801,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14448,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14458,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14484
+				return ts + 14494
 			}
-			return ts + 14487
+			return ts + 14497
 		}()))
 	goto append_from_error
 __1:
@@ -72528,7 +72975,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14493, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72564,9 +73011,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14499
+				return ts + 14509
 			}
-			return ts + 14508
+			return ts + 14518
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72591,7 +73038,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14493, ts + 14515, ts + 14499}
+var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72606,7 +73053,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14523, 0)
+				ts+14533, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72743,14 +73190,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14593, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14604, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14614, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
@@ -72776,11 +73223,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14607, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72910,7 +73357,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14616, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -73006,7 +73453,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14662, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14672, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73199,7 +73646,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14692, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73479,7 +73926,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73511,11 +73958,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14756, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14785, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74019,7 +74466,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14823)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
 __62:
 	;
 delete_from_cleanup:
@@ -74134,7 +74581,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11286) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11348) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74364,7 +74811,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 7945, ts + 7940, ts + 6181}
+var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 8005, ts + 8000, ts + 6181}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74423,7 +74870,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14836, -1)
+					Xsqlite3_result_error(tls, context, ts+14846, -1)
 					return
 				}
 				iVal = -iVal
@@ -74727,7 +75174,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14853, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75073,7 +75520,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14858, -1)
+		Xsqlite3_result_error(tls, context, ts+14868, -1)
 		return
 	}
 	if argc == 3 {
@@ -75083,7 +75530,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14891, -1)
+				ts+14901, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75182,7 +75629,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14936, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14946, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75197,21 +75644,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = uint8('\'')
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = uint8(0)
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = uint8('\'')
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = uint8(0)
 				*(*uint8)(unsafe.Pointer(zText)) = uint8('X')
 				*(*uint8)(unsafe.Pointer(zText + 1)) = uint8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -75219,7 +75666,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14943, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14953, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -75333,6 +75780,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1554
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -75535,7 +76095,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10858}
+var azOne = [1]uintptr{ts + 10920}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75571,7 +76131,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(j))) = uint8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14946, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14956, 4, uintptr(0))
 	}
 }
 
@@ -75596,7 +76156,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12038, -1)
+		Xsqlite3_result_error(tls, context, ts+12100, -1)
 		return
 	}
 
@@ -75674,7 +76234,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14836, -1)
+			Xsqlite3_result_error(tls, context, ts+14846, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75936,7 +76496,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14951, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14961, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -75956,14 +76516,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14957, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14957, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76093,17 +76653,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -76162,6 +76722,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -76202,108 +76763,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14962},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14982},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14995},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15013},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15022},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15045},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15071},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15096},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15105},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15116},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15123},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15154},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15154},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15154},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15158},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15162},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15169},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15177},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15184},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15190},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15197},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15204},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15212},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15217},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14992},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 15005},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15023},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15032},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15055},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15081},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15106},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15115},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15126},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15133},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15164},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15164},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15164},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15168},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15179},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15187},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15194},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15200},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15207},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15222},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15227},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15233},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15239},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15243},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15257},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15275},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15290},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15307},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15318},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15324},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15350},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15364},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15398},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15402},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15408},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15237},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15249},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15259},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15266},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15273},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15284},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15291},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15306},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15323},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15334},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15340},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15358},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15366},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15380},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15414},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15431},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15436},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15441},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15449},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15455},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15461},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15468},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15474},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15479},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15483},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15487},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15493},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15497},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15507},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15512},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15424},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15447},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15452},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15457},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15465},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15471},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15484},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15490},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15495},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15503},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15509},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15513},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15530},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15540},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15545},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15523},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15528},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15534},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15538},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15542},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15546},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15551},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15557},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15563},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15568},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15576},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15584},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15587},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6526},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15592}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15556},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15561},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15567},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15573},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15579},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15584},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15592},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15600},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6586},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15608}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76424,7 +76987,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15596,
+				ts+15612,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -77084,8 +77647,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6392, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6388, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6452, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6448, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77586,7 +78149,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7910, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78054,7 +78617,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15641,
+		ts+15657,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78079,7 +78642,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15682,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -78228,7 +78791,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15714,
+		ts+15730,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78238,7 +78801,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15766, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78290,7 +78853,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15791,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78298,7 +78861,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15837, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -78710,7 +79273,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15858)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
 __125:
 	;
 insert_cleanup:
@@ -79026,8 +79589,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 								onError, iReg)
 							Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -80117,7 +80681,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -80563,6 +81127,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80601,7 +81166,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12038, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -80610,7 +81175,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15872
+		zEntry = ts + 15888
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -80625,7 +81190,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -80661,7 +81226,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15895, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -80675,7 +81240,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15904, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -80699,7 +81264,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15908, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -80717,7 +81282,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15914, libc.VaList(bp+16, zEntry, zFile))
+		ts+15930, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80744,7 +81309,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15957, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80782,7 +81347,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15989, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80792,7 +81357,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16026,
+	ts + 16042,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80948,7 +81513,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16029, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -80957,62 +81522,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5057,
-	ts + 16068,
-	ts + 8814,
-	ts + 16072,
-	ts + 16077,
-	ts + 16080,
-	ts + 16090,
-	ts + 16100,
+	ts + 16084,
+	ts + 8876,
+	ts + 16088,
+	ts + 16093,
+	ts + 16096,
 	ts + 16106,
-	ts + 16110,
-	ts + 16115,
-	ts + 16120,
-	ts + 16128,
-	ts + 16139,
-	ts + 16142,
-	ts + 16149,
-	ts + 16110,
-	ts + 16115,
-	ts + 16156,
-	ts + 16161,
-	ts + 16164,
-	ts + 16171,
-	ts + 16106,
-	ts + 16110,
+	ts + 16116,
+	ts + 16122,
+	ts + 16126,
+	ts + 16131,
+	ts + 16136,
+	ts + 16144,
+	ts + 16155,
+	ts + 16158,
+	ts + 16165,
+	ts + 16126,
+	ts + 16131,
+	ts + 16172,
 	ts + 16177,
-	ts + 16182,
+	ts + 16180,
 	ts + 16187,
-	ts + 16110,
-	ts + 16191,
-	ts + 16115,
-	ts + 16199,
+	ts + 16122,
+	ts + 16126,
+	ts + 16193,
+	ts + 16198,
 	ts + 16203,
-	ts + 16208,
-	ts + 11430,
-	ts + 11426,
-	ts + 16214,
+	ts + 16126,
+	ts + 16207,
+	ts + 16131,
+	ts + 16215,
 	ts + 16219,
 	ts + 16224,
-	ts + 16068,
-	ts + 16110,
-	ts + 16229,
-	ts + 16236,
-	ts + 16243,
-	ts + 8814,
-	ts + 16251,
-	ts + 5060,
-	ts + 16257,
-	ts + 16068,
-	ts + 16110,
-	ts + 16262,
+	ts + 11492,
+	ts + 11488,
+	ts + 16230,
+	ts + 16235,
+	ts + 16240,
+	ts + 16084,
+	ts + 16126,
+	ts + 16245,
+	ts + 16252,
+	ts + 16259,
+	ts + 8876,
 	ts + 16267,
-	ts + 15464,
-	ts + 16272,
-	ts + 16285,
-	ts + 16294,
+	ts + 5060,
+	ts + 16273,
+	ts + 16084,
+	ts + 16126,
+	ts + 16278,
+	ts + 16283,
+	ts + 15480,
+	ts + 16288,
 	ts + 16301,
-	ts + 16312,
+	ts + 16310,
+	ts + 16317,
+	ts + 16328,
 }
 
 // Definitions of all built-in pragmas
@@ -81030,238 +81595,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16320,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16335,
+	{FzName: ts + 16351,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16350,
+	{FzName: ts + 16366,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16362,
+	{FzName: ts + 16378,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16394,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16301,
+	{FzName: ts + 16317,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16391,
+	{FzName: ts + 16407,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16403,
+	{FzName: ts + 16419,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16423,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16439,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16455,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16460,
+	{FzName: ts + 16476,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16475,
+	{FzName: ts + 16491,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16507,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16505,
+	{FzName: ts + 16521,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16518,
+	{FzName: ts + 16534,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16532,
+	{FzName: ts + 16548,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16551,
+	{FzName: ts + 16567,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16570,
+	{FzName: ts + 16586,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16593,
+	{FzName: ts + 16609,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16618,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16620,
+	{FzName: ts + 16636,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16637,
+	{FzName: ts + 16653,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16650,
+	{FzName: ts + 16666,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16665,
+	{FzName: ts + 16681,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16683,
+	{FzName: ts + 16699,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16693,
+	{FzName: ts + 16709,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16723,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16739,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16748,
+	{FzName: ts + 16764,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16767,
+	{FzName: ts + 16783,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16778,
+	{FzName: ts + 16794,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16789,
+	{FzName: ts + 16805,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16801,
+	{FzName: ts + 16817,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16833,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16830,
+	{FzName: ts + 16846,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16849,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16868,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16881,
+	{FzName: ts + 16897,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16896,
+	{FzName: ts + 16912,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16906,
+	{FzName: ts + 16922,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16918,
+	{FzName: ts + 16934,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16943,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16938,
+	{FzName: ts + 16954,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16948,
+	{FzName: ts + 16964,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16960,
+	{FzName: ts + 16976,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16971,
+	{FzName: ts + 16987,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16983,
+	{FzName: ts + 16999,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17000,
+	{FzName: ts + 17016,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17019,
+	{FzName: ts + 17035,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17045,
+	{FzName: ts + 17061,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17060,
+	{FzName: ts + 17076,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17074,
+	{FzName: ts + 17090,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17093,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17107,
+	{FzName: ts + 17123,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17139,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17135,
+	{FzName: ts + 17151,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17146,
+	{FzName: ts + 17162,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17157,
+	{FzName: ts + 17173,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17169,
+	{FzName: ts + 17185,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17180,
+	{FzName: ts + 17196,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17201,
+	{FzName: ts + 17217,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17209,
+	{FzName: ts + 17225,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17224,
+	{FzName: ts + 17240,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17237,
+	{FzName: ts + 17253,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17256,
+	{FzName: ts + 17272,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17271,
+	{FzName: ts + 17287,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81283,7 +81848,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17287))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17303))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -81295,10 +81860,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17312) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17328) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81307,13 +81872,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7958) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8026) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17329) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17334) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81328,9 +81893,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*uint8)(unsafe.Pointer(z))) >= '0' && int32(*(*uint8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*uint8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16262) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16278) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17346) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81344,7 +81909,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17353, 0)
+				ts+17369, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -81435,19 +82000,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17415
+		zName = ts + 17431
 		break
 	case OE_SetDflt:
-		zName = ts + 17424
+		zName = ts + 17440
 		break
 	case OE_Cascade:
-		zName = ts + 17436
+		zName = ts + 17452
 		break
 	case OE_Restrict:
-		zName = ts + 17444
+		zName = ts + 17460
 		break
 	default:
-		zName = ts + 17453
+		zName = ts + 17469
 		break
 	}
 	return zName
@@ -81464,7 +82029,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17463, ts + 17470, ts + 17478, ts + 17482, ts + 17346, ts + 17491,
+	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81511,13 +82076,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17495
+			zType = ts + 17511
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17497
+			zType = ts + 17513
 		} else {
-			zType = ts + 7468
+			zType = ts + 7528
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17499,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -81525,7 +82090,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17506, ts + 17511, ts + 17519}
+var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -81676,14 +82241,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -81770,7 +82337,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17527, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82031,7 +82598,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17531) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82103,7 +82670,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17322
+	zRet = ts + 17338
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82141,7 +82708,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17312
+	zRet = ts + 17328
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82428,7 +82995,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17536, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82469,7 +83036,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17561, 0)
+		ts+17577, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82523,7 +83090,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17614) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
 		goto __142
 	}
 
@@ -82620,9 +83187,9 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17620
+			return ts + 17636
 		}
-		return ts + 17628
+		return ts + 17644
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -82691,7 +83258,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17635, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82737,29 +83304,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10429
+	zType = ts + 10491
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12711
+	zType = ts + 12721
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17651
+	zType = ts + 17667
 	goto __183
 __182:
-	zType = ts + 8814
+	zType = ts + 8876
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82825,7 +83392,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17665, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82835,7 +83402,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17670,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -82872,8 +83439,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17675, ts + 17677, ts + 16139}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17679,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82906,7 +83473,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -82928,7 +83495,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17689, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -82992,7 +83559,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -83008,7 +83575,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83043,7 +83610,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17692,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83051,7 +83618,7 @@ __226:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+17701))
+			ts+17717))
 	goto __227
 __227:
 	j2++
@@ -83240,7 +83807,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17706, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 600)))
@@ -83457,7 +84024,7 @@ __284:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17710, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -83518,262 +84085,284 @@ __299:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 612)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__300:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __301
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __300
+	}
+	mxCol = -1
+	j4 = 0
+__302:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __304
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __305
+	}
+	mxCol++
+__305:
+	;
+	goto __303
+__303:
+	j4++
+	goto __302
+	goto __304
+__304:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __306
 	}
 	mxCol--
-	goto __300
+__306:
+	;
+	goto __301
+__300:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __301:
 	;
 	if !(mxCol >= 0) {
-		goto __302
+		goto __307
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__302:
+__307:
 	;
 	if !!(isQuick != 0) {
-		goto __303
+		goto __308
 	}
 	if !(pPk1 != 0) {
-		goto __304
+		goto __309
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 612)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17734,
+		ts+17750,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__305:
+__310:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __307
+		goto __312
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 612)), j4, r2+j4)
-	goto __306
-__306:
+	goto __311
+__311:
 	j4++
-	goto __305
-	goto __307
-__307:
+	goto __310
+	goto __312
+__312:
 	;
-__304:
+__309:
 	;
-__303:
+__308:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__308:
+__313:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __310
+		goto __315
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __311
+		goto __316
 	}
-	goto __309
-__311:
+	goto __314
+__316:
 	;
 	if !(bStrict != 0) {
-		goto __312
+		goto __317
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __313
-__312:
+	goto __318
+__317:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__313:
+__318:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __314
+		goto __319
 	}
-	goto __309
-__314:
+	goto __314
+__319:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __316
-__315:
+	goto __321
+__320:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __317
+		goto __322
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 624)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		(*Column)(unsafe.Pointer(pCol1)).Faffinity, bp+624)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 624)) != 0) {
-		goto __318
+		goto __323
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
-__318:
+__323:
 	;
-__317:
+__322:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 612))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __319
+		goto __324
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __320
-__319:
+	goto __325
+__324:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__320:
+__325:
 	;
-__316:
+__321:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __321
+		goto __326
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17770, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __323
-__322:
+	goto __328
+__327:
 	;
-__323:
+__328:
 	;
-__321:
+__326:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __324
+		goto __329
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17790,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __325
-__324:
+	goto __330
+__329:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __326
+		goto __331
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17812,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __327
-__326:
+	goto __332
+__331:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __328
+		goto __333
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
-__329:
+__334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17835, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17837,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__328:
+__333:
 	;
-__327:
+__332:
 	;
-__325:
+__330:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __309
-__309:
+	goto __314
+__314:
 	j4++
-	goto __308
-	goto __310
-__310:
+	goto __313
+	goto __315
+__315:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __330
+		goto __335
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __331
+		goto __336
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 612)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__332:
+__337:
 	if !(k3 > 0) {
-		goto __334
+		goto __339
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __333
-__333:
+	goto __338
+__338:
 	k3--
-	goto __332
-	goto __334
-__334:
+	goto __337
+	goto __339
+__339:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17857,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__331:
+__336:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__330:
+__335:
 	;
 	if !!(isQuick != 0) {
-		goto __335
+		goto __340
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__336:
+__341:
 	if !(pIdx5 != 0) {
-		goto __338
+		goto __343
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __339
+		goto __344
 	}
-	goto __337
-__339:
+	goto __342
+__344:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 612)), 0, 0, bp+632,
 		pPrior, r1)
@@ -83782,80 +84371,119 @@ __339:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 616))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17892)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__345:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __347
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __348
+	}
+	goto __346
+__348:
+	;
+	if !(label6 == 0) {
+		goto __349
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__349:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 616))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	if !(label6 != 0) {
+		goto __350
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__350:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __340
+		goto __351
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__341:
+__352:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __343
+		goto __354
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __344
+		goto __355
 	}
-	goto __342
-__344:
+	goto __353
+__355:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17956)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__351:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
 	goto __342
 __342:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __341
 	goto __343
 __343:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17913)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __340:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
-	goto __337
-__337:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __336
-	goto __338
-__338:
-	;
-__335:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __345
+		goto __356
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17940)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__346:
+__357:
 	if !(pIdx5 != 0) {
-		goto __348
+		goto __359
 	}
 	if !(pPk1 == pIdx5) {
-		goto __349
+		goto __360
 	}
-	goto __347
-__349:
+	goto __358
+__360:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83864,21 +84492,21 @@ __349:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __347
-__347:
+	goto __358
+__358:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __346
-	goto __348
-__348:
+	goto __357
+	goto __359
+__359:
 	;
 	if !(pPk1 != 0) {
-		goto __350
+		goto __361
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__350:
+__361:
 	;
-__345:
+__356:
 	;
 	goto __291
 __291:
@@ -83896,14 +84524,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __351
+		goto __362
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 608))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 17969
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18012
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__351:
+__362:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83911,27 +84539,27 @@ __351:
 
 __45:
 	if !!(zRight != 0) {
-		goto __352
+		goto __363
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __354
+		goto __365
 	}
 	goto pragma_out
-__354:
+__365:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __353
-__352:
+	goto __364
+__363:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __355
+		goto __366
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__356:
+__367:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __358
+		goto __369
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __359
+		goto __370
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83940,25 +84568,25 @@ __356:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __358
-__359:
+	goto __369
+__370:
 	;
-	goto __357
-__357:
+	goto __368
+__368:
 	pEnc += 16
-	goto __356
-	goto __358
-__358:
+	goto __367
+	goto __369
+__369:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __360
+		goto __371
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17972, libc.VaList(bp+456, zRight))
-__360:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+__371:
 	;
-__355:
+__366:
 	;
-__353:
+__364:
 	;
 	goto __15
 
@@ -83966,15 +84594,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __361
+		goto __372
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __363
+		goto __374
 	}
 	goto __15
-__363:
+__374:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -83982,41 +84610,41 @@ __363:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __364
+		goto __375
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__364:
+__375:
 	;
-	goto __362
-__361:
+	goto __373
+__372:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __365
+		goto __376
 	}
 	goto __15
-__365:
+__376:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__362:
+__373:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__366:
+__377:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __366
-__367:
+	goto __377
+__378:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84031,31 +84659,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17329) == 0) {
-		goto __369
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
+		goto __380
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __370
-__369:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17997) == 0) {
-		goto __371
+	goto __381
+__380:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
+		goto __382
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __372
-__371:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17482) == 0) {
-		goto __373
+	goto __383
+__382:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
+		goto __384
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__373:
+__384:
 	;
-__372:
+__383:
 	;
-__370:
+__381:
 	;
-__368:
+__379:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84065,10 +84693,10 @@ __368:
 
 __49:
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__374:
+__385:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84088,19 +84716,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __377
+		goto __388
 	}
 	goto __15
-__377:
+__388:
 	;
-	goto __376
-__375:
+	goto __387
+__386:
 	opMask = U32(0xfffe)
-__376:
+__387:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84109,86 +84737,86 @@ __376:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__378:
+__389:
 	if !(iDb <= iDbLast) {
-		goto __380
+		goto __391
 	}
 	if !(iDb == 1) {
-		goto __381
+		goto __392
 	}
-	goto __379
-__381:
+	goto __390
+__392:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__382:
+__393:
 	if !(k4 != 0) {
-		goto __384
+		goto __395
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __385
+		goto __396
 	}
-	goto __383
-__385:
+	goto __394
+__396:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__386:
+__397:
 	if !(pIdx6 != 0) {
-		goto __388
+		goto __399
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __389
+		goto __400
 	}
 	szThreshold = int16(0)
-	goto __388
-__389:
+	goto __399
+__400:
 	;
-	goto __387
-__387:
+	goto __398
+__398:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __386
-	goto __388
-__388:
+	goto __397
+	goto __399
+__399:
 	;
 	if !(szThreshold != 0) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__390:
+__401:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18005,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __391
+		goto __402
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __392
-__391:
+	goto __403
+__402:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__392:
+__403:
 	;
-	goto __383
-__383:
+	goto __394
+__394:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __382
-	goto __384
-__384:
+	goto __393
+	goto __395
+__395:
 	;
-	goto __379
-__379:
+	goto __390
+__390:
 	iDb++
-	goto __378
-	goto __380
-__380:
+	goto __389
+	goto __391
+__391:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84196,36 +84824,36 @@ __380:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __393
+		goto __404
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__393:
+__404:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __394
+		goto __405
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__394:
+__405:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __395
+		goto __406
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 648)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__396:
+__407:
 	;
-__395:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84234,10 +84862,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__397:
+__408:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84246,10 +84874,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __398
+		goto __409
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__398:
+__409:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84257,10 +84885,10 @@ __398:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __399
+		goto __410
 	}
 
-__399:
+__410:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84312,14 +84940,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18023, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18028, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18034, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18043, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18052, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18060, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18068},
-	{FzName: ts + 18075},
+	{FzName: ts + 18066, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18071, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18077, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18086, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18095, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18103, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18111},
+	{FzName: ts + 18118},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84371,7 +84999,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]uint8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18081)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18124)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84379,7 +85007,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18096, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -84392,16 +85020,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18103, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18109)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18152)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18121)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
@@ -84584,13 +85212,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18136)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18179)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18144, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18148, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -84667,12 +85295,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18152, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -84681,19 +85309,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5008
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18180, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18211, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18219,
-	ts + 18226,
-	ts + 18238,
+	ts + 18262,
+	ts + 18269,
+	ts + 18281,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84753,7 +85381,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -84785,13 +85413,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18249)
+			corruptSchema(tls, pData, argv, ts+18292)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 	}
@@ -84824,16 +85452,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8814
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8876
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7878
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18262
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7938
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18305
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -84911,17 +85539,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11713)
+		ts+11775)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -84930,44 +85567,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18334)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18377)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18358,
+		ts+18401,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -84978,57 +85615,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -85117,8 +85754,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -85231,8 +85870,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -85243,8 +85882,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -85256,8 +85895,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -85297,7 +85936,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18392, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85327,7 +85966,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18422, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85423,7 +86062,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -85522,7 +86161,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85840,8 +86479,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10858
-		var zSp2 uintptr = ts + 10858
+		var zSp1 uintptr = ts + 10920
+		var zSp2 uintptr = ts + 10920
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85849,13 +86488,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18441, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18471))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18514))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86030,7 +86669,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18505, libc.VaList(bp, 0))
+					ts+18548, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86075,7 +86714,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18555, libc.VaList(bp+8, zName))
+						ts+18598, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86086,7 +86725,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18619,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18662,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86130,7 +86769,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6526, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -86477,9 +87116,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -86717,16 +87353,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18656
+		z = ts + 18699
 		break
 	case TK_INTERSECT:
-		z = ts + 18666
+		z = ts + 18709
 		break
 	case TK_EXCEPT:
-		z = ts + 18676
+		z = ts + 18719
 		break
 	default:
-		z = ts + 18683
+		z = ts + 18726
 		break
 	}
 	return z
@@ -86736,10 +87372,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18689, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -86759,6 +87398,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18755, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18786
+		}
+		return ts + 1554
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -86825,6 +87471,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -86889,6 +87536,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -86943,7 +87591,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16251
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16267
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -87082,13 +87730,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16251
+				zCol = ts + 16267
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -87096,7 +87744,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87161,7 +87809,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -87186,7 +87834,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16251
+					zName = ts + 16267
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87196,7 +87844,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87212,7 +87860,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18721, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -87237,45 +87886,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -87285,14 +87937,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18818
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -87302,9 +87986,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -87348,7 +88029,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -87499,7 +88180,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18729, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
 	return
 __1:
 	;
@@ -87590,7 +88271,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18778, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -87610,7 +88291,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18820, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -87647,7 +88328,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18826, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -87681,11 +88362,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18841, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18934, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1554
 		}
-		return ts + 18864
+		return ts + 18957
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87786,8 +88467,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18866, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18881, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87834,7 +88515,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18656, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87901,7 +88582,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -87963,7 +88644,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88116,10 +88797,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19014, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18967,
+			ts+19060,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88373,8 +89054,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7174)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88401,13 +89082,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19049, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19060, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19153, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88419,7 +89100,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19065, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19158, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88834,6 +89515,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff uint8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -88953,15 +89653,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff uint8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -89337,16 +90030,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -89406,12 +90116,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15154) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15158) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15168) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -89477,7 +90187,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19071, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19164, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -89560,7 +90270,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19089, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89689,15 +90399,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19112, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -89715,7 +90422,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19132, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89731,7 +90438,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19175
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -89757,7 +90464,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19198,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19291,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -89768,9 +90475,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19236
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19329
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19270
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89817,7 +90524,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19308, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19401, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89929,7 +90636,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19312,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -89948,7 +90655,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19351,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19444,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -89956,7 +90663,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90057,7 +90764,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6386
+							zSchemaName = ts + 6446
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90072,7 +90779,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19382, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19475, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -90137,7 +90844,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19387,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19480,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90149,7 +90856,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -90168,9 +90875,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19396, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19414, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
 					}
 				}
 			}
@@ -90180,7 +90887,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19434, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19527, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90239,11 +90946,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -90302,6 +91005,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -90317,7 +91095,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -90330,13 +91109,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19465, 0)
+					ts+19558, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19516, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -90344,7 +91123,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -90364,19 +91143,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -90390,6 +91172,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -90464,7 +91249,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -90476,7 +91263,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -90494,13 +91281,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -90517,11 +91304,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19549,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19642,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19561
+						return ts + 19654
 					}
 					return ts + 1554
 				}(),
@@ -90542,7 +91329,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90574,14 +91361,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -90635,6 +91423,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -90699,7 +91538,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -90798,7 +91636,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19584,
+		ts+19677,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90859,7 +91697,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19638,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -90973,7 +91811,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -90990,11 +91828,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -91005,7 +91839,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19678, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19771, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -91031,7 +91865,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -91063,11 +91897,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19693, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -91101,7 +91933,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -91410,12 +92242,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -91444,39 +92275,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -91487,24 +92294,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -91537,27 +92344,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19709
+				return ts + 19802
 			}
-			return ts + 19718
+			return ts + 19811
 		}())
 
 	groupBySort = 1
@@ -91565,47 +92379,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -91621,45 +92435,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -91678,16 +92498,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -91718,16 +92538,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -91740,98 +92560,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -91840,79 +92663,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19709)
-__148:
+	explainTempTable(tls, pParse, ts+19802)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19727
-			}
-			return ts + 19750
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -92009,7 +92827,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19759, 0)
+		ts+19820, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92242,7 +93060,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19824, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19885, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92286,7 +93104,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19870, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -92304,7 +93122,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19878, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -92316,7 +93134,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19870, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -92331,7 +93149,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19919, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -92343,22 +93161,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19945, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19983,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20020
+				return ts + 20081
 			}
-			return ts + 20027
+			return ts + 20088
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -92367,7 +93185,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20033, libc.VaList(bp+24, pTableName+8))
+		ts+20094, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -92396,9 +93214,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -92516,7 +93334,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19870, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19931, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -92549,7 +93367,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20079,
+		ts+20140,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92574,13 +93392,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20127,
+		ts+20188,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20202, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20263, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92836,7 +93654,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20231, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92875,9 +93693,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12086
+				return ts + 6389
 			}
-			return ts + 5893
+			return ts + 5883
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92889,7 +93707,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20251,
+			ts+20312,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -93003,12 +93821,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20313,
+		ts+20374,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20361
+				return ts + 20422
 			}
-			return ts + 20368
+			return ts + 20429
 		}()))
 __15:
 	;
@@ -93122,7 +93940,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20375, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20436, 0)
 	return 1
 }
 
@@ -93305,8 +94123,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -93339,8 +94157,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -93352,13 +94170,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20417, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -93674,7 +94492,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -93944,7 +94763,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20431,
+		ts+20492,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -93976,7 +94795,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20467, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -93986,7 +94805,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7653
+				return ts + 7713
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -94856,7 +95675,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20486)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
 __169:
 	;
 update_cleanup:
@@ -95162,10 +95981,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*uint8)(unsafe.Pointer(bp + 216)) = uint8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20499, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20560, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20503, libc.VaList(bp+8, bp+216))
+				ts+20564, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -95256,7 +96075,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12140, -1)
+				ts+12150, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95288,7 +96107,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20576, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20580, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20637, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -95436,14 +96255,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20584)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20645)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20624)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
 	return SQLITE_ERROR
 __2:
 	;
@@ -95454,7 +96273,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20667)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
 	return SQLITE_ERROR
 __5:
 	;
@@ -95482,7 +96301,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20685, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -95502,7 +96321,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20708)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
 	goto end_of_vacuum
 __8:
 	;
@@ -95517,7 +96336,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14493)
+	rc = execSql(tls, db, pzErrMsg, ts+14503)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -95562,7 +96381,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20735,
+		ts+20796,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95571,7 +96390,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20843,
+		ts+20904,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95582,7 +96401,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20897,
+		ts+20958,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95593,7 +96412,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21048,
+		ts+21109,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95815,12 +96634,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -95938,7 +96757,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96022,11 +96841,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21178, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21239, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21202,
+			ts+21263,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -96036,7 +96855,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21301, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96070,7 +96889,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -96097,7 +96916,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21320, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96135,7 +96954,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21423, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -96147,7 +96966,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21392
+			var zFormat uintptr = ts + 21453
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96164,7 +96983,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16142, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -96221,7 +97040,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21438, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21499, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -96279,7 +97098,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21438, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21499, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -96299,8 +97118,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -96313,7 +97132,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96766,7 +97585,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -96793,7 +97612,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -97024,10 +97843,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21457
+		return ts + 21518
 	}
 	if i == -1 {
-		return ts + 16251
+		return ts + 16267
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97036,15 +97855,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -97055,11 +97874,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
 	}
@@ -97081,27 +97900,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21472, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21533, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21475
+				return ts + 21536
 			}
-			return ts + 21480
+			return ts + 21541
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21488)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21549)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21490)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21551)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
 }
@@ -97144,11 +97963,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21492, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21553, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21498
+				return ts + 21559
 			}
-			return ts + 21505
+			return ts + 21566
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97158,43 +97977,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10914
+					zFmt = ts + 10976
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21510
+				zFmt = ts + 21571
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21543
+				zFmt = ts + 21604
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21568
+				zFmt = ts + 21629
 			} else {
-				zFmt = ts + 21586
+				zFmt = ts + 21647
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21595, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp uint8
-			var zRowid uintptr = ts + 16251
-			Xsqlite3_str_appendf(tls, bp+64, ts+21603, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16267
+			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = uint8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21634, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21695, libc.VaList(bp+32, zRowid))
 				cRangeOp = uint8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = uint8('>')
 			} else {
 				cRangeOp = uint8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21644, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21705, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21649,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21676, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21737, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97226,28 +98045,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21687, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21748, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21708, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21769, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21464, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21525, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -97308,52 +98128,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -98831,7 +99657,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21716, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98859,7 +99685,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21731, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -99377,7 +100203,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21740, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99735,10 +100561,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16100, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15431, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14957, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21754, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16116, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15447, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14967, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21815, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100115,49 +100941,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -100165,13 +100980,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -100236,12 +101054,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -100265,7 +101083,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -100275,7 +101093,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -100320,7 +101138,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -100414,7 +101232,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21802
+				return ts + 21863
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100425,7 +101243,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -100433,6 +101250,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -100466,7 +101284,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -100619,6 +101437,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -100787,7 +101608,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21809,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101521,7 +102342,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21845, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101592,7 +102413,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21871
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102099,7 +102920,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -102119,7 +102940,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -102130,10 +102951,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -102144,29 +102965,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -102268,8 +103089,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -102281,7 +103102,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -102291,17 +103112,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -102321,19 +103142,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -102345,19 +103166,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -102367,10 +103188,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -102384,9 +103205,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -102411,8 +103232,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -102424,7 +103245,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -102438,23 +103259,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -102465,7 +103286,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -102787,6 +103608,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -102880,8 +103702,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -102905,8 +103727,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -103058,7 +103881,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -103077,7 +103900,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -103091,7 +103914,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -103100,9 +103923,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -103121,6 +103948,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -103248,30 +104078,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -103279,20 +104128,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -103301,9 +104155,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -103344,7 +104204,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -103384,7 +104244,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -103450,19 +104311,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -103643,7 +104509,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103701,7 +104567,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104099,7 +104965,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21908, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21969, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104310,8 +105176,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -104430,14 +105296,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -104589,7 +105464,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -104697,7 +105572,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21943, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -104959,19 +105834,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -104983,9 +105860,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -105018,13 +105895,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -105176,7 +106053,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21961, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105240,7 +106117,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21989, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
 	goto __5
 __4:
 	ii = 0
@@ -105941,7 +106818,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -106122,7 +106999,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22007, -1)
+		pCtx, ts+22068, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -106255,7 +107132,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22063, -1)
+					pCtx, ts+22124, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -106345,17 +107222,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22108))
-var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22119))
-var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22130))
-var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22135))
-var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22148))
-var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22158))
-var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22164))
-var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22175))
-var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22185))
-var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22197))
-var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22202))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22169))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22180))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22191))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22196))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22209))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22219))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22225))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22236))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22246))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22258))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22263))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -106401,7 +107278,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22206, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -106445,12 +107322,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22225, 0)
+			ts+22286, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22296, 0)
+				ts+22357, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -106473,7 +107350,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 					}
 					break
 				}
@@ -106679,7 +107556,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22359, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106795,7 +107672,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106806,6 +107683,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, uint8(SQLITE_AFF_NONE))
@@ -106909,7 +107787,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22385, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -106974,15 +107852,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22417
+				zErr = ts + 22478
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22434
+				zErr = ts + 22495
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22450
+				zErr = ts + 22511
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22470, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -107003,7 +107881,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22503, 0)
+				ts+22564, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107159,11 +108037,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22550,
-	ts + 22603,
-	ts + 22007,
-	ts + 22654,
-	ts + 22706,
+	ts + 22611,
+	ts + 22664,
+	ts + 22068,
+	ts + 22715,
+	ts + 22767,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108360,8 +109238,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -108372,13 +109249,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -108562,19 +109436,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22756,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22817,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19750
+							return ts + 22859
 						}
-						return ts + 22798
+						return ts + 22868
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22804, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22874, 0)
 		}
 	}
 
@@ -108642,7 +109516,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22838,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22908,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109739,7 +110613,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22876, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110714,21 +111588,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16251, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16267, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16164, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16180, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -111471,7 +112345,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22925)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22995)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -111635,7 +112509,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -111852,9 +112726,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 6704
+							return ts + 6764
 						}
-						return ts + 6709
+						return ts + 6769
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -111866,6 +112740,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -112133,19 +113012,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22958, 0)
+					ts+23028, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23053, 0)
+					ts+23123, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23137, 0)
+					ts+23207, 0)
 			}
 			break
 		case uint32(273):
@@ -112524,9 +113403,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23222, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -113294,7 +114173,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23239, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23309, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -113317,7 +114196,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23264, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -113490,7 +114369,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23275, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -113503,11 +114382,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19870, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23282, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23287, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113520,9 +114399,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23297, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23301, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113756,7 +114635,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -114331,7 +115210,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -114346,7 +115225,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23309, 0)
+			ts+23379, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114537,23 +115416,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23377
+	var zErr uintptr = ts + 23447
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23391
+			zErr = ts + 23461
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23413
+			zErr = ts + 23483
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23435
+			zErr = ts + 23505
 			break
 
 		}
@@ -114571,35 +115450,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23458,
-	ts + 23471,
+	ts + 23528,
+	ts + 23541,
 	uintptr(0),
-	ts + 23487,
-	ts + 23512,
-	ts + 23526,
-	ts + 23545,
+	ts + 23557,
+	ts + 23582,
+	ts + 23596,
+	ts + 23615,
 	ts + 1490,
-	ts + 23570,
-	ts + 23607,
-	ts + 23619,
-	ts + 23634,
-	ts + 23667,
-	ts + 23685,
-	ts + 23710,
-	ts + 23739,
+	ts + 23640,
+	ts + 23677,
+	ts + 23689,
+	ts + 23704,
+	ts + 23737,
+	ts + 23755,
+	ts + 23780,
+	ts + 23809,
 	uintptr(0),
-	ts + 5848,
+	ts + 5838,
 	ts + 5334,
-	ts + 23756,
-	ts + 23774,
-	ts + 23792,
-	uintptr(0),
 	ts + 23826,
+	ts + 23844,
+	ts + 23862,
 	uintptr(0),
-	ts + 23847,
-	ts + 23873,
 	ts + 23896,
+	uintptr(0),
 	ts + 23917,
+	ts + 23943,
+	ts + 23966,
+	ts + 23987,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114700,6 +115579,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	libc.AtomicStoreNInt32(db+432, int32(1), 0)
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(libc.AtomicLoadNInt32(db+432, 0) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -114714,7 +115599,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114759,7 +115644,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23933, 0)
+				ts+24003, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114876,7 +115761,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23996, libc.VaList(bp, zName))
+		ts+24066, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115112,7 +115997,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24047, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24117, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115205,7 +116090,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -115275,7 +116160,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115285,7 +116170,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115317,14 +116202,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24068, 0)
+				ts+24138, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -115454,7 +116339,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24136, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24206, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -115499,10 +116384,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24142, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24152,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115607,7 +116492,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24180, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115618,17 +116503,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24184, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24184
+	zModeType = ts + 24254
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24190, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -115666,7 +116551,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24195, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115674,7 +116559,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115714,7 +116599,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24239, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115738,15 +116623,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24255, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24262, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24270, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24273, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24276, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17346, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24340, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24343, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24346, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17362, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115892,10 +116777,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21802, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24280, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -115909,7 +116794,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -115960,9 +116845,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6381
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6441
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23282
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23352
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -116067,7 +116952,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24286
+		zFilename = ts + 24356
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -116170,21 +117055,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24289,
+	Xsqlite3_log(tls, iErr, ts+24359,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24314)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24384)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24334)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24341)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -116342,7 +117227,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24358, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -116998,7 +117883,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24386, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117116,7 +118001,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24394
+			return ts + 24464
 		}
 		return uintptr(0)
 	}(), 0)
@@ -117294,7 +118179,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6704, ts + 6709, ts + 6191, ts + 6186, ts + 7945, ts + 24417, ts + 24423,
+	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -117447,7 +118332,7 @@ __10:
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0' + int32(c)>>4)
-	c = *(*uint8)(unsafe.Pointer(ts + 24430 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24500 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -117502,7 +118387,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24447, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24517, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117566,13 +118451,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6704, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6709, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
 			break
 
 		}
@@ -118122,12 +119007,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6704, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6764, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6709, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6769, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(5))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -118228,7 +119113,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24476, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24546, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118534,7 +119419,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24491, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24561, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118549,7 +119434,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24495, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118603,7 +119488,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24521,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24591,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118708,11 +119593,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*uint8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zPath))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24564, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24634, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24567, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -118869,14 +119754,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24570, -1)
+			ts+24640, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, uint8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24621, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24691, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -118971,7 +119856,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15364)
+	jsonWrongNumArgs(tls, ctx, ts+15380)
 	return
 __2:
 	;
@@ -119046,9 +119931,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24655
+			return ts + 24725
 		}
-		return ts + 24659
+		return ts + 24729
 	}())
 	return
 __2:
@@ -119181,7 +120066,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24666, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119278,7 +120163,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24669, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119322,7 +120207,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24672)
+		ts+24742)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -119453,7 +120338,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24755, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -119472,7 +120357,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24761, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -119568,7 +120453,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, uint8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24761, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119592,7 +120477,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24766
+				zRoot = ts + 24836
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119657,6 +120542,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -119708,7 +120599,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24476, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24546, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119803,25 +120694,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24768},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24773},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24802},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24815},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24818},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24822},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24834},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24846},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24857},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24868},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24880},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24893},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24912},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24923},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24940}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24838},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24843},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24872},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24885},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24888},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24892},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24904},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24916},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24927},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24938},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24950},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24963},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24982},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24993},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25010}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119840,8 +120731,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24958, FpModule: 0},
-	{FzName: ts + 24968, FpModule: 0},
+	{FzName: ts + 25028, FpModule: 0},
+	{FzName: ts + 25038, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120101,11 +120992,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24978, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24986, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25056, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -120316,7 +121207,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24991,
+		ts+25061,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -121014,7 +121905,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25073)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122355,7 +123246,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25087, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -122367,12 +123258,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25107, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25139, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122598,7 +123489,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25176, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25246, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -122621,14 +123512,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25321
+	var zFmt uintptr = ts + 25391
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11286, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -122669,7 +123560,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25377, ts + 5060, ts + 16251,
+	ts + 25447, ts + 5060, ts + 16267,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122712,19 +123603,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25382,
+			ts+25452,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25444, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25449,
+			ts+25519,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25513,
+			ts+25583,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25653,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122753,7 +123644,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25632
+			zFormat = ts + 25702
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122765,7 +123656,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25740,
+			ts+25810,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122773,18 +123664,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25785, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25855, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12757, 1)
+					Xsqlite3_str_append(tls, p, ts+12767, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25812, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25834, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25842, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122799,14 +123690,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25858,
-	ts + 25911,
-	ts + 25956,
-	ts + 26008,
-	ts + 26062,
-	ts + 26107,
-	ts + 26165,
-	ts + 26220,
+	ts + 25928,
+	ts + 25981,
+	ts + 26026,
+	ts + 26078,
+	ts + 26132,
+	ts + 26177,
+	ts + 26235,
+	ts + 26290,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122835,7 +123726,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26267, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -122847,7 +123738,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26287,
+			ts+26357,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -122855,7 +123746,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26344,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122897,10 +123788,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26379,
-		ts + 26422,
-		ts + 26457,
-		ts + 26493,
+		ts + 26449,
+		ts + 26492,
+		ts + 26527,
+		ts + 26563,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -122931,7 +123822,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26530,
+	Xsqlite3_str_appendf(tls, pSql, ts+26600,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -122943,7 +123834,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26554, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -122966,7 +123857,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123062,7 +123953,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26563, ts + 26574}
+var azFormat = [2]uintptr{ts + 26633, ts + 26644}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -123100,13 +123991,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10858, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10920, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26584, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26590, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26594, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -123117,7 +124008,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26596, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26666, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123195,7 +124086,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26629,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26699,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4062
@@ -123219,7 +124110,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26636,
+			ts+26706,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123238,7 +124129,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26681, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26751, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -123252,8 +124143,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26713,
-		ts + 26767,
+		ts + 26783,
+		ts + 26837,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -123268,23 +124159,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26815,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26885,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26860
+					return ts + 26930
 				}
-				return ts + 26868
+				return ts + 26938
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26877,
+				ts+26947,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26860
+						return ts + 26930
 					}
-					return ts + 26868
+					return ts + 26938
 				}(), iKey, iVal))
 		}
 	}
@@ -123308,7 +124199,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26935, libc.VaList(bp, i, iCell, iNode))
+				ts+27005, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -123328,7 +124219,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26983, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27053, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -123345,14 +124236,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27050, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27084, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27154, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -123360,7 +124251,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27114,
+					ts+27184,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -123389,14 +124280,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27169,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27239,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27200, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -123418,12 +124309,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14493, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14503, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27267, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -123432,12 +124323,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25087, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27295, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27365, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -123451,8 +124342,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27326, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27333, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -123460,7 +124351,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27341, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27411, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -123475,7 +124366,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27345, -1)
+			ts+27415, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -123483,7 +124374,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6381
+			zDb = ts + 6441
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -123493,7 +124384,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17969
+				return ts + 18012
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123788,7 +124679,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -123846,6 +124737,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123858,15 +124750,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27396, 1)
+		Xsqlite3_str_append(tls, x, ts+27466, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27398, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27468, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27409, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123886,19 +124779,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep uint8 = uint8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27420, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27490, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27438, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27508, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = uint8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27446, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*uint8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27454, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27524, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27458, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123917,6 +124810,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -123948,6 +124842,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -123956,6 +124851,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -124014,6 +124910,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -124182,6 +125079,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -124203,6 +125101,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -124287,6 +125186,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -124315,6 +125216,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124753,6 +125655,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124766,6 +125669,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -124780,6 +125686,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -124804,7 +125711,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27471, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27541, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124813,7 +125720,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27493, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -124821,7 +125728,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124900,6 +125807,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -125028,6 +125936,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -125046,7 +125955,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16251
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16267
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -125056,7 +125965,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27497
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27567
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -125064,7 +125973,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27503
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27573
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125176,7 +126085,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27512, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -125306,14 +126215,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27552) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27568) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27638) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -125350,8 +126261,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -125368,7 +126279,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -125378,7 +126289,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27583, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -125390,25 +126301,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27591},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27604},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27617},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27630},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27568},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27642},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27552},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27665},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27679},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27692},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27706},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27722},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27661},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27674},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27687},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27700},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27638},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27712},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27622},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27735},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27749},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27762},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27776},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27792},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27734},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -125418,26 +126329,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27753, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27763, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27774, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27497, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27785, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125491,7 +126402,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25073, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125818,7 +126729,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27795, -1)
+		Xsqlite3_result_error(tls, context, ts+27865, -1)
 		return
 	}
 
@@ -125829,7 +126740,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27795, -1)
+			Xsqlite3_result_error(tls, context, ts+27865, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -125930,7 +126841,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27816, uintptr(0), uintptr(0), p+64)
+				ts+27886, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -125994,7 +126905,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+24986, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25056, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -126015,16 +126926,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+27987, libc.VaList(bp, func() uintptr {
+			ts+28057, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28137
+					return ts + 28207
 				}
 				return ts + 1554
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28178)
+			ts+28248)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126140,7 +127051,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28303, libc.VaList(bp, zTab)))
+			ts+28373, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126158,7 +127069,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28422, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28492, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126176,7 +127087,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28443, libc.VaList(bp+16, zIdx)))
+			ts+28513, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126199,7 +127110,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28494, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28564, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126245,7 +127156,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -126260,7 +127171,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -126300,7 +127211,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19396, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -126310,18 +127221,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+28572, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+28591, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28661, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28596, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28666, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -126333,18 +127244,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28606, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28635
+							return ts + 28705
 						}
-						return ts + 28648
+						return ts + 28718
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+28657, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -126358,7 +127269,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28679,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28749,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -126405,8 +127316,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+28706, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14604
+		zList = rbuMPrintf(tls, p, ts+28776, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14614
 	}
 	return zList
 }
@@ -126423,7 +127334,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+28715, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -126445,25 +127356,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+28728, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28760, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28830, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+28783)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28789, ts+28796, ts+4957)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+28853)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28859, ts+28866, ts+4957)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+28804,
+					ts+28874,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28846, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28916, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126505,7 +127416,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -126540,7 +127451,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28866
+	zCol = ts + 28936
 __7:
 	;
 	goto __5
@@ -126548,13 +127459,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28874,
+	zLhs = rbuMPrintf(tls, p, ts+28944,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28895,
+	zOrder = rbuMPrintf(tls, p, ts+28965,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28931,
+	zSelect = rbuMPrintf(tls, p, ts+29001,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14604
+	zSep = ts + 14614
 	iCol++
 	goto __1
 __2:
@@ -126572,7 +127483,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+28958,
+		Xsqlite3_mprintf(tls, ts+29028,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -126599,8 +127510,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29006, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14604
+	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14614
 	goto __15
 __15:
 	iCol++
@@ -126611,7 +127522,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29013, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126644,7 +127555,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126656,7 +127567,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29025, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29095, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1554
 		} else {
@@ -126668,37 +127579,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28866
+					zCol = ts + 28936
 				} else {
-					zCol = ts + 28596
+					zCol = ts + 28666
 				}
 				zType = ts + 1119
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29047, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28783
+					return ts + 28853
 				}
 				return ts + 1554
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29067,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29088,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29121, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14604
-		zAnd = ts + 21464
+		zCom = ts + 14614
+		zAnd = ts + 21525
 		nBind++
 	}
 
@@ -126737,11 +127648,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+29145, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29215, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29157, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14604
+			zS = ts + 14614
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126749,7 +127660,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29166, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29236, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126761,18 +127672,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29181, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1554
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29195, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21525
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29207, libc.VaList(bp+40, zList))
+			ts+29277, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1554
@@ -126780,8 +127691,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29257, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21525
 			}
 		}
 	}
@@ -126790,7 +127701,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29270, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29340, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126808,17 +127719,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c uint8 = *(*uint8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29257,
+					zList = rbuMPrintf(tls, p, ts+29327,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29296,
+					zList = rbuMPrintf(tls, p, ts+29366,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29326,
+					zList = rbuMPrintf(tls, p, ts+29396,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				}
 			}
 		}
@@ -126853,19 +127764,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29363
+		var zSep uintptr = ts + 29433
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16139) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16155) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126877,15 +127788,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 28783
+					zDesc = ts + 28853
 				} else {
 					zDesc = ts + 1554
 				}
-				z = rbuMPrintf(tls, p, ts+29376, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14604
+				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14614
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29387, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -126905,7 +127816,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29391)
+			ts+29461)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -126914,7 +127825,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -126924,25 +127835,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29441, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29511, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29463, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28783
+						return ts + 28853
 					}
 					return ts + 1554
 				}()))
-				zComma = ts + 14604
+				zComma = ts + 14614
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29473, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29488,
+			ts+29558,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -126955,7 +127866,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1554
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1554
@@ -126963,39 +127874,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29550
+				zPk = ts + 29620
 			}
-			zSql = rbuMPrintf(tls, p, ts+29563,
+			zSql = rbuMPrintf(tls, p, ts+29633,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29590
+							return ts + 29660
 						}
 						return ts + 1554
 					}()))
-			zComma = ts + 14604
+			zComma = ts + 14614
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29600, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29670, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29607,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29677,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29639
+						return ts + 29709
 					}
 					return ts + 1554
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -127008,7 +127919,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+29654,
+				ts+29724,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127045,7 +127956,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+29711)
+			ts+29781)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -127150,7 +128061,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29777, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29847, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127170,24 +128081,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29797,
+				ts+29867,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+29862, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29932, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+29898, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127203,7 +128114,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29932,
+						ts+30002,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127211,9 +128122,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29993
+											return ts + 30063
 										}
-										return ts + 29997
+										return ts + 30067
 									}()
 								}
 								return ts + 1554
@@ -127222,20 +128133,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30003,
+						ts+30073,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30064,
+						ts+30134,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29993
+									return ts + 30063
 								}
-								return ts + 29997
+								return ts + 30067
 							}(),
 							zCollist, zLimit))
 				}
@@ -127260,8 +128171,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6392)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6388)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6452)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -127272,16 +128183,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1554
 				}
-				return ts + 30223
+				return ts + 30293
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30232,
+						ts+30302,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30268
+								return ts + 30338
 							}
 							return ts + 1554
 						}(), zBindings)))
@@ -127290,32 +128201,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30278, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1554
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30306
+					zRbuRowid = ts + 30376
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30318, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30388, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30394
+							return ts + 30464
 						}
 						return ts + 1554
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30411,
+					ts+30481,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30710,
+						ts+30780,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -127328,9 +128239,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30809
+						zRbuRowid = ts + 30879
 					} else {
-						zRbuRowid = ts + 30819
+						zRbuRowid = ts + 30889
 					}
 				}
 
@@ -127343,20 +128254,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28866, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30830,
+							ts+30900,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30878
+										return ts + 30948
 									}
 									return ts + 1554
 								}(),
@@ -127369,7 +128280,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19750
+										return ts + 22859
 									}
 									return ts + 1554
 								}(), zOrder,
@@ -127437,9 +128348,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1554
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30223
+				zPrefix = ts + 30293
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30884,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -127498,7 +128409,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+30914, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+30984, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -127568,28 +128479,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30944, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30972, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31042, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+48, ts+3286, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6381, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6441, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30990, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127622,11 +128533,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31056, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31126, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24136, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -127638,13 +128549,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31088,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381),
+			zTarget = Xsqlite3_mprintf(tls, ts+31158,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
 						}
-						return ts + 31120
+						return ts + 31190
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
@@ -127663,37 +128574,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31122, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31137, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31154, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31198, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31268, 0)
 	}
 }
 
@@ -127722,15 +128633,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31216, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31286, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -127778,7 +128689,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -127838,7 +128749,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127855,23 +128766,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31251, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31321, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31276, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31283, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -127988,7 +128899,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23774, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23844, 0)
 			return
 		}
 
@@ -128081,7 +128992,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+31290)
+			ts+31360)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -128089,7 +129000,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31312, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31382, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -128110,7 +129021,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+31339,
+				ts+31409,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128140,9 +129051,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+31497, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31567, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31512,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31582,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128156,10 +129067,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31532, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31602, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31557)
+			ts+31627)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128173,12 +129084,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31665)
+			ts+31735)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+31730)
+			ts+31800)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128190,7 +129101,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31774, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31844, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128210,15 +129121,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17224)
-					rbuCopyPragma(tls, p, ts+16335)
+					rbuCopyPragma(tls, p, ts+17240)
+					rbuCopyPragma(tls, p, ts+16351)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31799, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31869, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128242,10 +129153,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -128340,7 +129251,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31827, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31897, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -128353,16 +129264,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31276, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -128372,7 +129284,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31852, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -128406,7 +129318,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31863, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -128436,13 +129348,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31935, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31949)
+				ts+32019)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -128453,7 +129365,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+32006)
+				ts+32076)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -128527,7 +129439,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32080, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32150, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -128545,12 +129457,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32112,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32182,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32144
+							return ts + 32214
 						}
-						return ts + 32151
+						return ts + 32221
 					}()))
 			}
 		}
@@ -128558,7 +129470,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14493, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14503, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -128569,19 +129481,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16938)
-						rbuCopyPragma(tls, p, ts+16350)
+						rbuCopyPragma(tls, p, ts+16954)
+						rbuCopyPragma(tls, p, ts+16366)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32158, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32174, uintptr(0), uintptr(0), p+64)
+								db, ts+32244, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -128635,7 +129547,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32198, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32268, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128662,7 +129574,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30223, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30293, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -128679,7 +129591,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128692,13 +129604,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32206, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32276, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128793,7 +129705,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128810,19 +129722,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14493
+				zBegin = ts + 14503
 			} else {
-				zBegin = ts + 32158
+				zBegin = ts + 32228
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32158, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32228, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128945,11 +129857,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -129088,7 +130003,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -129165,7 +130080,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32233, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32303, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129190,7 +130105,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32256, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129335,7 +130250,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6381)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6441)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -129350,7 +130265,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32267, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32337, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129361,7 +130276,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -129391,6 +130312,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -130154,11 +131090,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11286, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11348, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32278, 0)
+				ts+32348, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
 		} else {
@@ -130171,7 +131107,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32399, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -130269,7 +131205,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11286, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130736,6 +131672,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -130818,6 +131757,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -130847,9 +131787,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32428,
+			zRet = Xsqlite3_mprintf(tls, ts+32498,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 21464
+			zSep = ts + 21525
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130872,9 +131812,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32462,
+				ts+32532,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 32503
+			zSep = ts + 32573
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130882,18 +131822,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7470, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32508,
+		ts+32578,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130903,7 +131843,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -130936,7 +131876,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32586,
+			ts+32656,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -131063,7 +132003,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32639, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -131537,9 +132477,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11286, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11348, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32666, libc.VaList(bp, zDb))
+			ts+32736, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -131548,18 +132488,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1554
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32776, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32846, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1567, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32791, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32861, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+32799, bp+24)
+				sessionAppendStr(tls, bp+8, ts+32869, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21464
+				zSep = ts + 21525
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131668,7 +132608,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32805, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32875, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -131760,7 +132700,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32825, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -132023,7 +132963,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132046,7 +132986,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -132088,7 +133028,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132149,7 +133089,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -132223,13 +133163,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -132291,7 +133231,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -132664,7 +133604,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -132832,7 +133772,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11286) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11348) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -132843,34 +133783,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32843, bp+16)
+				sessionAppendStr(tls, bp, ts+32913, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32856, bp+16)
+				sessionAppendStr(tls, bp, ts+32926, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+32862, bp+16)
+						sessionAppendStr(tls, bp, ts+32932, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14604
+						zSep = ts + 14614
 					}
 				}
 
 				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32791, bp+16)
+				sessionAppendStr(tls, bp, ts+32861, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32867, bp+16)
+								ts+32937, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32799, bp+16)
+							sessionAppendStr(tls, bp, ts+32869, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21464
+						zSep = ts + 21525
 					}
 				}
 
@@ -132922,34 +133862,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32942, bp+16)
+	sessionAppendStr(tls, bp, ts+33012, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32791, bp+16)
+	sessionAppendStr(tls, bp, ts+32861, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+32862, bp+16)
+			sessionAppendStr(tls, bp, ts+32932, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21464
+			zSep = ts + 21525
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32960, bp+16)
+		sessionAppendStr(tls, bp, ts+33030, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32503, bp+16)
+		sessionAppendStr(tls, bp, ts+32573, bp+16)
 
 		zSep = ts + 1554
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+32799, bp+16)
+				sessionAppendStr(tls, bp, ts+32869, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 32968
+				zSep = ts + 33038
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4957, bp+16)
@@ -132965,7 +133905,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6381, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -132976,19 +133916,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32973, bp+16)
+	sessionAppendStr(tls, bp, ts+33043, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21470, bp+16)
+	sessionAppendStr(tls, bp, ts+21531, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14604, bp+16)
+			sessionAppendStr(tls, bp, ts+14614, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+32991, bp+16)
+	sessionAppendStr(tls, bp, ts+33061, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33002, bp+16)
+		sessionAppendStr(tls, bp, ts+33072, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+4957, bp+16)
 
@@ -133004,14 +133944,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11286, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11348, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33006)
+			ts+33076)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33119)
+			ts+33189)
 	}
 	return rc
 }
@@ -133039,7 +133979,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -133048,7 +133988,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -133125,7 +134065,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -133251,7 +134191,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -133292,7 +134232,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33263, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33333, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -133308,7 +134248,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33284, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33354, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -133381,10 +134321,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33303, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33373, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33329, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -133430,7 +134370,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6381, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6441, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -133443,19 +134383,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33359, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33403,
+						ts+33473,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33474, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11286) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11348) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133506,14 +134446,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33534, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33588, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134761,7 +135701,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33616, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135049,7 +135989,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33644, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135236,7 +136176,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33675, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -135304,7 +136244,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33682
+		var zErr uintptr = ts + 33752
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135486,7 +136426,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33732
+		var zErr uintptr = ts + 33802
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135810,13 +136750,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33780, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33788, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33798, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136367,7 +137307,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33803, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33873, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -136394,14 +137334,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*uint8)(unsafe.Pointer(p))) < '0' || int32(*(*uint8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33810, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33880, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33841, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136412,7 +137352,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33874, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136425,7 +137365,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33911, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -136434,7 +137374,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33920, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33990, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136453,7 +137393,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33953, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136468,14 +137408,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33987, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33995, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*uint8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34027, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136483,9 +137423,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34033, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34047, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136493,9 +137433,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34085, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
 		if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || int32(*(*uint8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34096, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34166, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -136505,19 +137445,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 7958, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17329},
-			{FzName: ts + 34131, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17345},
+			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34139, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34209, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34170, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136564,15 +137504,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22130) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16251) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34198, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22191) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34228) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34238, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34308, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136589,13 +137529,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34269, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34274, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34281, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34351, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136633,8 +137573,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22130) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34289, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22191) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136666,7 +137606,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34318, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34388, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136703,19 +137643,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33987
+			zTail = ts + 34057
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34338
+			zTail = ts + 34408
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34346, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16251, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16267, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136759,18 +137699,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34357, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34427, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1554
 			}
-			return ts + 14604
+			return ts + 14614
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34373, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34443, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34380,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22130))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136880,7 +137820,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34406) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136890,7 +137830,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34411) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34481) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136900,7 +137840,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34420) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34490) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -136913,7 +137853,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34430) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34500) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -136923,7 +137863,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34440) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34510) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -136939,7 +137879,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22130) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22191) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -136962,7 +137902,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34452
+	var zSelect uintptr = ts + 34522
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -136984,7 +137924,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34484) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34554) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -136998,7 +137938,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34492,
+				ts+34562,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -137096,7 +138036,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34557, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
 					return FTS5_EOF
 				}
 			}
@@ -137109,20 +138049,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34577, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34647, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34608, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34678, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34611, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29993, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -137208,6 +138148,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*uint8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -137236,7 +138187,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 1))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*uint8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = uint8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -138889,9 +139840,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34615, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33644, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -138907,7 +139858,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c uint8 = *(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34620, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -138994,7 +139945,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20467, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -139075,7 +140026,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34649, 0)
+			ts+34719, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -139245,12 +140196,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34702,
+								ts+34772,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34752
+										return ts + 34822
 									}
-									return ts + 34615
+									return ts + 34685
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140193,7 +141144,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34759, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34829, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -140272,7 +141223,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+34765,
+			ts+34835,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -140297,7 +141248,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34816,
+			ts+34886,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -140320,7 +141271,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+34865,
+			ts+34935,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140559,7 +141510,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+34905, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141758,7 +142709,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+34928,
+			ts+34998,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143224,7 +144175,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+35012,
+			ts+35082,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -143715,10 +144666,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -144301,13 +145257,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35069, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24986, ts+35077, 0, pzErr)
+				pConfig, ts+25056, ts+35147, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11426,
-					ts+35112,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
+					ts+35182,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144560,7 +145516,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34759, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -144674,7 +145630,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35156,
+		ts+35226,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -144844,7 +145800,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35242)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35312)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -145115,7 +146071,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35247, 0)
+			ts+35317, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145539,11 +146495,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35286,
+		ts+35356,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14604
+					return ts + 14614
 				}
 				return ts + 1554
 			}(),
@@ -145555,9 +146511,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35341
+					return ts + 35411
 				}
-				return ts + 35346
+				return ts + 35416
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145603,12 +146559,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35350, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35420, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5057, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35356, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145639,7 +146595,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35384, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35454, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -145670,7 +146626,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35394, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35464, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145702,14 +146658,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35415, libc.VaList(bp, z))
+				ts+35485, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33798
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33868
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145765,7 +146721,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35247, 0)
+		ts+35317, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -145982,7 +146938,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35448, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -146127,28 +147083,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35484, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35554, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35495, 0)
+				ts+35565, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35575, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35583, 0)
+				ts+35653, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16918, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35639, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35715, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146206,7 +147162,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17463, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17479, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -146219,12 +147175,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35661,
+				ts+35731,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20368
+						return ts + 20429
 					}
-					return ts + 35698
+					return ts + 35768
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146854,7 +147810,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35710, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35780, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -147098,7 +148054,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35731, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -147117,7 +148073,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35753, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35823, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147164,7 +148120,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35784)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35854)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147173,7 +148129,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35797, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35867, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -147187,7 +148143,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35888, ts + 33987, ts + 24986, ts + 34338, ts + 11426,
+	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147211,7 +148167,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35895, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147229,13 +148185,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35895, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35900, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35970, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -147290,17 +148248,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35915,
-			ts + 35983,
-			ts + 36052,
-			ts + 36085,
-			ts + 36124,
-			ts + 36164,
-			ts + 36203,
-			ts + 36244,
-			ts + 36283,
-			ts + 36325,
-			ts + 36365,
+			ts + 35985,
+			ts + 36053,
+			ts + 36122,
+			ts + 36155,
+			ts + 36194,
+			ts + 36234,
+			ts + 36273,
+			ts + 36314,
+			ts + 36353,
+			ts + 36395,
+			ts + 36435,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -147402,18 +148360,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36388,
+		ts+36458,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36492,
+			ts+36562,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36530,
+			ts+36600,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -147425,7 +148383,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36568,
+			ts+36638,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147437,14 +148395,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24986, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11426, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35888, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25056, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34338, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33987, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147456,17 +148414,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36610,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36680,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29639
+					return ts + 29709
 				}
 				return ts + 1554
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36640,
+			ts+36710,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147503,27 +148461,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36684, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36707, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36777, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33987, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34338, ts+36713, 0, pzErr)
+				pConfig, ts+34408, ts+36783, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35888, ts+36745, 1, pzErr)
+				pConfig, ts+35958, ts+36815, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147729,12 +148687,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36762,
+		ts+36832,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36812,
+			ts+36882,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147742,7 +148700,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -147918,7 +148876,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36841,
+	zSql = Xsqlite3_mprintf(tls, ts+36911,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -148100,14 +149058,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33987, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34057, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34338, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34408, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -148302,9 +149260,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36873) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36943) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148519,7 +149477,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36895
+			var zCat uintptr = ts + 36965
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148531,7 +149489,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36904) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -148542,18 +149500,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36915) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36985) {
 					if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '2' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*uint8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36873) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36943) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36904) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148829,7 +149787,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36933
+	var zBase uintptr = ts + 37003
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -148971,7 +149929,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36943, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148979,11 +149937,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36946, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36951, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -148991,7 +149949,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36956, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -148999,7 +149957,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36959, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149007,11 +149965,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36962, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36967, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37037, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149019,19 +149977,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36972, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36976, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37046, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36982, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37052, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36987, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37057, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149039,11 +149997,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36991, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36995, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149051,7 +150009,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36998, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149059,11 +150017,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37002, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37076, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149071,7 +150029,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37010, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149079,7 +150037,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37014, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149087,7 +150045,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37018, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149103,24 +150061,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37002, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37092, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37028, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37098, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37018, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37088, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -149135,137 +150093,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37105, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37043, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37050, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37055, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36951, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37060, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36946, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37018, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37070, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15464, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37075, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37028, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37079, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37154, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36987, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37090, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37094, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37096, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37010, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37018, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37110, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37116, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37121, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37127, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37014, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37143, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37010, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37155, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37161, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37014, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37167, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37028, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -149280,16 +150238,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37174, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37244, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149297,21 +150255,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37143, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149319,7 +150277,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37196, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -149327,9 +150285,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37202, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -149344,12 +150302,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37208, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37212, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37215, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -149358,7 +150316,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149514,7 +150472,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37222) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37292) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149694,22 +150652,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36933, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37237, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37243, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37250, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -150852,14 +151810,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37258) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37328) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37262) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37266) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37275, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150885,19 +151843,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 37309,
-		ts + 37349,
-		ts + 37384,
+		ts + 37379,
+		ts + 37419,
+		ts + 37454,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23282, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23352, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37427, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151030,11 +151988,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37460, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37491,
+		ts+37561,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -151058,7 +152016,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37542, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -151453,7 +152411,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37568, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151475,7 +152433,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37578
+	return ts + 37648
 }
 
 func init() {
@@ -151530,114 +152488,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -152098,6 +153058,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -152416,6 +153388,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -152437,5 +153410,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_linux_ppc64le.go b/vendor/modernc.org/sqlite/lib/sqlite_linux_ppc64le.go
index ee951a11..9cb7ea8c 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_linux_ppc64le.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_linux_ppc64le.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_ppc64le.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_ppc64le.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -493,6 +493,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -608,6 +609,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -982,6 +984,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1470,6 +1473,7 @@ const (
 	SF_Recursive                          = 0x0002000
 	SF_Resolved                           = 0x0000004
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1554,6 +1558,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1671,6 +1676,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -2036,6 +2042,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -2133,11 +2140,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -2152,7 +2162,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2259,8 +2269,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2727,6 +2737,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -4161,6 +4172,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -5778,10 +5790,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -5846,12 +5856,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -6103,7 +6111,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -6224,7 +6231,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -6248,11 +6255,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -6260,11 +6269,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -6896,7 +6905,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -7034,10 +7043,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -7052,12 +7059,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -7247,10 +7252,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -7454,7 +7461,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1099))
@@ -7606,7 +7613,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -7655,8 +7661,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -7667,6 +7683,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -7783,7 +7808,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8634,14 +8659,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = uint8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -8649,7 +8674,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -10460,7 +10485,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -10716,6 +10741,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -11702,6 +11729,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -11710,11 +11738,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -11726,30 +11778,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1554
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -11758,83 +11810,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -11848,17 +11900,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -11866,90 +11918,90 @@ __219:
 		}
 		return ts + 1560
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(j))) = uint8(0)
 	length = int32(j)
@@ -11957,89 +12009,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -12052,32 +12104,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -12136,7 +12188,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -12152,8 +12204,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -12182,12 +12233,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -12196,7 +12248,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -13326,6 +13378,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -13931,10 +14001,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13960,6 +14033,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = uint8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]uint8{}))-uint64(1)-uint64(i))
+	return int32(uint64(unsafe.Sizeof([22]uint8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14916,11 +14990,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -15830,7 +15905,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -16053,7 +16128,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -16069,113 +16144,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off64_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -16307,7 +16382,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16598,7 +16673,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3378, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16615,14 +16690,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16642,7 +16717,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16710,7 +16785,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -16937,7 +17012,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16965,7 +17040,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -17064,7 +17139,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3261, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -17194,7 +17269,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -17240,7 +17315,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -17471,7 +17546,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17605,7 +17680,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+16)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17626,7 +17701,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17942,7 +18017,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3261, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18033,7 +18108,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43337)
 		}
 		return rc
 	}
@@ -18041,9 +18116,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18086,12 +18161,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*uint8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -18110,18 +18182,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*24 + 8)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3459, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3459, zIn, 43443)
 			}
 		} else if (*stat)(unsafe.Pointer(bp)).Fst_mode&X__mode_t(0170000) == X__mode_t(0120000) {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls, zIn, bp+144, uint64(unsafe.Sizeof([4098]uint8{}))-uint64(2))
 			if got <= int64(0) || got >= Ssize_t(unsafe.Sizeof([4098]uint8{}))-int64(2) {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3450, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3450, zIn, 43454)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 144 + uintptr(got))) = uint8(0)
@@ -18161,14 +18233,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 4104)).FzOut = zOut
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, bp, uint64(unsafe.Sizeof([4098]uint8{}))-uint64(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3279, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3279, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+4104, bp)
 	}
 	appendAllPathElements(tls, bp+4104, zPath)
 	*(*uint8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+4104)).FnUsed))) = uint8(0)
 	if (*DbPath)(unsafe.Pointer(bp+4104)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+4104)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4104)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18269,7 +18341,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == EINTR {
 				got = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*24 + 8)))(tls, fd, zBuf, uint64(nBuf)))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -18277,12 +18349,12 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 }
 
 func unixSleep(tls *libc.TLS, NotUsed uintptr, microseconds int32) int32 {
-	if microseconds >= 1000000 {
-		libc.Xsleep(tls, uint32(microseconds/1000000))
-	}
-	if microseconds%1000000 != 0 {
-		libc.Xusleep(tls, uint32(microseconds%1000000))
-	}
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	(*timespec)(unsafe.Pointer(bp)).Ftv_sec = X__time_t(microseconds / 1000000)
+	(*timespec)(unsafe.Pointer(bp)).Ftv_nsec = X__syscall_slong_t(microseconds % 1000000 * 1000)
+	libc.Xnanosleep(tls, bp, uintptr(0))
 	_ = NotUsed
 	return microseconds
 }
@@ -22193,7 +22265,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -23245,7 +23317,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -23262,7 +23333,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -23328,7 +23398,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -23338,7 +23407,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23529,36 +23598,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -23730,7 +23788,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23854,7 +23912,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23893,7 +23951,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23970,7 +24028,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24882,10 +24940,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0)}
@@ -24971,7 +25031,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25728,7 +25788,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25827,7 +25887,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -26413,7 +26473,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26688,7 +26748,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27161,7 +27221,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27666,7 +27726,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27901,8 +27961,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27910,23 +27970,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -28322,7 +28384,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28459,7 +28521,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -28476,7 +28538,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -28484,7 +28546,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -28527,7 +28589,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28537,7 +28599,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -28787,7 +28849,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28834,7 +28896,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28844,7 +28906,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28857,7 +28919,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28866,14 +28928,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28883,7 +28945,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -28947,7 +29009,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -28957,7 +29019,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28979,7 +29041,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -29014,7 +29076,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -29027,13 +29089,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -29058,7 +29120,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -29069,7 +29131,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -29121,22 +29183,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29146,7 +29208,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29154,7 +29216,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29162,10 +29224,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29189,13 +29251,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29203,7 +29264,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29211,32 +29311,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -29264,11 +29353,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -29279,15 +29368,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29315,14 +29404,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2) + 1)))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -29336,7 +29425,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29348,7 +29437,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29451,7 +29540,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29479,7 +29568,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29518,7 +29607,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -30401,7 +30490,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30816,7 +30905,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30842,7 +30931,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -30851,7 +30940,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30862,7 +30951,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30878,7 +30967,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30939,7 +31028,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30974,7 +31063,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -31034,7 +31123,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31073,7 +31162,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31104,7 +31193,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31445,7 +31534,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31689,14 +31778,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31741,7 +31830,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31790,7 +31879,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -31870,7 +31959,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31961,7 +32050,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -31981,7 +32070,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32045,18 +32134,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -32072,6 +32151,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -32193,7 +32280,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -32397,7 +32484,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32462,7 +32549,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -32510,7 +32597,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -32629,7 +32716,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32789,7 +32876,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32854,7 +32941,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32890,7 +32977,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32934,7 +33021,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -33046,7 +33133,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -33204,7 +33291,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33261,7 +33348,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -33277,7 +33364,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -33351,7 +33438,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33363,7 +33450,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -33374,7 +33461,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33539,7 +33626,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33563,9 +33650,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -33588,16 +33675,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -33618,9 +33703,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -33754,11 +33845,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -33811,12 +33905,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -33824,7 +33918,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33884,7 +33978,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -33973,7 +34067,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -34089,7 +34183,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -34132,8 +34226,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -34215,6 +34309,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -34407,7 +34503,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -34418,7 +34514,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -34576,7 +34672,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -34650,7 +34746,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -34676,9 +34772,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -34689,8 +34786,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -34712,7 +34809,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -34740,7 +34837,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -35001,11 +35098,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -35193,7 +35290,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -35231,7 +35328,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -35308,7 +35405,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -35320,19 +35417,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -35345,7 +35434,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35364,6 +35453,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -35399,7 +35505,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -35408,13 +35513,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -35425,7 +35529,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -35538,7 +35642,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -35552,20 +35656,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -35575,7 +35679,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -35583,100 +35693,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx) + 1)))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -35685,30 +35795,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -35731,7 +35841,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -35750,13 +35859,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, uint64(nIn))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -35773,7 +35884,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35832,9 +35943,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -35874,7 +35985,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -35882,11 +35993,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx) + 1)))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35961,7 +36072,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)) + 1)))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35971,7 +36082,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -36030,7 +36141,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36059,7 +36170,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -36135,7 +36246,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36149,7 +36260,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36283,7 +36394,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36458,12 +36569,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -36471,15 +36611,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4062, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -36503,9 +36643,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if libc.AtomicLoadNInt32((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb+432, 0) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -36519,7 +36656,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
 		return
@@ -36593,7 +36730,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -36678,48 +36817,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4318, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4356, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -36734,29 +36880,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -36764,28 +36910,28 @@ __9:
 	pc = U32(int32(*(*U8)(unsafe.Pointer(pCellIdx)))<<8 | int32(*(*U8)(unsafe.Pointer(pCellIdx + 1))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4470,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4500, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -36793,97 +36939,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4548, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2) + 1))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -36893,48 +37039,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4610,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -36963,9 +37109,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -36997,19 +37143,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -37021,7 +37161,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -37029,7 +37169,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -37114,7 +37254,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -37157,22 +37297,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -37399,8 +37536,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -37900,7 +38037,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
 		libc.Xmemcpy(tls, bp+8, p, uint64(int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int*2))
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+16, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+16, ts+4925,
@@ -37912,6 +38049,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*uint8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+16)).FnChar))) = uint8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 16)).FnChar)
 	}
 }
 
@@ -38099,7 +38237,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -38273,16 +38410,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -38725,7 +38864,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38962,43 +39101,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -39383,7 +39513,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39398,14 +39528,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39775,7 +39905,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -39787,13 +39919,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -39870,6 +40004,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -40758,7 +40895,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -40767,7 +40904,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -40801,7 +40938,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -40843,7 +40979,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -41595,7 +41731,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -41703,7 +41839,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42254,7 +42390,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -42319,7 +42455,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42353,7 +42489,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42403,7 +42539,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -42549,7 +42685,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -42720,7 +42856,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42746,7 +42882,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -43020,7 +43156,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43387,13 +43523,16 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = func() uint8 {
-			if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
-				return uint8(SQLITE_UTF16BE)
-			}
-			return uint8(SQLITE_UTF16LE)
-		}()
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = func() uint8 {
+				if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
+					return uint8(SQLITE_UTF16BE)
+				}
+				return uint8(SQLITE_UTF16LE)
+			}()
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -43403,7 +43542,7 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, func() uint8 {
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), func() uint8 {
 		if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
 			return uint8(SQLITE_UTF16BE)
 		}
@@ -43412,11 +43551,11 @@ func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDe
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -43604,6 +43743,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -43656,7 +43796,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -43720,6 +43860,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -43731,9 +43880,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5357)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -43967,7 +44117,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -43991,8 +44141,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -44166,15 +44316,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5367, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44285,19 +44435,22 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = func() uint8 {
-			if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
-				return uint8(SQLITE_UTF16BE)
-			}
-			return uint8(SQLITE_UTF16LE)
-		}()
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = func() uint8 {
+				if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
+					return uint8(SQLITE_UTF16BE)
+				}
+				return uint8(SQLITE_UTF16LE)
+			}()
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, func() uint8 {
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, func() uint8 {
 		if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
 			return uint8(SQLITE_UTF16BE)
 		}
@@ -44586,7 +44739,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -44730,7 +44883,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -44902,7 +45055,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*uint8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5407, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5397, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -44957,21 +45110,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5418, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5431, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5434, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5424, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5439, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
 			}
 		}
 	}
@@ -45063,11 +45216,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity uint8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -45198,8 +45351,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -45434,7 +45587,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -45535,593 +45687,597 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
+
+	case OP_IfNoHope:
 		goto __100
-	case OP_NotFound:
+	case OP_NoConflict:
 		goto __101
-	case OP_Found:
+	case OP_NotFound:
 		goto __102
+	case OP_Found:
+		goto __103
 
 	case OP_SeekRowid:
-		goto __103
-	case OP_NotExists:
 		goto __104
-
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46130,56 +46286,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -46187,20 +46343,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -46208,124 +46365,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5441, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5462, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5452, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5469, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5459, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -46333,10 +46490,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -46347,9 +46504,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -46357,171 +46514,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint64(uintptr(0)+24))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -46529,95 +46686,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = uint8(0)
@@ -46625,231 +46782,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -46858,95 +47015,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46956,189 +47113,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -47147,38 +47308,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -47186,9 +47347,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -47199,298 +47360,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -47500,144 +47662,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -47645,353 +47807,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len))
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = uint8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5493,
+	Xsqlite3VdbeError(tls, p, ts+5483,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*uint8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -48005,319 +48167,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*uint8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -48325,467 +48476,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5534, 0)
+	Xsqlite3VdbeError(tls, p, ts+5524, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5585, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5607, 0)
+		ts+5597, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5661, 0)
+		ts+5651, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5716
+				return ts + 5706
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5764
+					return ts + 5754
 				}
-				return ts + 5807
+				return ts + 5797
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5848)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -48793,67 +48955,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -48864,24 +49026,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -48889,30 +49051,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -48928,22 +49090,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -48957,133 +49119,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1554
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -49091,18 +49253,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49113,92 +49275,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -49216,106 +49378,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -49324,108 +49486,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49433,14 +49595,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -49450,108 +49612,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, uint8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -49570,35 +49732,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -49606,123 +49768,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49732,52 +49894,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -49789,15 +49951,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -49805,13 +49968,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -49824,11 +49987,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -49839,38 +50002,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -49882,47 +50045,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -49931,35 +50094,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49968,51 +50131,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -50022,72 +50185,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50095,43 +50258,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50139,84 +50302,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50226,34 +50394,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -50262,10 +50430,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -50282,14 +50450,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50302,21 +50470,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50328,62 +50496,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5876)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -50396,56 +50564,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -50456,54 +50624,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -50511,72 +50679,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -50585,55 +50753,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5893
+	goto __799
+__798:
+	zSchema = ts + 5883
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5907,
+		ts+5897,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -50643,66 +50811,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -50711,151 +50879,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5950, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -50863,10 +51032,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -50886,26 +51055,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -50917,7 +51086,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -50928,170 +51097,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -51108,146 +51277,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -51255,70 +51424,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5987,
+		ts+5977,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6039
+				return ts + 6029
 			}
-			return ts + 6044
+			return ts + 6034
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -51326,17 +51495,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -51346,14 +51515,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -51363,197 +51532,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6051, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5357, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -51567,27 +51736,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -51595,72 +51764,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.Xmemset(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -51670,192 +51839,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -51864,63 +52033,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= uint8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -51930,104 +52099,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -52035,52 +52204,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6086,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -52199,8 +52372,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -52220,7 +52393,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -52240,8 +52413,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -52272,8 +52445,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -52306,8 +52479,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52387,8 +52560,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52457,7 +52630,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -52485,12 +52658,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 3663
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52534,7 +52707,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52617,7 +52790,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -55156,6 +55329,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6381, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6389+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6408+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -55175,7 +55376,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -55230,7 +55430,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6381, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
 		goto __8
 	}
 
@@ -55351,7 +55551,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6386) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55359,73 +55559,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -55437,28 +55655,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -55469,160 +55687,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6388, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6392, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6396, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -55631,8 +55850,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -55640,19 +55859,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -55660,81 +55879,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6405, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6436, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -55747,141 +55966,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6491, libc.VaList(bp+16, zCol))
+		ts+6551, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6526
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6586
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6535
+		zErr = ts + 6595
 	} else {
-		zErr = ts + 6550
+		zErr = ts + 6610
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6572, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -55925,15 +56144,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6602
+	var zIn uintptr = ts + 6662
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6630
+		zIn = ts + 6690
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6648
+		zIn = ts + 6708
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6666
+		zIn = ts + 6726
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6684, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -56012,10 +56231,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6704
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6764
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -56062,7 +56281,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6715, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6775, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56126,7 +56345,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6732, libc.VaList(bp, pExpr))
+								ts+6792, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56142,7 +56361,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6796,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6856,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56156,7 +56375,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6832, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6892, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56179,30 +56398,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6860, libc.VaList(bp+16, pExpr))
+						ts+6920, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6903
+						zType = ts + 6963
 					} else {
-						zType = ts + 6910
+						zType = ts + 6970
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6920, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6948, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7008, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6970,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7014,
+						ts+7074,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56274,7 +56493,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7062, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7122, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -56290,7 +56509,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7073, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7133, pExpr, pExpr)
 			}
 
 			break
@@ -56346,7 +56565,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56421,7 +56640,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7084, libc.VaList(bp, i, zType, mx))
+		ts+7144, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56441,7 +56660,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7140, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7200, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56476,7 +56695,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7174, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56533,7 +56752,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7180, libc.VaList(bp, i+1))
+				ts+7240, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56561,7 +56780,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7241, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7301, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56775,7 +56994,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7272, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7332, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56815,7 +57034,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56826,7 +57045,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7311) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56838,7 +57057,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7317, 0)
+						ts+7377, 0)
 					return WRC_Abort
 				}
 
@@ -56938,12 +57157,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -56979,12 +57198,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -57094,33 +57313,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) uint8
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) uint8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -57190,7 +57510,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -57525,7 +57846,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 		return
 	}
 
@@ -57600,7 +57921,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7376, libc.VaList(bp, mxHeight))
+			ts+7436, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57849,10 +58170,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7424,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7468
+						return ts + 7528
 					}
 					return ts + 1554
 				}(), nElem))
@@ -57893,7 +58214,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57919,7 +58240,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7472, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7532, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57947,7 +58268,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7506, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7566, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57994,7 +58315,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7526,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7586,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -58019,7 +58340,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7569, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7629, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58594,7 +58915,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58717,7 +59038,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7622, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7682, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58773,10 +59094,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6704) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6764) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6709) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59206,13 +59527,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff uint8) int3
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7645) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7705) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7653) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7659) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
 		return 1
 	}
 	return 0
@@ -59416,7 +59737,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7663, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59494,7 +59815,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7710, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -59588,7 +59909,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7741
+		var zFmt uintptr = ts + 7801
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59606,7 +59927,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	}
 }
 
@@ -59647,7 +59968,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7785, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59677,11 +59998,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7808, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7868, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1554
 			}
-			return ts + 7827
+			return ts + 7887
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59808,7 +60129,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7839, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -59823,12 +60144,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7857, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1554
 		}
-		return ts + 7827
+		return ts + 7887
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -59849,7 +60171,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59858,7 +60180,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7878)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7938)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60244,8 +60566,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7880, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7883,
+			if Xsqlite3_strnicmp(tls, z, ts+7940, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4932
@@ -60321,7 +60643,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60407,8 +60729,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -60494,14 +60816,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 7940, ts + 7945, ts + 7950, ts + 6191, ts + 6186}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
+				ts + 6186, ts + 8018}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7958
+						return ts + 8026
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60515,7 +60839,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60538,10 +60862,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -60641,7 +60965,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -60771,12 +61095,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -60785,110 +61110,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -60931,13 +61269,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*uint8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -60947,11 +61285,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -60974,11 +61312,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -60987,15 +61325,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -61022,20 +61360,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -61044,9 +61382,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -61084,14 +61422,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -61102,17 +61442,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -61124,128 +61464,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7990, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -61253,42 +61593,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -61311,23 +61651,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -61344,42 +61684,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -61400,15 +61742,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61418,22 +61760,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61442,21 +61784,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61466,27 +61808,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8014, 0)
+		ts+8082, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61495,7 +61837,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -61506,7 +61848,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]uint8)(unsafe.Pointer(ts + 8064))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8132))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62878,18 +63220,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -62919,7 +63261,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -62932,12 +63274,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -62945,6 +63385,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -62959,81 +63439,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -63055,34 +63462,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -63172,7 +63578,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -63180,7 +63586,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -63231,11 +63637,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63247,13 +63653,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8108,
+		ts+8170,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8283,
+			ts+8345,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63263,10 +63669,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8457, libc.VaList(bp, zDb, zDb))
+		ts+8519, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8604, 0)
+			ts+8666, 0)
 	}
 }
 
@@ -63330,7 +63736,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8755, libc.VaList(bp, zName))
+		ts+8817, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63340,7 +63746,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8814, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63349,7 +63755,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8820, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63390,19 +63796,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8847, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9031,
+		ts+9093,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9336, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9352,
+		ts+9414,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63410,7 +63816,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9410, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63422,7 +63828,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9675, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63434,7 +63840,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9688,
+		ts+9750,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63480,12 +63886,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9726, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9758, 0)
+			ts+9820, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63495,11 +63901,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9785)
+				ts+9847)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9844)
+				ts+9906)
 		}
 
 		if pDflt != 0 {
@@ -63512,12 +63918,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9897)
+					ts+9959)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9943)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63528,7 +63934,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9970,
+			ts+10032,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63550,7 +63956,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10116,
+				ts+10178,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63598,14 +64004,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10346, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10380, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63633,7 +64039,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10410, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -63673,18 +64079,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10429
+		zType = ts + 10491
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10434
+		zType = ts + 10496
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10448,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10466
+					return ts + 10528
 				}
-				return ts + 10483
+				return ts + 10545
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -63768,7 +64174,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -63785,17 +64191,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10522,
+		ts+10584,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10704,
+		ts+10766,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9675, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9737, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63990,7 +64396,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -64053,10 +64459,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10835,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10897,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10858
+				return ts + 10920
 			}
 			return ts + 1554
 		}(), zWhen,
@@ -64098,8 +64504,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10860, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10922, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64116,7 +64522,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64138,7 +64544,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10868, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10930, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64178,10 +64584,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))
 				*(*uint8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = uint8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10874, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10936, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*uint8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10858
+							return ts + 10920
 						}
 						return ts + 1554
 					}()))
@@ -64357,8 +64763,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -64441,15 +64847,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -64477,7 +64883,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -64510,13 +64916,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64529,7 +64935,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64544,7 +64950,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -64600,8 +65006,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -64649,7 +65055,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -64717,8 +65123,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64760,11 +65166,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.Xmemset(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.Xmemset(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -64857,8 +65263,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64876,16 +65282,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -64900,31 +65306,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -64942,8 +65348,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64969,9 +65375,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -64999,8 +65405,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -65037,7 +65443,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -65061,7 +65467,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10879, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -65142,17 +65548,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10886,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10948,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10914
+				return ts + 10976
 			}
 			return ts + 6127
 		}(),
@@ -65163,7 +65569,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10926, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65180,10 +65586,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10974, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11095, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11157, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -65301,11 +65707,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11113},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11134},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11154},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11173},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11192}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11175},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11196},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11216},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65339,7 +65745,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11215, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -65348,10 +65754,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11238,
+					ts+11300,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11268, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -65369,9 +65775,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11286, FzCols: ts + 11299},
-	{FzName: ts + 11312, FzCols: ts + 11325},
-	{FzName: ts + 11353},
+	{FzName: ts + 11348, FzCols: ts + 11361},
+	{FzName: ts + 11374, FzCols: ts + 11387},
+	{FzName: ts + 11415},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65390,7 +65796,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -65469,7 +65874,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -65515,13 +65920,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -65534,11 +65939,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -65562,17 +65967,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11366}
+	FzName:     ts + 11428}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -65583,8 +65988,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -65627,7 +66032,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -65655,7 +66060,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -65722,7 +66127,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -65738,8 +66143,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -65756,9 +66161,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -65766,14 +66171,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -65781,31 +66186,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -65813,7 +66218,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11376}
+	FzName:     ts + 11438}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -65827,20 +66232,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11386,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11448,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11391, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65882,7 +66287,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+11397, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -65896,7 +66301,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11403}
+	FzName:     ts + 11465}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -65940,7 +66345,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11412, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65957,7 +66362,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11286, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11348, uint64(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -66113,7 +66518,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66170,7 +66575,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66217,9 +66622,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11426)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11488)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11430)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66305,16 +66710,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1554
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*uint8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -66324,15 +66729,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*uint8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11434, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11496, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11445, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11455, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11517, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -66412,7 +66817,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -66426,42 +66831,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -66535,15 +66940,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -66608,11 +67013,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11312, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11374, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11467,
-			ts+11521,
+			ts+11529,
+			ts+11583,
 			zDb)
 	}
 	return rc
@@ -66659,10 +67064,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11286, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11573, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66720,12 +67125,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6381, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6441, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -66736,13 +67141,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -66763,128 +67171,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3835)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3835)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11614, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11617,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11654, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11679,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.Xmemset(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11684, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+11713, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+11775, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -66894,89 +67325,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11781, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -67030,14 +67461,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11809, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11871, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11830, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -67045,7 +67476,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11856, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67087,42 +67518,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -67131,13 +67568,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -67156,7 +67593,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11878}
+	FzName:     ts + 11940}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67169,7 +67606,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11892}
+	FzName:     ts + 11954}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67183,7 +67620,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11906, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67215,7 +67652,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11930,
+						ts+11992,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67390,7 +67827,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11976, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67416,11 +67853,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12005, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12011, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67467,7 +67904,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 7653
+		zCol = ts + 7713
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67491,7 +67928,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12100, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -67716,6 +68153,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -67728,13 +68168,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -67759,25 +68199,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6381) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+12086)
+						ts+6389)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5893)
+						ts+5883)
 				}
 			}
 		}
@@ -67798,12 +68238,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5893)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5883)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+12086)
+					ts+6389)
 			}
 		}
 	}
@@ -67834,7 +68274,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12105, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12115, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67852,14 +68292,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12113
+			zMsg = ts + 12123
 		} else {
-			zMsg = ts + 12126
+			zMsg = ts + 12136
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67889,12 +68329,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
-			return ts + 12072
+	if Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
+			return ts + 6427
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12086+7) == 0 {
-			return ts + 12053
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
+			return ts + 6408
 		}
 	}
 	return zName
@@ -68252,7 +68692,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5893)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5883)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68278,7 +68718,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6381, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
 				goto __3
 			}
 
@@ -68331,13 +68771,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12140, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12150, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12157, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68379,9 +68819,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8072, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12177,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68541,9 +68981,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68559,7 +68999,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12219, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
 	return
 __4:
 	;
@@ -68587,9 +69027,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10429
+			return ts + 10491
 		}
-		return ts + 8814
+		return ts + 8876
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68605,9 +69045,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68638,12 +69078,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12260,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10429
+				return ts + 10491
 			}
-			return ts + 8814
+			return ts + 8876
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68658,7 +69098,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12281, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -68745,7 +69185,7 @@ var nullRow = [6]uint8{uint8(6), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+12316, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12326, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -68769,7 +69209,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12333, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12343, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68789,7 +69229,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12316
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12326
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -68801,7 +69241,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12316, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12326, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68835,7 +69275,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68843,13 +69283,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12390, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12400, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12397, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12407, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -68886,7 +69326,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12407, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12417, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -69050,10 +69490,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12433,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12443,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12478, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -69084,7 +69524,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12519, 0)
+			ts+12529, 0)
 	}
 }
 
@@ -69129,7 +69569,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12571, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69218,7 +69658,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12612, 0)
+		ts+12622, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69313,7 +69753,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12668, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
 	goto generated_done
 __2:
 	;
@@ -69326,13 +69766,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12711, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12719, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69359,13 +69799,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12726,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69487,12 +69934,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1554
-		zSep2 = ts + 12757
+		zSep2 = ts + 12767
 		zEnd = ts + 4957
 	} else {
-		zSep = ts + 12759
-		zSep2 = ts + 12763
-		zEnd = ts + 12768
+		zSep = ts + 12769
+		zSep2 = ts + 12773
+		zEnd = ts + 12778
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69500,7 +69947,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12771, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*uint8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = uint8('(')
@@ -69538,11 +69985,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1554,
-	ts + 12785,
-	ts + 12791,
-	ts + 12796,
+	ts + 12795,
+	ts + 12801,
+	ts + 12806,
+	ts + 12811,
 	ts + 12801,
 }
 
@@ -69950,10 +70398,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12807,
+						ts+12817,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12840,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69972,11 +70420,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12867, 0)
+				ts+12877, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12917, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -70010,7 +70458,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12949, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
 			return
 		}
 	}
@@ -70035,11 +70483,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8814
-			zType2 = ts + 12993
+			zType = ts + 8876
+			zType2 = ts + 13003
 		} else {
-			zType = ts + 10429
-			zType2 = ts + 12999
+			zType = ts + 10491
+			zType2 = ts + 13009
 		}
 
 		if pSelect != 0 {
@@ -70101,7 +70549,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -70110,11 +70558,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+13004, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13019,
+			ts+13029,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70130,13 +70578,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13117,
+					ts+13127,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13159, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70151,7 +70599,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9336) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9398) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70181,7 +70629,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13193, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13203, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70197,7 +70645,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10429, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -70279,7 +70727,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13229, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70307,8 +70755,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -70405,13 +70852,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13259, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13269, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13274,
+		ts+13284,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -70452,10 +70899,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13341, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13351, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11238,
+				ts+11300,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70487,12 +70934,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13355,
+			ts+13365,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13400,
+		ts+13410,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -70520,11 +70967,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7073, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70602,9 +71049,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70663,21 +71110,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13467, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13495, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13529, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70689,7 +71136,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11430, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -70753,7 +71200,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13561,
+		ts+13571,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -70765,7 +71212,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13624, 0)
+		ts+13634, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70850,7 +71297,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13718,
+		ts+13728,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -71077,12 +71524,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13764,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13774,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13792
+							return ts + 13802
 						}
-						return ts + 13798
+						return ts + 13808
 					}()))
 				return 1
 			}
@@ -71203,7 +71650,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13803, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -71222,7 +71669,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13809,
+		ts+13819,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71248,26 +71695,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13859, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13887, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13897, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13912, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71281,7 +71728,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13803, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71296,7 +71743,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13946, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71308,7 +71755,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13980, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71337,7 +71784,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14004, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71358,9 +71805,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71399,7 +71846,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13803)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71500,7 +71947,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14027, 0)
+		ts+14037, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71717,7 +72164,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14088, libc.VaList(bp+48, 0))
+		ts+14098, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -71769,8 +72216,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14130, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -71816,12 +72263,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14147,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1554
 			}
-			return ts + 14167
+			return ts + 14177
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71829,7 +72276,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14175,
+		ts+14185,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -71843,7 +72290,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14234, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -72004,7 +72451,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14261, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -72019,7 +72466,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14279, libc.VaList(bp+8, 0))
+		ts+14289, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -72030,9 +72477,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72058,9 +72505,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14352,
+		ts+14362,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11426, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -72195,7 +72642,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14412,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14422,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72403,12 +72850,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14448,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14458,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14484
+				return ts + 14494
 			}
-			return ts + 14487
+			return ts + 14497
 		}()))
 	goto append_from_error
 __1:
@@ -72577,7 +73024,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14493, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72613,9 +73060,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14499
+				return ts + 14509
 			}
-			return ts + 14508
+			return ts + 14518
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72640,7 +73087,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14493, ts + 14515, ts + 14499}
+var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72655,7 +73102,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14523, 0)
+				ts+14533, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72792,14 +73239,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14593, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14604, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14614, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
@@ -72825,11 +73272,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14607, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72959,7 +73406,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14616, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -73055,7 +73502,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14662, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14672, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73253,7 +73700,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14692, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73533,7 +73980,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73565,11 +74012,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14756, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14785, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74073,7 +74520,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14823)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
 __62:
 	;
 delete_from_cleanup:
@@ -74188,7 +74635,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11286) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11348) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74418,7 +74865,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 7945, ts + 7940, ts + 6181}
+var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 8005, ts + 8000, ts + 6181}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74477,7 +74924,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14836, -1)
+					Xsqlite3_result_error(tls, context, ts+14846, -1)
 					return
 				}
 				iVal = -iVal
@@ -74781,7 +75228,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14853, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75127,7 +75574,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14858, -1)
+		Xsqlite3_result_error(tls, context, ts+14868, -1)
 		return
 	}
 	if argc == 3 {
@@ -75137,7 +75584,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14891, -1)
+				ts+14901, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75236,7 +75683,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14936, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14946, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75251,21 +75698,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = uint8('\'')
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = uint8(0)
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = uint8('\'')
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = uint8(0)
 				*(*uint8)(unsafe.Pointer(zText)) = uint8('X')
 				*(*uint8)(unsafe.Pointer(zText + 1)) = uint8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -75273,7 +75720,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14943, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14953, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -75387,6 +75834,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1554
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -75589,7 +76149,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10858}
+var azOne = [1]uintptr{ts + 10920}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75625,7 +76185,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(j))) = uint8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14946, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14956, 4, uintptr(0))
 	}
 }
 
@@ -75650,7 +76210,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12038, -1)
+		Xsqlite3_result_error(tls, context, ts+12100, -1)
 		return
 	}
 
@@ -75728,7 +76288,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14836, -1)
+			Xsqlite3_result_error(tls, context, ts+14846, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75990,7 +76550,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14951, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14961, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -76010,14 +76570,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14957, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14957, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76147,17 +76707,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -76216,6 +76776,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -76256,108 +76817,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14962},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14982},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14995},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15013},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15022},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15045},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15071},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15096},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15105},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15116},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15123},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15154},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15154},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15154},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15158},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15162},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15169},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15177},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15184},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15190},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15197},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15204},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15212},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15217},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14992},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 15005},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15023},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15032},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15055},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15081},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15106},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15115},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15126},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15133},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15164},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15164},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15164},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15168},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15179},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15187},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15194},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15200},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15207},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15222},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15227},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15233},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15239},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15243},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15257},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15275},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15290},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15307},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15318},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15324},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15350},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15364},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15398},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15402},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15408},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15237},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15249},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15259},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15266},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15273},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15284},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15291},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15306},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15323},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15334},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15340},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15358},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15366},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15380},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15414},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15431},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15436},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15441},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15449},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15455},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15461},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15468},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15474},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15479},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15483},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15487},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15493},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15497},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15507},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15512},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15424},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15447},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15452},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15457},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15465},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15471},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15484},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15490},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15495},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15503},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15509},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15513},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15530},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15540},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15545},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15523},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15528},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15534},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15538},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15542},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15546},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15551},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15557},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15563},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15568},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15576},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15584},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15587},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6526},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15592}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15556},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15561},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15567},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15573},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15579},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15584},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15592},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15600},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6586},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15608}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76478,7 +77041,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15596,
+				ts+15612,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -77138,8 +77701,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6392, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6388, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6452, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6448, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77640,7 +78203,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7910, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78108,7 +78671,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15641,
+		ts+15657,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78133,7 +78696,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15682,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -78282,7 +78845,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15714,
+		ts+15730,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78292,7 +78855,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15766, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78344,7 +78907,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15791,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78352,7 +78915,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15837, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -78764,7 +79327,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15858)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
 __125:
 	;
 insert_cleanup:
@@ -79080,8 +79643,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 								onError, iReg)
 							Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -80171,7 +80735,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -80617,6 +81181,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80655,7 +81220,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12038, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -80664,7 +81229,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15872
+		zEntry = ts + 15888
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -80679,7 +81244,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -80715,7 +81280,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15895, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -80729,7 +81294,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15904, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -80753,7 +81318,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15908, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -80771,7 +81336,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15914, libc.VaList(bp+16, zEntry, zFile))
+		ts+15930, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80798,7 +81363,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15957, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80836,7 +81401,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15989, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80846,7 +81411,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16026,
+	ts + 16042,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -81002,7 +81567,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16029, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -81011,62 +81576,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5057,
-	ts + 16068,
-	ts + 8814,
-	ts + 16072,
-	ts + 16077,
-	ts + 16080,
-	ts + 16090,
-	ts + 16100,
+	ts + 16084,
+	ts + 8876,
+	ts + 16088,
+	ts + 16093,
+	ts + 16096,
 	ts + 16106,
-	ts + 16110,
-	ts + 16115,
-	ts + 16120,
-	ts + 16128,
-	ts + 16139,
-	ts + 16142,
-	ts + 16149,
-	ts + 16110,
-	ts + 16115,
-	ts + 16156,
-	ts + 16161,
-	ts + 16164,
-	ts + 16171,
-	ts + 16106,
-	ts + 16110,
+	ts + 16116,
+	ts + 16122,
+	ts + 16126,
+	ts + 16131,
+	ts + 16136,
+	ts + 16144,
+	ts + 16155,
+	ts + 16158,
+	ts + 16165,
+	ts + 16126,
+	ts + 16131,
+	ts + 16172,
 	ts + 16177,
-	ts + 16182,
+	ts + 16180,
 	ts + 16187,
-	ts + 16110,
-	ts + 16191,
-	ts + 16115,
-	ts + 16199,
+	ts + 16122,
+	ts + 16126,
+	ts + 16193,
+	ts + 16198,
 	ts + 16203,
-	ts + 16208,
-	ts + 11430,
-	ts + 11426,
-	ts + 16214,
+	ts + 16126,
+	ts + 16207,
+	ts + 16131,
+	ts + 16215,
 	ts + 16219,
 	ts + 16224,
-	ts + 16068,
-	ts + 16110,
-	ts + 16229,
-	ts + 16236,
-	ts + 16243,
-	ts + 8814,
-	ts + 16251,
-	ts + 5060,
-	ts + 16257,
-	ts + 16068,
-	ts + 16110,
-	ts + 16262,
+	ts + 11492,
+	ts + 11488,
+	ts + 16230,
+	ts + 16235,
+	ts + 16240,
+	ts + 16084,
+	ts + 16126,
+	ts + 16245,
+	ts + 16252,
+	ts + 16259,
+	ts + 8876,
 	ts + 16267,
-	ts + 15464,
-	ts + 16272,
-	ts + 16285,
-	ts + 16294,
+	ts + 5060,
+	ts + 16273,
+	ts + 16084,
+	ts + 16126,
+	ts + 16278,
+	ts + 16283,
+	ts + 15480,
+	ts + 16288,
 	ts + 16301,
-	ts + 16312,
+	ts + 16310,
+	ts + 16317,
+	ts + 16328,
 }
 
 // Definitions of all built-in pragmas
@@ -81084,238 +81649,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16320,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16335,
+	{FzName: ts + 16351,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16350,
+	{FzName: ts + 16366,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16362,
+	{FzName: ts + 16378,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16394,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16301,
+	{FzName: ts + 16317,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16391,
+	{FzName: ts + 16407,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16403,
+	{FzName: ts + 16419,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16423,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16439,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16455,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16460,
+	{FzName: ts + 16476,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16475,
+	{FzName: ts + 16491,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16507,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16505,
+	{FzName: ts + 16521,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16518,
+	{FzName: ts + 16534,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16532,
+	{FzName: ts + 16548,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16551,
+	{FzName: ts + 16567,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16570,
+	{FzName: ts + 16586,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16593,
+	{FzName: ts + 16609,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16618,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16620,
+	{FzName: ts + 16636,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16637,
+	{FzName: ts + 16653,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16650,
+	{FzName: ts + 16666,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16665,
+	{FzName: ts + 16681,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16683,
+	{FzName: ts + 16699,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16693,
+	{FzName: ts + 16709,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16723,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16739,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16748,
+	{FzName: ts + 16764,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16767,
+	{FzName: ts + 16783,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16778,
+	{FzName: ts + 16794,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16789,
+	{FzName: ts + 16805,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16801,
+	{FzName: ts + 16817,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16833,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16830,
+	{FzName: ts + 16846,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16849,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16868,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16881,
+	{FzName: ts + 16897,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16896,
+	{FzName: ts + 16912,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16906,
+	{FzName: ts + 16922,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16918,
+	{FzName: ts + 16934,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16943,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16938,
+	{FzName: ts + 16954,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16948,
+	{FzName: ts + 16964,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16960,
+	{FzName: ts + 16976,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16971,
+	{FzName: ts + 16987,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16983,
+	{FzName: ts + 16999,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17000,
+	{FzName: ts + 17016,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17019,
+	{FzName: ts + 17035,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17045,
+	{FzName: ts + 17061,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17060,
+	{FzName: ts + 17076,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17074,
+	{FzName: ts + 17090,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17093,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17107,
+	{FzName: ts + 17123,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17139,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17135,
+	{FzName: ts + 17151,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17146,
+	{FzName: ts + 17162,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17157,
+	{FzName: ts + 17173,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17169,
+	{FzName: ts + 17185,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17180,
+	{FzName: ts + 17196,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17201,
+	{FzName: ts + 17217,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17209,
+	{FzName: ts + 17225,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17224,
+	{FzName: ts + 17240,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17237,
+	{FzName: ts + 17253,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17256,
+	{FzName: ts + 17272,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17271,
+	{FzName: ts + 17287,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81337,7 +81902,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17287))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17303))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -81349,10 +81914,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17312) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17328) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81361,13 +81926,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7958) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8026) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17329) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17334) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81382,9 +81947,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*uint8)(unsafe.Pointer(z))) >= '0' && int32(*(*uint8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*uint8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16262) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16278) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17346) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81398,7 +81963,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17353, 0)
+				ts+17369, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -81489,19 +82054,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17415
+		zName = ts + 17431
 		break
 	case OE_SetDflt:
-		zName = ts + 17424
+		zName = ts + 17440
 		break
 	case OE_Cascade:
-		zName = ts + 17436
+		zName = ts + 17452
 		break
 	case OE_Restrict:
-		zName = ts + 17444
+		zName = ts + 17460
 		break
 	default:
-		zName = ts + 17453
+		zName = ts + 17469
 		break
 	}
 	return zName
@@ -81518,7 +82083,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17463, ts + 17470, ts + 17478, ts + 17482, ts + 17346, ts + 17491,
+	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81565,13 +82130,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17495
+			zType = ts + 17511
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17497
+			zType = ts + 17513
 		} else {
-			zType = ts + 7468
+			zType = ts + 7528
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17499,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -81579,7 +82144,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17506, ts + 17511, ts + 17519}
+var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -81730,14 +82295,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -81824,7 +82391,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17527, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82085,7 +82652,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17531) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82157,7 +82724,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17322
+	zRet = ts + 17338
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82195,7 +82762,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17312
+	zRet = ts + 17328
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82482,7 +83049,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17536, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82523,7 +83090,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17561, 0)
+		ts+17577, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82577,7 +83144,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17614) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
 		goto __142
 	}
 
@@ -82674,9 +83241,9 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17620
+			return ts + 17636
 		}
-		return ts + 17628
+		return ts + 17644
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -82745,7 +83312,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17635, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82791,29 +83358,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10429
+	zType = ts + 10491
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12711
+	zType = ts + 12721
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17651
+	zType = ts + 17667
 	goto __183
 __182:
-	zType = ts + 8814
+	zType = ts + 8876
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82879,7 +83446,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17665, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82889,7 +83456,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17670,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -82926,8 +83493,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17675, ts + 17677, ts + 16139}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17679,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82960,7 +83527,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -82982,7 +83549,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17689, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -83046,7 +83613,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -83062,7 +83629,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83097,7 +83664,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17692,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83105,7 +83672,7 @@ __226:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+17701))
+			ts+17717))
 	goto __227
 __227:
 	j2++
@@ -83294,7 +83861,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17706, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 600)))
@@ -83511,7 +84078,7 @@ __284:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17710, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -83572,262 +84139,284 @@ __299:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 612)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__300:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __301
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __300
+	}
+	mxCol = -1
+	j4 = 0
+__302:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __304
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __305
+	}
+	mxCol++
+__305:
+	;
+	goto __303
+__303:
+	j4++
+	goto __302
+	goto __304
+__304:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __306
 	}
 	mxCol--
-	goto __300
+__306:
+	;
+	goto __301
+__300:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __301:
 	;
 	if !(mxCol >= 0) {
-		goto __302
+		goto __307
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__302:
+__307:
 	;
 	if !!(isQuick != 0) {
-		goto __303
+		goto __308
 	}
 	if !(pPk1 != 0) {
-		goto __304
+		goto __309
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 612)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17734,
+		ts+17750,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__305:
+__310:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __307
+		goto __312
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 612)), j4, r2+j4)
-	goto __306
-__306:
+	goto __311
+__311:
 	j4++
-	goto __305
-	goto __307
-__307:
+	goto __310
+	goto __312
+__312:
 	;
-__304:
+__309:
 	;
-__303:
+__308:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__308:
+__313:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __310
+		goto __315
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __311
+		goto __316
 	}
-	goto __309
-__311:
+	goto __314
+__316:
 	;
 	if !(bStrict != 0) {
-		goto __312
+		goto __317
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __313
-__312:
+	goto __318
+__317:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__313:
+__318:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __314
+		goto __319
 	}
-	goto __309
-__314:
+	goto __314
+__319:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __316
-__315:
+	goto __321
+__320:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __317
+		goto __322
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 624)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		(*Column)(unsafe.Pointer(pCol1)).Faffinity, bp+624)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 624)) != 0) {
-		goto __318
+		goto __323
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
-__318:
+__323:
 	;
-__317:
+__322:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 612))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __319
+		goto __324
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __320
-__319:
+	goto __325
+__324:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__320:
+__325:
 	;
-__316:
+__321:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __321
+		goto __326
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17770, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __323
-__322:
+	goto __328
+__327:
 	;
-__323:
+__328:
 	;
-__321:
+__326:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __324
+		goto __329
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17790,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __325
-__324:
+	goto __330
+__329:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __326
+		goto __331
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17812,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __327
-__326:
+	goto __332
+__331:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __328
+		goto __333
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
-__329:
+__334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17835, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17837,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__328:
+__333:
 	;
-__327:
+__332:
 	;
-__325:
+__330:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __309
-__309:
+	goto __314
+__314:
 	j4++
-	goto __308
-	goto __310
-__310:
+	goto __313
+	goto __315
+__315:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __330
+		goto __335
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __331
+		goto __336
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 612)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__332:
+__337:
 	if !(k3 > 0) {
-		goto __334
+		goto __339
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __333
-__333:
+	goto __338
+__338:
 	k3--
-	goto __332
-	goto __334
-__334:
+	goto __337
+	goto __339
+__339:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17857,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__331:
+__336:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__330:
+__335:
 	;
 	if !!(isQuick != 0) {
-		goto __335
+		goto __340
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__336:
+__341:
 	if !(pIdx5 != 0) {
-		goto __338
+		goto __343
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __339
+		goto __344
 	}
-	goto __337
-__339:
+	goto __342
+__344:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 612)), 0, 0, bp+632,
 		pPrior, r1)
@@ -83836,80 +84425,119 @@ __339:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 616))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17892)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__345:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __347
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __348
+	}
+	goto __346
+__348:
+	;
+	if !(label6 == 0) {
+		goto __349
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__349:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 616))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	if !(label6 != 0) {
+		goto __350
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__350:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __340
+		goto __351
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__341:
+__352:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __343
+		goto __354
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __344
+		goto __355
 	}
-	goto __342
-__344:
+	goto __353
+__355:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17956)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__351:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
 	goto __342
 __342:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __341
 	goto __343
 __343:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17913)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __340:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
-	goto __337
-__337:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __336
-	goto __338
-__338:
-	;
-__335:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __345
+		goto __356
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17940)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__346:
+__357:
 	if !(pIdx5 != 0) {
-		goto __348
+		goto __359
 	}
 	if !(pPk1 == pIdx5) {
-		goto __349
+		goto __360
 	}
-	goto __347
-__349:
+	goto __358
+__360:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83918,21 +84546,21 @@ __349:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __347
-__347:
+	goto __358
+__358:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __346
-	goto __348
-__348:
+	goto __357
+	goto __359
+__359:
 	;
 	if !(pPk1 != 0) {
-		goto __350
+		goto __361
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__350:
+__361:
 	;
-__345:
+__356:
 	;
 	goto __291
 __291:
@@ -83950,14 +84578,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __351
+		goto __362
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 608))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 17969
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18012
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__351:
+__362:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83965,27 +84593,27 @@ __351:
 
 __45:
 	if !!(zRight != 0) {
-		goto __352
+		goto __363
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __354
+		goto __365
 	}
 	goto pragma_out
-__354:
+__365:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __353
-__352:
+	goto __364
+__363:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __355
+		goto __366
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__356:
+__367:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __358
+		goto __369
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __359
+		goto __370
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83999,25 +84627,25 @@ __356:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __358
-__359:
+	goto __369
+__370:
 	;
-	goto __357
-__357:
+	goto __368
+__368:
 	pEnc += 16
-	goto __356
-	goto __358
-__358:
+	goto __367
+	goto __369
+__369:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __360
+		goto __371
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17972, libc.VaList(bp+456, zRight))
-__360:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+__371:
 	;
-__355:
+__366:
 	;
-__353:
+__364:
 	;
 	goto __15
 
@@ -84025,15 +84653,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __361
+		goto __372
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __363
+		goto __374
 	}
 	goto __15
-__363:
+__374:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -84041,41 +84669,41 @@ __363:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __364
+		goto __375
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__364:
+__375:
 	;
-	goto __362
-__361:
+	goto __373
+__372:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __365
+		goto __376
 	}
 	goto __15
-__365:
+__376:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__362:
+__373:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__366:
+__377:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __366
-__367:
+	goto __377
+__378:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84090,31 +84718,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17329) == 0) {
-		goto __369
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
+		goto __380
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __370
-__369:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17997) == 0) {
-		goto __371
+	goto __381
+__380:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
+		goto __382
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __372
-__371:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17482) == 0) {
-		goto __373
+	goto __383
+__382:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
+		goto __384
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__373:
+__384:
 	;
-__372:
+__383:
 	;
-__370:
+__381:
 	;
-__368:
+__379:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84124,10 +84752,10 @@ __368:
 
 __49:
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__374:
+__385:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84147,19 +84775,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __377
+		goto __388
 	}
 	goto __15
-__377:
+__388:
 	;
-	goto __376
-__375:
+	goto __387
+__386:
 	opMask = U32(0xfffe)
-__376:
+__387:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84168,86 +84796,86 @@ __376:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__378:
+__389:
 	if !(iDb <= iDbLast) {
-		goto __380
+		goto __391
 	}
 	if !(iDb == 1) {
-		goto __381
+		goto __392
 	}
-	goto __379
-__381:
+	goto __390
+__392:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__382:
+__393:
 	if !(k4 != 0) {
-		goto __384
+		goto __395
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __385
+		goto __396
 	}
-	goto __383
-__385:
+	goto __394
+__396:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__386:
+__397:
 	if !(pIdx6 != 0) {
-		goto __388
+		goto __399
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __389
+		goto __400
 	}
 	szThreshold = int16(0)
-	goto __388
-__389:
+	goto __399
+__400:
 	;
-	goto __387
-__387:
+	goto __398
+__398:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __386
-	goto __388
-__388:
+	goto __397
+	goto __399
+__399:
 	;
 	if !(szThreshold != 0) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__390:
+__401:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18005,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __391
+		goto __402
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __392
-__391:
+	goto __403
+__402:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__392:
+__403:
 	;
-	goto __383
-__383:
+	goto __394
+__394:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __382
-	goto __384
-__384:
+	goto __393
+	goto __395
+__395:
 	;
-	goto __379
-__379:
+	goto __390
+__390:
 	iDb++
-	goto __378
-	goto __380
-__380:
+	goto __389
+	goto __391
+__391:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84255,36 +84883,36 @@ __380:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __393
+		goto __404
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__393:
+__404:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __394
+		goto __405
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__394:
+__405:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __395
+		goto __406
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 648)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__396:
+__407:
 	;
-__395:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84293,10 +84921,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__397:
+__408:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84305,10 +84933,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __398
+		goto __409
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__398:
+__409:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84316,10 +84944,10 @@ __398:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __399
+		goto __410
 	}
 
-__399:
+__410:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84371,14 +84999,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18023, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18028, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18034, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18043, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18052, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18060, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18068},
-	{FzName: ts + 18075},
+	{FzName: ts + 18066, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18071, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18077, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18086, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18095, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18103, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18111},
+	{FzName: ts + 18118},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84430,7 +85058,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]uint8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18081)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18124)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84438,7 +85066,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18096, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -84451,16 +85079,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18103, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18109)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18152)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18121)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
@@ -84643,13 +85271,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18136)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18179)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18144, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18148, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -84726,12 +85354,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18152, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -84740,19 +85368,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5008
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18180, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18211, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18219,
-	ts + 18226,
-	ts + 18238,
+	ts + 18262,
+	ts + 18269,
+	ts + 18281,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84812,7 +85440,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -84844,13 +85472,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18249)
+			corruptSchema(tls, pData, argv, ts+18292)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 	}
@@ -84883,16 +85511,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8814
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8876
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7878
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18262
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7938
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18305
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -84970,17 +85598,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11713)
+		ts+11775)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -84989,44 +85626,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18334)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18377)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18358,
+		ts+18401,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85037,57 +85674,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -85176,8 +85813,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -85290,8 +85929,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -85302,8 +85941,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -85315,8 +85954,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -85356,7 +85995,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18392, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85386,7 +86025,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18422, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85482,7 +86121,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -85581,7 +86220,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85904,8 +86543,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10858
-		var zSp2 uintptr = ts + 10858
+		var zSp1 uintptr = ts + 10920
+		var zSp2 uintptr = ts + 10920
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85913,13 +86552,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18441, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18471))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18514))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86094,7 +86733,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18505, libc.VaList(bp, 0))
+					ts+18548, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86139,7 +86778,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18555, libc.VaList(bp+8, zName))
+						ts+18598, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86150,7 +86789,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18619,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18662,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86194,7 +86833,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6526, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -86541,9 +87180,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -86781,16 +87417,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18656
+		z = ts + 18699
 		break
 	case TK_INTERSECT:
-		z = ts + 18666
+		z = ts + 18709
 		break
 	case TK_EXCEPT:
-		z = ts + 18676
+		z = ts + 18719
 		break
 	default:
-		z = ts + 18683
+		z = ts + 18726
 		break
 	}
 	return z
@@ -86800,10 +87436,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18689, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -86823,6 +87462,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18755, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18786
+		}
+		return ts + 1554
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -86889,6 +87535,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -86953,6 +87600,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -87007,7 +87655,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16251
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16267
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -87146,13 +87794,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16251
+				zCol = ts + 16267
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -87160,7 +87808,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87225,7 +87873,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -87250,7 +87898,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16251
+					zName = ts + 16267
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87260,7 +87908,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87276,7 +87924,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18721, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -87301,45 +87950,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -87349,14 +88001,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18818
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -87366,9 +88050,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -87412,7 +88093,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -87563,7 +88244,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18729, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
 	return
 __1:
 	;
@@ -87654,7 +88335,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18778, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -87674,7 +88355,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18820, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -87711,7 +88392,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18826, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -87745,11 +88426,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18841, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18934, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1554
 		}
-		return ts + 18864
+		return ts + 18957
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87850,8 +88531,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18866, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18881, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87898,7 +88579,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18656, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87965,7 +88646,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -88027,7 +88708,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88180,10 +88861,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19014, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18967,
+			ts+19060,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88437,8 +89118,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7174)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88465,13 +89146,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19049, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19060, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19153, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88483,7 +89164,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19065, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19158, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88898,6 +89579,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff uint8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -89017,15 +89717,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff uint8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -89401,16 +90094,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -89470,12 +90180,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15154) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15158) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15168) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -89541,7 +90251,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19071, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19164, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -89624,7 +90334,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19089, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89753,15 +90463,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19112, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -89779,7 +90486,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19132, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89795,7 +90502,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19175
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -89821,7 +90528,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19198,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19291,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -89832,9 +90539,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19236
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19329
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19270
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89881,7 +90588,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19308, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19401, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89993,7 +90700,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19312,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -90012,7 +90719,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19351,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19444,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -90020,7 +90727,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90121,7 +90828,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6386
+							zSchemaName = ts + 6446
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90136,7 +90843,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19382, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19475, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -90201,7 +90908,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19387,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19480,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90213,7 +90920,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -90232,9 +90939,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19396, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19414, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
 					}
 				}
 			}
@@ -90244,7 +90951,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19434, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19527, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90303,11 +91010,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -90366,6 +91069,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -90381,7 +91159,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -90394,13 +91173,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19465, 0)
+					ts+19558, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19516, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -90408,7 +91187,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -90428,19 +91207,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -90454,6 +91236,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -90528,7 +91313,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -90540,7 +91327,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -90558,13 +91345,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -90581,11 +91368,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19549,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19642,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19561
+						return ts + 19654
 					}
 					return ts + 1554
 				}(),
@@ -90606,7 +91393,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90638,14 +91425,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -90699,6 +91487,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -90763,7 +91602,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -90862,7 +91700,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19584,
+		ts+19677,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90923,7 +91761,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19638,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -91037,7 +91875,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -91054,11 +91892,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -91069,7 +91903,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19678, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19771, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -91095,7 +91929,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -91127,11 +91961,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19693, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -91165,7 +91997,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -91474,12 +92306,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -91508,39 +92339,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -91551,24 +92358,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -91601,27 +92408,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19709
+				return ts + 19802
 			}
-			return ts + 19718
+			return ts + 19811
 		}())
 
 	groupBySort = 1
@@ -91629,47 +92443,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -91685,45 +92499,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -91742,16 +92562,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -91782,16 +92602,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -91804,98 +92624,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -91904,79 +92727,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19709)
-__148:
+	explainTempTable(tls, pParse, ts+19802)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19727
-			}
-			return ts + 19750
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -92073,7 +92891,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19759, 0)
+		ts+19820, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92306,7 +93124,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19824, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19885, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92350,7 +93168,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19870, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -92368,7 +93186,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19878, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -92380,7 +93198,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19870, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -92395,7 +93213,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19919, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -92407,22 +93225,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19945, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19983,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20020
+				return ts + 20081
 			}
-			return ts + 20027
+			return ts + 20088
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -92431,7 +93249,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20033, libc.VaList(bp+24, pTableName+8))
+		ts+20094, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -92460,9 +93278,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -92580,7 +93398,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19870, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19931, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -92613,7 +93431,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20079,
+		ts+20140,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92638,13 +93456,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20127,
+		ts+20188,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20202, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20263, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92900,7 +93718,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20231, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92939,9 +93757,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12086
+				return ts + 6389
 			}
-			return ts + 5893
+			return ts + 5883
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92953,7 +93771,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20251,
+			ts+20312,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -93067,12 +93885,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20313,
+		ts+20374,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20361
+				return ts + 20422
 			}
-			return ts + 20368
+			return ts + 20429
 		}()))
 __15:
 	;
@@ -93186,7 +94004,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20375, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20436, 0)
 	return 1
 }
 
@@ -93369,8 +94187,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -93403,8 +94221,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -93416,13 +94234,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20417, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -93738,7 +94556,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -94008,7 +94827,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20431,
+		ts+20492,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94040,7 +94859,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20467, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -94050,7 +94869,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7653
+				return ts + 7713
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -94920,7 +95739,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20486)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
 __169:
 	;
 update_cleanup:
@@ -95226,10 +96045,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*uint8)(unsafe.Pointer(bp + 216)) = uint8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20499, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20560, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20503, libc.VaList(bp+8, bp+216))
+				ts+20564, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -95320,7 +96139,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12140, -1)
+				ts+12150, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95352,7 +96171,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20576, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20580, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20637, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -95500,14 +96319,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20584)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20645)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20624)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
 	return SQLITE_ERROR
 __2:
 	;
@@ -95518,7 +96337,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20667)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
 	return SQLITE_ERROR
 __5:
 	;
@@ -95546,7 +96365,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20685, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -95566,7 +96385,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20708)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
 	goto end_of_vacuum
 __8:
 	;
@@ -95581,7 +96400,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14493)
+	rc = execSql(tls, db, pzErrMsg, ts+14503)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -95626,7 +96445,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20735,
+		ts+20796,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95635,7 +96454,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20843,
+		ts+20904,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95646,7 +96465,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20897,
+		ts+20958,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95657,7 +96476,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21048,
+		ts+21109,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95879,12 +96698,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -96002,7 +96821,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96086,11 +96905,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21178, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21239, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21202,
+			ts+21263,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -96100,7 +96919,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21301, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96134,7 +96953,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -96161,7 +96980,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21320, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96199,7 +97018,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21423, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -96211,7 +97030,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21392
+			var zFormat uintptr = ts + 21453
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96228,7 +97047,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16142, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -96285,7 +97104,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21438, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21499, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -96343,7 +97162,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21438, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21499, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -96363,8 +97182,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -96377,7 +97196,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96830,7 +97649,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -96857,7 +97676,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -97088,10 +97907,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21457
+		return ts + 21518
 	}
 	if i == -1 {
-		return ts + 16251
+		return ts + 16267
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97100,15 +97919,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -97119,11 +97938,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
 	}
@@ -97145,27 +97964,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21472, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21533, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21475
+				return ts + 21536
 			}
-			return ts + 21480
+			return ts + 21541
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21488)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21549)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21490)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21551)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
 }
@@ -97208,11 +98027,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21492, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21553, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21498
+				return ts + 21559
 			}
-			return ts + 21505
+			return ts + 21566
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97222,43 +98041,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10914
+					zFmt = ts + 10976
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21510
+				zFmt = ts + 21571
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21543
+				zFmt = ts + 21604
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21568
+				zFmt = ts + 21629
 			} else {
-				zFmt = ts + 21586
+				zFmt = ts + 21647
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21595, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp uint8
-			var zRowid uintptr = ts + 16251
-			Xsqlite3_str_appendf(tls, bp+64, ts+21603, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16267
+			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = uint8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21634, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21695, libc.VaList(bp+32, zRowid))
 				cRangeOp = uint8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = uint8('>')
 			} else {
 				cRangeOp = uint8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21644, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21705, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21649,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21676, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21737, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97290,28 +98109,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21687, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21748, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21708, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21769, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21464, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21525, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -97372,52 +98192,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -98895,7 +99721,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21716, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98923,7 +99749,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21731, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -99441,7 +100267,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21740, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99799,10 +100625,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16100, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15431, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14957, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21754, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16116, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15447, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14967, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21815, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100179,49 +101005,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -100229,13 +101044,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -100300,12 +101118,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -100329,7 +101147,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -100339,7 +101157,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -100384,7 +101202,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -100478,7 +101296,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21802
+				return ts + 21863
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100489,7 +101307,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -100497,6 +101314,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -100530,7 +101348,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -100683,6 +101501,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -100851,7 +101672,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21809,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101585,7 +102406,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21845, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101656,7 +102477,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21871
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102163,7 +102984,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -102183,7 +103004,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -102194,10 +103015,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -102208,29 +103029,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -102332,8 +103153,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -102345,7 +103166,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -102355,17 +103176,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -102385,19 +103206,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -102409,19 +103230,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -102431,10 +103252,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -102448,9 +103269,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -102475,8 +103296,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -102488,7 +103309,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -102502,23 +103323,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -102529,7 +103350,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -102851,6 +103672,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -102944,8 +103766,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -102969,8 +103791,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -103122,7 +103945,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -103141,7 +103964,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -103155,7 +103978,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -103164,9 +103987,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -103185,6 +104012,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -103312,30 +104142,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -103343,20 +104192,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -103365,9 +104219,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -103408,7 +104268,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -103448,7 +104308,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -103514,19 +104375,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -103707,7 +104573,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103765,7 +104631,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104163,7 +105029,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21908, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21969, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104374,8 +105240,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -104494,14 +105360,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -104653,7 +105528,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -104761,7 +105636,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21943, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -105023,19 +105898,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -105047,9 +105924,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -105082,13 +105959,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -105240,7 +106117,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21961, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105304,7 +106181,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21989, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
 	goto __5
 __4:
 	ii = 0
@@ -106005,7 +106882,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -106186,7 +107063,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22007, -1)
+		pCtx, ts+22068, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -106319,7 +107196,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22063, -1)
+					pCtx, ts+22124, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -106409,17 +107286,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22108))
-var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22119))
-var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22130))
-var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22135))
-var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22148))
-var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22158))
-var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22164))
-var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22175))
-var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22185))
-var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22197))
-var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22202))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22169))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22180))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22191))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22196))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22209))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22219))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22225))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22236))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22246))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22258))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22263))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -106465,7 +107342,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22206, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -106509,12 +107386,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22225, 0)
+			ts+22286, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22296, 0)
+				ts+22357, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -106537,7 +107414,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 					}
 					break
 				}
@@ -106743,7 +107620,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22359, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106859,7 +107736,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106870,6 +107747,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, uint8(SQLITE_AFF_NONE))
@@ -106973,7 +107851,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22385, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107038,15 +107916,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22417
+				zErr = ts + 22478
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22434
+				zErr = ts + 22495
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22450
+				zErr = ts + 22511
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22470, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -107067,7 +107945,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22503, 0)
+				ts+22564, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107223,11 +108101,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22550,
-	ts + 22603,
-	ts + 22007,
-	ts + 22654,
-	ts + 22706,
+	ts + 22611,
+	ts + 22664,
+	ts + 22068,
+	ts + 22715,
+	ts + 22767,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108424,8 +109302,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -108436,13 +109313,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -108626,19 +109500,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22756,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22817,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19750
+							return ts + 22859
 						}
-						return ts + 22798
+						return ts + 22868
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22804, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22874, 0)
 		}
 	}
 
@@ -108706,7 +109580,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22838,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22908,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109803,7 +110677,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22876, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110778,21 +111652,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16251, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16267, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16164, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16180, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -111535,7 +112409,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22925)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22995)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -111699,7 +112573,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -111916,9 +112790,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 6704
+							return ts + 6764
 						}
-						return ts + 6709
+						return ts + 6769
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -111930,6 +112804,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -112197,19 +113076,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22958, 0)
+					ts+23028, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23053, 0)
+					ts+23123, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23137, 0)
+					ts+23207, 0)
 			}
 			break
 		case uint32(273):
@@ -112588,9 +113467,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23222, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -113358,7 +114237,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23239, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23309, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -113381,7 +114260,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23264, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -113554,7 +114433,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23275, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -113567,11 +114446,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19870, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23282, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23287, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113584,9 +114463,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23297, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23301, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113825,7 +114704,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -114400,7 +115279,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -114415,7 +115294,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23309, 0)
+			ts+23379, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114606,23 +115485,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23377
+	var zErr uintptr = ts + 23447
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23391
+			zErr = ts + 23461
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23413
+			zErr = ts + 23483
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23435
+			zErr = ts + 23505
 			break
 
 		}
@@ -114640,35 +115519,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23458,
-	ts + 23471,
+	ts + 23528,
+	ts + 23541,
 	uintptr(0),
-	ts + 23487,
-	ts + 23512,
-	ts + 23526,
-	ts + 23545,
+	ts + 23557,
+	ts + 23582,
+	ts + 23596,
+	ts + 23615,
 	ts + 1490,
-	ts + 23570,
-	ts + 23607,
-	ts + 23619,
-	ts + 23634,
-	ts + 23667,
-	ts + 23685,
-	ts + 23710,
-	ts + 23739,
+	ts + 23640,
+	ts + 23677,
+	ts + 23689,
+	ts + 23704,
+	ts + 23737,
+	ts + 23755,
+	ts + 23780,
+	ts + 23809,
 	uintptr(0),
-	ts + 5848,
+	ts + 5838,
 	ts + 5334,
-	ts + 23756,
-	ts + 23774,
-	ts + 23792,
-	uintptr(0),
 	ts + 23826,
+	ts + 23844,
+	ts + 23862,
 	uintptr(0),
-	ts + 23847,
-	ts + 23873,
 	ts + 23896,
+	uintptr(0),
 	ts + 23917,
+	ts + 23943,
+	ts + 23966,
+	ts + 23987,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114769,6 +115648,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	libc.AtomicStoreNInt32(db+432, int32(1), 0)
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(libc.AtomicLoadNInt32(db+432, 0) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -114783,7 +115668,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114833,7 +115718,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23933, 0)
+				ts+24003, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114955,7 +115840,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23996, libc.VaList(bp, zName))
+		ts+24066, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115191,7 +116076,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24047, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24117, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115284,7 +116169,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -115354,7 +116239,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115364,7 +116249,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115401,14 +116286,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		}()
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24068, 0)
+				ts+24138, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -115538,7 +116423,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24136, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24206, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -115583,10 +116468,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24142, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24152,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115691,7 +116576,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24180, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115702,17 +116587,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24184, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24184
+	zModeType = ts + 24254
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24190, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -115750,7 +116635,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24195, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115758,7 +116643,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115798,7 +116683,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24239, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115822,15 +116707,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24255, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24262, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24270, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24273, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24276, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17346, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24340, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24343, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24346, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17362, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115976,10 +116861,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21802, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24280, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -115993,7 +116878,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -116044,9 +116929,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6381
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6441
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23282
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23352
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -116151,7 +117036,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24286
+		zFilename = ts + 24356
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, func() uint8 {
@@ -116269,21 +117154,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24289,
+	Xsqlite3_log(tls, iErr, ts+24359,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24314)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24384)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24334)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24341)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -116441,7 +117326,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24358, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -117097,7 +117982,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24386, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117215,7 +118100,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24394
+			return ts + 24464
 		}
 		return uintptr(0)
 	}(), 0)
@@ -117393,7 +118278,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6704, ts + 6709, ts + 6191, ts + 6186, ts + 7945, ts + 24417, ts + 24423,
+	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -117546,7 +118431,7 @@ __10:
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0' + int32(c)>>4)
-	c = *(*uint8)(unsafe.Pointer(ts + 24430 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24500 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -117601,7 +118486,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24447, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24517, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117665,13 +118550,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6704, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6709, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
 			break
 
 		}
@@ -118221,12 +119106,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6704, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6764, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6709, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6769, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(5))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -118327,7 +119212,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24476, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24546, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118633,7 +119518,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24491, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24561, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118648,7 +119533,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24495, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118702,7 +119587,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24521,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24591,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118807,11 +119692,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*uint8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zPath))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24564, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24634, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24567, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -118968,14 +119853,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24570, -1)
+			ts+24640, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, uint8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24621, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24691, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119070,7 +119955,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15364)
+	jsonWrongNumArgs(tls, ctx, ts+15380)
 	return
 __2:
 	;
@@ -119145,9 +120030,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24655
+			return ts + 24725
 		}
-		return ts + 24659
+		return ts + 24729
 	}())
 	return
 __2:
@@ -119280,7 +120165,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24666, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119377,7 +120262,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24669, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119421,7 +120306,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24672)
+		ts+24742)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -119552,7 +120437,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24755, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -119571,7 +120456,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24761, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -119667,7 +120552,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, uint8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24761, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119691,7 +120576,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24766
+				zRoot = ts + 24836
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119756,6 +120641,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -119807,7 +120698,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24476, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24546, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119902,25 +120793,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24768},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24773},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24802},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24815},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24818},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24822},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24834},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24846},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24857},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24868},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24880},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24893},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24912},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24923},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24940}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24838},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24843},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24872},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24885},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24888},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24892},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24904},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24916},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24927},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24938},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24950},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24963},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24982},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24993},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25010}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119939,8 +120830,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24958, FpModule: 0},
-	{FzName: ts + 24968, FpModule: 0},
+	{FzName: ts + 25028, FpModule: 0},
+	{FzName: ts + 25038, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120200,11 +121091,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24978, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24986, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25056, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -120415,7 +121306,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24991,
+		ts+25061,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -121113,7 +122004,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25073)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122454,7 +123345,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25087, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -122466,12 +123357,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25107, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25139, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122697,7 +123588,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25176, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25246, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -122720,14 +123611,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25321
+	var zFmt uintptr = ts + 25391
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11286, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -122768,7 +123659,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25377, ts + 5060, ts + 16251,
+	ts + 25447, ts + 5060, ts + 16267,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122811,19 +123702,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25382,
+			ts+25452,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25444, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25449,
+			ts+25519,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25513,
+			ts+25583,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25653,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122852,7 +123743,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25632
+			zFormat = ts + 25702
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122864,7 +123755,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25740,
+			ts+25810,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122872,18 +123763,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25785, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25855, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12757, 1)
+					Xsqlite3_str_append(tls, p, ts+12767, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25812, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25834, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25842, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122898,14 +123789,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25858,
-	ts + 25911,
-	ts + 25956,
-	ts + 26008,
-	ts + 26062,
-	ts + 26107,
-	ts + 26165,
-	ts + 26220,
+	ts + 25928,
+	ts + 25981,
+	ts + 26026,
+	ts + 26078,
+	ts + 26132,
+	ts + 26177,
+	ts + 26235,
+	ts + 26290,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122934,7 +123825,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26267, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -122946,7 +123837,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26287,
+			ts+26357,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -122954,7 +123845,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26344,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122996,10 +123887,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26379,
-		ts + 26422,
-		ts + 26457,
-		ts + 26493,
+		ts + 26449,
+		ts + 26492,
+		ts + 26527,
+		ts + 26563,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -123030,7 +123921,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26530,
+	Xsqlite3_str_appendf(tls, pSql, ts+26600,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -123042,7 +123933,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26554, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123065,7 +123956,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123161,7 +124052,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26563, ts + 26574}
+var azFormat = [2]uintptr{ts + 26633, ts + 26644}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -123199,13 +124090,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10858, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10920, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26584, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26590, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26594, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -123216,7 +124107,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26596, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26666, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123294,7 +124185,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26629,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26699,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4062
@@ -123318,7 +124209,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26636,
+			ts+26706,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123337,7 +124228,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26681, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26751, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -123351,8 +124242,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26713,
-		ts + 26767,
+		ts + 26783,
+		ts + 26837,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -123367,23 +124258,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26815,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26885,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26860
+					return ts + 26930
 				}
-				return ts + 26868
+				return ts + 26938
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26877,
+				ts+26947,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26860
+						return ts + 26930
 					}
-					return ts + 26868
+					return ts + 26938
 				}(), iKey, iVal))
 		}
 	}
@@ -123407,7 +124298,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26935, libc.VaList(bp, i, iCell, iNode))
+				ts+27005, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -123427,7 +124318,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26983, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27053, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -123444,14 +124335,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27050, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27084, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27154, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -123459,7 +124350,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27114,
+					ts+27184,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -123488,14 +124379,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27169,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27239,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27200, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -123517,12 +124408,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14493, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14503, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27267, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -123531,12 +124422,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25087, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27295, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27365, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -123550,8 +124441,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27326, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27333, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -123559,7 +124450,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27341, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27411, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -123574,7 +124465,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27345, -1)
+			ts+27415, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -123582,7 +124473,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6381
+			zDb = ts + 6441
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -123592,7 +124483,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17969
+				return ts + 18012
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123887,7 +124778,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -123945,6 +124836,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123957,15 +124849,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27396, 1)
+		Xsqlite3_str_append(tls, x, ts+27466, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27398, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27468, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27409, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123985,19 +124878,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep uint8 = uint8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27420, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27490, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27438, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27508, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = uint8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27446, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*uint8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27454, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27524, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27458, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -124016,6 +124909,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -124047,6 +124941,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -124055,6 +124950,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -124113,6 +125009,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -124281,6 +125178,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -124302,6 +125200,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -124386,6 +125285,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -124414,6 +125315,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124852,6 +125754,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124865,6 +125768,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -124879,6 +125785,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -124903,7 +125810,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27471, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27541, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124912,7 +125819,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27493, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -124920,7 +125827,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124999,6 +125906,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -125127,6 +126035,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -125145,7 +126054,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16251
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16267
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -125155,7 +126064,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27497
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27567
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -125163,7 +126072,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27503
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27573
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125275,7 +126184,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27512, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -125405,14 +126314,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27552) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27568) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27638) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -125449,8 +126360,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -125467,7 +126378,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -125477,7 +126388,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27583, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -125489,25 +126400,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27591},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27604},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27617},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27630},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27568},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27642},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27552},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27665},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27679},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27692},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27706},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27722},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27661},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27674},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27687},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27700},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27638},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27712},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27622},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27735},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27749},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27762},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27776},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27792},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27734},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -125517,26 +126428,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27753, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27763, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27774, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27497, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27785, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125590,7 +126501,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25073, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125917,7 +126828,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27795, -1)
+		Xsqlite3_result_error(tls, context, ts+27865, -1)
 		return
 	}
 
@@ -125928,7 +126839,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27795, -1)
+			Xsqlite3_result_error(tls, context, ts+27865, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126029,7 +126940,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27816, uintptr(0), uintptr(0), p+64)
+				ts+27886, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -126093,7 +127004,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+24986, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25056, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -126114,16 +127025,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+27987, libc.VaList(bp, func() uintptr {
+			ts+28057, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28137
+					return ts + 28207
 				}
 				return ts + 1554
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28178)
+			ts+28248)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126239,7 +127150,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28303, libc.VaList(bp, zTab)))
+			ts+28373, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126257,7 +127168,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28422, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28492, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126275,7 +127186,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28443, libc.VaList(bp+16, zIdx)))
+			ts+28513, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126298,7 +127209,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28494, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28564, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126344,7 +127255,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -126359,7 +127270,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -126399,7 +127310,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19396, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -126409,18 +127320,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+28572, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+28591, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28661, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28596, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28666, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -126432,18 +127343,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28606, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28635
+							return ts + 28705
 						}
-						return ts + 28648
+						return ts + 28718
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+28657, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -126457,7 +127368,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28679,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28749,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -126504,8 +127415,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+28706, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14604
+		zList = rbuMPrintf(tls, p, ts+28776, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14614
 	}
 	return zList
 }
@@ -126522,7 +127433,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+28715, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -126544,25 +127455,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+28728, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28760, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28830, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+28783)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28789, ts+28796, ts+4957)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+28853)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28859, ts+28866, ts+4957)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+28804,
+					ts+28874,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28846, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28916, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126604,7 +127515,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -126639,7 +127550,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28866
+	zCol = ts + 28936
 __7:
 	;
 	goto __5
@@ -126647,13 +127558,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28874,
+	zLhs = rbuMPrintf(tls, p, ts+28944,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28895,
+	zOrder = rbuMPrintf(tls, p, ts+28965,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28931,
+	zSelect = rbuMPrintf(tls, p, ts+29001,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14604
+	zSep = ts + 14614
 	iCol++
 	goto __1
 __2:
@@ -126671,7 +127582,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+28958,
+		Xsqlite3_mprintf(tls, ts+29028,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -126698,8 +127609,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29006, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14604
+	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14614
 	goto __15
 __15:
 	iCol++
@@ -126710,7 +127621,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29013, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126743,7 +127654,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126755,7 +127666,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29025, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29095, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1554
 		} else {
@@ -126767,37 +127678,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28866
+					zCol = ts + 28936
 				} else {
-					zCol = ts + 28596
+					zCol = ts + 28666
 				}
 				zType = ts + 1119
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29047, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28783
+					return ts + 28853
 				}
 				return ts + 1554
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29067,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29088,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29121, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14604
-		zAnd = ts + 21464
+		zCom = ts + 14614
+		zAnd = ts + 21525
 		nBind++
 	}
 
@@ -126836,11 +127747,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+29145, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29215, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29157, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14604
+			zS = ts + 14614
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126848,7 +127759,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29166, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29236, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126860,18 +127771,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29181, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1554
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29195, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21525
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29207, libc.VaList(bp+40, zList))
+			ts+29277, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1554
@@ -126879,8 +127790,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29257, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21525
 			}
 		}
 	}
@@ -126889,7 +127800,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29270, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29340, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126907,17 +127818,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c uint8 = *(*uint8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29257,
+					zList = rbuMPrintf(tls, p, ts+29327,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29296,
+					zList = rbuMPrintf(tls, p, ts+29366,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29326,
+					zList = rbuMPrintf(tls, p, ts+29396,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				}
 			}
 		}
@@ -126952,19 +127863,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29363
+		var zSep uintptr = ts + 29433
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16139) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16155) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126976,15 +127887,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 28783
+					zDesc = ts + 28853
 				} else {
 					zDesc = ts + 1554
 				}
-				z = rbuMPrintf(tls, p, ts+29376, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14604
+				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14614
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29387, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -127004,7 +127915,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29391)
+			ts+29461)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -127013,7 +127924,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127023,25 +127934,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29441, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29511, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29463, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28783
+						return ts + 28853
 					}
 					return ts + 1554
 				}()))
-				zComma = ts + 14604
+				zComma = ts + 14614
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29473, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29488,
+			ts+29558,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -127054,7 +127965,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1554
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1554
@@ -127062,39 +127973,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29550
+				zPk = ts + 29620
 			}
-			zSql = rbuMPrintf(tls, p, ts+29563,
+			zSql = rbuMPrintf(tls, p, ts+29633,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29590
+							return ts + 29660
 						}
 						return ts + 1554
 					}()))
-			zComma = ts + 14604
+			zComma = ts + 14614
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29600, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29670, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29607,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29677,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29639
+						return ts + 29709
 					}
 					return ts + 1554
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -127107,7 +128018,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+29654,
+				ts+29724,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127144,7 +128055,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+29711)
+			ts+29781)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -127249,7 +128160,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29777, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29847, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127269,24 +128180,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29797,
+				ts+29867,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+29862, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29932, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+29898, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127302,7 +128213,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29932,
+						ts+30002,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127310,9 +128221,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29993
+											return ts + 30063
 										}
-										return ts + 29997
+										return ts + 30067
 									}()
 								}
 								return ts + 1554
@@ -127321,20 +128232,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30003,
+						ts+30073,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30064,
+						ts+30134,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29993
+									return ts + 30063
 								}
-								return ts + 29997
+								return ts + 30067
 							}(),
 							zCollist, zLimit))
 				}
@@ -127359,8 +128270,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6392)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6388)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6452)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -127371,16 +128282,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1554
 				}
-				return ts + 30223
+				return ts + 30293
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30232,
+						ts+30302,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30268
+								return ts + 30338
 							}
 							return ts + 1554
 						}(), zBindings)))
@@ -127389,32 +128300,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30278, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1554
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30306
+					zRbuRowid = ts + 30376
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30318, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30388, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30394
+							return ts + 30464
 						}
 						return ts + 1554
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30411,
+					ts+30481,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30710,
+						ts+30780,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -127427,9 +128338,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30809
+						zRbuRowid = ts + 30879
 					} else {
-						zRbuRowid = ts + 30819
+						zRbuRowid = ts + 30889
 					}
 				}
 
@@ -127442,20 +128353,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28866, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30830,
+							ts+30900,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30878
+										return ts + 30948
 									}
 									return ts + 1554
 								}(),
@@ -127468,7 +128379,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19750
+										return ts + 22859
 									}
 									return ts + 1554
 								}(), zOrder,
@@ -127536,9 +128447,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1554
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30223
+				zPrefix = ts + 30293
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30884,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -127597,7 +128508,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+30914, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+30984, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -127667,28 +128578,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30944, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30972, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31042, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+48, ts+3286, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6381, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6441, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30990, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127721,11 +128632,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31056, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31126, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24136, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -127737,13 +128648,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31088,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381),
+			zTarget = Xsqlite3_mprintf(tls, ts+31158,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
 						}
-						return ts + 31120
+						return ts + 31190
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
@@ -127762,37 +128673,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31122, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31137, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31154, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31198, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31268, 0)
 	}
 }
 
@@ -127821,15 +128732,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31216, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31286, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -127877,7 +128788,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -127937,7 +128848,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127954,23 +128865,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31251, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31321, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31276, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31283, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128087,7 +128998,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23774, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23844, 0)
 			return
 		}
 
@@ -128180,7 +129091,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+31290)
+			ts+31360)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -128188,7 +129099,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31312, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31382, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -128209,7 +129120,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+31339,
+				ts+31409,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128239,9 +129150,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+31497, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31567, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31512,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31582,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128255,10 +129166,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31532, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31602, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31557)
+			ts+31627)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128272,12 +129183,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31665)
+			ts+31735)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+31730)
+			ts+31800)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128289,7 +129200,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31774, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31844, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128309,15 +129220,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17224)
-					rbuCopyPragma(tls, p, ts+16335)
+					rbuCopyPragma(tls, p, ts+17240)
+					rbuCopyPragma(tls, p, ts+16351)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31799, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31869, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128341,10 +129252,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -128439,7 +129350,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31827, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31897, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -128452,16 +129363,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31276, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -128471,7 +129383,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31852, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -128505,7 +129417,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31863, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -128535,13 +129447,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31935, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31949)
+				ts+32019)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -128552,7 +129464,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+32006)
+				ts+32076)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -128626,7 +129538,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32080, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32150, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -128644,12 +129556,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32112,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32182,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32144
+							return ts + 32214
 						}
-						return ts + 32151
+						return ts + 32221
 					}()))
 			}
 		}
@@ -128657,7 +129569,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14493, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14503, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -128668,19 +129580,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16938)
-						rbuCopyPragma(tls, p, ts+16350)
+						rbuCopyPragma(tls, p, ts+16954)
+						rbuCopyPragma(tls, p, ts+16366)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32158, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32174, uintptr(0), uintptr(0), p+64)
+								db, ts+32244, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -128734,7 +129646,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32198, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32268, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128761,7 +129673,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30223, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30293, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -128778,7 +129690,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128791,13 +129703,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32206, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32276, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128892,7 +129804,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128909,19 +129821,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14493
+				zBegin = ts + 14503
 			} else {
-				zBegin = ts + 32158
+				zBegin = ts + 32228
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32158, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32228, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129044,11 +129956,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -129187,7 +130102,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -129264,7 +130179,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32233, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32303, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129289,7 +130204,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32256, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129434,7 +130349,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6381)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6441)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -129449,7 +130364,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32267, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32337, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129460,7 +130375,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -129490,6 +130411,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -130253,11 +131189,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11286, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11348, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32278, 0)
+				ts+32348, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
 		} else {
@@ -130270,7 +131206,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32399, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -130368,7 +131304,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11286, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130835,6 +131771,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -130917,6 +131856,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -130946,9 +131886,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32428,
+			zRet = Xsqlite3_mprintf(tls, ts+32498,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 21464
+			zSep = ts + 21525
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130971,9 +131911,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32462,
+				ts+32532,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 32503
+			zSep = ts + 32573
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130981,18 +131921,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7470, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32508,
+		ts+32578,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -131002,7 +131942,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -131035,7 +131975,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32586,
+			ts+32656,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -131162,7 +132102,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32639, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -131636,9 +132576,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11286, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11348, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32666, libc.VaList(bp, zDb))
+			ts+32736, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -131647,18 +132587,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1554
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32776, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32846, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1567, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32791, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32861, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+32799, bp+24)
+				sessionAppendStr(tls, bp+8, ts+32869, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21464
+				zSep = ts + 21525
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131767,7 +132707,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32805, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32875, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -131859,7 +132799,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32825, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -132122,7 +133062,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132145,7 +133085,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -132187,7 +133127,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132248,7 +133188,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -132322,13 +133262,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -132390,7 +133330,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -132763,7 +133703,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -132931,7 +133871,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11286) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11348) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -132942,34 +133882,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32843, bp+16)
+				sessionAppendStr(tls, bp, ts+32913, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32856, bp+16)
+				sessionAppendStr(tls, bp, ts+32926, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+32862, bp+16)
+						sessionAppendStr(tls, bp, ts+32932, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14604
+						zSep = ts + 14614
 					}
 				}
 
 				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32791, bp+16)
+				sessionAppendStr(tls, bp, ts+32861, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32867, bp+16)
+								ts+32937, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32799, bp+16)
+							sessionAppendStr(tls, bp, ts+32869, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21464
+						zSep = ts + 21525
 					}
 				}
 
@@ -133021,34 +133961,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32942, bp+16)
+	sessionAppendStr(tls, bp, ts+33012, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32791, bp+16)
+	sessionAppendStr(tls, bp, ts+32861, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+32862, bp+16)
+			sessionAppendStr(tls, bp, ts+32932, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21464
+			zSep = ts + 21525
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32960, bp+16)
+		sessionAppendStr(tls, bp, ts+33030, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32503, bp+16)
+		sessionAppendStr(tls, bp, ts+32573, bp+16)
 
 		zSep = ts + 1554
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+32799, bp+16)
+				sessionAppendStr(tls, bp, ts+32869, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 32968
+				zSep = ts + 33038
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4957, bp+16)
@@ -133064,7 +134004,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6381, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -133075,19 +134015,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32973, bp+16)
+	sessionAppendStr(tls, bp, ts+33043, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21470, bp+16)
+	sessionAppendStr(tls, bp, ts+21531, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14604, bp+16)
+			sessionAppendStr(tls, bp, ts+14614, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+32991, bp+16)
+	sessionAppendStr(tls, bp, ts+33061, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33002, bp+16)
+		sessionAppendStr(tls, bp, ts+33072, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+4957, bp+16)
 
@@ -133103,14 +134043,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11286, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11348, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33006)
+			ts+33076)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33119)
+			ts+33189)
 	}
 	return rc
 }
@@ -133138,7 +134078,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -133147,7 +134087,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -133224,7 +134164,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -133350,7 +134290,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -133391,7 +134331,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33263, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33333, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -133407,7 +134347,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33284, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33354, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -133480,10 +134420,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33303, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33373, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33329, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -133529,7 +134469,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6381, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6441, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -133542,19 +134482,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33359, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33403,
+						ts+33473,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33474, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11286) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11348) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133605,14 +134545,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33534, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33588, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134860,7 +135800,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33616, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135148,7 +136088,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33644, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135335,7 +136275,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33675, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -135403,7 +136343,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33682
+		var zErr uintptr = ts + 33752
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135585,7 +136525,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33732
+		var zErr uintptr = ts + 33802
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135909,13 +136849,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33780, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33788, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33798, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136466,7 +137406,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33803, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33873, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -136493,14 +137433,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*uint8)(unsafe.Pointer(p))) < '0' || int32(*(*uint8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33810, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33880, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33841, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136511,7 +137451,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33874, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136524,7 +137464,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33911, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -136533,7 +137473,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33920, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33990, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136552,7 +137492,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33953, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136567,14 +137507,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33987, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33995, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*uint8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34027, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136582,9 +137522,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34033, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34047, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136592,9 +137532,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34085, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
 		if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || int32(*(*uint8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34096, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34166, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -136604,19 +137544,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 7958, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17329},
-			{FzName: ts + 34131, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17345},
+			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34139, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34209, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34170, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136663,15 +137603,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22130) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16251) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34198, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22191) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34228) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34238, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34308, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136688,13 +137628,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34269, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34274, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34281, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34351, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136732,8 +137672,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22130) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34289, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22191) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136765,7 +137705,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34318, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34388, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136802,19 +137742,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33987
+			zTail = ts + 34057
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34338
+			zTail = ts + 34408
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34346, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16251, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16267, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136858,18 +137798,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34357, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34427, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1554
 			}
-			return ts + 14604
+			return ts + 14614
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34373, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34443, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34380,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22130))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136979,7 +137919,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34406) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136989,7 +137929,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34411) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34481) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136999,7 +137939,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34420) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34490) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137012,7 +137952,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34430) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34500) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137022,7 +137962,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34440) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34510) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137038,7 +137978,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22130) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22191) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -137061,7 +138001,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34452
+	var zSelect uintptr = ts + 34522
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -137083,7 +138023,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34484) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34554) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -137097,7 +138037,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34492,
+				ts+34562,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -137195,7 +138135,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34557, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
 					return FTS5_EOF
 				}
 			}
@@ -137208,20 +138148,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34577, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34647, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34608, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34678, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34611, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29993, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -137307,6 +138247,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*uint8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -137335,7 +138286,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 1))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*uint8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = uint8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -138988,9 +139939,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34615, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33644, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139006,7 +139957,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c uint8 = *(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34620, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -139093,7 +140044,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20467, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -139174,7 +140125,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34649, 0)
+			ts+34719, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -139344,12 +140295,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34702,
+								ts+34772,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34752
+										return ts + 34822
 									}
-									return ts + 34615
+									return ts + 34685
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140292,7 +141243,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34759, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34829, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -140371,7 +141322,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+34765,
+			ts+34835,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -140396,7 +141347,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34816,
+			ts+34886,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -140419,7 +141370,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+34865,
+			ts+34935,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140658,7 +141609,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+34905, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141857,7 +142808,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+34928,
+			ts+34998,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143323,7 +144274,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+35012,
+			ts+35082,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -143814,10 +144765,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -144400,13 +145356,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35069, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24986, ts+35077, 0, pzErr)
+				pConfig, ts+25056, ts+35147, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11426,
-					ts+35112,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
+					ts+35182,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144659,7 +145615,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34759, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -144773,7 +145729,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35156,
+		ts+35226,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -144943,7 +145899,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35242)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35312)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -145214,7 +146170,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35247, 0)
+			ts+35317, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145638,11 +146594,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35286,
+		ts+35356,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14604
+					return ts + 14614
 				}
 				return ts + 1554
 			}(),
@@ -145654,9 +146610,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35341
+					return ts + 35411
 				}
-				return ts + 35346
+				return ts + 35416
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145702,12 +146658,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35350, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35420, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5057, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35356, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145738,7 +146694,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35384, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35454, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -145769,7 +146725,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35394, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35464, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145801,14 +146757,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35415, libc.VaList(bp, z))
+				ts+35485, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33798
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33868
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145864,7 +146820,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35247, 0)
+		ts+35317, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146081,7 +147037,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35448, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -146226,28 +147182,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35484, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35554, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35495, 0)
+				ts+35565, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35575, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35583, 0)
+				ts+35653, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16918, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35639, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35715, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146305,7 +147261,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17463, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17479, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -146318,12 +147274,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35661,
+				ts+35731,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20368
+						return ts + 20429
 					}
-					return ts + 35698
+					return ts + 35768
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146953,7 +147909,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35710, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35780, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -147197,7 +148153,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35731, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -147216,7 +148172,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35753, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35823, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147263,7 +148219,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35784)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35854)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147272,7 +148228,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35797, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35867, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -147286,7 +148242,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35888, ts + 33987, ts + 24986, ts + 34338, ts + 11426,
+	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147310,7 +148266,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35895, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147328,13 +148284,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35895, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35900, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35970, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -147389,17 +148347,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35915,
-			ts + 35983,
-			ts + 36052,
-			ts + 36085,
-			ts + 36124,
-			ts + 36164,
-			ts + 36203,
-			ts + 36244,
-			ts + 36283,
-			ts + 36325,
-			ts + 36365,
+			ts + 35985,
+			ts + 36053,
+			ts + 36122,
+			ts + 36155,
+			ts + 36194,
+			ts + 36234,
+			ts + 36273,
+			ts + 36314,
+			ts + 36353,
+			ts + 36395,
+			ts + 36435,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -147501,18 +148459,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36388,
+		ts+36458,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36492,
+			ts+36562,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36530,
+			ts+36600,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -147524,7 +148482,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36568,
+			ts+36638,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147536,14 +148494,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24986, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11426, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35888, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25056, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34338, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33987, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147555,17 +148513,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36610,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36680,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29639
+					return ts + 29709
 				}
 				return ts + 1554
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36640,
+			ts+36710,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147602,27 +148560,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36684, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36707, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36777, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33987, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34338, ts+36713, 0, pzErr)
+				pConfig, ts+34408, ts+36783, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35888, ts+36745, 1, pzErr)
+				pConfig, ts+35958, ts+36815, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147828,12 +148786,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36762,
+		ts+36832,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36812,
+			ts+36882,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147841,7 +148799,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148017,7 +148975,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36841,
+	zSql = Xsqlite3_mprintf(tls, ts+36911,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -148199,14 +149157,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33987, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34057, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34338, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34408, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -148401,9 +149359,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36873) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36943) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148618,7 +149576,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36895
+			var zCat uintptr = ts + 36965
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148630,7 +149588,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36904) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -148641,18 +149599,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36915) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36985) {
 					if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '2' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*uint8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36873) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36943) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36904) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148928,7 +149886,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36933
+	var zBase uintptr = ts + 37003
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -149070,7 +150028,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36943, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149078,11 +150036,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36946, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36951, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149090,7 +150048,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36956, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149098,7 +150056,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36959, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149106,11 +150064,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36962, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36967, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37037, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149118,19 +150076,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36972, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36976, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37046, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36982, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37052, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36987, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37057, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149138,11 +150096,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36991, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36995, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149150,7 +150108,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36998, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149158,11 +150116,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37002, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37076, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149170,7 +150128,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37010, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149178,7 +150136,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37014, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149186,7 +150144,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37018, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149202,24 +150160,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37002, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37092, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37028, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37098, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37018, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37088, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -149234,137 +150192,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37105, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37043, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37050, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37055, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36951, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37060, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36946, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37018, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37070, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15464, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37075, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37028, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37079, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37154, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36987, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37090, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37094, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37096, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37010, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37018, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37110, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37116, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37121, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37127, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37014, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37143, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37010, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37155, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37161, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37014, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37167, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37028, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -149379,16 +150337,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37174, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37244, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149396,21 +150354,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37143, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149418,7 +150376,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37196, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -149426,9 +150384,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37202, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -149443,12 +150401,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37208, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37212, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37215, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -149457,7 +150415,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149613,7 +150571,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37222) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37292) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149793,22 +150751,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36933, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37237, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37243, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37250, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -150951,14 +151909,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37258) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37328) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37262) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37266) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37275, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150984,19 +151942,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 37309,
-		ts + 37349,
-		ts + 37384,
+		ts + 37379,
+		ts + 37419,
+		ts + 37454,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23282, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23352, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37427, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151129,11 +152087,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37460, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37491,
+		ts+37561,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -151157,7 +152115,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37542, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -151552,7 +152510,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37568, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151574,7 +152532,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37578
+	return ts + 37648
 }
 
 func init() {
@@ -151629,114 +152587,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -152197,6 +153157,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -152515,6 +153487,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -152536,5 +153509,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_linux_riscv64.go b/vendor/modernc.org/sqlite/lib/sqlite_linux_riscv64.go
index 299da005..3f33db0b 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_linux_riscv64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_linux_riscv64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_riscv64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_riscv64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -497,6 +497,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -612,6 +613,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -986,6 +988,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1473,6 +1476,7 @@ const (
 	SF_Recursive                          = 0x0002000
 	SF_Resolved                           = 0x0000004
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1557,6 +1561,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1674,6 +1679,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -2039,6 +2045,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -2136,11 +2143,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -2155,7 +2165,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2262,8 +2272,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2743,6 +2753,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -4165,6 +4176,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -5780,10 +5792,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -5848,12 +5858,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -6105,7 +6113,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -6226,7 +6233,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -6250,11 +6257,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -6262,11 +6271,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -6898,7 +6907,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -7036,10 +7045,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -7054,12 +7061,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -7249,10 +7254,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -7456,7 +7463,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1099))
@@ -7608,7 +7615,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -7657,8 +7663,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -7669,6 +7685,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -7785,7 +7810,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8636,14 +8661,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = uint8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -8651,7 +8676,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -10462,7 +10487,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -10718,6 +10743,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -11704,6 +11731,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -11712,11 +11740,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -11728,30 +11780,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1554
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -11760,83 +11812,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -11850,17 +11902,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -11868,90 +11920,90 @@ __219:
 		}
 		return ts + 1560
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(j))) = uint8(0)
 	length = int32(j)
@@ -11959,89 +12011,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -12054,32 +12106,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -12138,7 +12190,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -12154,8 +12206,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -12184,12 +12235,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -12198,7 +12250,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -13328,6 +13380,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -13933,10 +14003,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13962,6 +14035,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = uint8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]uint8{}))-uint64(1)-uint64(i))
+	return int32(uint64(unsafe.Sizeof([22]uint8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14918,11 +14992,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -15825,7 +15900,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -16048,7 +16123,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -16064,113 +16139,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -16302,7 +16377,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16593,7 +16668,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3378, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16610,14 +16685,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16637,7 +16712,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16705,7 +16780,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -16932,7 +17007,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16960,7 +17035,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -17059,7 +17134,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3261, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -17189,7 +17264,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -17235,7 +17310,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -17466,7 +17541,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17600,7 +17675,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+16)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17621,7 +17696,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17937,7 +18012,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3261, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18028,7 +18103,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43337)
 		}
 		return rc
 	}
@@ -18036,9 +18111,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18081,12 +18156,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*uint8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -18105,18 +18177,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*24 + 8)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3459, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3459, zIn, 43443)
 			}
 		} else if (*stat)(unsafe.Pointer(bp)).Fst_mode&X__mode_t(0170000) == X__mode_t(0120000) {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls, zIn, bp+128, uint64(unsafe.Sizeof([4098]uint8{}))-uint64(2))
 			if got <= int64(0) || got >= Ssize_t(unsafe.Sizeof([4098]uint8{}))-int64(2) {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3450, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3450, zIn, 43454)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 128 + uintptr(got))) = uint8(0)
@@ -18156,14 +18228,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 4104)).FzOut = zOut
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, bp, uint64(unsafe.Sizeof([4098]uint8{}))-uint64(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3279, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3279, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+4104, bp)
 	}
 	appendAllPathElements(tls, bp+4104, zPath)
 	*(*uint8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+4104)).FnUsed))) = uint8(0)
 	if (*DbPath)(unsafe.Pointer(bp+4104)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+4104)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4104)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18264,7 +18336,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == EINTR {
 				got = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*24 + 8)))(tls, fd, zBuf, uint64(nBuf)))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -18272,12 +18344,12 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 }
 
 func unixSleep(tls *libc.TLS, NotUsed uintptr, microseconds int32) int32 {
-	if microseconds >= 1000000 {
-		libc.Xsleep(tls, uint32(microseconds/1000000))
-	}
-	if microseconds%1000000 != 0 {
-		libc.Xusleep(tls, uint32(microseconds%1000000))
-	}
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	(*timespec)(unsafe.Pointer(bp)).Ftv_sec = X__time_t(microseconds / 1000000)
+	(*timespec)(unsafe.Pointer(bp)).Ftv_nsec = X__syscall_slong_t(microseconds % 1000000 * 1000)
+	libc.Xnanosleep(tls, bp, uintptr(0))
 	_ = NotUsed
 	return microseconds
 }
@@ -22188,7 +22260,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -23240,7 +23312,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -23257,7 +23328,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -23323,7 +23393,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -23333,7 +23402,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23524,36 +23593,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -23725,7 +23783,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23849,7 +23907,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23888,7 +23946,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23965,7 +24023,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24877,10 +24935,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0)}
@@ -24966,7 +25026,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25723,7 +25783,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25822,7 +25882,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -26408,7 +26468,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26683,7 +26743,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27156,7 +27216,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27661,7 +27721,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27896,8 +27956,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27905,23 +27965,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -28317,7 +28379,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28454,7 +28516,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -28471,7 +28533,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -28479,7 +28541,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -28522,7 +28584,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28532,7 +28594,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -28782,7 +28844,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28829,7 +28891,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28839,7 +28901,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28852,7 +28914,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28861,14 +28923,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28878,7 +28940,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -28942,7 +29004,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -28952,7 +29014,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28974,7 +29036,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -29009,7 +29071,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -29022,13 +29084,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -29053,7 +29115,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -29064,7 +29126,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -29116,22 +29178,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29141,7 +29203,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29149,7 +29211,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29157,10 +29219,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29184,13 +29246,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29198,7 +29259,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29206,32 +29306,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -29259,11 +29348,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -29274,15 +29363,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29310,14 +29399,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2) + 1)))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -29331,7 +29420,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29343,7 +29432,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29446,7 +29535,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29474,7 +29563,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29513,7 +29602,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -30396,7 +30485,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30811,7 +30900,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30837,7 +30926,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -30846,7 +30935,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30857,7 +30946,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30873,7 +30962,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30934,7 +31023,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30969,7 +31058,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -31029,7 +31118,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31068,7 +31157,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31099,7 +31188,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31440,7 +31529,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31684,14 +31773,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31736,7 +31825,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31785,7 +31874,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -31865,7 +31954,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31956,7 +32045,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -31976,7 +32065,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32040,18 +32129,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -32067,6 +32146,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -32188,7 +32275,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -32392,7 +32479,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32457,7 +32544,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -32505,7 +32592,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -32624,7 +32711,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32784,7 +32871,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32849,7 +32936,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32885,7 +32972,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32929,7 +33016,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -33041,7 +33128,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -33199,7 +33286,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33256,7 +33343,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -33272,7 +33359,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -33346,7 +33433,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33358,7 +33445,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -33369,7 +33456,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33534,7 +33621,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33558,9 +33645,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -33583,16 +33670,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -33613,9 +33698,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -33749,11 +33840,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -33806,12 +33900,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -33819,7 +33913,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33879,7 +33973,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -33968,7 +34062,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -34084,7 +34178,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -34127,8 +34221,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -34210,6 +34304,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -34402,7 +34498,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -34413,7 +34509,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -34571,7 +34667,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -34645,7 +34741,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -34671,9 +34767,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -34684,8 +34781,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -34707,7 +34804,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -34735,7 +34832,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -34996,11 +35093,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -35188,7 +35285,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -35226,7 +35323,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -35303,7 +35400,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -35315,19 +35412,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -35340,7 +35429,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35359,6 +35448,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -35394,7 +35500,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -35403,13 +35508,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -35420,7 +35524,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -35533,7 +35637,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -35547,20 +35651,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -35570,7 +35674,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -35578,100 +35688,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx) + 1)))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -35680,30 +35790,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -35726,7 +35836,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -35745,13 +35854,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, uint64(nIn))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -35768,7 +35879,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35827,9 +35938,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -35869,7 +35980,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -35877,11 +35988,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx) + 1)))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35956,7 +36067,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)) + 1)))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35966,7 +36077,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -36025,7 +36136,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36054,7 +36165,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -36130,7 +36241,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36144,7 +36255,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36278,7 +36389,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36453,12 +36564,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -36466,15 +36606,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4062, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -36498,9 +36638,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if libc.AtomicLoadNInt32((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb+432, 0) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -36514,7 +36651,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
 		return
@@ -36588,7 +36725,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -36673,48 +36812,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4318, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4356, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -36729,29 +36875,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -36759,28 +36905,28 @@ __9:
 	pc = U32(int32(*(*U8)(unsafe.Pointer(pCellIdx)))<<8 | int32(*(*U8)(unsafe.Pointer(pCellIdx + 1))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4470,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4500, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -36788,97 +36934,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4548, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2) + 1))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -36888,48 +37034,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4610,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -36958,9 +37104,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -36992,19 +37138,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -37016,7 +37156,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -37024,7 +37164,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -37109,7 +37249,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -37152,22 +37292,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -37394,8 +37531,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -37895,7 +38032,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
 		libc.Xmemcpy(tls, bp+8, p, uint64(int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int*2))
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+16, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+16, ts+4925,
@@ -37907,6 +38044,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*uint8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+16)).FnChar))) = uint8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 16)).FnChar)
 	}
 }
 
@@ -38094,7 +38232,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -38268,16 +38405,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -38720,7 +38859,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38957,43 +39096,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -39378,7 +39508,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39393,14 +39523,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39770,7 +39900,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -39782,13 +39914,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -39865,6 +39999,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -40753,7 +40890,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -40762,7 +40899,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -40796,7 +40933,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -40838,7 +40974,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -41590,7 +41726,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -41698,7 +41834,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42249,7 +42385,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -42314,7 +42450,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42348,7 +42484,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42398,7 +42534,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -42544,7 +42680,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -42715,7 +42851,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42741,7 +42877,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -43015,7 +43151,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43382,13 +43518,16 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = func() uint8 {
-			if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
-				return uint8(SQLITE_UTF16BE)
-			}
-			return uint8(SQLITE_UTF16LE)
-		}()
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = func() uint8 {
+				if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
+					return uint8(SQLITE_UTF16BE)
+				}
+				return uint8(SQLITE_UTF16LE)
+			}()
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -43398,7 +43537,7 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, func() uint8 {
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), func() uint8 {
 		if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
 			return uint8(SQLITE_UTF16BE)
 		}
@@ -43407,11 +43546,11 @@ func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDe
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -43599,6 +43738,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -43651,7 +43791,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -43715,6 +43855,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -43726,9 +43875,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5357)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -43962,7 +44112,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -43986,8 +44136,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -44161,15 +44311,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5367, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44280,19 +44430,22 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = func() uint8 {
-			if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
-				return uint8(SQLITE_UTF16BE)
-			}
-			return uint8(SQLITE_UTF16LE)
-		}()
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = func() uint8 {
+				if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
+					return uint8(SQLITE_UTF16BE)
+				}
+				return uint8(SQLITE_UTF16LE)
+			}()
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, func() uint8 {
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, func() uint8 {
 		if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
 			return uint8(SQLITE_UTF16BE)
 		}
@@ -44581,7 +44734,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -44725,7 +44878,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -44897,7 +45050,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*uint8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5407, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5397, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -44952,21 +45105,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5418, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5431, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5434, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5424, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5439, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
 			}
 		}
 	}
@@ -45058,11 +45211,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity uint8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -45193,8 +45346,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -45429,7 +45582,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -45530,593 +45682,597 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
+
+	case OP_IfNoHope:
 		goto __100
-	case OP_NotFound:
+	case OP_NoConflict:
 		goto __101
-	case OP_Found:
+	case OP_NotFound:
 		goto __102
+	case OP_Found:
+		goto __103
 
 	case OP_SeekRowid:
-		goto __103
-	case OP_NotExists:
 		goto __104
-
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46125,56 +46281,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -46182,20 +46338,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -46203,124 +46360,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5441, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5462, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5452, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5469, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5459, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -46328,10 +46485,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -46342,9 +46499,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -46352,171 +46509,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint64(uintptr(0)+24))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -46524,95 +46681,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = uint8(0)
@@ -46620,231 +46777,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -46853,95 +47010,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46951,189 +47108,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -47142,38 +47303,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -47181,9 +47342,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -47194,298 +47355,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -47495,144 +47657,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -47640,353 +47802,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len))
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = uint8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5493,
+	Xsqlite3VdbeError(tls, p, ts+5483,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*uint8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -48000,319 +48162,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*uint8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -48320,467 +48471,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5534, 0)
+	Xsqlite3VdbeError(tls, p, ts+5524, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5585, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5607, 0)
+		ts+5597, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5661, 0)
+		ts+5651, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5716
+				return ts + 5706
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5764
+					return ts + 5754
 				}
-				return ts + 5807
+				return ts + 5797
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5848)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -48788,67 +48950,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -48859,24 +49021,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -48884,30 +49046,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -48923,22 +49085,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -48952,133 +49114,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1554
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -49086,18 +49248,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49108,92 +49270,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -49211,106 +49373,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -49319,108 +49481,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49428,14 +49590,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -49445,108 +49607,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, uint8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -49565,35 +49727,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -49601,123 +49763,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49727,52 +49889,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -49784,15 +49946,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -49800,13 +49963,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -49819,11 +49982,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -49834,38 +49997,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -49877,47 +50040,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -49926,35 +50089,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49963,51 +50126,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -50017,72 +50180,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50090,43 +50253,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50134,84 +50297,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50221,34 +50389,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -50257,10 +50425,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -50277,14 +50445,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50297,21 +50465,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50323,62 +50491,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5876)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -50391,56 +50559,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -50451,54 +50619,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -50506,72 +50674,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -50580,55 +50748,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5893
+	goto __799
+__798:
+	zSchema = ts + 5883
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5907,
+		ts+5897,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -50638,66 +50806,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -50706,151 +50874,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5950, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -50858,10 +51027,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -50881,26 +51050,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -50912,7 +51081,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -50923,170 +51092,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -51103,146 +51272,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -51250,70 +51419,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5987,
+		ts+5977,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6039
+				return ts + 6029
 			}
-			return ts + 6044
+			return ts + 6034
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -51321,17 +51490,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -51341,14 +51510,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -51358,197 +51527,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6051, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5357, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -51562,27 +51731,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -51590,72 +51759,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.Xmemset(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -51665,192 +51834,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -51859,63 +52028,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= uint8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -51925,104 +52094,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -52030,52 +52199,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6086,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -52194,8 +52367,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -52215,7 +52388,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -52235,8 +52408,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -52267,8 +52440,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -52301,8 +52474,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52382,8 +52555,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52452,7 +52625,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -52480,12 +52653,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 3663
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52529,7 +52702,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52612,7 +52785,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -55151,6 +55324,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6381, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6389+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6408+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -55170,7 +55371,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -55225,7 +55425,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6381, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
 		goto __8
 	}
 
@@ -55346,7 +55546,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6386) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55354,73 +55554,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -55432,28 +55650,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -55464,160 +55682,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6388, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6392, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6396, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -55626,8 +55845,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -55635,19 +55854,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -55655,81 +55874,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6405, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6436, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -55742,141 +55961,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6491, libc.VaList(bp+16, zCol))
+		ts+6551, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6526
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6586
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6535
+		zErr = ts + 6595
 	} else {
-		zErr = ts + 6550
+		zErr = ts + 6610
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6572, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -55920,15 +56139,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6602
+	var zIn uintptr = ts + 6662
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6630
+		zIn = ts + 6690
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6648
+		zIn = ts + 6708
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6666
+		zIn = ts + 6726
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6684, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -56007,10 +56226,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6704
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6764
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -56057,7 +56276,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6715, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6775, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56121,7 +56340,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6732, libc.VaList(bp, pExpr))
+								ts+6792, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56137,7 +56356,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6796,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6856,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56151,7 +56370,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6832, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6892, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56174,30 +56393,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6860, libc.VaList(bp+16, pExpr))
+						ts+6920, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6903
+						zType = ts + 6963
 					} else {
-						zType = ts + 6910
+						zType = ts + 6970
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6920, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6948, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7008, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6970,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7014,
+						ts+7074,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56269,7 +56488,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7062, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7122, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -56285,7 +56504,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7073, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7133, pExpr, pExpr)
 			}
 
 			break
@@ -56341,7 +56560,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56416,7 +56635,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7084, libc.VaList(bp, i, zType, mx))
+		ts+7144, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56436,7 +56655,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7140, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7200, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56471,7 +56690,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7174, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56528,7 +56747,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7180, libc.VaList(bp, i+1))
+				ts+7240, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56556,7 +56775,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7241, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7301, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56770,7 +56989,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7272, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7332, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56810,7 +57029,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56821,7 +57040,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7311) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56833,7 +57052,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7317, 0)
+						ts+7377, 0)
 					return WRC_Abort
 				}
 
@@ -56933,12 +57152,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -56974,12 +57193,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -57089,33 +57308,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) uint8
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) uint8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -57185,7 +57505,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -57520,7 +57841,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 		return
 	}
 
@@ -57595,7 +57916,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7376, libc.VaList(bp, mxHeight))
+			ts+7436, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57844,10 +58165,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7424,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7468
+						return ts + 7528
 					}
 					return ts + 1554
 				}(), nElem))
@@ -57888,7 +58209,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57914,7 +58235,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7472, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7532, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57942,7 +58263,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7506, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7566, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57989,7 +58310,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7526,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7586,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -58014,7 +58335,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7569, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7629, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58589,7 +58910,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58712,7 +59033,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7622, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7682, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58768,10 +59089,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6704) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6764) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6709) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59201,13 +59522,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff uint8) int3
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7645) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7705) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7653) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7659) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
 		return 1
 	}
 	return 0
@@ -59411,7 +59732,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7663, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59489,7 +59810,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7710, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -59583,7 +59904,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7741
+		var zFmt uintptr = ts + 7801
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59601,7 +59922,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	}
 }
 
@@ -59642,7 +59963,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7785, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59672,11 +59993,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7808, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7868, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1554
 			}
-			return ts + 7827
+			return ts + 7887
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59803,7 +60124,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7839, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -59818,12 +60139,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7857, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1554
 		}
-		return ts + 7827
+		return ts + 7887
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -59844,7 +60166,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59853,7 +60175,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7878)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7938)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60239,8 +60561,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7880, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7883,
+			if Xsqlite3_strnicmp(tls, z, ts+7940, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4932
@@ -60316,7 +60638,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60402,8 +60724,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -60489,14 +60811,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 7940, ts + 7945, ts + 7950, ts + 6191, ts + 6186}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
+				ts + 6186, ts + 8018}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7958
+						return ts + 8026
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60510,7 +60834,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60533,10 +60857,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -60636,7 +60960,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -60766,12 +61090,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -60780,110 +61105,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -60926,13 +61264,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*uint8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -60942,11 +61280,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -60969,11 +61307,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -60982,15 +61320,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -61017,20 +61355,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -61039,9 +61377,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -61079,14 +61417,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -61097,17 +61437,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -61119,128 +61459,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7990, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -61248,42 +61588,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -61306,23 +61646,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -61339,42 +61679,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -61395,15 +61737,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61413,22 +61755,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61437,21 +61779,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61461,27 +61803,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8014, 0)
+		ts+8082, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61490,7 +61832,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -61501,7 +61843,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]uint8)(unsafe.Pointer(ts + 8064))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8132))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62873,18 +63215,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -62914,7 +63256,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -62927,12 +63269,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -62940,6 +63380,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -62954,81 +63434,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -63050,34 +63457,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -63167,7 +63573,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -63175,7 +63581,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -63226,11 +63632,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63242,13 +63648,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8108,
+		ts+8170,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8283,
+			ts+8345,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63258,10 +63664,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8457, libc.VaList(bp, zDb, zDb))
+		ts+8519, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8604, 0)
+			ts+8666, 0)
 	}
 }
 
@@ -63325,7 +63731,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8755, libc.VaList(bp, zName))
+		ts+8817, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63335,7 +63741,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8814, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63344,7 +63750,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8820, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63385,19 +63791,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8847, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9031,
+		ts+9093,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9336, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9352,
+		ts+9414,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63405,7 +63811,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9410, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63417,7 +63823,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9675, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63429,7 +63835,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9688,
+		ts+9750,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63475,12 +63881,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9726, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9758, 0)
+			ts+9820, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63490,11 +63896,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9785)
+				ts+9847)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9844)
+				ts+9906)
 		}
 
 		if pDflt != 0 {
@@ -63507,12 +63913,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9897)
+					ts+9959)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9943)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63523,7 +63929,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9970,
+			ts+10032,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63545,7 +63951,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10116,
+				ts+10178,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63593,14 +63999,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10346, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10380, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63628,7 +64034,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10410, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -63668,18 +64074,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10429
+		zType = ts + 10491
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10434
+		zType = ts + 10496
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10448,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10466
+					return ts + 10528
 				}
-				return ts + 10483
+				return ts + 10545
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -63763,7 +64169,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -63780,17 +64186,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10522,
+		ts+10584,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10704,
+		ts+10766,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9675, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9737, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63985,7 +64391,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -64048,10 +64454,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10835,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10897,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10858
+				return ts + 10920
 			}
 			return ts + 1554
 		}(), zWhen,
@@ -64093,8 +64499,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10860, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10922, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64111,7 +64517,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64133,7 +64539,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10868, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10930, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64173,10 +64579,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))
 				*(*uint8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = uint8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10874, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10936, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*uint8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10858
+							return ts + 10920
 						}
 						return ts + 1554
 					}()))
@@ -64352,8 +64758,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -64436,15 +64842,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -64472,7 +64878,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -64505,13 +64911,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64524,7 +64930,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64539,7 +64945,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -64595,8 +65001,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -64644,7 +65050,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -64712,8 +65118,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64755,11 +65161,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.Xmemset(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.Xmemset(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -64852,8 +65258,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64871,16 +65277,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -64895,31 +65301,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -64937,8 +65343,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64964,9 +65370,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -64994,8 +65400,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -65032,7 +65438,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -65056,7 +65462,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10879, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -65137,17 +65543,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10886,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10948,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10914
+				return ts + 10976
 			}
 			return ts + 6127
 		}(),
@@ -65158,7 +65564,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10926, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65175,10 +65581,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10974, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11095, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11157, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -65296,11 +65702,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11113},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11134},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11154},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11173},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11192}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11175},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11196},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11216},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65334,7 +65740,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11215, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -65343,10 +65749,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11238,
+					ts+11300,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11268, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -65364,9 +65770,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11286, FzCols: ts + 11299},
-	{FzName: ts + 11312, FzCols: ts + 11325},
-	{FzName: ts + 11353},
+	{FzName: ts + 11348, FzCols: ts + 11361},
+	{FzName: ts + 11374, FzCols: ts + 11387},
+	{FzName: ts + 11415},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65385,7 +65791,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -65464,7 +65869,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -65510,13 +65915,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -65529,11 +65934,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -65557,17 +65962,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11366}
+	FzName:     ts + 11428}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -65578,8 +65983,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -65622,7 +66027,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -65650,7 +66055,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -65717,7 +66122,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -65733,8 +66138,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -65751,9 +66156,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -65761,14 +66166,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -65776,31 +66181,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -65808,7 +66213,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11376}
+	FzName:     ts + 11438}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -65822,20 +66227,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11386,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11448,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11391, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65877,7 +66282,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+11397, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -65891,7 +66296,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11403}
+	FzName:     ts + 11465}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -65935,7 +66340,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11412, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65952,7 +66357,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11286, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11348, uint64(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -66108,7 +66513,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66165,7 +66570,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66212,9 +66617,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11426)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11488)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11430)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66300,16 +66705,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1554
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*uint8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -66319,15 +66724,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*uint8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11434, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11496, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11445, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11455, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11517, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -66407,7 +66812,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -66421,42 +66826,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -66530,15 +66935,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -66603,11 +67008,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11312, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11374, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11467,
-			ts+11521,
+			ts+11529,
+			ts+11583,
 			zDb)
 	}
 	return rc
@@ -66654,10 +67059,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11286, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11573, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66715,12 +67120,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6381, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6441, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -66731,13 +67136,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -66758,128 +67166,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3835)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3835)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11614, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11617,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11654, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11679,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.Xmemset(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11684, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+11713, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+11775, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -66889,89 +67320,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11781, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -67025,14 +67456,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11809, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11871, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11830, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -67040,7 +67471,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11856, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67082,42 +67513,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -67126,13 +67563,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -67151,7 +67588,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11878}
+	FzName:     ts + 11940}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67164,7 +67601,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11892}
+	FzName:     ts + 11954}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67178,7 +67615,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11906, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67210,7 +67647,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11930,
+						ts+11992,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67385,7 +67822,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11976, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67411,11 +67848,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12005, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12011, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67462,7 +67899,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 7653
+		zCol = ts + 7713
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67486,7 +67923,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12100, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -67711,6 +68148,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -67723,13 +68163,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -67754,25 +68194,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6381) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+12086)
+						ts+6389)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5893)
+						ts+5883)
 				}
 			}
 		}
@@ -67793,12 +68233,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5893)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5883)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+12086)
+					ts+6389)
 			}
 		}
 	}
@@ -67829,7 +68269,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12105, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12115, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67847,14 +68287,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12113
+			zMsg = ts + 12123
 		} else {
-			zMsg = ts + 12126
+			zMsg = ts + 12136
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67884,12 +68324,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
-			return ts + 12072
+	if Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
+			return ts + 6427
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12086+7) == 0 {
-			return ts + 12053
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
+			return ts + 6408
 		}
 	}
 	return zName
@@ -68247,7 +68687,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5893)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5883)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68273,7 +68713,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6381, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
 				goto __3
 			}
 
@@ -68326,13 +68766,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12140, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12150, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12157, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68374,9 +68814,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8072, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12177,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68536,9 +68976,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68554,7 +68994,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12219, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
 	return
 __4:
 	;
@@ -68582,9 +69022,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10429
+			return ts + 10491
 		}
-		return ts + 8814
+		return ts + 8876
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68600,9 +69040,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68633,12 +69073,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12260,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10429
+				return ts + 10491
 			}
-			return ts + 8814
+			return ts + 8876
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68653,7 +69093,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12281, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -68740,7 +69180,7 @@ var nullRow = [6]uint8{uint8(6), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+12316, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12326, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -68764,7 +69204,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12333, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12343, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68784,7 +69224,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12316
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12326
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -68796,7 +69236,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12316, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12326, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68830,7 +69270,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68838,13 +69278,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12390, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12400, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12397, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12407, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -68881,7 +69321,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12407, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12417, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -69045,10 +69485,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12433,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12443,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12478, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -69079,7 +69519,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12519, 0)
+			ts+12529, 0)
 	}
 }
 
@@ -69124,7 +69564,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12571, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69213,7 +69653,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12612, 0)
+		ts+12622, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69308,7 +69748,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12668, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
 	goto generated_done
 __2:
 	;
@@ -69321,13 +69761,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12711, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12719, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69354,13 +69794,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12726,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69482,12 +69929,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1554
-		zSep2 = ts + 12757
+		zSep2 = ts + 12767
 		zEnd = ts + 4957
 	} else {
-		zSep = ts + 12759
-		zSep2 = ts + 12763
-		zEnd = ts + 12768
+		zSep = ts + 12769
+		zSep2 = ts + 12773
+		zEnd = ts + 12778
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69495,7 +69942,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12771, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*uint8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = uint8('(')
@@ -69533,11 +69980,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1554,
-	ts + 12785,
-	ts + 12791,
-	ts + 12796,
+	ts + 12795,
+	ts + 12801,
+	ts + 12806,
+	ts + 12811,
 	ts + 12801,
 }
 
@@ -69945,10 +70393,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12807,
+						ts+12817,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12840,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69967,11 +70415,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12867, 0)
+				ts+12877, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12917, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -70005,7 +70453,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12949, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
 			return
 		}
 	}
@@ -70030,11 +70478,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8814
-			zType2 = ts + 12993
+			zType = ts + 8876
+			zType2 = ts + 13003
 		} else {
-			zType = ts + 10429
-			zType2 = ts + 12999
+			zType = ts + 10491
+			zType2 = ts + 13009
 		}
 
 		if pSelect != 0 {
@@ -70096,7 +70544,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -70105,11 +70553,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+13004, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13019,
+			ts+13029,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70125,13 +70573,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13117,
+					ts+13127,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13159, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70146,7 +70594,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9336) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9398) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70176,7 +70624,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13193, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13203, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70192,7 +70640,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10429, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -70274,7 +70722,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13229, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70302,8 +70750,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -70400,13 +70847,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13259, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13269, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13274,
+		ts+13284,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -70447,10 +70894,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13341, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13351, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11238,
+				ts+11300,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70482,12 +70929,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13355,
+			ts+13365,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13400,
+		ts+13410,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -70515,11 +70962,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7073, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70597,9 +71044,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70658,21 +71105,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13467, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13495, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13529, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70684,7 +71131,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11430, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -70748,7 +71195,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13561,
+		ts+13571,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -70760,7 +71207,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13624, 0)
+		ts+13634, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70845,7 +71292,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13718,
+		ts+13728,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -71072,12 +71519,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13764,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13774,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13792
+							return ts + 13802
 						}
-						return ts + 13798
+						return ts + 13808
 					}()))
 				return 1
 			}
@@ -71198,7 +71645,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13803, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -71217,7 +71664,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13809,
+		ts+13819,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71243,26 +71690,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13859, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13887, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13897, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13912, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71276,7 +71723,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13803, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71291,7 +71738,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13946, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71303,7 +71750,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13980, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71332,7 +71779,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14004, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71353,9 +71800,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71394,7 +71841,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13803)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71495,7 +71942,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14027, 0)
+		ts+14037, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71712,7 +72159,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14088, libc.VaList(bp+48, 0))
+		ts+14098, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -71764,8 +72211,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14130, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -71811,12 +72258,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14147,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1554
 			}
-			return ts + 14167
+			return ts + 14177
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71824,7 +72271,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14175,
+		ts+14185,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -71838,7 +72285,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14234, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71999,7 +72446,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14261, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -72014,7 +72461,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14279, libc.VaList(bp+8, 0))
+		ts+14289, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -72025,9 +72472,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72053,9 +72500,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14352,
+		ts+14362,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11426, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -72190,7 +72637,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14412,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14422,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72398,12 +72845,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14448,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14458,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14484
+				return ts + 14494
 			}
-			return ts + 14487
+			return ts + 14497
 		}()))
 	goto append_from_error
 __1:
@@ -72572,7 +73019,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14493, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72608,9 +73055,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14499
+				return ts + 14509
 			}
-			return ts + 14508
+			return ts + 14518
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72635,7 +73082,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14493, ts + 14515, ts + 14499}
+var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72650,7 +73097,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14523, 0)
+				ts+14533, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72787,14 +73234,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14593, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14604, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14614, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
@@ -72820,11 +73267,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14607, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72954,7 +73401,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14616, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -73050,7 +73497,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14662, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14672, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73248,7 +73695,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14692, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73528,7 +73975,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73560,11 +74007,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14756, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14785, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74068,7 +74515,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14823)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
 __62:
 	;
 delete_from_cleanup:
@@ -74183,7 +74630,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11286) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11348) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74413,7 +74860,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 7945, ts + 7940, ts + 6181}
+var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 8005, ts + 8000, ts + 6181}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74472,7 +74919,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14836, -1)
+					Xsqlite3_result_error(tls, context, ts+14846, -1)
 					return
 				}
 				iVal = -iVal
@@ -74776,7 +75223,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14853, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75122,7 +75569,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14858, -1)
+		Xsqlite3_result_error(tls, context, ts+14868, -1)
 		return
 	}
 	if argc == 3 {
@@ -75132,7 +75579,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14891, -1)
+				ts+14901, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75231,7 +75678,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14936, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14946, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75246,21 +75693,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = uint8('\'')
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = uint8(0)
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = uint8('\'')
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = uint8(0)
 				*(*uint8)(unsafe.Pointer(zText)) = uint8('X')
 				*(*uint8)(unsafe.Pointer(zText + 1)) = uint8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -75268,7 +75715,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14943, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14953, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -75382,6 +75829,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1554
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -75584,7 +76144,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10858}
+var azOne = [1]uintptr{ts + 10920}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75620,7 +76180,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(j))) = uint8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14946, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14956, 4, uintptr(0))
 	}
 }
 
@@ -75645,7 +76205,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12038, -1)
+		Xsqlite3_result_error(tls, context, ts+12100, -1)
 		return
 	}
 
@@ -75723,7 +76283,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14836, -1)
+			Xsqlite3_result_error(tls, context, ts+14846, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75985,7 +76545,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14951, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14961, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -76005,14 +76565,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14957, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14957, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76142,17 +76702,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -76211,6 +76771,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -76251,108 +76812,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14962},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14982},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14995},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15013},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15022},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15045},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15071},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15096},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15105},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15116},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15123},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15154},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15154},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15154},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15158},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15162},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15169},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15177},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15184},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15190},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15197},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15204},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15212},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15217},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14992},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 15005},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15023},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15032},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15055},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15081},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15106},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15115},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15126},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15133},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15164},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15164},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15164},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15168},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15179},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15187},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15194},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15200},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15207},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15222},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15227},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15233},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15239},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15243},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15257},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15275},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15290},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15307},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15318},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15324},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15350},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15364},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15398},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15402},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15408},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15237},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15249},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15259},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15266},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15273},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15284},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15291},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15306},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15323},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15334},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15340},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15358},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15366},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15380},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15414},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15431},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15436},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15441},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15449},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15455},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15461},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15468},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15474},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15479},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15483},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15487},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15493},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15497},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15507},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15512},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15424},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15447},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15452},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15457},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15465},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15471},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15484},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15490},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15495},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15503},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15509},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15513},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15530},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15540},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15545},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15523},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15528},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15534},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15538},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15542},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15546},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15551},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15557},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15563},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15568},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15576},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15584},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15587},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6526},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15592}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15556},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15561},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15567},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15573},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15579},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15584},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15592},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15600},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6586},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15608}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76473,7 +77036,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15596,
+				ts+15612,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -77133,8 +77696,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6392, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6388, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6452, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6448, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77635,7 +78198,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7910, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78103,7 +78666,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15641,
+		ts+15657,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78128,7 +78691,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15682,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -78277,7 +78840,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15714,
+		ts+15730,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78287,7 +78850,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15766, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78339,7 +78902,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15791,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78347,7 +78910,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15837, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -78759,7 +79322,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15858)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
 __125:
 	;
 insert_cleanup:
@@ -79075,8 +79638,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 								onError, iReg)
 							Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -80166,7 +80730,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -80612,6 +81176,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80650,7 +81215,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12038, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -80659,7 +81224,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15872
+		zEntry = ts + 15888
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -80674,7 +81239,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -80710,7 +81275,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15895, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -80724,7 +81289,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15904, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -80748,7 +81313,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15908, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -80766,7 +81331,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15914, libc.VaList(bp+16, zEntry, zFile))
+		ts+15930, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80793,7 +81358,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15957, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80831,7 +81396,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15989, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80841,7 +81406,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16026,
+	ts + 16042,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80997,7 +81562,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16029, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -81006,62 +81571,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5057,
-	ts + 16068,
-	ts + 8814,
-	ts + 16072,
-	ts + 16077,
-	ts + 16080,
-	ts + 16090,
-	ts + 16100,
+	ts + 16084,
+	ts + 8876,
+	ts + 16088,
+	ts + 16093,
+	ts + 16096,
 	ts + 16106,
-	ts + 16110,
-	ts + 16115,
-	ts + 16120,
-	ts + 16128,
-	ts + 16139,
-	ts + 16142,
-	ts + 16149,
-	ts + 16110,
-	ts + 16115,
-	ts + 16156,
-	ts + 16161,
-	ts + 16164,
-	ts + 16171,
-	ts + 16106,
-	ts + 16110,
+	ts + 16116,
+	ts + 16122,
+	ts + 16126,
+	ts + 16131,
+	ts + 16136,
+	ts + 16144,
+	ts + 16155,
+	ts + 16158,
+	ts + 16165,
+	ts + 16126,
+	ts + 16131,
+	ts + 16172,
 	ts + 16177,
-	ts + 16182,
+	ts + 16180,
 	ts + 16187,
-	ts + 16110,
-	ts + 16191,
-	ts + 16115,
-	ts + 16199,
+	ts + 16122,
+	ts + 16126,
+	ts + 16193,
+	ts + 16198,
 	ts + 16203,
-	ts + 16208,
-	ts + 11430,
-	ts + 11426,
-	ts + 16214,
+	ts + 16126,
+	ts + 16207,
+	ts + 16131,
+	ts + 16215,
 	ts + 16219,
 	ts + 16224,
-	ts + 16068,
-	ts + 16110,
-	ts + 16229,
-	ts + 16236,
-	ts + 16243,
-	ts + 8814,
-	ts + 16251,
-	ts + 5060,
-	ts + 16257,
-	ts + 16068,
-	ts + 16110,
-	ts + 16262,
+	ts + 11492,
+	ts + 11488,
+	ts + 16230,
+	ts + 16235,
+	ts + 16240,
+	ts + 16084,
+	ts + 16126,
+	ts + 16245,
+	ts + 16252,
+	ts + 16259,
+	ts + 8876,
 	ts + 16267,
-	ts + 15464,
-	ts + 16272,
-	ts + 16285,
-	ts + 16294,
+	ts + 5060,
+	ts + 16273,
+	ts + 16084,
+	ts + 16126,
+	ts + 16278,
+	ts + 16283,
+	ts + 15480,
+	ts + 16288,
 	ts + 16301,
-	ts + 16312,
+	ts + 16310,
+	ts + 16317,
+	ts + 16328,
 }
 
 // Definitions of all built-in pragmas
@@ -81079,238 +81644,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16320,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16335,
+	{FzName: ts + 16351,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16350,
+	{FzName: ts + 16366,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16362,
+	{FzName: ts + 16378,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16394,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16301,
+	{FzName: ts + 16317,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16391,
+	{FzName: ts + 16407,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16403,
+	{FzName: ts + 16419,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16423,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16439,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16455,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16460,
+	{FzName: ts + 16476,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16475,
+	{FzName: ts + 16491,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16507,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16505,
+	{FzName: ts + 16521,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16518,
+	{FzName: ts + 16534,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16532,
+	{FzName: ts + 16548,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16551,
+	{FzName: ts + 16567,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16570,
+	{FzName: ts + 16586,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16593,
+	{FzName: ts + 16609,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16618,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16620,
+	{FzName: ts + 16636,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16637,
+	{FzName: ts + 16653,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16650,
+	{FzName: ts + 16666,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16665,
+	{FzName: ts + 16681,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16683,
+	{FzName: ts + 16699,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16693,
+	{FzName: ts + 16709,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16723,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16739,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16748,
+	{FzName: ts + 16764,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16767,
+	{FzName: ts + 16783,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16778,
+	{FzName: ts + 16794,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16789,
+	{FzName: ts + 16805,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16801,
+	{FzName: ts + 16817,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16833,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16830,
+	{FzName: ts + 16846,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16849,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16868,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16881,
+	{FzName: ts + 16897,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16896,
+	{FzName: ts + 16912,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16906,
+	{FzName: ts + 16922,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16918,
+	{FzName: ts + 16934,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16943,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16938,
+	{FzName: ts + 16954,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16948,
+	{FzName: ts + 16964,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16960,
+	{FzName: ts + 16976,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16971,
+	{FzName: ts + 16987,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16983,
+	{FzName: ts + 16999,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17000,
+	{FzName: ts + 17016,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17019,
+	{FzName: ts + 17035,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17045,
+	{FzName: ts + 17061,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17060,
+	{FzName: ts + 17076,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17074,
+	{FzName: ts + 17090,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17093,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17107,
+	{FzName: ts + 17123,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17139,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17135,
+	{FzName: ts + 17151,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17146,
+	{FzName: ts + 17162,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17157,
+	{FzName: ts + 17173,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17169,
+	{FzName: ts + 17185,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17180,
+	{FzName: ts + 17196,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17201,
+	{FzName: ts + 17217,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17209,
+	{FzName: ts + 17225,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17224,
+	{FzName: ts + 17240,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17237,
+	{FzName: ts + 17253,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17256,
+	{FzName: ts + 17272,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17271,
+	{FzName: ts + 17287,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81332,7 +81897,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17287))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17303))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -81344,10 +81909,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17312) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17328) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81356,13 +81921,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7958) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8026) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17329) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17334) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81377,9 +81942,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*uint8)(unsafe.Pointer(z))) >= '0' && int32(*(*uint8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*uint8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16262) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16278) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17346) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81393,7 +81958,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17353, 0)
+				ts+17369, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -81484,19 +82049,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17415
+		zName = ts + 17431
 		break
 	case OE_SetDflt:
-		zName = ts + 17424
+		zName = ts + 17440
 		break
 	case OE_Cascade:
-		zName = ts + 17436
+		zName = ts + 17452
 		break
 	case OE_Restrict:
-		zName = ts + 17444
+		zName = ts + 17460
 		break
 	default:
-		zName = ts + 17453
+		zName = ts + 17469
 		break
 	}
 	return zName
@@ -81513,7 +82078,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17463, ts + 17470, ts + 17478, ts + 17482, ts + 17346, ts + 17491,
+	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81560,13 +82125,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17495
+			zType = ts + 17511
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17497
+			zType = ts + 17513
 		} else {
-			zType = ts + 7468
+			zType = ts + 7528
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17499,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -81574,7 +82139,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17506, ts + 17511, ts + 17519}
+var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -81725,14 +82290,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -81819,7 +82386,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17527, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82080,7 +82647,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17531) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82152,7 +82719,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17322
+	zRet = ts + 17338
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82190,7 +82757,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17312
+	zRet = ts + 17328
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82477,7 +83044,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17536, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82518,7 +83085,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17561, 0)
+		ts+17577, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82572,7 +83139,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17614) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
 		goto __142
 	}
 
@@ -82669,9 +83236,9 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17620
+			return ts + 17636
 		}
-		return ts + 17628
+		return ts + 17644
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -82740,7 +83307,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17635, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82786,29 +83353,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10429
+	zType = ts + 10491
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12711
+	zType = ts + 12721
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17651
+	zType = ts + 17667
 	goto __183
 __182:
-	zType = ts + 8814
+	zType = ts + 8876
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82874,7 +83441,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17665, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82884,7 +83451,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17670,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -82921,8 +83488,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17675, ts + 17677, ts + 16139}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17679,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82955,7 +83522,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -82977,7 +83544,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17689, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -83041,7 +83608,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -83057,7 +83624,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83092,7 +83659,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17692,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83100,7 +83667,7 @@ __226:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+17701))
+			ts+17717))
 	goto __227
 __227:
 	j2++
@@ -83289,7 +83856,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17706, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 600)))
@@ -83506,7 +84073,7 @@ __284:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17710, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -83567,262 +84134,284 @@ __299:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 612)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__300:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __301
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __300
+	}
+	mxCol = -1
+	j4 = 0
+__302:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __304
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __305
+	}
+	mxCol++
+__305:
+	;
+	goto __303
+__303:
+	j4++
+	goto __302
+	goto __304
+__304:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __306
 	}
 	mxCol--
-	goto __300
+__306:
+	;
+	goto __301
+__300:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __301:
 	;
 	if !(mxCol >= 0) {
-		goto __302
+		goto __307
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__302:
+__307:
 	;
 	if !!(isQuick != 0) {
-		goto __303
+		goto __308
 	}
 	if !(pPk1 != 0) {
-		goto __304
+		goto __309
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 612)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17734,
+		ts+17750,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__305:
+__310:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __307
+		goto __312
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 612)), j4, r2+j4)
-	goto __306
-__306:
+	goto __311
+__311:
 	j4++
-	goto __305
-	goto __307
-__307:
+	goto __310
+	goto __312
+__312:
 	;
-__304:
+__309:
 	;
-__303:
+__308:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__308:
+__313:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __310
+		goto __315
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __311
+		goto __316
 	}
-	goto __309
-__311:
+	goto __314
+__316:
 	;
 	if !(bStrict != 0) {
-		goto __312
+		goto __317
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __313
-__312:
+	goto __318
+__317:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__313:
+__318:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __314
+		goto __319
 	}
-	goto __309
-__314:
+	goto __314
+__319:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __316
-__315:
+	goto __321
+__320:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __317
+		goto __322
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 624)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		(*Column)(unsafe.Pointer(pCol1)).Faffinity, bp+624)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 624)) != 0) {
-		goto __318
+		goto __323
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
-__318:
+__323:
 	;
-__317:
+__322:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 612))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __319
+		goto __324
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __320
-__319:
+	goto __325
+__324:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__320:
+__325:
 	;
-__316:
+__321:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __321
+		goto __326
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17770, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __323
-__322:
+	goto __328
+__327:
 	;
-__323:
+__328:
 	;
-__321:
+__326:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __324
+		goto __329
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17790,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __325
-__324:
+	goto __330
+__329:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __326
+		goto __331
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17812,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __327
-__326:
+	goto __332
+__331:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __328
+		goto __333
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
-__329:
+__334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17835, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17837,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__328:
+__333:
 	;
-__327:
+__332:
 	;
-__325:
+__330:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __309
-__309:
+	goto __314
+__314:
 	j4++
-	goto __308
-	goto __310
-__310:
+	goto __313
+	goto __315
+__315:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __330
+		goto __335
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __331
+		goto __336
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 612)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__332:
+__337:
 	if !(k3 > 0) {
-		goto __334
+		goto __339
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __333
-__333:
+	goto __338
+__338:
 	k3--
-	goto __332
-	goto __334
-__334:
+	goto __337
+	goto __339
+__339:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17857,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__331:
+__336:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__330:
+__335:
 	;
 	if !!(isQuick != 0) {
-		goto __335
+		goto __340
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__336:
+__341:
 	if !(pIdx5 != 0) {
-		goto __338
+		goto __343
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __339
+		goto __344
 	}
-	goto __337
-__339:
+	goto __342
+__344:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 612)), 0, 0, bp+632,
 		pPrior, r1)
@@ -83831,80 +84420,119 @@ __339:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 616))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17892)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__345:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __347
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __348
+	}
+	goto __346
+__348:
+	;
+	if !(label6 == 0) {
+		goto __349
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__349:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 616))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	if !(label6 != 0) {
+		goto __350
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__350:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __340
+		goto __351
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__341:
+__352:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __343
+		goto __354
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __344
+		goto __355
 	}
-	goto __342
-__344:
+	goto __353
+__355:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17956)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__351:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
 	goto __342
 __342:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __341
 	goto __343
 __343:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17913)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __340:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
-	goto __337
-__337:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __336
-	goto __338
-__338:
-	;
-__335:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __345
+		goto __356
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17940)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__346:
+__357:
 	if !(pIdx5 != 0) {
-		goto __348
+		goto __359
 	}
 	if !(pPk1 == pIdx5) {
-		goto __349
+		goto __360
 	}
-	goto __347
-__349:
+	goto __358
+__360:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83913,21 +84541,21 @@ __349:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __347
-__347:
+	goto __358
+__358:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __346
-	goto __348
-__348:
+	goto __357
+	goto __359
+__359:
 	;
 	if !(pPk1 != 0) {
-		goto __350
+		goto __361
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__350:
+__361:
 	;
-__345:
+__356:
 	;
 	goto __291
 __291:
@@ -83945,14 +84573,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __351
+		goto __362
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 608))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 17969
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18012
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__351:
+__362:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83960,27 +84588,27 @@ __351:
 
 __45:
 	if !!(zRight != 0) {
-		goto __352
+		goto __363
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __354
+		goto __365
 	}
 	goto pragma_out
-__354:
+__365:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __353
-__352:
+	goto __364
+__363:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __355
+		goto __366
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__356:
+__367:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __358
+		goto __369
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __359
+		goto __370
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83994,25 +84622,25 @@ __356:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __358
-__359:
+	goto __369
+__370:
 	;
-	goto __357
-__357:
+	goto __368
+__368:
 	pEnc += 16
-	goto __356
-	goto __358
-__358:
+	goto __367
+	goto __369
+__369:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __360
+		goto __371
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17972, libc.VaList(bp+456, zRight))
-__360:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+__371:
 	;
-__355:
+__366:
 	;
-__353:
+__364:
 	;
 	goto __15
 
@@ -84020,15 +84648,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __361
+		goto __372
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __363
+		goto __374
 	}
 	goto __15
-__363:
+__374:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -84036,41 +84664,41 @@ __363:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __364
+		goto __375
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__364:
+__375:
 	;
-	goto __362
-__361:
+	goto __373
+__372:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __365
+		goto __376
 	}
 	goto __15
-__365:
+__376:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__362:
+__373:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__366:
+__377:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __366
-__367:
+	goto __377
+__378:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84085,31 +84713,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17329) == 0) {
-		goto __369
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
+		goto __380
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __370
-__369:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17997) == 0) {
-		goto __371
+	goto __381
+__380:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
+		goto __382
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __372
-__371:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17482) == 0) {
-		goto __373
+	goto __383
+__382:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
+		goto __384
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__373:
+__384:
 	;
-__372:
+__383:
 	;
-__370:
+__381:
 	;
-__368:
+__379:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84119,10 +84747,10 @@ __368:
 
 __49:
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__374:
+__385:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84142,19 +84770,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __377
+		goto __388
 	}
 	goto __15
-__377:
+__388:
 	;
-	goto __376
-__375:
+	goto __387
+__386:
 	opMask = U32(0xfffe)
-__376:
+__387:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84163,86 +84791,86 @@ __376:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__378:
+__389:
 	if !(iDb <= iDbLast) {
-		goto __380
+		goto __391
 	}
 	if !(iDb == 1) {
-		goto __381
+		goto __392
 	}
-	goto __379
-__381:
+	goto __390
+__392:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__382:
+__393:
 	if !(k4 != 0) {
-		goto __384
+		goto __395
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __385
+		goto __396
 	}
-	goto __383
-__385:
+	goto __394
+__396:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__386:
+__397:
 	if !(pIdx6 != 0) {
-		goto __388
+		goto __399
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __389
+		goto __400
 	}
 	szThreshold = int16(0)
-	goto __388
-__389:
+	goto __399
+__400:
 	;
-	goto __387
-__387:
+	goto __398
+__398:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __386
-	goto __388
-__388:
+	goto __397
+	goto __399
+__399:
 	;
 	if !(szThreshold != 0) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__390:
+__401:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18005,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __391
+		goto __402
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __392
-__391:
+	goto __403
+__402:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__392:
+__403:
 	;
-	goto __383
-__383:
+	goto __394
+__394:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __382
-	goto __384
-__384:
+	goto __393
+	goto __395
+__395:
 	;
-	goto __379
-__379:
+	goto __390
+__390:
 	iDb++
-	goto __378
-	goto __380
-__380:
+	goto __389
+	goto __391
+__391:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84250,36 +84878,36 @@ __380:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __393
+		goto __404
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__393:
+__404:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __394
+		goto __405
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__394:
+__405:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __395
+		goto __406
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 648)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__396:
+__407:
 	;
-__395:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84288,10 +84916,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__397:
+__408:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84300,10 +84928,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __398
+		goto __409
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__398:
+__409:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84311,10 +84939,10 @@ __398:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __399
+		goto __410
 	}
 
-__399:
+__410:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84366,14 +84994,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18023, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18028, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18034, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18043, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18052, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18060, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18068},
-	{FzName: ts + 18075},
+	{FzName: ts + 18066, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18071, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18077, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18086, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18095, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18103, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18111},
+	{FzName: ts + 18118},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84425,7 +85053,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]uint8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18081)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18124)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84433,7 +85061,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18096, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -84446,16 +85074,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18103, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18109)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18152)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18121)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
@@ -84638,13 +85266,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18136)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18179)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18144, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18148, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -84721,12 +85349,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18152, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -84735,19 +85363,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5008
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18180, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18211, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18219,
-	ts + 18226,
-	ts + 18238,
+	ts + 18262,
+	ts + 18269,
+	ts + 18281,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84807,7 +85435,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -84839,13 +85467,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18249)
+			corruptSchema(tls, pData, argv, ts+18292)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 	}
@@ -84878,16 +85506,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8814
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8876
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7878
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18262
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7938
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18305
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -84965,17 +85593,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11713)
+		ts+11775)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -84984,44 +85621,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18334)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18377)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18358,
+		ts+18401,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85032,57 +85669,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -85171,8 +85808,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -85285,8 +85924,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -85297,8 +85936,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -85310,8 +85949,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -85351,7 +85990,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18392, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85381,7 +86020,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18422, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85477,7 +86116,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -85576,7 +86215,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85899,8 +86538,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10858
-		var zSp2 uintptr = ts + 10858
+		var zSp1 uintptr = ts + 10920
+		var zSp2 uintptr = ts + 10920
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85908,13 +86547,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18441, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18471))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18514))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86089,7 +86728,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18505, libc.VaList(bp, 0))
+					ts+18548, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86134,7 +86773,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18555, libc.VaList(bp+8, zName))
+						ts+18598, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86145,7 +86784,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18619,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18662,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86189,7 +86828,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6526, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -86536,9 +87175,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -86776,16 +87412,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18656
+		z = ts + 18699
 		break
 	case TK_INTERSECT:
-		z = ts + 18666
+		z = ts + 18709
 		break
 	case TK_EXCEPT:
-		z = ts + 18676
+		z = ts + 18719
 		break
 	default:
-		z = ts + 18683
+		z = ts + 18726
 		break
 	}
 	return z
@@ -86795,10 +87431,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18689, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -86818,6 +87457,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18755, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18786
+		}
+		return ts + 1554
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -86884,6 +87530,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -86948,6 +87595,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -87002,7 +87650,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16251
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16267
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -87141,13 +87789,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16251
+				zCol = ts + 16267
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -87155,7 +87803,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87220,7 +87868,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -87245,7 +87893,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16251
+					zName = ts + 16267
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87255,7 +87903,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87271,7 +87919,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18721, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -87296,45 +87945,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -87344,14 +87996,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18818
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -87361,9 +88045,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -87407,7 +88088,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -87558,7 +88239,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18729, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
 	return
 __1:
 	;
@@ -87649,7 +88330,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18778, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -87669,7 +88350,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18820, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -87706,7 +88387,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18826, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -87740,11 +88421,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18841, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18934, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1554
 		}
-		return ts + 18864
+		return ts + 18957
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87845,8 +88526,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18866, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18881, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87893,7 +88574,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18656, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87960,7 +88641,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -88022,7 +88703,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88175,10 +88856,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19014, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18967,
+			ts+19060,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88432,8 +89113,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7174)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88460,13 +89141,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19049, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19060, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19153, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88478,7 +89159,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19065, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19158, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88893,6 +89574,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff uint8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -89012,15 +89712,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff uint8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -89396,16 +90089,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -89465,12 +90175,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15154) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15158) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15168) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -89536,7 +90246,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19071, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19164, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -89619,7 +90329,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19089, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89748,15 +90458,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19112, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -89774,7 +90481,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19132, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89790,7 +90497,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19175
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -89816,7 +90523,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19198,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19291,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -89827,9 +90534,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19236
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19329
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19270
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89876,7 +90583,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19308, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19401, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89988,7 +90695,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19312,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -90007,7 +90714,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19351,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19444,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -90015,7 +90722,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90116,7 +90823,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6386
+							zSchemaName = ts + 6446
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90131,7 +90838,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19382, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19475, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -90196,7 +90903,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19387,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19480,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90208,7 +90915,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -90227,9 +90934,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19396, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19414, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
 					}
 				}
 			}
@@ -90239,7 +90946,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19434, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19527, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90298,11 +91005,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -90361,6 +91064,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -90376,7 +91154,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -90389,13 +91168,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19465, 0)
+					ts+19558, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19516, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -90403,7 +91182,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -90423,19 +91202,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -90449,6 +91231,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -90523,7 +91308,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -90535,7 +91322,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -90553,13 +91340,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -90576,11 +91363,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19549,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19642,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19561
+						return ts + 19654
 					}
 					return ts + 1554
 				}(),
@@ -90601,7 +91388,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90633,14 +91420,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -90694,6 +91482,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -90758,7 +91597,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -90857,7 +91695,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19584,
+		ts+19677,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90918,7 +91756,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19638,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -91032,7 +91870,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -91049,11 +91887,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -91064,7 +91898,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19678, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19771, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -91090,7 +91924,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -91122,11 +91956,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19693, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -91160,7 +91992,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -91469,12 +92301,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -91503,39 +92334,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -91546,24 +92353,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -91596,27 +92403,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19709
+				return ts + 19802
 			}
-			return ts + 19718
+			return ts + 19811
 		}())
 
 	groupBySort = 1
@@ -91624,47 +92438,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -91680,45 +92494,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -91737,16 +92557,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -91777,16 +92597,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -91799,98 +92619,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -91899,79 +92722,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19709)
-__148:
+	explainTempTable(tls, pParse, ts+19802)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19727
-			}
-			return ts + 19750
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -92068,7 +92886,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19759, 0)
+		ts+19820, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92301,7 +93119,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19824, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19885, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92345,7 +93163,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19870, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -92363,7 +93181,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19878, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -92375,7 +93193,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19870, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -92390,7 +93208,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19919, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -92402,22 +93220,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19945, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19983,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20020
+				return ts + 20081
 			}
-			return ts + 20027
+			return ts + 20088
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -92426,7 +93244,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20033, libc.VaList(bp+24, pTableName+8))
+		ts+20094, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -92455,9 +93273,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -92575,7 +93393,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19870, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19931, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -92608,7 +93426,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20079,
+		ts+20140,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92633,13 +93451,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20127,
+		ts+20188,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20202, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20263, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92895,7 +93713,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20231, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92934,9 +93752,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12086
+				return ts + 6389
 			}
-			return ts + 5893
+			return ts + 5883
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92948,7 +93766,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20251,
+			ts+20312,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -93062,12 +93880,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20313,
+		ts+20374,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20361
+				return ts + 20422
 			}
-			return ts + 20368
+			return ts + 20429
 		}()))
 __15:
 	;
@@ -93181,7 +93999,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20375, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20436, 0)
 	return 1
 }
 
@@ -93364,8 +94182,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -93398,8 +94216,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -93411,13 +94229,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20417, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -93733,7 +94551,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -94003,7 +94822,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20431,
+		ts+20492,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94035,7 +94854,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20467, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -94045,7 +94864,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7653
+				return ts + 7713
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -94915,7 +95734,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20486)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
 __169:
 	;
 update_cleanup:
@@ -95221,10 +96040,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*uint8)(unsafe.Pointer(bp + 216)) = uint8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20499, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20560, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20503, libc.VaList(bp+8, bp+216))
+				ts+20564, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -95315,7 +96134,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12140, -1)
+				ts+12150, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95347,7 +96166,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20576, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20580, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20637, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -95495,14 +96314,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20584)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20645)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20624)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
 	return SQLITE_ERROR
 __2:
 	;
@@ -95513,7 +96332,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20667)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
 	return SQLITE_ERROR
 __5:
 	;
@@ -95541,7 +96360,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20685, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -95561,7 +96380,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20708)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
 	goto end_of_vacuum
 __8:
 	;
@@ -95576,7 +96395,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14493)
+	rc = execSql(tls, db, pzErrMsg, ts+14503)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -95621,7 +96440,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20735,
+		ts+20796,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95630,7 +96449,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20843,
+		ts+20904,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95641,7 +96460,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20897,
+		ts+20958,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95652,7 +96471,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21048,
+		ts+21109,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95874,12 +96693,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -95997,7 +96816,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96081,11 +96900,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21178, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21239, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21202,
+			ts+21263,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -96095,7 +96914,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21301, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96129,7 +96948,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -96156,7 +96975,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21320, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96194,7 +97013,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21423, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -96206,7 +97025,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21392
+			var zFormat uintptr = ts + 21453
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96223,7 +97042,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16142, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -96280,7 +97099,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21438, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21499, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -96338,7 +97157,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21438, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21499, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -96358,8 +97177,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -96372,7 +97191,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96825,7 +97644,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -96852,7 +97671,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -97083,10 +97902,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21457
+		return ts + 21518
 	}
 	if i == -1 {
-		return ts + 16251
+		return ts + 16267
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97095,15 +97914,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -97114,11 +97933,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
 	}
@@ -97140,27 +97959,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21472, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21533, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21475
+				return ts + 21536
 			}
-			return ts + 21480
+			return ts + 21541
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21488)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21549)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21490)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21551)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
 }
@@ -97203,11 +98022,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21492, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21553, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21498
+				return ts + 21559
 			}
-			return ts + 21505
+			return ts + 21566
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97217,43 +98036,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10914
+					zFmt = ts + 10976
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21510
+				zFmt = ts + 21571
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21543
+				zFmt = ts + 21604
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21568
+				zFmt = ts + 21629
 			} else {
-				zFmt = ts + 21586
+				zFmt = ts + 21647
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21595, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp uint8
-			var zRowid uintptr = ts + 16251
-			Xsqlite3_str_appendf(tls, bp+64, ts+21603, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16267
+			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = uint8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21634, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21695, libc.VaList(bp+32, zRowid))
 				cRangeOp = uint8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = uint8('>')
 			} else {
 				cRangeOp = uint8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21644, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21705, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21649,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21676, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21737, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97285,28 +98104,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21687, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21748, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21708, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21769, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21464, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21525, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -97367,52 +98187,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -98890,7 +99716,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21716, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98918,7 +99744,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21731, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -99436,7 +100262,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21740, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99794,10 +100620,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16100, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15431, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14957, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21754, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16116, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15447, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14967, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21815, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100174,49 +101000,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -100224,13 +101039,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -100295,12 +101113,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -100324,7 +101142,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -100334,7 +101152,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -100379,7 +101197,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -100473,7 +101291,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21802
+				return ts + 21863
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100484,7 +101302,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -100492,6 +101309,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -100525,7 +101343,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -100678,6 +101496,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -100846,7 +101667,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21809,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101580,7 +102401,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21845, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101651,7 +102472,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21871
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102158,7 +102979,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -102178,7 +102999,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -102189,10 +103010,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -102203,29 +103024,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -102327,8 +103148,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -102340,7 +103161,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -102350,17 +103171,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -102380,19 +103201,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -102404,19 +103225,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -102426,10 +103247,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -102443,9 +103264,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -102470,8 +103291,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -102483,7 +103304,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -102497,23 +103318,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -102524,7 +103345,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -102846,6 +103667,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -102939,8 +103761,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -102964,8 +103786,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -103117,7 +103940,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -103136,7 +103959,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -103150,7 +103973,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -103159,9 +103982,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -103180,6 +104007,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -103307,30 +104137,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -103338,20 +104187,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -103360,9 +104214,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -103403,7 +104263,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -103443,7 +104303,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -103509,19 +104370,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -103702,7 +104568,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103760,7 +104626,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104158,7 +105024,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21908, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21969, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104369,8 +105235,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -104489,14 +105355,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -104648,7 +105523,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -104756,7 +105631,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21943, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -105018,19 +105893,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -105042,9 +105919,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -105077,13 +105954,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -105235,7 +106112,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21961, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105299,7 +106176,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21989, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
 	goto __5
 __4:
 	ii = 0
@@ -106000,7 +106877,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -106181,7 +107058,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22007, -1)
+		pCtx, ts+22068, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -106314,7 +107191,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22063, -1)
+					pCtx, ts+22124, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -106404,17 +107281,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22108))
-var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22119))
-var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22130))
-var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22135))
-var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22148))
-var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22158))
-var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22164))
-var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22175))
-var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22185))
-var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22197))
-var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22202))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22169))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22180))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22191))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22196))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22209))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22219))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22225))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22236))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22246))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22258))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22263))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -106460,7 +107337,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22206, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -106504,12 +107381,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22225, 0)
+			ts+22286, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22296, 0)
+				ts+22357, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -106532,7 +107409,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 					}
 					break
 				}
@@ -106738,7 +107615,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22359, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106854,7 +107731,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106865,6 +107742,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, uint8(SQLITE_AFF_NONE))
@@ -106968,7 +107846,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22385, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107033,15 +107911,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22417
+				zErr = ts + 22478
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22434
+				zErr = ts + 22495
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22450
+				zErr = ts + 22511
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22470, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -107062,7 +107940,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22503, 0)
+				ts+22564, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107218,11 +108096,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22550,
-	ts + 22603,
-	ts + 22007,
-	ts + 22654,
-	ts + 22706,
+	ts + 22611,
+	ts + 22664,
+	ts + 22068,
+	ts + 22715,
+	ts + 22767,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108419,8 +109297,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -108431,13 +109308,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -108621,19 +109495,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22756,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22817,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19750
+							return ts + 22859
 						}
-						return ts + 22798
+						return ts + 22868
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22804, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22874, 0)
 		}
 	}
 
@@ -108701,7 +109575,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22838,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22908,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109798,7 +110672,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22876, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110773,21 +111647,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16251, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16267, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16164, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16180, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -111530,7 +112404,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22925)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22995)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -111694,7 +112568,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -111911,9 +112785,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 6704
+							return ts + 6764
 						}
-						return ts + 6709
+						return ts + 6769
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -111925,6 +112799,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -112192,19 +113071,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22958, 0)
+					ts+23028, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23053, 0)
+					ts+23123, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23137, 0)
+					ts+23207, 0)
 			}
 			break
 		case uint32(273):
@@ -112583,9 +113462,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23222, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -113353,7 +114232,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23239, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23309, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -113376,7 +114255,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23264, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -113549,7 +114428,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23275, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -113562,11 +114441,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19870, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23282, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23287, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113579,9 +114458,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23297, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23301, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113820,7 +114699,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -114395,7 +115274,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -114410,7 +115289,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23309, 0)
+			ts+23379, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114601,23 +115480,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23377
+	var zErr uintptr = ts + 23447
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23391
+			zErr = ts + 23461
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23413
+			zErr = ts + 23483
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23435
+			zErr = ts + 23505
 			break
 
 		}
@@ -114635,35 +115514,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23458,
-	ts + 23471,
+	ts + 23528,
+	ts + 23541,
 	uintptr(0),
-	ts + 23487,
-	ts + 23512,
-	ts + 23526,
-	ts + 23545,
+	ts + 23557,
+	ts + 23582,
+	ts + 23596,
+	ts + 23615,
 	ts + 1490,
-	ts + 23570,
-	ts + 23607,
-	ts + 23619,
-	ts + 23634,
-	ts + 23667,
-	ts + 23685,
-	ts + 23710,
-	ts + 23739,
+	ts + 23640,
+	ts + 23677,
+	ts + 23689,
+	ts + 23704,
+	ts + 23737,
+	ts + 23755,
+	ts + 23780,
+	ts + 23809,
 	uintptr(0),
-	ts + 5848,
+	ts + 5838,
 	ts + 5334,
-	ts + 23756,
-	ts + 23774,
-	ts + 23792,
-	uintptr(0),
 	ts + 23826,
+	ts + 23844,
+	ts + 23862,
 	uintptr(0),
-	ts + 23847,
-	ts + 23873,
 	ts + 23896,
+	uintptr(0),
 	ts + 23917,
+	ts + 23943,
+	ts + 23966,
+	ts + 23987,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114764,6 +115643,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	libc.AtomicStoreNInt32(db+432, int32(1), 0)
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(libc.AtomicLoadNInt32(db+432, 0) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -114778,7 +115663,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114828,7 +115713,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23933, 0)
+				ts+24003, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114950,7 +115835,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23996, libc.VaList(bp, zName))
+		ts+24066, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115186,7 +116071,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24047, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24117, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115279,7 +116164,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -115349,7 +116234,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115359,7 +116244,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115396,14 +116281,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		}()
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24068, 0)
+				ts+24138, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -115533,7 +116418,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24136, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24206, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -115578,10 +116463,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24142, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24152,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115686,7 +116571,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24180, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115697,17 +116582,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24184, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24184
+	zModeType = ts + 24254
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24190, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -115745,7 +116630,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24195, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115753,7 +116638,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115793,7 +116678,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24239, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115817,15 +116702,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24255, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24262, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24270, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24273, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24276, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17346, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24340, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24343, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24346, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17362, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115971,10 +116856,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21802, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24280, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -115988,7 +116873,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -116039,9 +116924,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6381
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6441
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23282
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23352
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -116146,7 +117031,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24286
+		zFilename = ts + 24356
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, func() uint8 {
@@ -116264,21 +117149,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24289,
+	Xsqlite3_log(tls, iErr, ts+24359,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24314)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24384)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24334)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24341)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -116436,7 +117321,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24358, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -117092,7 +117977,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24386, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117210,7 +118095,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24394
+			return ts + 24464
 		}
 		return uintptr(0)
 	}(), 0)
@@ -117388,7 +118273,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6704, ts + 6709, ts + 6191, ts + 6186, ts + 7945, ts + 24417, ts + 24423,
+	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -117541,7 +118426,7 @@ __10:
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0' + int32(c)>>4)
-	c = *(*uint8)(unsafe.Pointer(ts + 24430 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24500 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -117596,7 +118481,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24447, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24517, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117660,13 +118545,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6704, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6709, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
 			break
 
 		}
@@ -118216,12 +119101,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6704, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6764, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6709, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6769, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(5))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -118322,7 +119207,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24476, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24546, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118628,7 +119513,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24491, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24561, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118643,7 +119528,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24495, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118697,7 +119582,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24521,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24591,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118802,11 +119687,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*uint8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zPath))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24564, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24634, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24567, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -118963,14 +119848,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24570, -1)
+			ts+24640, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, uint8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24621, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24691, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119065,7 +119950,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15364)
+	jsonWrongNumArgs(tls, ctx, ts+15380)
 	return
 __2:
 	;
@@ -119140,9 +120025,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24655
+			return ts + 24725
 		}
-		return ts + 24659
+		return ts + 24729
 	}())
 	return
 __2:
@@ -119275,7 +120160,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24666, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119372,7 +120257,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24669, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119416,7 +120301,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24672)
+		ts+24742)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -119547,7 +120432,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24755, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -119566,7 +120451,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24761, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -119662,7 +120547,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, uint8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24761, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119686,7 +120571,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24766
+				zRoot = ts + 24836
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119751,6 +120636,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -119802,7 +120693,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24476, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24546, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119897,25 +120788,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24768},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24773},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24802},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24815},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24818},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24822},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24834},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24846},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24857},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24868},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24880},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24893},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24912},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24923},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24940}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24838},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24843},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24872},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24885},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24888},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24892},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24904},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24916},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24927},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24938},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24950},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24963},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24982},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24993},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25010}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119934,8 +120825,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24958, FpModule: 0},
-	{FzName: ts + 24968, FpModule: 0},
+	{FzName: ts + 25028, FpModule: 0},
+	{FzName: ts + 25038, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120195,11 +121086,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24978, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24986, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25056, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -120410,7 +121301,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24991,
+		ts+25061,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -121108,7 +121999,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25073)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122449,7 +123340,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25087, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -122461,12 +123352,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25107, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25139, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122692,7 +123583,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25176, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25246, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -122715,14 +123606,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25321
+	var zFmt uintptr = ts + 25391
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11286, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -122763,7 +123654,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25377, ts + 5060, ts + 16251,
+	ts + 25447, ts + 5060, ts + 16267,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122806,19 +123697,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25382,
+			ts+25452,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25444, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25449,
+			ts+25519,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25513,
+			ts+25583,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25653,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122847,7 +123738,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25632
+			zFormat = ts + 25702
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122859,7 +123750,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25740,
+			ts+25810,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122867,18 +123758,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25785, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25855, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12757, 1)
+					Xsqlite3_str_append(tls, p, ts+12767, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25812, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25834, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25842, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122893,14 +123784,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25858,
-	ts + 25911,
-	ts + 25956,
-	ts + 26008,
-	ts + 26062,
-	ts + 26107,
-	ts + 26165,
-	ts + 26220,
+	ts + 25928,
+	ts + 25981,
+	ts + 26026,
+	ts + 26078,
+	ts + 26132,
+	ts + 26177,
+	ts + 26235,
+	ts + 26290,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122929,7 +123820,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26267, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -122941,7 +123832,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26287,
+			ts+26357,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -122949,7 +123840,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26344,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122991,10 +123882,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26379,
-		ts + 26422,
-		ts + 26457,
-		ts + 26493,
+		ts + 26449,
+		ts + 26492,
+		ts + 26527,
+		ts + 26563,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -123025,7 +123916,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26530,
+	Xsqlite3_str_appendf(tls, pSql, ts+26600,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -123037,7 +123928,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26554, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123060,7 +123951,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123156,7 +124047,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26563, ts + 26574}
+var azFormat = [2]uintptr{ts + 26633, ts + 26644}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -123194,13 +124085,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10858, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10920, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26584, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26590, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26594, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -123211,7 +124102,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26596, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26666, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123289,7 +124180,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26629,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26699,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4062
@@ -123313,7 +124204,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26636,
+			ts+26706,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123332,7 +124223,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26681, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26751, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -123346,8 +124237,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26713,
-		ts + 26767,
+		ts + 26783,
+		ts + 26837,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -123362,23 +124253,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26815,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26885,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26860
+					return ts + 26930
 				}
-				return ts + 26868
+				return ts + 26938
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26877,
+				ts+26947,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26860
+						return ts + 26930
 					}
-					return ts + 26868
+					return ts + 26938
 				}(), iKey, iVal))
 		}
 	}
@@ -123402,7 +124293,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26935, libc.VaList(bp, i, iCell, iNode))
+				ts+27005, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -123422,7 +124313,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26983, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27053, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -123439,14 +124330,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27050, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27084, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27154, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -123454,7 +124345,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27114,
+					ts+27184,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -123483,14 +124374,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27169,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27239,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27200, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -123512,12 +124403,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14493, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14503, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27267, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -123526,12 +124417,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25087, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27295, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27365, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -123545,8 +124436,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27326, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27333, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -123554,7 +124445,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27341, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27411, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -123569,7 +124460,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27345, -1)
+			ts+27415, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -123577,7 +124468,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6381
+			zDb = ts + 6441
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -123587,7 +124478,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17969
+				return ts + 18012
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123882,7 +124773,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -123940,6 +124831,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123952,15 +124844,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27396, 1)
+		Xsqlite3_str_append(tls, x, ts+27466, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27398, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27468, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27409, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123980,19 +124873,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep uint8 = uint8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27420, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27490, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27438, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27508, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = uint8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27446, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*uint8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27454, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27524, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27458, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -124011,6 +124904,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -124042,6 +124936,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -124050,6 +124945,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -124108,6 +125004,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -124276,6 +125173,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -124297,6 +125195,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -124381,6 +125280,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -124409,6 +125310,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124847,6 +125749,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124860,6 +125763,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -124874,6 +125780,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -124898,7 +125805,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27471, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27541, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124907,7 +125814,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27493, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -124915,7 +125822,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124994,6 +125901,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -125122,6 +126030,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -125140,7 +126049,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16251
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16267
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -125150,7 +126059,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27497
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27567
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -125158,7 +126067,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27503
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27573
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125270,7 +126179,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27512, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -125400,14 +126309,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27552) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27568) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27638) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -125444,8 +126355,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -125462,7 +126373,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -125472,7 +126383,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27583, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -125484,25 +126395,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27591},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27604},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27617},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27630},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27568},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27642},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27552},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27665},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27679},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27692},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27706},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27722},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27661},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27674},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27687},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27700},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27638},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27712},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27622},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27735},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27749},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27762},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27776},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27792},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27734},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -125512,26 +126423,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27753, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27763, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27774, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27497, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27785, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125585,7 +126496,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25073, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125912,7 +126823,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27795, -1)
+		Xsqlite3_result_error(tls, context, ts+27865, -1)
 		return
 	}
 
@@ -125923,7 +126834,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27795, -1)
+			Xsqlite3_result_error(tls, context, ts+27865, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126024,7 +126935,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27816, uintptr(0), uintptr(0), p+64)
+				ts+27886, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -126088,7 +126999,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+24986, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25056, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -126109,16 +127020,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+27987, libc.VaList(bp, func() uintptr {
+			ts+28057, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28137
+					return ts + 28207
 				}
 				return ts + 1554
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28178)
+			ts+28248)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126234,7 +127145,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28303, libc.VaList(bp, zTab)))
+			ts+28373, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126252,7 +127163,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28422, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28492, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126270,7 +127181,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28443, libc.VaList(bp+16, zIdx)))
+			ts+28513, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126293,7 +127204,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28494, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28564, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126339,7 +127250,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -126354,7 +127265,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -126394,7 +127305,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19396, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -126404,18 +127315,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+28572, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+28591, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28661, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28596, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28666, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -126427,18 +127338,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28606, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28635
+							return ts + 28705
 						}
-						return ts + 28648
+						return ts + 28718
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+28657, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -126452,7 +127363,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28679,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28749,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -126499,8 +127410,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+28706, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14604
+		zList = rbuMPrintf(tls, p, ts+28776, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14614
 	}
 	return zList
 }
@@ -126517,7 +127428,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+28715, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -126539,25 +127450,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+28728, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28760, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28830, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+28783)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28789, ts+28796, ts+4957)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+28853)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28859, ts+28866, ts+4957)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+28804,
+					ts+28874,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28846, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28916, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126599,7 +127510,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -126634,7 +127545,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28866
+	zCol = ts + 28936
 __7:
 	;
 	goto __5
@@ -126642,13 +127553,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28874,
+	zLhs = rbuMPrintf(tls, p, ts+28944,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28895,
+	zOrder = rbuMPrintf(tls, p, ts+28965,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28931,
+	zSelect = rbuMPrintf(tls, p, ts+29001,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14604
+	zSep = ts + 14614
 	iCol++
 	goto __1
 __2:
@@ -126666,7 +127577,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+28958,
+		Xsqlite3_mprintf(tls, ts+29028,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -126693,8 +127604,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29006, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14604
+	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14614
 	goto __15
 __15:
 	iCol++
@@ -126705,7 +127616,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29013, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126738,7 +127649,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126750,7 +127661,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29025, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29095, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1554
 		} else {
@@ -126762,37 +127673,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28866
+					zCol = ts + 28936
 				} else {
-					zCol = ts + 28596
+					zCol = ts + 28666
 				}
 				zType = ts + 1119
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29047, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28783
+					return ts + 28853
 				}
 				return ts + 1554
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29067,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29088,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29121, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14604
-		zAnd = ts + 21464
+		zCom = ts + 14614
+		zAnd = ts + 21525
 		nBind++
 	}
 
@@ -126831,11 +127742,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+29145, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29215, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29157, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14604
+			zS = ts + 14614
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126843,7 +127754,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29166, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29236, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126855,18 +127766,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29181, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1554
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29195, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21525
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29207, libc.VaList(bp+40, zList))
+			ts+29277, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1554
@@ -126874,8 +127785,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29257, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21525
 			}
 		}
 	}
@@ -126884,7 +127795,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29270, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29340, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126902,17 +127813,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c uint8 = *(*uint8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29257,
+					zList = rbuMPrintf(tls, p, ts+29327,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29296,
+					zList = rbuMPrintf(tls, p, ts+29366,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29326,
+					zList = rbuMPrintf(tls, p, ts+29396,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				}
 			}
 		}
@@ -126947,19 +127858,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29363
+		var zSep uintptr = ts + 29433
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16139) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16155) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126971,15 +127882,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 28783
+					zDesc = ts + 28853
 				} else {
 					zDesc = ts + 1554
 				}
-				z = rbuMPrintf(tls, p, ts+29376, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14604
+				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14614
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29387, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -126999,7 +127910,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29391)
+			ts+29461)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -127008,7 +127919,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127018,25 +127929,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29441, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29511, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29463, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28783
+						return ts + 28853
 					}
 					return ts + 1554
 				}()))
-				zComma = ts + 14604
+				zComma = ts + 14614
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29473, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29488,
+			ts+29558,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -127049,7 +127960,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1554
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1554
@@ -127057,39 +127968,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29550
+				zPk = ts + 29620
 			}
-			zSql = rbuMPrintf(tls, p, ts+29563,
+			zSql = rbuMPrintf(tls, p, ts+29633,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29590
+							return ts + 29660
 						}
 						return ts + 1554
 					}()))
-			zComma = ts + 14604
+			zComma = ts + 14614
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29600, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29670, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29607,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29677,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29639
+						return ts + 29709
 					}
 					return ts + 1554
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -127102,7 +128013,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+29654,
+				ts+29724,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127139,7 +128050,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+29711)
+			ts+29781)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -127244,7 +128155,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29777, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29847, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127264,24 +128175,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29797,
+				ts+29867,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+29862, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29932, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+29898, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127297,7 +128208,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29932,
+						ts+30002,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127305,9 +128216,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29993
+											return ts + 30063
 										}
-										return ts + 29997
+										return ts + 30067
 									}()
 								}
 								return ts + 1554
@@ -127316,20 +128227,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30003,
+						ts+30073,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30064,
+						ts+30134,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29993
+									return ts + 30063
 								}
-								return ts + 29997
+								return ts + 30067
 							}(),
 							zCollist, zLimit))
 				}
@@ -127354,8 +128265,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6392)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6388)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6452)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -127366,16 +128277,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1554
 				}
-				return ts + 30223
+				return ts + 30293
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30232,
+						ts+30302,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30268
+								return ts + 30338
 							}
 							return ts + 1554
 						}(), zBindings)))
@@ -127384,32 +128295,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30278, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1554
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30306
+					zRbuRowid = ts + 30376
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30318, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30388, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30394
+							return ts + 30464
 						}
 						return ts + 1554
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30411,
+					ts+30481,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30710,
+						ts+30780,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -127422,9 +128333,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30809
+						zRbuRowid = ts + 30879
 					} else {
-						zRbuRowid = ts + 30819
+						zRbuRowid = ts + 30889
 					}
 				}
 
@@ -127437,20 +128348,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28866, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30830,
+							ts+30900,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30878
+										return ts + 30948
 									}
 									return ts + 1554
 								}(),
@@ -127463,7 +128374,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19750
+										return ts + 22859
 									}
 									return ts + 1554
 								}(), zOrder,
@@ -127531,9 +128442,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1554
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30223
+				zPrefix = ts + 30293
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30884,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -127592,7 +128503,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+30914, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+30984, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -127662,28 +128573,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30944, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30972, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31042, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+48, ts+3286, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6381, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6441, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30990, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127716,11 +128627,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31056, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31126, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24136, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -127732,13 +128643,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31088,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381),
+			zTarget = Xsqlite3_mprintf(tls, ts+31158,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
 						}
-						return ts + 31120
+						return ts + 31190
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
@@ -127757,37 +128668,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31122, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31137, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31154, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31198, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31268, 0)
 	}
 }
 
@@ -127816,15 +128727,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31216, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31286, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -127872,7 +128783,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -127932,7 +128843,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127949,23 +128860,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31251, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31321, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31276, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31283, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128082,7 +128993,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23774, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23844, 0)
 			return
 		}
 
@@ -128175,7 +129086,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+31290)
+			ts+31360)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -128183,7 +129094,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31312, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31382, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -128204,7 +129115,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+31339,
+				ts+31409,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128234,9 +129145,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+31497, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31567, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31512,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31582,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128250,10 +129161,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31532, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31602, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31557)
+			ts+31627)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128267,12 +129178,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31665)
+			ts+31735)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+31730)
+			ts+31800)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128284,7 +129195,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31774, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31844, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128304,15 +129215,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17224)
-					rbuCopyPragma(tls, p, ts+16335)
+					rbuCopyPragma(tls, p, ts+17240)
+					rbuCopyPragma(tls, p, ts+16351)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31799, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31869, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128336,10 +129247,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -128434,7 +129345,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31827, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31897, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -128447,16 +129358,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31276, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -128466,7 +129378,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31852, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -128500,7 +129412,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31863, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -128530,13 +129442,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31935, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31949)
+				ts+32019)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -128547,7 +129459,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+32006)
+				ts+32076)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -128621,7 +129533,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32080, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32150, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -128639,12 +129551,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32112,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32182,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32144
+							return ts + 32214
 						}
-						return ts + 32151
+						return ts + 32221
 					}()))
 			}
 		}
@@ -128652,7 +129564,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14493, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14503, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -128663,19 +129575,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16938)
-						rbuCopyPragma(tls, p, ts+16350)
+						rbuCopyPragma(tls, p, ts+16954)
+						rbuCopyPragma(tls, p, ts+16366)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32158, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32174, uintptr(0), uintptr(0), p+64)
+								db, ts+32244, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -128729,7 +129641,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32198, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32268, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128756,7 +129668,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30223, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30293, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -128773,7 +129685,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128786,13 +129698,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32206, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32276, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128887,7 +129799,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128904,19 +129816,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14493
+				zBegin = ts + 14503
 			} else {
-				zBegin = ts + 32158
+				zBegin = ts + 32228
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32158, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32228, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129039,11 +129951,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -129182,7 +130097,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -129259,7 +130174,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32233, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32303, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129284,7 +130199,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32256, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129429,7 +130344,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6381)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6441)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -129444,7 +130359,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32267, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32337, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129455,7 +130370,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -129485,6 +130406,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -130248,11 +131184,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11286, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11348, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32278, 0)
+				ts+32348, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
 		} else {
@@ -130265,7 +131201,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32399, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -130363,7 +131299,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11286, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130830,6 +131766,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -130912,6 +131851,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -130941,9 +131881,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32428,
+			zRet = Xsqlite3_mprintf(tls, ts+32498,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 21464
+			zSep = ts + 21525
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130966,9 +131906,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32462,
+				ts+32532,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 32503
+			zSep = ts + 32573
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130976,18 +131916,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7470, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32508,
+		ts+32578,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130997,7 +131937,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -131030,7 +131970,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32586,
+			ts+32656,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -131157,7 +132097,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32639, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -131631,9 +132571,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11286, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11348, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32666, libc.VaList(bp, zDb))
+			ts+32736, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -131642,18 +132582,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1554
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32776, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32846, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1567, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32791, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32861, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+32799, bp+24)
+				sessionAppendStr(tls, bp+8, ts+32869, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21464
+				zSep = ts + 21525
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131762,7 +132702,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32805, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32875, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -131854,7 +132794,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32825, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -132117,7 +133057,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132140,7 +133080,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -132182,7 +133122,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132243,7 +133183,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -132317,13 +133257,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -132385,7 +133325,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -132758,7 +133698,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -132926,7 +133866,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11286) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11348) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -132937,34 +133877,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32843, bp+16)
+				sessionAppendStr(tls, bp, ts+32913, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32856, bp+16)
+				sessionAppendStr(tls, bp, ts+32926, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+32862, bp+16)
+						sessionAppendStr(tls, bp, ts+32932, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14604
+						zSep = ts + 14614
 					}
 				}
 
 				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32791, bp+16)
+				sessionAppendStr(tls, bp, ts+32861, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32867, bp+16)
+								ts+32937, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32799, bp+16)
+							sessionAppendStr(tls, bp, ts+32869, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21464
+						zSep = ts + 21525
 					}
 				}
 
@@ -133016,34 +133956,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32942, bp+16)
+	sessionAppendStr(tls, bp, ts+33012, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32791, bp+16)
+	sessionAppendStr(tls, bp, ts+32861, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+32862, bp+16)
+			sessionAppendStr(tls, bp, ts+32932, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21464
+			zSep = ts + 21525
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32960, bp+16)
+		sessionAppendStr(tls, bp, ts+33030, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32503, bp+16)
+		sessionAppendStr(tls, bp, ts+32573, bp+16)
 
 		zSep = ts + 1554
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+32799, bp+16)
+				sessionAppendStr(tls, bp, ts+32869, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 32968
+				zSep = ts + 33038
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4957, bp+16)
@@ -133059,7 +133999,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6381, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -133070,19 +134010,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32973, bp+16)
+	sessionAppendStr(tls, bp, ts+33043, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21470, bp+16)
+	sessionAppendStr(tls, bp, ts+21531, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14604, bp+16)
+			sessionAppendStr(tls, bp, ts+14614, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+32991, bp+16)
+	sessionAppendStr(tls, bp, ts+33061, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33002, bp+16)
+		sessionAppendStr(tls, bp, ts+33072, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+4957, bp+16)
 
@@ -133098,14 +134038,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11286, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11348, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33006)
+			ts+33076)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33119)
+			ts+33189)
 	}
 	return rc
 }
@@ -133133,7 +134073,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -133142,7 +134082,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -133219,7 +134159,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -133345,7 +134285,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -133386,7 +134326,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33263, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33333, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -133402,7 +134342,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33284, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33354, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -133475,10 +134415,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33303, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33373, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33329, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -133524,7 +134464,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6381, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6441, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -133537,19 +134477,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33359, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33403,
+						ts+33473,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33474, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11286) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11348) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133600,14 +134540,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33534, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33588, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134855,7 +135795,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33616, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135143,7 +136083,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33644, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135330,7 +136270,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33675, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -135398,7 +136338,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33682
+		var zErr uintptr = ts + 33752
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135580,7 +136520,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33732
+		var zErr uintptr = ts + 33802
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135904,13 +136844,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33780, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33788, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33798, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136461,7 +137401,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33803, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33873, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -136488,14 +137428,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*uint8)(unsafe.Pointer(p))) < '0' || int32(*(*uint8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33810, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33880, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33841, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136506,7 +137446,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33874, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136519,7 +137459,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33911, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -136528,7 +137468,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33920, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33990, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136547,7 +137487,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33953, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136562,14 +137502,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33987, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33995, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*uint8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34027, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136577,9 +137517,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34033, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34047, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136587,9 +137527,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34085, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
 		if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || int32(*(*uint8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34096, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34166, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -136599,19 +137539,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 7958, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17329},
-			{FzName: ts + 34131, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17345},
+			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34139, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34209, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34170, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136658,15 +137598,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22130) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16251) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34198, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22191) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34228) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34238, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34308, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136683,13 +137623,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34269, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34274, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34281, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34351, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136727,8 +137667,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22130) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34289, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22191) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136760,7 +137700,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34318, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34388, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136797,19 +137737,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33987
+			zTail = ts + 34057
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34338
+			zTail = ts + 34408
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34346, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16251, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16267, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136853,18 +137793,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34357, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34427, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1554
 			}
-			return ts + 14604
+			return ts + 14614
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34373, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34443, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34380,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22130))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136974,7 +137914,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34406) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136984,7 +137924,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34411) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34481) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136994,7 +137934,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34420) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34490) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137007,7 +137947,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34430) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34500) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137017,7 +137957,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34440) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34510) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137033,7 +137973,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22130) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22191) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -137056,7 +137996,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34452
+	var zSelect uintptr = ts + 34522
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -137078,7 +138018,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34484) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34554) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -137092,7 +138032,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34492,
+				ts+34562,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -137190,7 +138130,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34557, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
 					return FTS5_EOF
 				}
 			}
@@ -137203,20 +138143,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34577, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34647, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34608, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34678, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34611, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29993, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -137302,6 +138242,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*uint8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -137330,7 +138281,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 1))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*uint8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = uint8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -138983,9 +139934,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34615, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33644, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -139001,7 +139952,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c uint8 = *(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34620, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -139088,7 +140039,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20467, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -139169,7 +140120,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34649, 0)
+			ts+34719, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -139339,12 +140290,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34702,
+								ts+34772,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34752
+										return ts + 34822
 									}
-									return ts + 34615
+									return ts + 34685
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140287,7 +141238,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34759, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34829, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -140366,7 +141317,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+34765,
+			ts+34835,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -140391,7 +141342,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34816,
+			ts+34886,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -140414,7 +141365,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+34865,
+			ts+34935,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140653,7 +141604,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+34905, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141852,7 +142803,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+34928,
+			ts+34998,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143318,7 +144269,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+35012,
+			ts+35082,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -143809,10 +144760,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -144395,13 +145351,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35069, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24986, ts+35077, 0, pzErr)
+				pConfig, ts+25056, ts+35147, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11426,
-					ts+35112,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
+					ts+35182,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144654,7 +145610,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34759, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -144768,7 +145724,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35156,
+		ts+35226,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -144938,7 +145894,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35242)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35312)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -145209,7 +146165,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35247, 0)
+			ts+35317, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145633,11 +146589,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35286,
+		ts+35356,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14604
+					return ts + 14614
 				}
 				return ts + 1554
 			}(),
@@ -145649,9 +146605,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35341
+					return ts + 35411
 				}
-				return ts + 35346
+				return ts + 35416
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145697,12 +146653,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35350, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35420, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5057, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35356, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145733,7 +146689,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35384, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35454, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -145764,7 +146720,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35394, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35464, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145796,14 +146752,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35415, libc.VaList(bp, z))
+				ts+35485, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33798
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33868
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145859,7 +146815,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35247, 0)
+		ts+35317, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146076,7 +147032,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35448, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -146221,28 +147177,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35484, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35554, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35495, 0)
+				ts+35565, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35575, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35583, 0)
+				ts+35653, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16918, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35639, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35715, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146300,7 +147256,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17463, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17479, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -146313,12 +147269,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35661,
+				ts+35731,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20368
+						return ts + 20429
 					}
-					return ts + 35698
+					return ts + 35768
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146948,7 +147904,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35710, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35780, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -147192,7 +148148,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35731, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -147211,7 +148167,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35753, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35823, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147258,7 +148214,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35784)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35854)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147267,7 +148223,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35797, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35867, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -147281,7 +148237,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35888, ts + 33987, ts + 24986, ts + 34338, ts + 11426,
+	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147305,7 +148261,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35895, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147323,13 +148279,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35895, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35900, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35970, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -147384,17 +148342,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35915,
-			ts + 35983,
-			ts + 36052,
-			ts + 36085,
-			ts + 36124,
-			ts + 36164,
-			ts + 36203,
-			ts + 36244,
-			ts + 36283,
-			ts + 36325,
-			ts + 36365,
+			ts + 35985,
+			ts + 36053,
+			ts + 36122,
+			ts + 36155,
+			ts + 36194,
+			ts + 36234,
+			ts + 36273,
+			ts + 36314,
+			ts + 36353,
+			ts + 36395,
+			ts + 36435,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -147496,18 +148454,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36388,
+		ts+36458,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36492,
+			ts+36562,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36530,
+			ts+36600,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -147519,7 +148477,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36568,
+			ts+36638,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147531,14 +148489,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24986, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11426, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35888, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25056, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34338, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33987, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147550,17 +148508,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36610,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36680,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29639
+					return ts + 29709
 				}
 				return ts + 1554
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36640,
+			ts+36710,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147597,27 +148555,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36684, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36707, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36777, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33987, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34338, ts+36713, 0, pzErr)
+				pConfig, ts+34408, ts+36783, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35888, ts+36745, 1, pzErr)
+				pConfig, ts+35958, ts+36815, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147823,12 +148781,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36762,
+		ts+36832,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36812,
+			ts+36882,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147836,7 +148794,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148012,7 +148970,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36841,
+	zSql = Xsqlite3_mprintf(tls, ts+36911,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -148194,14 +149152,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33987, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34057, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34338, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34408, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -148396,9 +149354,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36873) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36943) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148613,7 +149571,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36895
+			var zCat uintptr = ts + 36965
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148625,7 +149583,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36904) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -148636,18 +149594,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36915) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36985) {
 					if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '2' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*uint8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36873) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36943) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36904) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148923,7 +149881,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36933
+	var zBase uintptr = ts + 37003
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -149065,7 +150023,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36943, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149073,11 +150031,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36946, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36951, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149085,7 +150043,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36956, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149093,7 +150051,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36959, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149101,11 +150059,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36962, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36967, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37037, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149113,19 +150071,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36972, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36976, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37046, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36982, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37052, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36987, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37057, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149133,11 +150091,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36991, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36995, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149145,7 +150103,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36998, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149153,11 +150111,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37002, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37076, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149165,7 +150123,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37010, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149173,7 +150131,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37014, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149181,7 +150139,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37018, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149197,24 +150155,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37002, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37092, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37028, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37098, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37018, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37088, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -149229,137 +150187,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37105, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37043, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37050, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37055, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36951, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37060, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36946, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37018, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37070, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15464, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37075, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37028, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37079, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37154, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36987, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37090, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37094, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37096, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37010, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37018, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37110, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37116, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37121, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37127, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37014, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37143, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37010, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37155, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37161, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37014, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37167, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37028, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -149374,16 +150332,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37174, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37244, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149391,21 +150349,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37143, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149413,7 +150371,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37196, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -149421,9 +150379,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37202, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -149438,12 +150396,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37208, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37212, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37215, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -149452,7 +150410,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149608,7 +150566,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37222) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37292) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149788,22 +150746,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36933, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37237, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37243, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37250, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -150946,14 +151904,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37258) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37328) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37262) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37266) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37275, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150979,19 +151937,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 37309,
-		ts + 37349,
-		ts + 37384,
+		ts + 37379,
+		ts + 37419,
+		ts + 37454,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23282, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23352, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37427, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151124,11 +152082,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37460, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37491,
+		ts+37561,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -151152,7 +152110,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37542, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -151547,7 +152505,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37568, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151569,7 +152527,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37578
+	return ts + 37648
 }
 
 func init() {
@@ -151624,114 +152582,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -152192,6 +153152,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -152510,6 +153482,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -152531,5 +153504,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_linux_s390x.go b/vendor/modernc.org/sqlite/lib/sqlite_linux_s390x.go
index b07db89e..45e6cb62 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_linux_s390x.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_linux_s390x.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_s390x.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_linux_s390x.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -497,6 +497,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -612,6 +613,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -986,6 +988,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1473,6 +1476,7 @@ const (
 	SF_Recursive                          = 0x0002000
 	SF_Resolved                           = 0x0000004
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1557,6 +1561,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1674,6 +1679,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -2039,6 +2045,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -2136,11 +2143,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -2155,7 +2165,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -2262,8 +2272,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2743,6 +2753,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -4158,6 +4169,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -5774,10 +5786,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -5842,12 +5852,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -6099,7 +6107,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -6220,7 +6227,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -6244,11 +6251,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -6256,11 +6265,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -6892,7 +6901,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -7030,10 +7039,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -7048,12 +7055,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -7243,10 +7248,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -7450,7 +7457,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]uint8)(unsafe.Pointer(ts + 1099))
@@ -7602,7 +7609,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -7651,8 +7657,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -7663,6 +7679,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -7779,7 +7804,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -8630,14 +8655,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = uint8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -8645,7 +8670,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -10456,7 +10481,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zStart + uintptr(n-1)))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -10712,6 +10737,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -11698,6 +11725,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -11706,11 +11734,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -11722,30 +11774,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1554
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -11754,83 +11806,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*uint8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -11844,17 +11896,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -11862,90 +11914,90 @@ __219:
 		}
 		return ts + 1560
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*uint8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignUint8(&ch1, *(*uint8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*uint8)(unsafe.Pointer(bufpt + uintptr(j))) = uint8(0)
 	length = int32(j)
@@ -11953,89 +12005,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1567, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1579, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -12048,32 +12100,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, uint8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -12132,7 +12184,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -12148,8 +12200,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -12178,12 +12229,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -12192,7 +12244,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c uint8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -13322,6 +13374,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -13927,10 +13997,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13956,6 +14029,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = uint8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]uint8{}))-uint64(1)-uint64(i))
+	return int32(uint64(unsafe.Sizeof([22]uint8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14912,11 +14986,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -15821,7 +15896,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -16044,7 +16119,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -16060,113 +16135,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = X__off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno_location(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -16298,7 +16373,7 @@ func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	unixUnmapfile(tls, pFile)
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -16589,7 +16664,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3378, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3378, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -16606,14 +16681,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3666, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16633,7 +16708,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		if nByte < (*UnixFile)(unsafe.Pointer(pFile)).FmmapSize {
 			(*UnixFile)(unsafe.Pointer(pFile)).FmmapSize = nByte
@@ -16701,7 +16776,7 @@ func fcntlSizeHint(tls *libc.TLS, pFile uintptr, nByte I64) int32 {
 		if (*UnixFile)(unsafe.Pointer(pFile)).FszChunk <= 0 {
 			if robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte) != 0 {
 				storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))))
-				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40592)
+				return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3297, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40883)
 			}
 		}
 
@@ -16928,7 +17003,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -16956,7 +17031,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3297, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -17055,7 +17130,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3261, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3261, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -17185,7 +17260,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3332, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -17231,7 +17306,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3419, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -17462,7 +17537,7 @@ func unixRemapfile(tls *libc.TLS, pFd uintptr, nNew I64) {
 	if pNew == libc.UintptrFromInt32(-1) {
 		pNew = uintptr(0)
 		nNew = int64(0)
-		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 41878)
+		unixLogErrorAtLine(tls, SQLITE_OK, zErr, (*UnixFile)(unsafe.Pointer(pFd)).FzPath, 42169)
 
 		(*UnixFile)(unsafe.Pointer(pFd)).FmmapSizeMax = int64(0)
 	}
@@ -17596,7 +17671,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+16)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -17617,7 +17692,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -17933,7 +18008,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3261, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3261, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -18024,7 +18099,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3371, zPath, 43337)
 		}
 		return rc
 	}
@@ -18032,9 +18107,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3788, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -18077,12 +18152,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*uint8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*uint8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -18101,18 +18173,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*24 + 8)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3459, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3459, zIn, 43443)
 			}
 		} else if (*stat)(unsafe.Pointer(bp)).Fst_mode&X__mode_t(0170000) == X__mode_t(0120000) {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls, zIn, bp+144, uint64(unsafe.Sizeof([4098]uint8{}))-uint64(2))
 			if got <= int64(0) || got >= Ssize_t(unsafe.Sizeof([4098]uint8{}))-int64(2) {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3450, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3450, zIn, 43454)
 				return
 			}
 			*(*uint8)(unsafe.Pointer(bp + 144 + uintptr(got))) = uint8(0)
@@ -18152,14 +18224,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 4104)).FzOut = zOut
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, bp, uint64(unsafe.Sizeof([4098]uint8{}))-uint64(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3279, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3279, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+4104, bp)
 	}
 	appendAllPathElements(tls, bp+4104, zPath)
 	*(*uint8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+4104)).FnUsed))) = uint8(0)
 	if (*DbPath)(unsafe.Pointer(bp+4104)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+4104)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+4104)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -18260,7 +18332,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__errno_location(tls))) == EINTR {
 				got = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*24 + 8)))(tls, fd, zBuf, uint64(nBuf)))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -18268,12 +18340,12 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 }
 
 func unixSleep(tls *libc.TLS, NotUsed uintptr, microseconds int32) int32 {
-	if microseconds >= 1000000 {
-		libc.Xsleep(tls, uint32(microseconds/1000000))
-	}
-	if microseconds%1000000 != 0 {
-		libc.Xusleep(tls, uint32(microseconds%1000000))
-	}
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
+
+	(*timespec)(unsafe.Pointer(bp)).Ftv_sec = X__time_t(microseconds / 1000000)
+	(*timespec)(unsafe.Pointer(bp)).Ftv_nsec = X__syscall_slong_t(microseconds % 1000000 * 1000)
+	libc.Xnanosleep(tls, bp, uintptr(0))
 	_ = NotUsed
 	return microseconds
 }
@@ -22184,7 +22256,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -23236,7 +23308,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -23253,7 +23324,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -23319,7 +23389,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -23329,7 +23398,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -23520,36 +23589,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -23721,7 +23779,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -23845,7 +23903,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -23884,7 +23942,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23961,7 +24019,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -24873,10 +24931,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]uint8{uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0)}
@@ -24962,7 +25022,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -25719,7 +25779,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -25818,7 +25878,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -26404,7 +26464,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -26679,7 +26739,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -27152,7 +27212,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -27657,7 +27717,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -27892,8 +27952,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -27901,23 +27961,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -28313,7 +28375,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -28450,7 +28512,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -28467,7 +28529,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -28475,7 +28537,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -28518,7 +28580,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -28528,7 +28590,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -28778,7 +28840,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -28825,7 +28887,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -28835,7 +28897,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -28848,7 +28910,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -28857,14 +28919,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -28874,7 +28936,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -28938,7 +29000,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -28948,7 +29010,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -28970,7 +29032,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -29005,7 +29067,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -29018,13 +29080,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -29049,7 +29111,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -29060,7 +29122,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -29112,22 +29174,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -29137,7 +29199,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -29145,7 +29207,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -29153,10 +29215,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -29180,13 +29242,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29194,7 +29255,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -29202,32 +29302,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -29255,11 +29344,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -29270,15 +29359,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -29306,14 +29395,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2) + 1)))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -29327,7 +29416,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -29339,7 +29428,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -29442,7 +29531,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -29470,7 +29559,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -29509,7 +29598,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -30392,7 +30481,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -30807,7 +30896,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -30833,7 +30922,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -30842,7 +30931,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -30853,7 +30942,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -30869,7 +30958,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -30930,7 +31019,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -30965,7 +31054,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -31025,7 +31114,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -31064,7 +31153,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -31095,7 +31184,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -31436,7 +31525,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -31680,14 +31769,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -31732,7 +31821,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -31781,7 +31870,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -31861,7 +31950,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -31952,7 +32041,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -31972,7 +32061,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -32036,18 +32125,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -32063,6 +32142,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -32184,7 +32271,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -32388,7 +32475,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -32453,7 +32540,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -32501,7 +32588,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -32620,7 +32707,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -32780,7 +32867,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -32845,7 +32932,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -32881,7 +32968,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -32925,7 +33012,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -33037,7 +33124,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -33195,7 +33282,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -33252,7 +33339,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -33268,7 +33355,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -33342,7 +33429,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -33354,7 +33441,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -33365,7 +33452,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -33530,7 +33617,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -33554,9 +33641,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -33579,16 +33666,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -33609,9 +33694,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -33745,11 +33836,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -33802,12 +33896,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -33815,7 +33909,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -33875,7 +33969,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -33964,7 +34058,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -34080,7 +34174,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -34123,8 +34217,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -34206,6 +34300,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -34398,7 +34494,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -34409,7 +34505,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -34567,7 +34663,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -34641,7 +34737,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -34667,9 +34763,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -34680,8 +34777,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -34703,7 +34800,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -34731,7 +34828,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -34992,11 +35089,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -35184,7 +35281,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -35222,7 +35319,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -35299,7 +35396,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -35311,19 +35408,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -35336,7 +35425,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -35355,6 +35444,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -35390,7 +35496,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -35399,13 +35504,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -35416,7 +35520,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -35529,7 +35633,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -35543,20 +35647,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -35566,7 +35670,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -35574,100 +35684,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx) + 1)))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -35676,30 +35786,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -35722,7 +35832,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -35741,13 +35850,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, uint64(nIn))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -35764,7 +35875,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -35823,9 +35934,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -35865,7 +35976,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -35873,11 +35984,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx) + 1)))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -35952,7 +36063,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)) + 1)))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -35962,7 +36073,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -36021,7 +36132,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -36050,7 +36161,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -36126,7 +36237,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -36140,7 +36251,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -36274,7 +36385,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -36449,12 +36560,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -36462,15 +36602,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+4062, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4062, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -36494,9 +36634,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4087, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if libc.AtomicLoadNInt32((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb+432, 0) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -36510,7 +36647,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4112, libc.VaList(bp, iChild))
 		return
@@ -36584,7 +36721,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -36669,48 +36808,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4308
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4318, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4356, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4394, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -36725,29 +36871,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4442
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -36755,28 +36901,28 @@ __9:
 	pc = U32(int32(*(*U8)(unsafe.Pointer(pCellIdx)))<<8 | int32(*(*U8)(unsafe.Pointer(pCellIdx + 1))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4470,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4500, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -36784,97 +36930,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4524, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4548, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2) + 1))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -36884,48 +37030,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4573, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4610,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -36954,9 +37100,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -36988,19 +37134,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -37012,7 +37152,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -37020,7 +37160,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -37105,7 +37245,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -37148,22 +37288,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -37390,8 +37527,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -37891,7 +38028,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
 		libc.Xmemcpy(tls, bp+8, p, uint64(int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int*2))
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+16, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+16, ts+4925,
@@ -37903,6 +38040,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*uint8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+16)).FnChar))) = uint8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 16)).FnChar)
 	}
 }
 
@@ -38090,7 +38228,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -38264,16 +38401,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -38716,7 +38855,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -38953,43 +39092,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -39374,7 +39504,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -39389,14 +39519,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -39766,7 +39896,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -39778,13 +39910,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -39861,6 +39995,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -40749,7 +40886,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -40758,7 +40895,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -40792,7 +40929,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -40834,7 +40970,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -41586,7 +41722,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -41694,7 +41830,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -42245,7 +42381,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -42310,7 +42446,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -42344,7 +42480,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -42394,7 +42530,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -42540,7 +42676,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -42711,7 +42847,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -42737,7 +42873,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -43011,7 +43147,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -43378,13 +43514,16 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = func() uint8 {
-			if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
-				return uint8(SQLITE_UTF16BE)
-			}
-			return uint8(SQLITE_UTF16LE)
-		}()
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = func() uint8 {
+				if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
+					return uint8(SQLITE_UTF16BE)
+				}
+				return uint8(SQLITE_UTF16LE)
+			}()
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -43394,7 +43533,7 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, func() uint8 {
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), func() uint8 {
 		if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
 			return uint8(SQLITE_UTF16BE)
 		}
@@ -43403,11 +43542,11 @@ func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDe
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -43595,6 +43734,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -43647,7 +43787,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -43711,6 +43851,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -43722,9 +43871,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5357)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -43958,7 +44108,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -43982,8 +44132,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -44157,15 +44307,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5367, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5357, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -44276,19 +44426,22 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = func() uint8 {
-			if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
-				return uint8(SQLITE_UTF16BE)
-			}
-			return uint8(SQLITE_UTF16LE)
-		}()
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = func() uint8 {
+				if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
+					return uint8(SQLITE_UTF16BE)
+				}
+				return uint8(SQLITE_UTF16LE)
+			}()
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, func() uint8 {
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, func() uint8 {
 		if int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&Xsqlite3one))))) == 0 {
 			return uint8(SQLITE_UTF16BE)
 		}
@@ -44577,7 +44730,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -44721,7 +44874,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -44893,7 +45046,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*uint8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5407, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5397, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -44948,21 +45101,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5411, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5401, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5418, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5408, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5431, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5421, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5434, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5424, libc.VaList(bp+40, int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5439, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5429, 1)
 			}
 		}
 	}
@@ -45054,11 +45207,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity uint8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -45189,8 +45342,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -45425,7 +45578,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -45526,593 +45678,597 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
+
+	case OP_IfNoHope:
 		goto __100
-	case OP_NotFound:
+	case OP_NoConflict:
 		goto __101
-	case OP_Found:
+	case OP_NotFound:
 		goto __102
+	case OP_Found:
+		goto __103
 
 	case OP_SeekRowid:
-		goto __103
-	case OP_NotExists:
 		goto __104
-
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46121,56 +46277,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -46178,20 +46334,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -46199,124 +46356,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5441, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5462, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5431, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5452, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5469, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5459, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -46324,10 +46481,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -46338,9 +46495,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -46348,171 +46505,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint64(uintptr(0)+24))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -46520,95 +46677,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = uint8(0)
@@ -46616,231 +46773,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -46849,95 +47006,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, uint8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -46947,189 +47104,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = uint8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -47138,38 +47299,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -47177,9 +47338,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -47190,298 +47351,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -47491,144 +47653,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -47636,353 +47798,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len))
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = uint8(0)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = uint8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf >> 0) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5493,
+	Xsqlite3VdbeError(tls, p, ts+5483,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf>>0)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*uint8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -47996,319 +48158,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*uint8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*uint8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*uint8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -48316,467 +48467,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5534, 0)
+	Xsqlite3VdbeError(tls, p, ts+5524, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5585, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5575, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5607, 0)
+		ts+5597, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5661, 0)
+		ts+5651, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5716
+				return ts + 5706
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5764
+					return ts + 5754
 				}
-				return ts + 5807
+				return ts + 5797
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x4>>2)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5848)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5838)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 6, 0xc0)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 3, 0x8)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -48784,67 +48946,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 6, 0xc0)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0xc0>>6) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -48855,24 +49017,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -48880,30 +49042,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -48919,22 +49081,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 7, 0x80)
@@ -48948,133 +49110,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1554
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x10>>4) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 7, 0x80)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 5, 0x20)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -49082,18 +49244,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49104,92 +49266,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -49207,106 +49369,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -49315,108 +49477,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -49424,14 +49586,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -49441,108 +49603,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, uint8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -49561,35 +49723,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -49597,123 +49759,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x40>>6) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 6, 0x40)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x40>>6)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x40>>6)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49723,52 +49885,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -49780,15 +49942,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -49796,13 +49959,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -49815,11 +49978,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -49830,38 +49993,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -49873,47 +50036,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -49922,35 +50085,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -49959,51 +50122,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -50013,72 +50176,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 4, 0x10)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50086,43 +50249,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50130,84 +50293,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50217,34 +50385,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -50253,10 +50421,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -50273,14 +50441,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50293,21 +50461,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -50319,62 +50487,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5876)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5866)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -50387,56 +50555,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -50447,54 +50615,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -50502,72 +50670,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -50576,55 +50744,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 6, 0xc0)
-	goto __797
-__796:
-	zSchema = ts + 5893
+	goto __799
+__798:
+	zSchema = ts + 5883
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5907,
+		ts+5897,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -50634,66 +50802,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -50702,151 +50870,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5950, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5940, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -50854,10 +51023,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -50877,26 +51046,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -50908,7 +51077,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -50919,170 +51088,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -51099,146 +51268,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -51246,70 +51415,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5987,
+		ts+5977,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6039
+				return ts + 6029
 			}
-			return ts + 6044
+			return ts + 6034
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -51317,17 +51486,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -51337,14 +51506,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -51354,197 +51523,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 6, 0xc0)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 6, 0xc0)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6051, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6041, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5357, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6070, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -51558,27 +51727,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -51586,72 +51755,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.Xmemset(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -51661,192 +51830,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 6, 0xc0)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 6, 0xc0)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -51855,63 +52024,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= uint8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*uint8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -51921,104 +52090,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6080, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3663, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -52026,52 +52195,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6086,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -52190,8 +52363,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -52211,7 +52384,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -52231,8 +52404,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -52263,8 +52436,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -52297,8 +52470,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6306, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52378,8 +52551,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6347, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -52448,7 +52621,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -52476,12 +52649,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 3663
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52525,7 +52698,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -52608,7 +52781,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -55147,6 +55320,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6381, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6389+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6408+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5883+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6427+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -55166,7 +55367,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -55221,7 +55421,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6381, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6441, zDb) == 0) {
 		goto __8
 	}
 
@@ -55342,7 +55542,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6386) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6446) != 0) {
 		goto __33
 	}
 	goto __14
@@ -55350,73 +55550,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x20>>5) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -55428,28 +55646,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x4>>2)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -55460,160 +55678,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6388, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6448, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6392, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6452, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6396, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6456, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -55622,8 +55841,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -55631,19 +55850,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -55651,81 +55870,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = uint8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0xc000>>14) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6405, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6465, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6436, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6496, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -55738,141 +55957,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6491, libc.VaList(bp+16, zCol))
+		ts+6551, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6526
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6586
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6535
+		zErr = ts + 6595
 	} else {
-		zErr = ts + 6550
+		zErr = ts + 6610
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6572, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6632, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -55916,15 +56135,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6602
+	var zIn uintptr = ts + 6662
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6630
+		zIn = ts + 6690
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6648
+		zIn = ts + 6708
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6666
+		zIn = ts + 6726
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6684, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6744, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -56003,10 +56222,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6704
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6764
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -56053,7 +56272,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6715, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6775, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -56117,7 +56336,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6732, libc.VaList(bp, pExpr))
+								ts+6792, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -56133,7 +56352,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6796,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6856,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -56147,7 +56366,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6832, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6892, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -56170,30 +56389,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6860, libc.VaList(bp+16, pExpr))
+						ts+6920, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6903
+						zType = ts + 6963
 					} else {
-						zType = ts + 6910
+						zType = ts + 6970
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6920, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6980, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6948, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+7008, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6970,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7030,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7014,
+						ts+7074,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -56265,7 +56484,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7062, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7122, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -56281,7 +56500,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7073, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7133, pExpr, pExpr)
 			}
 
 			break
@@ -56337,7 +56556,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -56412,7 +56631,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7084, libc.VaList(bp, i, zType, mx))
+		ts+7144, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -56432,7 +56651,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7140, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7200, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -56467,7 +56686,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7174, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7234, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -56524,7 +56743,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x2000>>13) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7180, libc.VaList(bp, i+1))
+				ts+7240, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -56552,7 +56771,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7241, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7301, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -56766,7 +56985,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7272, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7332, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -56806,7 +57025,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -56817,7 +57036,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7311) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7371) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -56829,7 +57048,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7317, 0)
+						ts+7377, 0)
 					return WRC_Abort
 				}
 
@@ -56929,12 +57148,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -56970,12 +57189,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -57085,33 +57304,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) uint8
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) uint8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -57181,7 +57501,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -57516,7 +57837,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 		return
 	}
 
@@ -57591,7 +57912,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7376, libc.VaList(bp, mxHeight))
+			ts+7436, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -57840,10 +58161,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7424,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7484,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7468
+						return ts + 7528
 					}
 					return ts + 1554
 				}(), nElem))
@@ -57884,7 +58205,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -57910,7 +58231,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7472, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7532, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -57938,7 +58259,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7506, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7566, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -57985,7 +58306,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7526,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7586,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -58010,7 +58331,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7569, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7629, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -58585,7 +58906,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -58708,7 +59029,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7622, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7682, libc.VaList(bp, zObject))
 	}
 }
 
@@ -58764,10 +59085,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6704) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6764) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6709) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6769) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -59197,13 +59518,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff uint8) int3
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7645) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7705) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7653) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7713) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7659) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7719) == 0 {
 		return 1
 	}
 	return 0
@@ -59407,7 +59728,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7663, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7723, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -59485,7 +59806,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7710, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7770, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -59579,7 +59900,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7741
+		var zFmt uintptr = ts + 7801
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -59597,7 +59918,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	}
 }
 
@@ -59638,7 +59959,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7785, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7845, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -59668,11 +59989,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7808, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7868, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1554
 			}
-			return ts + 7827
+			return ts + 7887
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -59799,7 +60120,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7839, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7899, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -59814,12 +60135,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7857, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7917, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1554
 		}
-		return ts + 7827
+		return ts + 7887
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -59840,7 +60162,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = uint8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -59849,7 +60171,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7878)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7938)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -60235,8 +60557,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7880, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7883,
+			if Xsqlite3_strnicmp(tls, z, ts+7940, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7943,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4932
@@ -60312,7 +60634,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -60398,8 +60720,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -60485,14 +60807,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 7940, ts + 7945, ts + 7950, ts + 6191, ts + 6186}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 8000, ts + 8005, ts + 8010, ts + 6191,
+				ts + 6186, ts + 8018}
 			var aff uint8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7958
+						return ts + 8026
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -60506,7 +60830,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -60529,10 +60853,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -60632,7 +60956,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -60762,12 +61086,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -60776,110 +61101,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7910,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7970,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -60922,13 +61260,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*uint8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -60938,11 +61276,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -60965,11 +61303,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -60978,15 +61316,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -61013,20 +61351,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -61035,9 +61373,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -61075,14 +61413,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7963, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8031, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -61093,17 +61433,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -61115,128 +61455,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7990, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8058, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -61244,42 +61584,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7592,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7652,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -61302,23 +61642,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -61335,42 +61675,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6473, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6533, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -61391,15 +61733,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -61409,22 +61751,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -61433,21 +61775,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -61457,27 +61799,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8014, 0)
+		ts+8082, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -61486,7 +61828,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -61497,7 +61839,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]uint8)(unsafe.Pointer(ts + 8064))
+var zAff = *(*[10]uint8)(unsafe.Pointer(ts + 8132))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -62869,18 +63211,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -62910,7 +63252,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -62923,12 +63265,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -62936,6 +63376,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -62950,81 +63430,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -63046,34 +63453,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -63163,7 +63569,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -63171,7 +63577,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -63222,11 +63628,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8080, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8142, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -63238,13 +63644,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8108,
+		ts+8170,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8283,
+			ts+8345,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -63254,10 +63660,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8457, libc.VaList(bp, zDb, zDb))
+		ts+8519, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8604, 0)
+			ts+8666, 0)
 	}
 }
 
@@ -63321,7 +63727,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8755, libc.VaList(bp, zName))
+		ts+8817, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -63331,7 +63737,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8814, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8876, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -63340,7 +63746,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8820, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8882, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -63381,19 +63787,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8847, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8909, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9031,
+		ts+9093,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9336, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9398, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9352,
+		ts+9414,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -63401,7 +63807,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9410, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9472, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -63413,7 +63819,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9675, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9737, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63425,7 +63831,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9688,
+		ts+9750,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -63471,12 +63877,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9726, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9788, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9758, 0)
+			ts+9820, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -63486,11 +63892,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9785)
+				ts+9847)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9844)
+				ts+9906)
 		}
 
 		if pDflt != 0 {
@@ -63503,12 +63909,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9897)
+					ts+9959)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9943)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+10005)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -63519,7 +63925,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9970,
+			ts+10032,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -63541,7 +63947,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10116,
+				ts+10178,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -63589,14 +63995,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10346, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10408, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10380, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10442, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -63624,7 +64030,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10410, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10472, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -63664,18 +64070,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10429
+		zType = ts + 10491
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10434
+		zType = ts + 10496
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10448,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10510,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10466
+					return ts + 10528
 				}
-				return ts + 10483
+				return ts + 10545
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -63759,7 +64165,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -63776,17 +64182,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10522,
+		ts+10584,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10704,
+		ts+10766,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9675, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9737, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -63981,7 +64387,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -64044,10 +64450,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10835,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10897,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*uint8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10858
+				return ts + 10920
 			}
 			return ts + 1554
 		}(), zWhen,
@@ -64089,8 +64495,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10860, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10922, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -64107,7 +64513,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -64129,7 +64535,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10868, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10930, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -64169,10 +64575,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))
 				*(*uint8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = uint8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10874, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10936, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*uint8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10858
+							return ts + 10920
 						}
 						return ts + 1554
 					}()))
@@ -64348,8 +64754,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -64432,15 +64838,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -64468,7 +64874,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -64501,13 +64907,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64520,7 +64926,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -64535,7 +64941,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -64591,8 +64997,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -64640,7 +65046,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -64708,8 +65114,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64751,11 +65157,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.Xmemset(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.Xmemset(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -64848,8 +65254,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64867,16 +65273,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -64891,31 +65297,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -64933,8 +65339,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -64960,9 +65366,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -64990,8 +65396,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -65028,7 +65434,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -65052,7 +65458,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10879, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10941, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -65133,17 +65539,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10501, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10563, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10886,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10948,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10914
+				return ts + 10976
 			}
 			return ts + 6127
 		}(),
@@ -65154,7 +65560,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10926, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10988, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -65171,10 +65577,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1554, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10974, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11036, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11095, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11157, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -65292,11 +65698,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11113},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11134},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11154},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11173},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11192}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11175},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11196},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11216},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11235},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11254}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -65330,7 +65736,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11215, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11277, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -65339,10 +65745,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11238,
+					ts+11300,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11268, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11330, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -65360,9 +65766,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11286, FzCols: ts + 11299},
-	{FzName: ts + 11312, FzCols: ts + 11325},
-	{FzName: ts + 11353},
+	{FzName: ts + 11348, FzCols: ts + 11361},
+	{FzName: ts + 11374, FzCols: ts + 11387},
+	{FzName: ts + 11415},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -65381,7 +65787,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -65460,7 +65865,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -65506,13 +65911,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -65525,11 +65930,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -65553,17 +65958,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11366}
+	FzName:     ts + 11428}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -65574,8 +65979,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -65618,7 +66023,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -65646,7 +66051,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -65713,7 +66118,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -65729,8 +66134,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -65747,9 +66152,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -65757,14 +66162,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -65772,31 +66177,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -65804,7 +66209,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11376}
+	FzName:     ts + 11438}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -65818,20 +66223,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11386,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11448,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11391, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11453, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -65873,7 +66278,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+11397, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11459, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -65887,7 +66292,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11403}
+	FzName:     ts + 11465}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -65931,7 +66336,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11412, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11474, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -65948,7 +66353,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11286, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11348, uint64(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -66104,7 +66509,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -66161,7 +66566,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11422, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11484, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -66208,9 +66613,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11426)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11488)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11430)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11492)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -66296,16 +66701,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1554
 	}
 	for i = 0; *(*uint8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*uint8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*uint8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -66315,15 +66720,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 13, 0x2000)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 9, 0x200)
 		for *(*uint8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11434, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11496, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 13, 0x2000)
-			} else if Xsqlite3_strglob(tls, ts+11445, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11507, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11455, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11517, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 9, 0x200)
 			}
 			for int32(*(*uint8)(unsafe.Pointer(z))) != 0 && int32(*(*uint8)(unsafe.Pointer(z))) != ' ' {
@@ -66403,7 +66808,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -66417,42 +66822,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -66526,15 +66931,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -66599,11 +67004,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11312, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11374, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11467,
-			ts+11521,
+			ts+11529,
+			ts+11583,
 			zDb)
 	}
 	return rc
@@ -66650,10 +67055,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11286, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11348, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11573, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11635, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -66711,12 +67116,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6381, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6441, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -66727,13 +67132,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -66754,128 +67162,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3835)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3835)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11676, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11614, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11617,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11654, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11679,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11716, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.Xmemset(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11684, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11746, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+11713, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+11775, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -66885,89 +67316,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x20>>5) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x20>>5) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1490, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11781, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11843, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -67021,14 +67452,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11809, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11871, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11830, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11892, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -67036,7 +67467,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11856, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]uint8{})), bp+24, ts+11918, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -67078,42 +67509,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -67122,13 +67559,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -67147,7 +67584,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11878}
+	FzName:     ts + 11940}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -67160,7 +67597,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11892}
+	FzName:     ts + 11954}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -67174,7 +67611,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11906, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11968, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -67206,7 +67643,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11930,
+						ts+11992,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -67381,7 +67818,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11976, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -67407,11 +67844,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+12005, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12067, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+12011, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12073, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -67458,7 +67895,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 7653
+		zCol = ts + 7713
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -67482,7 +67919,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12038, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12100, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -67707,6 +68144,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -67719,13 +68159,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -67750,25 +68190,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6381) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6441) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+12086)
+						ts+6389)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5893)
+						ts+5883)
 				}
 			}
 		}
@@ -67789,12 +68229,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12072+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5893)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12053+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6427+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5883)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6408+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+12086)
+					ts+6389)
 			}
 		}
 	}
@@ -67825,7 +68265,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12105, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12115, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -67843,14 +68283,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12113
+			zMsg = ts + 12123
 		} else {
-			zMsg = ts + 12126
+			zMsg = ts + 12136
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6585, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6645, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6595, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6655, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -67880,12 +68320,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8072, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5893+7) == 0 {
-			return ts + 12072
+	if Xsqlite3_strnicmp(tls, zName, ts+6381, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5883+7) == 0 {
+			return ts + 6427
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12086+7) == 0 {
-			return ts + 12053
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6389+7) == 0 {
+			return ts + 6408
 		}
 	}
 	return zName
@@ -68243,7 +68683,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5893)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5883)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -68269,7 +68709,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6381, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6441, zName) {
 				goto __3
 			}
 
@@ -68322,13 +68762,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12140, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12150, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12157, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12167, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -68370,9 +68810,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8072, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6381, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12177,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12187,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -68532,9 +68972,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -68550,7 +68990,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12219, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12229, 0)
 	return
 __4:
 	;
@@ -68578,9 +69018,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10429
+			return ts + 10491
 		}
-		return ts + 8814
+		return ts + 8876
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -68596,9 +69036,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -68629,12 +69069,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12260,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12270,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10429
+				return ts + 10491
 			}
-			return ts + 8814
+			return ts + 8876
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -68649,7 +69089,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12281, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12291, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -68736,7 +69176,7 @@ var nullRow = [6]uint8{uint8(6), uint8(0), uint8(0), uint8(0), uint8(0), uint8(0
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+12316, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12326, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -68760,7 +69200,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12333, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12343, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -68780,7 +69220,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12316
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12326
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -68792,7 +69232,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12316, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12326, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -68826,7 +69266,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -68834,13 +69274,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12390, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12400, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12397, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12407, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -68877,7 +69317,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12407, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12417, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -69041,10 +69481,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12433,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12443,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12478, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12488, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -69075,7 +69515,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12519, 0)
+			ts+12529, 0)
 	}
 }
 
@@ -69120,7 +69560,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12571, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -69209,7 +69649,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12612, 0)
+		ts+12622, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -69304,7 +69744,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12668, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12678, 0)
 	goto generated_done
 __2:
 	;
@@ -69317,13 +69757,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12711, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12721, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12719, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12729, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -69350,13 +69790,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12726,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12736,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -69478,12 +69925,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1554
-		zSep2 = ts + 12757
+		zSep2 = ts + 12767
 		zEnd = ts + 4957
 	} else {
-		zSep = ts + 12759
-		zSep2 = ts + 12763
-		zEnd = ts + 12768
+		zSep = ts + 12769
+		zSep2 = ts + 12773
+		zEnd = ts + 12778
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -69491,7 +69938,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12771, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12781, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*uint8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = uint8('(')
@@ -69529,11 +69976,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1554,
-	ts + 12785,
-	ts + 12791,
-	ts + 12796,
+	ts + 12795,
+	ts + 12801,
+	ts + 12806,
+	ts + 12811,
 	ts + 12801,
 }
 
@@ -69941,10 +70389,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12807,
+						ts+12817,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1554)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12840,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12850,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -69963,11 +70411,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12867, 0)
+				ts+12877, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12917, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12927, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -70001,7 +70449,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12949, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12959, 0)
 			return
 		}
 	}
@@ -70026,11 +70474,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8814
-			zType2 = ts + 12993
+			zType = ts + 8876
+			zType2 = ts + 13003
 		} else {
-			zType = ts + 10429
-			zType2 = ts + 12999
+			zType = ts + 10491
+			zType2 = ts + 13009
 		}
 
 		if pSelect != 0 {
@@ -70092,7 +70540,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -70101,11 +70549,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+13004, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+13014, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13019,
+			ts+13029,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -70121,13 +70569,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13117,
+					ts+13127,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13159, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13169, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -70142,7 +70590,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9336) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9398) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -70172,7 +70620,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13193, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13203, 0)
 	goto create_view_fail
 __1:
 	;
@@ -70188,7 +70636,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10429, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10491, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -70270,7 +70718,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13229, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13239, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -70298,8 +70746,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -70396,13 +70843,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13259, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13269, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13274,
+		ts+13284,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -70443,10 +70890,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13341, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]uint8{})), bp+40, ts+13351, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11238,
+				ts+11300,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -70478,12 +70925,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13355,
+			ts+13365,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13400,
+		ts+13410,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -70511,11 +70958,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3286, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7073, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7133, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -70593,9 +71040,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -70654,21 +71101,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13467, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13477, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13495, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13505, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13529, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13539, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -70680,7 +71127,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11430, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11492, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -70744,7 +71191,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13561,
+		ts+13571,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -70756,7 +71203,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13624, 0)
+		ts+13634, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -70841,7 +71288,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13718,
+		ts+13728,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -71068,12 +71515,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x400>>10)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13764,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13774,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13792
+							return ts + 13802
 						}
-						return ts + 13798
+						return ts + 13808
 					}()))
 				return 1
 			}
@@ -71194,7 +71641,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13803, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13813, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -71213,7 +71660,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13809,
+		ts+13819,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -71239,26 +71686,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13859, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13869, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13887, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13897, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13912, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13922, 0)
 	goto exit_create_index
 __17:
 	;
@@ -71272,7 +71719,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13803, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13813, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -71287,7 +71734,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13946, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13956, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -71299,7 +71746,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13980, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13990, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -71328,7 +71775,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+14004, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+14014, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -71349,9 +71796,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -71390,7 +71837,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13803)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13813)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -71491,7 +71938,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14027, 0)
+		ts+14037, 0)
 	goto exit_create_index
 __56:
 	;
@@ -71708,7 +72155,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14088, libc.VaList(bp+48, 0))
+		ts+14098, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -71760,8 +72207,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14130, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14140, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -71807,12 +72254,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14147,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14157,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1554
 			}
-			return ts + 14167
+			return ts + 14177
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -71820,7 +72267,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14175,
+		ts+14185,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -71834,7 +72281,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14234, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14244, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -71995,7 +72442,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14261, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14271, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -72010,7 +72457,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14279, libc.VaList(bp+8, 0))
+		ts+14289, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -72021,9 +72468,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -72049,9 +72496,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14352,
+		ts+14362,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11426, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11488, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -72186,7 +72633,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14412,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14422,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -72394,12 +72841,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14448,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14458,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14484
+				return ts + 14494
 			}
-			return ts + 14487
+			return ts + 14497
 		}()))
 	goto append_from_error
 __1:
@@ -72568,7 +73015,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14493, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14503, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -72604,9 +73051,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14499
+				return ts + 14509
 			}
-			return ts + 14508
+			return ts + 14518
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -72631,7 +73078,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14493, ts + 14515, ts + 14499}
+var az = [3]uintptr{ts + 14503, ts + 14525, ts + 14509}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -72646,7 +73093,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14523, 0)
+				ts+14533, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -72783,14 +73230,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14593, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14603, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14604, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14614, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1567, 1)
@@ -72816,11 +73263,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14607, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14617, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -72950,7 +73397,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14616, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14626, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -73046,7 +73493,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14662, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14672, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -73244,7 +73691,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14692, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14702, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -73524,7 +73971,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -73556,11 +74003,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14756, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14766, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14785, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14795, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -74064,7 +74511,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14823)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14833)
 __62:
 	;
 delete_from_cleanup:
@@ -74179,7 +74626,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11286) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11348) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -74409,7 +74856,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 7945, ts + 7940, ts + 6181}
+var azType2 = [5]uintptr{ts + 6191, ts + 6186, ts + 8005, ts + 8000, ts + 6181}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -74468,7 +74915,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14836, -1)
+					Xsqlite3_result_error(tls, context, ts+14846, -1)
 					return
 				}
 				iVal = -iVal
@@ -74772,7 +75219,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14853, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14863, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -75118,7 +75565,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14858, -1)
+		Xsqlite3_result_error(tls, context, ts+14868, -1)
 		return
 	}
 	if argc == 3 {
@@ -75128,7 +75575,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14891, -1)
+				ts+14901, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -75227,7 +75674,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14936, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14946, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -75242,21 +75689,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*uint8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*uint8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = uint8('\'')
-				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = uint8(0)
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = uint8('\'')
+				*(*uint8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = uint8(0)
 				*(*uint8)(unsafe.Pointer(zText)) = uint8('X')
 				*(*uint8)(unsafe.Pointer(zText + 1)) = uint8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -75264,7 +75711,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14943, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14953, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -75378,6 +75825,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1554
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -75580,7 +76140,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10858}
+var azOne = [1]uintptr{ts + 10920}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -75616,7 +76176,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*uint8)(unsafe.Pointer(bp + uintptr(j))) = uint8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14946, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14956, 4, uintptr(0))
 	}
 }
 
@@ -75641,7 +76201,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12038, -1)
+		Xsqlite3_result_error(tls, context, ts+12100, -1)
 		return
 	}
 
@@ -75719,7 +76279,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14836, -1)
+			Xsqlite3_result_error(tls, context, ts+14846, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -75981,7 +76541,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14951, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14961, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -76001,14 +76561,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14957, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14957, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14967, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14957, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14967, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -76138,17 +76698,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -76207,6 +76767,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -76247,108 +76808,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14962},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14982},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14995},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15013},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15022},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15030},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15045},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15071},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15096},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15105},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15116},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15123},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15137},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15143},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15149},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15154},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15154},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15154},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15158},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15158},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15162},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15169},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15177},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15184},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15190},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15197},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15204},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15212},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15217},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14992},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 15005},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15023},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15032},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15040},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15055},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15081},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15106},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15115},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15126},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15133},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15147},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15153},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15159},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15164},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15164},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15164},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15168},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15168},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15172},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15179},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15187},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15194},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15200},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15207},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15214},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15222},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15227},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15233},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15239},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15243},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15257},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15275},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15290},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15307},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15318},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15324},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15350},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15364},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15398},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15402},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15408},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15231},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15237},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15243},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15249},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15253},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15259},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15266},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15273},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15284},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15291},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15306},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15323},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15334},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15340},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15358},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15366},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15380},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15397},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15404},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15414},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15431},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14957},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15436},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15441},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15449},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15455},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15461},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15468},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15474},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15464},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15479},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15483},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15487},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15493},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15497},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15507},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15512},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15424},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15428},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15434},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15447},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14967},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6586},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15452},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15457},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15465},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15471},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15477},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15484},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15490},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15480},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15495},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15499},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15503},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15509},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15513},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15530},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15540},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15545},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15523},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15528},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15534},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15538},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15542},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15546},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15551},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15557},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15563},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15568},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15576},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15584},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15587},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6526},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15592}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15556},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15561},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15567},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15573},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15579},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15584},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15592},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15600},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15603},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6586},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15608}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -76469,7 +77032,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15596,
+				ts+15612,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -77129,8 +77692,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6392, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6388, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6452, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6448, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -77631,7 +78194,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7910, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7970, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -78099,7 +78662,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15641,
+		ts+15657,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -78124,7 +78687,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15682,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15698,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -78273,7 +78836,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15714,
+		ts+15730,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -78283,7 +78846,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15766, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15782, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -78335,7 +78898,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15791,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15807,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -78343,7 +78906,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15837, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15853, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -78755,7 +79318,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15858)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15874)
 __125:
 	;
 insert_cleanup:
@@ -79071,8 +79634,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 								onError, iReg)
 							Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -80162,7 +80726,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -80608,6 +81172,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80646,7 +81211,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12038, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12100, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -80655,7 +81220,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15872
+		zEntry = ts + 15888
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -80670,7 +81235,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11999, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12061, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -80706,7 +81271,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15895, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15911, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*uint8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -80720,7 +81285,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15904, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15920, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -80744,7 +81309,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15908, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15924, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -80762,7 +81327,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15914, libc.VaList(bp+16, zEntry, zFile))
+		ts+15930, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -80789,7 +81354,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15957, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15973, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -80827,7 +81392,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15989, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+16005, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -80837,7 +81402,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16026,
+	ts + 16042,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -80993,7 +81558,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16029, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16045, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -81002,62 +81567,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5057,
-	ts + 16068,
-	ts + 8814,
-	ts + 16072,
-	ts + 16077,
-	ts + 16080,
-	ts + 16090,
-	ts + 16100,
+	ts + 16084,
+	ts + 8876,
+	ts + 16088,
+	ts + 16093,
+	ts + 16096,
 	ts + 16106,
-	ts + 16110,
-	ts + 16115,
-	ts + 16120,
-	ts + 16128,
-	ts + 16139,
-	ts + 16142,
-	ts + 16149,
-	ts + 16110,
-	ts + 16115,
-	ts + 16156,
-	ts + 16161,
-	ts + 16164,
-	ts + 16171,
-	ts + 16106,
-	ts + 16110,
+	ts + 16116,
+	ts + 16122,
+	ts + 16126,
+	ts + 16131,
+	ts + 16136,
+	ts + 16144,
+	ts + 16155,
+	ts + 16158,
+	ts + 16165,
+	ts + 16126,
+	ts + 16131,
+	ts + 16172,
 	ts + 16177,
-	ts + 16182,
+	ts + 16180,
 	ts + 16187,
-	ts + 16110,
-	ts + 16191,
-	ts + 16115,
-	ts + 16199,
+	ts + 16122,
+	ts + 16126,
+	ts + 16193,
+	ts + 16198,
 	ts + 16203,
-	ts + 16208,
-	ts + 11430,
-	ts + 11426,
-	ts + 16214,
+	ts + 16126,
+	ts + 16207,
+	ts + 16131,
+	ts + 16215,
 	ts + 16219,
 	ts + 16224,
-	ts + 16068,
-	ts + 16110,
-	ts + 16229,
-	ts + 16236,
-	ts + 16243,
-	ts + 8814,
-	ts + 16251,
-	ts + 5060,
-	ts + 16257,
-	ts + 16068,
-	ts + 16110,
-	ts + 16262,
+	ts + 11492,
+	ts + 11488,
+	ts + 16230,
+	ts + 16235,
+	ts + 16240,
+	ts + 16084,
+	ts + 16126,
+	ts + 16245,
+	ts + 16252,
+	ts + 16259,
+	ts + 8876,
 	ts + 16267,
-	ts + 15464,
-	ts + 16272,
-	ts + 16285,
-	ts + 16294,
+	ts + 5060,
+	ts + 16273,
+	ts + 16084,
+	ts + 16126,
+	ts + 16278,
+	ts + 16283,
+	ts + 15480,
+	ts + 16288,
 	ts + 16301,
-	ts + 16312,
+	ts + 16310,
+	ts + 16317,
+	ts + 16328,
 }
 
 // Definitions of all built-in pragmas
@@ -81075,238 +81640,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16320,
+	{FzName: ts + 16336,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16335,
+	{FzName: ts + 16351,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16350,
+	{FzName: ts + 16366,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16362,
+	{FzName: ts + 16378,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16378,
+	{FzName: ts + 16394,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16301,
+	{FzName: ts + 16317,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16391,
+	{FzName: ts + 16407,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16403,
+	{FzName: ts + 16419,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16423,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16439,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16455,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16460,
+	{FzName: ts + 16476,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16475,
+	{FzName: ts + 16491,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16491,
+	{FzName: ts + 16507,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16505,
+	{FzName: ts + 16521,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16518,
+	{FzName: ts + 16534,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16532,
+	{FzName: ts + 16548,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16551,
+	{FzName: ts + 16567,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16570,
+	{FzName: ts + 16586,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16593,
+	{FzName: ts + 16609,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16602,
+	{FzName: ts + 16618,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16620,
+	{FzName: ts + 16636,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16637,
+	{FzName: ts + 16653,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16650,
+	{FzName: ts + 16666,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16665,
+	{FzName: ts + 16681,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16683,
+	{FzName: ts + 16699,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16693,
+	{FzName: ts + 16709,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16723,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16723,
+	{FzName: ts + 16739,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16748,
+	{FzName: ts + 16764,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16767,
+	{FzName: ts + 16783,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16778,
+	{FzName: ts + 16794,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16789,
+	{FzName: ts + 16805,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16801,
+	{FzName: ts + 16817,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16817,
+	{FzName: ts + 16833,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16830,
+	{FzName: ts + 16846,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16849,
+	{FzName: ts + 16865,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16868,
+	{FzName: ts + 16884,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16881,
+	{FzName: ts + 16897,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16896,
+	{FzName: ts + 16912,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16906,
+	{FzName: ts + 16922,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16918,
+	{FzName: ts + 16934,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16927,
+	{FzName: ts + 16943,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16938,
+	{FzName: ts + 16954,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16948,
+	{FzName: ts + 16964,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16960,
+	{FzName: ts + 16976,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16971,
+	{FzName: ts + 16987,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16983,
+	{FzName: ts + 16999,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 17000,
+	{FzName: ts + 17016,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17019,
+	{FzName: ts + 17035,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17045,
+	{FzName: ts + 17061,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17060,
+	{FzName: ts + 17076,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17074,
+	{FzName: ts + 17090,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17093,
+	{FzName: ts + 17109,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17107,
+	{FzName: ts + 17123,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17123,
+	{FzName: ts + 17139,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17135,
+	{FzName: ts + 17151,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17146,
+	{FzName: ts + 17162,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17157,
+	{FzName: ts + 17173,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17169,
+	{FzName: ts + 17185,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17180,
+	{FzName: ts + 17196,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17201,
+	{FzName: ts + 17217,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17209,
+	{FzName: ts + 17225,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17224,
+	{FzName: ts + 17240,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17237,
+	{FzName: ts + 17253,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17256,
+	{FzName: ts + 17272,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17271,
+	{FzName: ts + 17287,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -81328,7 +81893,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17287))
+var zText = *(*[25]uint8)(unsafe.Pointer(ts + 17303))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -81340,10 +81905,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17312) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17328) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17338) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -81352,13 +81917,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7958) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8026) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17329) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17345) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17334) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17350) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -81373,9 +81938,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*uint8)(unsafe.Pointer(z))) >= '0' && int32(*(*uint8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*uint8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16262) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16278) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17346) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17362) == 0 {
 		return 2
 	} else {
 		return 0
@@ -81389,7 +81954,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17353, 0)
+				ts+17369, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -81480,19 +82045,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17415
+		zName = ts + 17431
 		break
 	case OE_SetDflt:
-		zName = ts + 17424
+		zName = ts + 17440
 		break
 	case OE_Cascade:
-		zName = ts + 17436
+		zName = ts + 17452
 		break
 	case OE_Restrict:
-		zName = ts + 17444
+		zName = ts + 17460
 		break
 	default:
-		zName = ts + 17453
+		zName = ts + 17469
 		break
 	}
 	return zName
@@ -81509,7 +82074,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17463, ts + 17470, ts + 17478, ts + 17482, ts + 17346, ts + 17491,
+	ts + 17479, ts + 17486, ts + 17494, ts + 17498, ts + 17362, ts + 17507,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -81556,13 +82121,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17495
+			zType = ts + 17511
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17497
+			zType = ts + 17513
 		} else {
-			zType = ts + 7468
+			zType = ts + 7528
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17499,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17515,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -81570,7 +82135,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17506, ts + 17511, ts + 17519}
+var azEnc = [4]uintptr{uintptr(0), ts + 17522, ts + 17527, ts + 17535}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -81721,14 +82286,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -81815,7 +82382,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17527, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17543, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -82076,7 +82643,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17531) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17547) == 0) {
 		goto __64
 	}
 	b = 2
@@ -82148,7 +82715,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17322
+	zRet = ts + 17338
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -82186,7 +82753,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17312
+	zRet = ts + 17328
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -82473,7 +83040,7 @@ __123:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 552)) == 0) {
 		goto __126
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17536, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17552, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __126:
@@ -82514,7 +83081,7 @@ __130:
 		goto __132
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17561, 0)
+		ts+17577, 0)
 	goto __133
 __132:
 	if !(iDb != 1) {
@@ -82568,7 +83135,7 @@ __139:
 __141:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17614) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17630) == 0) {
 		goto __142
 	}
 
@@ -82665,9 +83232,9 @@ __155:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17620
+			return ts + 17636
 		}
-		return ts + 17628
+		return ts + 17644
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -82736,7 +83303,7 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __171
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17635, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17651, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __172
 	}
@@ -82782,29 +83349,29 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __178
 	}
-	zType = ts + 10429
+	zType = ts + 10491
 	goto __179
 __178:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __180
 	}
-	zType = ts + 12711
+	zType = ts + 12721
 	goto __181
 __180:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __182
 	}
-	zType = ts + 17651
+	zType = ts + 17667
 	goto __183
 __182:
-	zType = ts + 8814
+	zType = ts + 8876
 __183:
 	;
 __181:
 	;
 __179:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17674,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -82870,7 +83437,7 @@ __190:
 		goto __192
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17665, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17681, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -82880,7 +83447,7 @@ __190:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __193
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17670,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17686,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -82917,8 +83484,8 @@ __196:
 	if !(pIdx1 != 0) {
 		goto __198
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17675, ts + 17677, ts + 16139}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17679,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 568)) = [3]uintptr{ts + 17691, ts + 17693, ts + 16155}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17695,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -82951,7 +83518,7 @@ __199:
 	goto __200
 __202:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17701,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -82973,7 +83540,7 @@ __203:
 		goto __205
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17689, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17705, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __204
 __204:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -83037,7 +83604,7 @@ __215:
 		goto __217
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __216
 __216:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -83053,7 +83620,7 @@ __218:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __220
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7468, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7528, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __219
 __219:
 	i6++
@@ -83088,7 +83655,7 @@ __226:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __228
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17692,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17708,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -83096,7 +83663,7 @@ __226:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+17701))
+			ts+17717))
 	goto __227
 __227:
 	j2++
@@ -83285,7 +83852,7 @@ __256:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __257:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17706, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17722, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 600)))
@@ -83502,7 +84069,7 @@ __284:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17710, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17726, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -83563,262 +84130,284 @@ __299:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 612)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__300:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __301
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __300
+	}
+	mxCol = -1
+	j4 = 0
+__302:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __304
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __305
+	}
+	mxCol++
+__305:
+	;
+	goto __303
+__303:
+	j4++
+	goto __302
+	goto __304
+__304:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __306
 	}
 	mxCol--
-	goto __300
+__306:
+	;
+	goto __301
+__300:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __301:
 	;
 	if !(mxCol >= 0) {
-		goto __302
+		goto __307
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 612)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__302:
+__307:
 	;
 	if !!(isQuick != 0) {
-		goto __303
+		goto __308
 	}
 	if !(pPk1 != 0) {
-		goto __304
+		goto __309
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 612)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17734,
+		ts+17750,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__305:
+__310:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __307
+		goto __312
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 612)), j4, r2+j4)
-	goto __306
-__306:
+	goto __311
+__311:
 	j4++
-	goto __305
-	goto __307
-__307:
+	goto __310
+	goto __312
+__312:
 	;
-__304:
+__309:
 	;
-__303:
+__308:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__308:
+__313:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __310
+		goto __315
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __311
+		goto __316
 	}
-	goto __309
-__311:
+	goto __314
+__316:
 	;
 	if !(bStrict != 0) {
-		goto __312
+		goto __317
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) > COLTYPE_ANY)
-	goto __313
-__312:
+	goto __318
+__317:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__313:
+__318:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) == 0 && !(doTypeCheck != 0)) {
-		goto __314
+		goto __319
 	}
-	goto __309
-__314:
+	goto __314
+__319:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __316
-__315:
+	goto __321
+__320:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __317
+		goto __322
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 624)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		(*Column)(unsafe.Pointer(pCol1)).Faffinity, bp+624)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 624)) != 0) {
-		goto __318
+		goto __323
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 624)))
-__318:
+__323:
 	;
-__317:
+__322:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 612))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __319
+		goto __324
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __320
-__319:
+	goto __325
+__324:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__320:
+__325:
 	;
-__316:
+__321:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)) != 0) {
-		goto __321
+		goto __326
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17770, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17786, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __323
-__322:
+	goto __328
+__327:
 	;
-__323:
+__328:
 	;
-__321:
+__326:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __324
+		goto __329
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17790,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17806,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __325
-__324:
+	goto __330
+__329:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __326
+		goto __331
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17812,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17828,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __327
-__326:
+	goto __332
+__331:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __328
+		goto __333
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 612)), j4, 3)
-__329:
+__334:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17835, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17851, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17837,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17853,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__328:
+__333:
 	;
-__327:
+__332:
 	;
-__325:
+__330:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __309
-__309:
+	goto __314
+__314:
 	j4++
-	goto __308
-	goto __310
-__310:
+	goto __313
+	goto __315
+__315:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __330
+		goto __335
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __331
+		goto __336
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 612)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__332:
+__337:
 	if !(k3 > 0) {
-		goto __334
+		goto __339
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __333
-__333:
+	goto __338
+__338:
 	k3--
-	goto __332
-	goto __334
-__334:
+	goto __337
+	goto __339
+__339:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17857,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17873,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__331:
+__336:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__330:
+__335:
 	;
 	if !!(isQuick != 0) {
-		goto __335
+		goto __340
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__336:
+__341:
 	if !(pIdx5 != 0) {
-		goto __338
+		goto __343
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __339
+		goto __344
 	}
-	goto __337
-__339:
+	goto __342
+__344:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 612)), 0, 0, bp+632,
 		pPrior, r1)
@@ -83827,80 +84416,119 @@ __339:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 616))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17892)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17908)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__345:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __347
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __348
+	}
+	goto __346
+__348:
+	;
+	if !(label6 == 0) {
+		goto __349
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__349:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 616))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	if !(label6 != 0) {
+		goto __350
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17903)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17929)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__350:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __340
+		goto __351
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__341:
+__352:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __343
+		goto __354
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf0>>4)) != 0) {
-		goto __344
+		goto __355
 	}
-	goto __342
-__344:
+	goto __353
+__355:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17956)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__351:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
 	goto __342
 __342:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __341
 	goto __343
 __343:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 616))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 616))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17913)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __340:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 632)))
-	goto __337
-__337:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __336
-	goto __338
-__338:
-	;
-__335:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 612)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __345
+		goto __356
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17940)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17983)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__346:
+__357:
 	if !(pIdx5 != 0) {
-		goto __348
+		goto __359
 	}
 	if !(pPk1 == pIdx5) {
-		goto __349
+		goto __360
 	}
-	goto __347
-__349:
+	goto __358
+__360:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 616))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -83909,21 +84537,21 @@ __349:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __347
-__347:
+	goto __358
+__358:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __346
-	goto __348
-__348:
+	goto __357
+	goto __359
+__359:
 	;
 	if !(pPk1 != 0) {
-		goto __350
+		goto __361
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__350:
+__361:
 	;
-__345:
+__356:
 	;
 	goto __291
 __291:
@@ -83941,14 +84569,14 @@ __266:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __351
+		goto __362
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 608))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 17969
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 18012
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__351:
+__362:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -83956,27 +84584,27 @@ __351:
 
 __45:
 	if !!(zRight != 0) {
-		goto __352
+		goto __363
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __354
+		goto __365
 	}
 	goto pragma_out
-__354:
+__365:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __353
-__352:
+	goto __364
+__363:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __355
+		goto __366
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__356:
+__367:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __358
+		goto __369
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __359
+		goto __370
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -83990,25 +84618,25 @@ __356:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __358
-__359:
+	goto __369
+__370:
 	;
-	goto __357
-__357:
+	goto __368
+__368:
 	pEnc += 16
-	goto __356
-	goto __358
-__358:
+	goto __367
+	goto __369
+__369:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __360
+		goto __371
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17972, libc.VaList(bp+456, zRight))
-__360:
+	Xsqlite3ErrorMsg(tls, pParse, ts+18015, libc.VaList(bp+456, zRight))
+__371:
 	;
-__355:
+__366:
 	;
-__353:
+__364:
 	;
 	goto __15
 
@@ -84016,15 +84644,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __361
+		goto __372
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __363
+		goto __374
 	}
 	goto __15
-__363:
+__374:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -84032,41 +84660,41 @@ __363:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __364
+		goto __375
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__364:
+__375:
 	;
-	goto __362
-__361:
+	goto __373
+__372:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __365
+		goto __376
 	}
 	goto __15
-__365:
+__376:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__362:
+__373:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__366:
+__377:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __366
-__367:
+	goto __377
+__378:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -84081,31 +84709,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17329) == 0) {
-		goto __369
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17345) == 0) {
+		goto __380
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __370
-__369:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17997) == 0) {
-		goto __371
+	goto __381
+__380:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18040) == 0) {
+		goto __382
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __372
-__371:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17482) == 0) {
-		goto __373
+	goto __383
+__382:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17498) == 0) {
+		goto __384
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__373:
+__384:
 	;
-__372:
+__383:
 	;
-__370:
+__381:
 	;
-__368:
+__379:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -84115,10 +84743,10 @@ __368:
 
 __49:
 	if !(zRight != 0) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__374:
+__385:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -84138,19 +84766,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __377
+		goto __388
 	}
 	goto __15
-__377:
+__388:
 	;
-	goto __376
-__375:
+	goto __387
+__386:
 	opMask = U32(0xfffe)
-__376:
+__387:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -84159,86 +84787,86 @@ __376:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__378:
+__389:
 	if !(iDb <= iDbLast) {
-		goto __380
+		goto __391
 	}
 	if !(iDb == 1) {
-		goto __381
+		goto __392
 	}
-	goto __379
-__381:
+	goto __390
+__392:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__382:
+__393:
 	if !(k4 != 0) {
-		goto __384
+		goto __395
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __385
+		goto __396
 	}
-	goto __383
-__385:
+	goto __394
+__396:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__386:
+__397:
 	if !(pIdx6 != 0) {
-		goto __388
+		goto __399
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x100>>8) != 0) {
-		goto __389
+		goto __400
 	}
 	szThreshold = int16(0)
-	goto __388
-__389:
+	goto __399
+__400:
 	;
-	goto __387
-__387:
+	goto __398
+__398:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __386
-	goto __388
-__388:
+	goto __397
+	goto __399
+__399:
 	;
 	if !(szThreshold != 0) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__390:
+__401:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+18005,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18048,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __391
+		goto __402
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __392
-__391:
+	goto __403
+__402:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__392:
+__403:
 	;
-	goto __383
-__383:
+	goto __394
+__394:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __382
-	goto __384
-__384:
+	goto __393
+	goto __395
+__395:
 	;
-	goto __379
-__379:
+	goto __390
+__390:
 	iDb++
-	goto __378
-	goto __380
-__380:
+	goto __389
+	goto __391
+__391:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -84246,36 +84874,36 @@ __380:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __393
+		goto __404
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__393:
+__404:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __394
+		goto __405
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__394:
+__405:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __395
+		goto __406
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 648)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))) {
-		goto __396
+		goto __407
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__396:
+__407:
 	;
-__395:
+__406:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -84284,10 +84912,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656))&int64(0x7fffffff)))
-__397:
+__408:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -84296,10 +84924,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __398
+		goto __409
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) & int64(0x7fffffff))
-__398:
+__409:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -84307,10 +84935,10 @@ __398:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __399
+		goto __410
 	}
 
-__399:
+__410:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -84362,14 +84990,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18023, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18028, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18034, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18043, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18052, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18060, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18068},
-	{FzName: ts + 18075},
+	{FzName: ts + 18066, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18071, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18077, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18086, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18095, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18103, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18111},
+	{FzName: ts + 18118},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -84421,7 +85049,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]uint8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18081)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18124)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -84429,7 +85057,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18096, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18139, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = uint8(',')
 
 	}
@@ -84442,16 +85070,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18103, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18146, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18109)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18152)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18121)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18164)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4957, 1)
@@ -84634,13 +85262,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18136)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18179)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18144, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18187, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18148, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18191, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -84717,12 +85345,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18152, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18195, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -84731,19 +85359,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 5008
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18180, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18223, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18211, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18254, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18219,
-	ts + 18226,
-	ts + 18238,
+	ts + 18262,
+	ts + 18269,
+	ts + 18281,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -84803,7 +85431,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 7, 0x80)
@@ -84835,13 +85463,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18249)
+			corruptSchema(tls, pData, argv, ts+18292)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14130)
+				corruptSchema(tls, pData, argv, ts+14140)
 			}
 		}
 	}
@@ -84874,16 +85502,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8814
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8876
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7878
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18262
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7938
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18305
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -84961,17 +85589,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11713)
+		ts+11775)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -84980,44 +85617,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18334)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18377)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18358,
+		ts+18401,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -85028,57 +85665,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -85167,8 +85804,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -85281,8 +85920,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -85293,8 +85932,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -85306,8 +85945,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -85347,7 +85986,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18392, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18435, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -85377,7 +86016,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18422, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18465, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -85473,7 +86112,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -85572,7 +86211,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -85895,8 +86534,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10858
-		var zSp2 uintptr = ts + 10858
+		var zSp1 uintptr = ts + 10920
+		var zSp2 uintptr = ts + 10920
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -85904,13 +86543,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18441, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18484, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18471))
+var zKeyText = *(*[34]uint8)(unsafe.Pointer(ts + 18514))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -86085,7 +86724,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x20>>5)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18505, libc.VaList(bp, 0))
+					ts+18548, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -86130,7 +86769,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x8>>3)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18555, libc.VaList(bp+8, zName))
+						ts+18598, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -86141,7 +86780,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x8>>3)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x20>>5) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18619,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18662,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -86185,7 +86824,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6526, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6586, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -86532,9 +87171,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -86772,16 +87408,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18656
+		z = ts + 18699
 		break
 	case TK_INTERSECT:
-		z = ts + 18666
+		z = ts + 18709
 		break
 	case TK_EXCEPT:
-		z = ts + 18676
+		z = ts + 18719
 		break
 	default:
-		z = ts + 18683
+		z = ts + 18726
 		break
 	}
 	return z
@@ -86791,10 +87427,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18689, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18732, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -86814,6 +87453,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18755, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18786
+		}
+		return ts + 1554
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -86880,6 +87526,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -86944,6 +87591,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -86998,7 +87646,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1119
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16251
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16267
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -87137,13 +87785,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16251
+				zCol = ts + 16267
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -87151,7 +87799,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -87216,7 +87864,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -87241,7 +87889,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16251
+					zName = ts + 16267
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -87251,7 +87899,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18712, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18801, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -87267,7 +87915,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18721, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18810, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -87292,45 +87941,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff uint8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -87340,14 +87992,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = uint8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18818
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -87357,9 +88041,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -87403,7 +88084,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -87554,7 +88235,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18729, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18822, 0)
 	return
 __1:
 	;
@@ -87645,7 +88326,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18778, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18871, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -87665,7 +88346,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18820, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18913, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -87702,7 +88383,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18826, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18919, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -87736,11 +88417,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18841, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18934, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1554
 		}
-		return ts + 18864
+		return ts + 18957
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -87841,8 +88522,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18866, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18881, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18959, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18974, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -87889,7 +88570,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18656, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18699, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -87956,7 +88637,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -88018,7 +88699,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18900, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18993, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -88171,10 +88852,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+19014, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18967,
+			ts+19060,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -88428,8 +89109,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7174)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7174)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7234)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7234)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -88456,13 +89137,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19049, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19142, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19060, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19153, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -88474,7 +89155,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19065, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19158, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -88889,6 +89570,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff uint8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -89008,15 +89708,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff uint8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -89392,16 +90085,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -89461,12 +90171,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15154) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15164) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15158) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15168) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -89532,7 +90242,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19071, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19164, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -89615,7 +90325,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2000>>13)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19089, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19182, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -89744,15 +90454,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4000>>14)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19112, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19205, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 7, 0x80)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -89770,7 +90477,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 9, 0x200)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19132, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19225, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -89786,7 +90493,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19175
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19268
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -89812,7 +90519,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19198,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19291,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -89823,9 +90530,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19236
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19329
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19270
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19363
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -89872,7 +90579,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19308, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19401, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -89984,7 +90691,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19312,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19405,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -90003,7 +90710,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19351,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19444,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -90011,7 +90718,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x100>>8)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14723,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14733,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -90112,7 +90819,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6386
+							zSchemaName = ts + 6446
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -90127,7 +90834,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19382, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19475, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 14, 0xc000)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
@@ -90192,7 +90899,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19387,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19480,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -90204,7 +90911,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11999, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12061, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 14, 0xc000)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -90223,9 +90930,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19396, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19489, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19414, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19507, 0)
 					}
 				}
 			}
@@ -90235,7 +90942,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19434, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19527, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -90294,11 +91001,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					uint8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, uint8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -90357,6 +91060,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -90372,7 +91150,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -90385,13 +91164,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19465, 0)
+					ts+19558, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19516, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19609, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -90399,7 +91178,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -90419,19 +91198,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -90445,6 +91227,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -90519,7 +91304,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -90531,7 +91318,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -90549,13 +91336,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -90572,11 +91359,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0xc000>>14) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19549,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19642,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19561
+						return ts + 19654
 					}
 					return ts + 1554
 				}(),
@@ -90597,7 +91384,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -90629,14 +91416,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -90690,6 +91478,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x80>>7)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -90754,7 +91593,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -90853,7 +91691,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19584,
+		ts+19677,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -90914,7 +91752,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19638,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19731,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -91028,7 +91866,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x80>>7) == 0 ||
@@ -91045,11 +91883,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x80>>7) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -91060,7 +91894,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19678, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19771, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 10, 0x400)
@@ -91086,7 +91920,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -91118,11 +91952,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19693, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19786, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -91156,7 +91988,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -91465,12 +92297,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -91499,39 +92330,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -91542,24 +92349,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -91592,27 +92399,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19709
+				return ts + 19802
 			}
-			return ts + 19718
+			return ts + 19811
 		}())
 
 	groupBySort = 1
@@ -91620,47 +92434,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -91676,45 +92490,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -91733,16 +92553,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -91773,16 +92593,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -91795,98 +92615,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x8000>>15) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x2000>>13) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -91895,79 +92718,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19709)
-__148:
+	explainTempTable(tls, pParse, ts+19802)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19727
-			}
-			return ts + 19750
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -92064,7 +92882,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19759, 0)
+		ts+19820, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -92297,7 +93115,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19824, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19885, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -92341,7 +93159,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19870, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19931, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -92359,7 +93177,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19878, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19939, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -92371,7 +93189,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19870, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19931, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -92386,7 +93204,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19919, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19980, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -92398,22 +93216,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8072, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6381, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19945, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20006, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19983,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20044,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20020
+				return ts + 20081
 			}
-			return ts + 20027
+			return ts + 20088
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -92422,7 +93240,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20033, libc.VaList(bp+24, pTableName+8))
+		ts+20094, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -92451,9 +93269,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12086
+			return ts + 6389
 		}
-		return ts + 5893
+		return ts + 5883
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -92571,7 +93389,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19870, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19931, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -92604,7 +93422,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20079,
+		ts+20140,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -92629,13 +93447,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20127,
+		ts+20188,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20202, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20263, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -92891,7 +93709,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20231, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20292, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -92930,9 +93748,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12086
+				return ts + 6389
 			}
-			return ts + 5893
+			return ts + 5883
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -92944,7 +93762,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20251,
+			ts+20312,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -93058,12 +93876,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20313,
+		ts+20374,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20361
+				return ts + 20422
 			}
-			return ts + 20368
+			return ts + 20429
 		}()))
 __15:
 	;
@@ -93177,7 +93995,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20375, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20436, 0)
 	return 1
 }
 
@@ -93360,8 +94178,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -93394,8 +94212,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -93407,13 +94225,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20417, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20478, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -93729,7 +94547,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -93999,7 +94818,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20431,
+		ts+20492,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -94031,7 +94850,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20467, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20528, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -94041,7 +94860,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7653
+				return ts + 7713
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -94911,7 +95730,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20486)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20547)
 __169:
 	;
 update_cleanup:
@@ -95217,10 +96036,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*uint8)(unsafe.Pointer(bp + 216)) = uint8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20499, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]uint8{})), bp+216, ts+20560, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20503, libc.VaList(bp+8, bp+216))
+				ts+20564, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -95311,7 +96130,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12140, -1)
+				ts+12150, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -95343,7 +96162,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20576, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20580, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20637, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20641, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -95491,14 +96310,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20584)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20645)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20624)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20685)
 	return SQLITE_ERROR
 __2:
 	;
@@ -95509,7 +96328,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20667)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20728)
 	return SQLITE_ERROR
 __5:
 	;
@@ -95537,7 +96356,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20685, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20746, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -95557,7 +96376,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20708)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20769)
 	goto end_of_vacuum
 __8:
 	;
@@ -95572,7 +96391,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14493)
+	rc = execSql(tls, db, pzErrMsg, ts+14503)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -95617,7 +96436,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20735,
+		ts+20796,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -95626,7 +96445,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20843,
+		ts+20904,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -95637,7 +96456,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20897,
+		ts+20958,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -95648,7 +96467,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21048,
+		ts+21109,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -95870,12 +96689,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -95993,7 +96812,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12367, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12377, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -96077,11 +96896,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21178, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21239, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21202,
+			ts+21263,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -96091,7 +96910,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21301, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -96125,7 +96944,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -96152,7 +96971,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21320, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21381, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -96190,7 +97009,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21362, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21423, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -96202,7 +97021,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21392
+			var zFormat uintptr = ts + 21453
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -96219,7 +97038,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16142, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16158, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*uint8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -96276,7 +97095,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21438, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21499, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -96334,7 +97153,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21438, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21499, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -96354,8 +97173,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -96368,7 +97187,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -96821,7 +97640,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -96848,7 +97667,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -97079,10 +97898,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21457
+		return ts + 21518
 	}
 	if i == -1 {
-		return ts + 16251
+		return ts + 16267
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -97091,15 +97910,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -97110,11 +97929,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21470, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21531, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12757, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12767, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+5008, 1)
 	}
@@ -97136,27 +97955,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21472, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21533, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21464, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21525, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21475
+				return ts + 21536
 			}
-			return ts + 21480
+			return ts + 21541
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21488)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21549)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21490)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21551)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4957, 1)
 }
@@ -97199,11 +98018,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21492, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21553, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21498
+				return ts + 21559
 			}
-			return ts + 21505
+			return ts + 21566
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -97213,43 +98032,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0xc000>>14) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10914
+					zFmt = ts + 10976
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21510
+				zFmt = ts + 21571
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21543
+				zFmt = ts + 21604
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21568
+				zFmt = ts + 21629
 			} else {
-				zFmt = ts + 21586
+				zFmt = ts + 21647
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21595, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21656, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp uint8
-			var zRowid uintptr = ts + 16251
-			Xsqlite3_str_appendf(tls, bp+64, ts+21603, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16267
+			Xsqlite3_str_appendf(tls, bp+64, ts+21664, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = uint8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21634, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21695, libc.VaList(bp+32, zRowid))
 				cRangeOp = uint8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = uint8('>')
 			} else {
 				cRangeOp = uint8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21644, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21705, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21649,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21710,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21676, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21737, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -97281,28 +98100,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]uint8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21687, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21748, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21708, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21769, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21464, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21525, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21475, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21536, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4957, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -97363,52 +98183,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -98886,7 +99712,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21716, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21777, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -98914,7 +99740,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21731, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21792, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -99432,7 +100258,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21740, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21801, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -99790,10 +100616,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16100, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15431, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14957, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21754, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16116, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15447, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14967, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21815, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -100170,49 +100996,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -100220,13 +101035,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -100291,12 +101109,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21761, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21822, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -100320,7 +101138,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -100330,7 +101148,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -100375,7 +101193,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6709
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6769
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -100469,7 +101287,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21802
+				return ts + 21863
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -100480,7 +101298,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -100488,6 +101305,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -100521,7 +101339,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -100674,6 +101492,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -100842,7 +101663,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21809,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21870,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -101576,7 +102397,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21845, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21906, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -101647,7 +102468,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21871
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21932
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -102154,7 +102975,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -102174,7 +102995,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -102185,10 +103006,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -102199,29 +103020,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -102323,8 +103144,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -102336,7 +103157,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -102346,17 +103167,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -102376,19 +103197,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -102400,19 +103221,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -102422,10 +103243,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -102439,9 +103260,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -102466,8 +103287,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -102479,7 +103300,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -102493,23 +103314,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -102520,7 +103341,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -102842,6 +103663,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -102935,8 +103757,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -102960,8 +103782,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -103113,7 +103936,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -103132,7 +103955,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -103146,7 +103969,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -103155,9 +103978,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0xc000>>14) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -103176,6 +104003,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0xc000>>14) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -103303,30 +104133,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x10>>4)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -103334,20 +104183,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x10>>4) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -103356,9 +104210,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -103399,7 +104259,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 14, 0xc000)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -103439,7 +104299,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -103505,19 +104366,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x10>>4)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -103698,7 +104564,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -103756,7 +104622,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21882, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21943, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -104154,7 +105020,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21908, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21969, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -104365,8 +105231,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -104485,14 +105351,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -104644,7 +105519,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -104752,7 +105627,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21943, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+22004, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -105014,19 +105889,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -105038,9 +105915,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -105073,13 +105950,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -105231,7 +106108,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21961, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22022, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -105295,7 +106172,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21989, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22050, 0)
 	goto __5
 __4:
 	ii = 0
@@ -105996,7 +106873,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x10>>4)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -106177,7 +107054,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+22007, -1)
+		pCtx, ts+22068, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -106310,7 +107187,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22063, -1)
+					pCtx, ts+22124, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -106400,17 +107277,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22108))
-var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22119))
-var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22130))
-var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22135))
-var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22148))
-var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22158))
-var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22164))
-var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22175))
-var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22185))
-var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22197))
-var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22202))
+var row_numberName = *(*[11]uint8)(unsafe.Pointer(ts + 22169))
+var dense_rankName = *(*[11]uint8)(unsafe.Pointer(ts + 22180))
+var rankName = *(*[5]uint8)(unsafe.Pointer(ts + 22191))
+var percent_rankName = *(*[13]uint8)(unsafe.Pointer(ts + 22196))
+var cume_distName = *(*[10]uint8)(unsafe.Pointer(ts + 22209))
+var ntileName = *(*[6]uint8)(unsafe.Pointer(ts + 22219))
+var last_valueName = *(*[11]uint8)(unsafe.Pointer(ts + 22225))
+var nth_valueName = *(*[10]uint8)(unsafe.Pointer(ts + 22236))
+var first_valueName = *(*[12]uint8)(unsafe.Pointer(ts + 22246))
+var leadName = *(*[5]uint8)(unsafe.Pointer(ts + 22258))
+var lagName = *(*[4]uint8)(unsafe.Pointer(ts + 22263))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -106456,7 +107333,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22206, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22267, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -106500,12 +107377,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22225, 0)
+			ts+22286, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22296, 0)
+				ts+22357, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -106528,7 +107405,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7878)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7938)
 					}
 					break
 				}
@@ -106734,7 +107611,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22359, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22420, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -106850,7 +107727,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7470))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7530))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -106861,6 +107738,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 12, 0x1000)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, uint8(SQLITE_AFF_NONE))
@@ -106964,7 +107842,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22385, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22446, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -107029,15 +107907,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22417
+				zErr = ts + 22478
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22434
+				zErr = ts + 22495
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22450
+				zErr = ts + 22511
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22470, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22531, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -107058,7 +107936,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22503, 0)
+				ts+22564, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -107214,11 +108092,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22550,
-	ts + 22603,
-	ts + 22007,
-	ts + 22654,
-	ts + 22706,
+	ts + 22611,
+	ts + 22664,
+	ts + 22068,
+	ts + 22715,
+	ts + 22767,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -108415,8 +109293,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -108427,13 +109304,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -108617,19 +109491,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22756,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22817,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19750
+							return ts + 22859
 						}
-						return ts + 22798
+						return ts + 22868
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22804, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22874, 0)
 		}
 	}
 
@@ -108697,7 +109571,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22838,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22908,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -109794,7 +110668,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22876, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22946, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -110769,21 +111643,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16251, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16267, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16164, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16180, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22898, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22968, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -111526,7 +112400,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22925)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22995)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -111690,7 +112564,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -111907,9 +112781,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 6704
+							return ts + 6764
 						}
-						return ts + 6709
+						return ts + 6769
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -111921,6 +112795,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -112188,19 +113067,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22958, 0)
+					ts+23028, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23053, 0)
+					ts+23123, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23137, 0)
+					ts+23207, 0)
 			}
 			break
 		case uint32(273):
@@ -112579,9 +113458,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*uint8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22934, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23004, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23222, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23292, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -113349,7 +114228,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23239, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23309, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -113372,7 +114251,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3663, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23264, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23334, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -113545,7 +114424,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23275, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23345, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -113558,11 +114437,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19870, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19931, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23282, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23352, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23287, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23357, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -113575,9 +114454,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23297, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23367, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23301, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23371, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -113816,7 +114695,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -114391,7 +115270,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -114406,7 +115285,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23309, 0)
+			ts+23379, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -114597,23 +115476,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23377
+	var zErr uintptr = ts + 23447
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23391
+			zErr = ts + 23461
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23413
+			zErr = ts + 23483
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23435
+			zErr = ts + 23505
 			break
 
 		}
@@ -114631,35 +115510,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23458,
-	ts + 23471,
+	ts + 23528,
+	ts + 23541,
 	uintptr(0),
-	ts + 23487,
-	ts + 23512,
-	ts + 23526,
-	ts + 23545,
+	ts + 23557,
+	ts + 23582,
+	ts + 23596,
+	ts + 23615,
 	ts + 1490,
-	ts + 23570,
-	ts + 23607,
-	ts + 23619,
-	ts + 23634,
-	ts + 23667,
-	ts + 23685,
-	ts + 23710,
-	ts + 23739,
+	ts + 23640,
+	ts + 23677,
+	ts + 23689,
+	ts + 23704,
+	ts + 23737,
+	ts + 23755,
+	ts + 23780,
+	ts + 23809,
 	uintptr(0),
-	ts + 5848,
+	ts + 5838,
 	ts + 5334,
-	ts + 23756,
-	ts + 23774,
-	ts + 23792,
-	uintptr(0),
 	ts + 23826,
+	ts + 23844,
+	ts + 23862,
 	uintptr(0),
-	ts + 23847,
-	ts + 23873,
 	ts + 23896,
+	uintptr(0),
 	ts + 23917,
+	ts + 23943,
+	ts + 23966,
+	ts + 23987,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -114760,6 +115639,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	libc.AtomicStoreNInt32(db+432, int32(1), 0)
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(libc.AtomicLoadNInt32(db+432, 0) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -114774,7 +115659,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -114824,7 +115709,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23933, 0)
+				ts+24003, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -114946,7 +115831,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23996, libc.VaList(bp, zName))
+		ts+24066, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -115182,7 +116067,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24047, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24117, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -115275,7 +116160,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -115345,7 +116230,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115355,7 +116240,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -115392,14 +116277,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		}()
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24068, 0)
+				ts+24138, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -115529,7 +116414,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24136, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24206, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -115574,10 +116459,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24142, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24212, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24152,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24222,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -115682,7 +116567,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24180, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24250, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -115693,17 +116578,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24184, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24254, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24184
+	zModeType = ts + 24254
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24190, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24260, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -115741,7 +116626,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24195, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24265, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -115749,7 +116634,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24215,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24285,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -115789,7 +116674,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24239, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24309, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -115813,15 +116698,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24255, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24262, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24325, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24332, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24270, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24273, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24276, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17346, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24340, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24343, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24346, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17362, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -115967,10 +116852,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21802, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21863, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24280, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24350, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -115984,7 +116869,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -116035,9 +116920,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6381
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6441
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23282
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23352
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -116142,7 +117027,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24286
+		zFilename = ts + 24356
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, func() uint8 {
@@ -116260,21 +117145,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24289,
+	Xsqlite3_log(tls, iErr, ts+24359,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24314)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24384)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24334)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24404)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24341)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24411)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -116432,7 +117317,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24358, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24428, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -117088,7 +117973,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24386, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24456, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -117206,7 +118091,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24394
+			return ts + 24464
 		}
 		return uintptr(0)
 	}(), 0)
@@ -117384,7 +118269,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6181, ts + 6704, ts + 6709, ts + 6191, ts + 6186, ts + 7945, ts + 24417, ts + 24423,
+	ts + 6181, ts + 6764, ts + 6769, ts + 6191, ts + 6186, ts + 8005, ts + 24487, ts + 24493,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -117537,7 +118422,7 @@ __10:
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0')
 	*(*uint8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = uint8('0' + int32(c)>>4)
-	c = *(*uint8)(unsafe.Pointer(ts + 24430 + uintptr(int32(c)&0xf)))
+	c = *(*uint8)(unsafe.Pointer(ts + 24500 + uintptr(int32(c)&0xf)))
 __8:
 	;
 __6:
@@ -117592,7 +118477,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24447, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24517, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -117656,13 +118541,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6704, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6764, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6709, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6769, uint32(5))
 			break
 
 		}
@@ -118212,12 +119097,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6704, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6764, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(4))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6709, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6769, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(z + uintptr(i+U32(5))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -118318,7 +119203,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24476, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24546, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -118624,7 +119509,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*uint8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24491, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24561, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -118639,7 +119524,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24495, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24565, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -118693,7 +119578,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24521,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24591,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -118798,11 +119683,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*uint8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[*(*uint8)(unsafe.Pointer(zPath))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24564, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24634, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4998, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24567, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24637, uint32(1+libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, uint8(0))
 				}
@@ -118959,14 +119844,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24570, -1)
+			ts+24640, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, uint8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24621, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24691, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -119061,7 +119946,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15364)
+	jsonWrongNumArgs(tls, ctx, ts+15380)
 	return
 __2:
 	;
@@ -119136,9 +120021,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24655
+			return ts + 24725
 		}
-		return ts + 24659
+		return ts + 24729
 	}())
 	return
 __2:
@@ -119271,7 +120156,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24666, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24736, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119368,7 +120253,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24669, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24739, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -119412,7 +120297,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24672)
+		ts+24742)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -119543,7 +120428,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24755, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24825, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -119562,7 +120447,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24761, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24831, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -119658,7 +120543,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, uint8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24761, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24831, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -119682,7 +120567,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24766
+				zRoot = ts + 24836
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -119747,6 +120632,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -119798,7 +120689,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24476, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24546, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -119893,25 +120784,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24768},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24773},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24784},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24802},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24815},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24818},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24822},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24834},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24846},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24857},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24868},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24880},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24893},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24902},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24912},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24923},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24940}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24838},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24843},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24854},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24872},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24885},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24888},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24892},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24904},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24916},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24927},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24938},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24950},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24963},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24972},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24982},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24993},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 25010}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -119930,8 +120821,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24958, FpModule: 0},
-	{FzName: ts + 24968, FpModule: 0},
+	{FzName: ts + 25028, FpModule: 0},
+	{FzName: ts + 25038, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -120191,11 +121082,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24978, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25048, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24986, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25056, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -120406,7 +121297,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24991,
+		ts+25061,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -121104,7 +121995,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25073)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25143)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -122445,7 +123336,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25087, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25157, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -122457,12 +123348,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25107, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25177, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25139, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25209, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -122688,7 +123579,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25176, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25246, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -122711,14 +123602,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25321
+	var zFmt uintptr = ts + 25391
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11286, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11348, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -122759,7 +123650,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25377, ts + 5060, ts + 16251,
+	ts + 25447, ts + 5060, ts + 16267,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -122802,19 +123693,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25382,
+			ts+25452,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25444, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25514, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25449,
+			ts+25519,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25513,
+			ts+25583,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25583,
+			ts+25653,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -122843,7 +123734,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25632
+			zFormat = ts + 25702
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -122855,7 +123746,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25740,
+			ts+25810,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -122863,18 +123754,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25785, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25855, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12757, 1)
+					Xsqlite3_str_append(tls, p, ts+12767, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25812, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25882, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25834, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25904, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25842, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25912, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -122889,14 +123780,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25858,
-	ts + 25911,
-	ts + 25956,
-	ts + 26008,
-	ts + 26062,
-	ts + 26107,
-	ts + 26165,
-	ts + 26220,
+	ts + 25928,
+	ts + 25981,
+	ts + 26026,
+	ts + 26078,
+	ts + 26132,
+	ts + 26177,
+	ts + 26235,
+	ts + 26290,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -122925,7 +123816,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26267, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26337, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -122937,7 +123828,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26287,
+			ts+26357,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -122945,7 +123836,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26344,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26414,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -122987,10 +123878,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26379,
-		ts + 26422,
-		ts + 26457,
-		ts + 26493,
+		ts + 26449,
+		ts + 26492,
+		ts + 26527,
+		ts + 26563,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -123021,7 +123912,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26530,
+	Xsqlite3_str_appendf(tls, pSql, ts+26600,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -123033,7 +123924,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26554, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26624, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -123056,7 +123947,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -123152,7 +124043,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26563, ts + 26574}
+var azFormat = [2]uintptr{ts + 26633, ts + 26644}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -123190,13 +124081,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10858, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10920, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26584, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26654, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26590, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26660, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26594, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26664, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -123207,7 +124098,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26596, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26666, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -123285,7 +124176,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26629,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26699,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4062
@@ -123309,7 +124200,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26636,
+			ts+26706,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -123328,7 +124219,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26681, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26751, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -123342,8 +124233,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26713,
-		ts + 26767,
+		ts + 26783,
+		ts + 26837,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -123358,23 +124249,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26815,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26885,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26860
+					return ts + 26930
 				}
-				return ts + 26868
+				return ts + 26938
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26877,
+				ts+26947,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26860
+						return ts + 26930
 					}
-					return ts + 26868
+					return ts + 26938
 				}(), iKey, iVal))
 		}
 	}
@@ -123398,7 +124289,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26935, libc.VaList(bp, i, iCell, iNode))
+				ts+27005, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -123418,7 +124309,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26983, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27053, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -123435,14 +124326,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27050, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27120, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27084, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27154, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -123450,7 +124341,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27114,
+					ts+27184,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -123479,14 +124370,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27169,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27239,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27200, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27270, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -123508,12 +124399,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14493, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14503, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27267, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27337, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -123522,12 +124413,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25087, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25157, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27295, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27365, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -123541,8 +124432,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27326, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27333, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27396, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27403, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -123550,7 +124441,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27341, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27411, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -123565,7 +124456,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27345, -1)
+			ts+27415, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -123573,7 +124464,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6381
+			zDb = ts + 6441
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -123583,7 +124474,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17969
+				return ts + 18012
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -123878,7 +124769,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -123936,6 +124827,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -123948,15 +124840,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27396, 1)
+		Xsqlite3_str_append(tls, x, ts+27466, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27398, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27468, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27409, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27479, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -123976,19 +124869,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep uint8 = uint8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27420, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27490, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27438, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27508, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = uint8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27446, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27516, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*uint8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27454, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27524, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27458, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27528, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -124007,6 +124900,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -124038,6 +124932,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -124046,6 +124941,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -124104,6 +125000,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -124272,6 +125169,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -124293,6 +125191,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -124377,6 +125276,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -124405,6 +125306,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124843,6 +125745,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -124856,6 +125759,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -124870,6 +125776,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -124894,7 +125801,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27471, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27541, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -124903,7 +125810,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27493, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27563, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -124911,7 +125818,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26560, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26630, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -124990,6 +125897,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -125118,6 +126026,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -125136,7 +126045,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16251
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16267
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -125146,7 +126055,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27497
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27567
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -125154,7 +126063,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27503
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27573
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -125266,7 +126175,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27512, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27582, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -125396,14 +126305,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27552) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27568) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27638) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -125440,8 +126351,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -125458,7 +126369,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -125468,7 +126379,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27583, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27653, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -125480,25 +126391,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27591},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27604},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27617},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27630},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27568},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27642},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27552},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27665},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27679},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27692},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27706},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27722},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27661},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27674},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27687},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27700},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27638},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27712},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27622},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27735},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27749},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27762},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27776},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27792},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27734},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27804},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -125508,26 +126419,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27753, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27823, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27763, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27833, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27774, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27844, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27497, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27567, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27785, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27855, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -125581,7 +126492,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25073, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25143, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -125908,7 +126819,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27795, -1)
+		Xsqlite3_result_error(tls, context, ts+27865, -1)
 		return
 	}
 
@@ -125919,7 +126830,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27795, -1)
+			Xsqlite3_result_error(tls, context, ts+27865, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -126020,7 +126931,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27816, uintptr(0), uintptr(0), p+64)
+				ts+27886, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -126084,7 +126995,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+24986, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25056, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*uint8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -126105,16 +127016,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+27987, libc.VaList(bp, func() uintptr {
+			ts+28057, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28137
+					return ts + 28207
 				}
 				return ts + 1554
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28178)
+			ts+28248)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -126230,7 +127141,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28303, libc.VaList(bp, zTab)))
+			ts+28373, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -126248,7 +127159,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28422, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28492, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -126266,7 +127177,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28443, libc.VaList(bp+16, zIdx)))
+			ts+28513, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -126289,7 +127200,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28494, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28564, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -126335,7 +127246,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -126350,7 +127261,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -126390,7 +127301,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19396, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19489, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -126400,18 +127311,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+28572, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28642, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+28591, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28661, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28596, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28666, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -126423,18 +127334,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28606, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28676, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28635
+							return ts + 28705
 						}
-						return ts + 28648
+						return ts + 28718
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+28657, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28727, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -126448,7 +127359,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28679,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28749,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -126495,8 +127406,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+28706, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14604
+		zList = rbuMPrintf(tls, p, ts+28776, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14614
 	}
 	return zList
 }
@@ -126513,7 +127424,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+28715, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28785, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -126535,25 +127446,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+28728, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28798, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28760, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28830, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+28783)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28789, ts+28796, ts+4957)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+28853)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28859, ts+28866, ts+4957)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+28804,
+					ts+28874,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28846, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28916, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -126595,7 +127506,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -126630,7 +127541,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28866
+	zCol = ts + 28936
 __7:
 	;
 	goto __5
@@ -126638,13 +127549,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28874,
+	zLhs = rbuMPrintf(tls, p, ts+28944,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28895,
+	zOrder = rbuMPrintf(tls, p, ts+28965,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28931,
+	zSelect = rbuMPrintf(tls, p, ts+29001,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14604
+	zSep = ts + 14614
 	iCol++
 	goto __1
 __2:
@@ -126662,7 +127573,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+28958,
+		Xsqlite3_mprintf(tls, ts+29028,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -126689,8 +127600,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+29006, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14604
+	zVector = rbuMPrintf(tls, p, ts+29076, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14614
 	goto __15
 __15:
 	iCol++
@@ -126701,7 +127612,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+29013, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29083, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -126734,7 +127645,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -126746,7 +127657,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29025, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29095, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1554
 		} else {
@@ -126758,37 +127669,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28866
+					zCol = ts + 28936
 				} else {
-					zCol = ts + 28596
+					zCol = ts + 28666
 				}
 				zType = ts + 1119
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29047, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29117, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28783
+					return ts + 28853
 				}
 				return ts + 1554
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29067,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29137,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29088,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29158,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29121, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29191, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14604
-		zAnd = ts + 21464
+		zCom = ts + 14614
+		zAnd = ts + 21525
 		nBind++
 	}
 
@@ -126827,11 +127738,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+29145, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29215, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29157, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29227, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14604
+			zS = ts + 14614
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -126839,7 +127750,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29166, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29236, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -126851,18 +127762,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29181, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29251, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1554
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29195, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29265, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21525
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29207, libc.VaList(bp+40, zList))
+			ts+29277, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1554
@@ -126870,8 +127781,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29257, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21464
+				zList = rbuMPrintf(tls, p, ts+29327, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21525
 			}
 		}
 	}
@@ -126880,7 +127791,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29270, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29340, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -126898,17 +127809,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c uint8 = *(*uint8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29257,
+					zList = rbuMPrintf(tls, p, ts+29327,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29296,
+					zList = rbuMPrintf(tls, p, ts+29366,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29326,
+					zList = rbuMPrintf(tls, p, ts+29396,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14604
+					zSep = ts + 14614
 				}
 			}
 		}
@@ -126943,19 +127854,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29363
+		var zSep uintptr = ts + 29433
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+28515, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28585, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16139) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16155) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -126967,15 +127878,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 28783
+					zDesc = ts + 28853
 				} else {
 					zDesc = ts + 1554
 				}
-				z = rbuMPrintf(tls, p, ts+29376, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14604
+				z = rbuMPrintf(tls, p, ts+29446, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14614
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29387, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -126995,7 +127906,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29391)
+			ts+29461)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -127004,7 +127915,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+28543, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28613, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -127014,25 +127925,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29441, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29511, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29463, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29533, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28783
+						return ts + 28853
 					}
 					return ts + 1554
 				}()))
-				zComma = ts + 14604
+				zComma = ts + 14614
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29473, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29543, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29488,
+			ts+29558,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -127045,7 +127956,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1554
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1554
@@ -127053,39 +127964,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29550
+				zPk = ts + 29620
 			}
-			zSql = rbuMPrintf(tls, p, ts+29563,
+			zSql = rbuMPrintf(tls, p, ts+29633,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29590
+							return ts + 29660
 						}
 						return ts + 1554
 					}()))
-			zComma = ts + 14604
+			zComma = ts + 14614
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29600, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29670, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29607,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29677,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29639
+						return ts + 29709
 					}
 					return ts + 1554
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 	}
 }
 
@@ -127098,7 +128009,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+29654,
+				ts+29724,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -127135,7 +128046,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+29711)
+			ts+29781)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -127240,7 +128151,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29777, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29847, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -127260,24 +128171,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29797,
+				ts+29867,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+29862, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29932, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+29898, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+29968, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -127293,7 +128204,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29932,
+						ts+30002,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -127301,9 +128212,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29993
+											return ts + 30063
 										}
-										return ts + 29997
+										return ts + 30067
 									}()
 								}
 								return ts + 1554
@@ -127312,20 +128223,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30003,
+						ts+30073,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30064,
+						ts+30134,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29993
+									return ts + 30063
 								}
-								return ts + 29997
+								return ts + 30067
 							}(),
 							zCollist, zLimit))
 				}
@@ -127350,8 +128261,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6392)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6388)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6452)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6448)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -127362,16 +128273,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1554
 				}
-				return ts + 30223
+				return ts + 30293
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30232,
+						ts+30302,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30268
+								return ts + 30338
 							}
 							return ts + 1554
 						}(), zBindings)))
@@ -127380,32 +128291,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30278, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30348, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1554
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30306
+					zRbuRowid = ts + 30376
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30318, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30388, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30394
+							return ts + 30464
 						}
 						return ts + 1554
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30411,
+					ts+30481,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30710,
+						ts+30780,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -127418,9 +128329,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30809
+						zRbuRowid = ts + 30879
 					} else {
-						zRbuRowid = ts + 30819
+						zRbuRowid = ts + 30889
 					}
 				}
 
@@ -127433,20 +128344,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28866, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28936, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14604, ts+1554)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1554, ts+14614, ts+1554)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30830,
+							ts+30900,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30878
+										return ts + 30948
 									}
 									return ts + 1554
 								}(),
@@ -127459,7 +128370,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19750
+										return ts + 22859
 									}
 									return ts + 1554
 								}(), zOrder,
@@ -127527,9 +128438,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1554
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30223
+				zPrefix = ts + 30293
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30884,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30954,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -127588,7 +128499,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+30914, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+30984, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -127658,28 +128569,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30944, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+31014, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30972, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31042, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+48, ts+3286, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6381, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6441, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30990, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31060, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -127712,11 +128623,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31056, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31126, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24136, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24206, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*uint8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -127728,13 +128639,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31088,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381),
+			zTarget = Xsqlite3_mprintf(tls, ts+31158,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
 						}
-						return ts + 31120
+						return ts + 31190
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1554
@@ -127753,37 +128664,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31122, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31192, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31137, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31207, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31154, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31224, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31198, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31268, 0)
 	}
 }
 
@@ -127812,15 +128723,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31170, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31240, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31216, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31286, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -127868,7 +128779,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -127928,7 +128839,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -127945,23 +128856,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31251, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31321, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6381)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6381)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6441)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31276, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31283, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31346, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31353, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -128078,7 +128989,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23774, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23844, 0)
 			return
 		}
 
@@ -128171,7 +129082,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+31290)
+			ts+31360)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -128179,7 +129090,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31312, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31382, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -128200,7 +129111,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+31339,
+				ts+31409,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -128230,9 +129141,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+31497, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31567, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31512,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31582,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -128246,10 +129157,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31532, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31602, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31557)
+			ts+31627)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128263,12 +129174,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31665)
+			ts+31735)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+31730)
+			ts+31800)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -128280,7 +129191,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31774, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31844, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -128300,15 +129211,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17224)
-					rbuCopyPragma(tls, p, ts+16335)
+					rbuCopyPragma(tls, p, ts+17240)
+					rbuCopyPragma(tls, p, ts+16351)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31799, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31869, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -128332,10 +129243,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -128430,7 +129341,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31827, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31897, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -128443,16 +129354,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31276, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31346, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6441, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -128462,7 +129374,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31852, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]uint8{})), bp+12, ts+31922, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -128496,7 +129408,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31863, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31933, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -128526,13 +129438,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31935, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32005, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31949)
+				ts+32019)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -128543,7 +129455,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+32006)
+				ts+32076)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -128617,7 +129529,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32080, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32150, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -128635,12 +129547,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32112,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32182,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32144
+							return ts + 32214
 						}
-						return ts + 32151
+						return ts + 32221
 					}()))
 			}
 		}
@@ -128648,7 +129560,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14493, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14503, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -128659,19 +129571,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16938)
-						rbuCopyPragma(tls, p, ts+16350)
+						rbuCopyPragma(tls, p, ts+16954)
+						rbuCopyPragma(tls, p, ts+16366)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32158, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32228, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6381, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6441, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32174, uintptr(0), uintptr(0), p+64)
+								db, ts+32244, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -128725,7 +129637,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32198, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32268, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -128752,7 +129664,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30223, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30293, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*uint8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -128769,7 +129681,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -128782,13 +129694,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32206, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32276, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -128883,7 +129795,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -128900,19 +129812,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14508, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14518, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14493
+				zBegin = ts + 14503
 			} else {
-				zBegin = ts + 32158
+				zBegin = ts + 32228
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32158, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32228, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -129035,11 +129947,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -129178,7 +130093,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -129255,7 +130170,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32233, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32303, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -129280,7 +130195,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32256, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32326, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129425,7 +130340,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6381)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6441)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -129440,7 +130355,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32267, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32337, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -129451,7 +130366,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -129481,6 +130402,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -130244,11 +131180,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11286, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11348, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32278, 0)
+				ts+32348, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1554, 0)
 		} else {
@@ -130261,7 +131197,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32399, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32469, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -130359,7 +131295,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11286, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11348, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -130826,6 +131762,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -130908,6 +131847,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -130937,9 +131877,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32428,
+			zRet = Xsqlite3_mprintf(tls, ts+32498,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 21464
+			zSep = ts + 21525
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130962,9 +131902,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32462,
+				ts+32532,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 32503
+			zSep = ts + 32573
 			if zRet == uintptr(0) {
 				break
 			}
@@ -130972,18 +131912,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7470, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7530, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32508,
+		ts+32578,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -130993,7 +131933,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -131026,7 +131966,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32586,
+			ts+32656,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -131153,7 +132093,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32639, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32709, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -131627,9 +132567,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11286, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11348, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32666, libc.VaList(bp, zDb))
+			ts+32736, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -131638,18 +132578,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1554
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32776, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32846, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1567, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32791, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32861, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+32799, bp+24)
+				sessionAppendStr(tls, bp+8, ts+32869, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21464
+				zSep = ts + 21525
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -131758,7 +132698,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32805, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32875, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -131850,7 +132790,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32825, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32895, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -132113,7 +133053,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -132136,7 +133076,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -132178,7 +133118,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -132239,7 +133179,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -132313,13 +133253,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -132381,7 +133321,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -132754,7 +133694,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -132922,7 +133862,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11286) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11348) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -132933,34 +133873,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32843, bp+16)
+				sessionAppendStr(tls, bp, ts+32913, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32856, bp+16)
+				sessionAppendStr(tls, bp, ts+32926, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+32862, bp+16)
+						sessionAppendStr(tls, bp, ts+32932, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14604
+						zSep = ts + 14614
 					}
 				}
 
 				zSep = ts + 1554
-				sessionAppendStr(tls, bp, ts+32791, bp+16)
+				sessionAppendStr(tls, bp, ts+32861, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32867, bp+16)
+								ts+32937, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32799, bp+16)
+							sessionAppendStr(tls, bp, ts+32869, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21464
+						zSep = ts + 21525
 					}
 				}
 
@@ -133012,34 +133952,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32942, bp+16)
+	sessionAppendStr(tls, bp, ts+33012, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32791, bp+16)
+	sessionAppendStr(tls, bp, ts+32861, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+32862, bp+16)
+			sessionAppendStr(tls, bp, ts+32932, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21464
+			zSep = ts + 21525
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32960, bp+16)
+		sessionAppendStr(tls, bp, ts+33030, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32503, bp+16)
+		sessionAppendStr(tls, bp, ts+32573, bp+16)
 
 		zSep = ts + 1554
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+32799, bp+16)
+				sessionAppendStr(tls, bp, ts+32869, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 32968
+				zSep = ts + 33038
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4957, bp+16)
@@ -133055,7 +133995,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6381, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6441, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -133066,19 +134006,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32973, bp+16)
+	sessionAppendStr(tls, bp, ts+33043, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21470, bp+16)
+	sessionAppendStr(tls, bp, ts+21531, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14604, bp+16)
+			sessionAppendStr(tls, bp, ts+14614, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+32991, bp+16)
+	sessionAppendStr(tls, bp, ts+33061, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+33002, bp+16)
+		sessionAppendStr(tls, bp, ts+33072, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+4957, bp+16)
 
@@ -133094,14 +134034,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11286, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11348, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+33006)
+			ts+33076)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33119)
+			ts+33189)
 	}
 	return rc
 }
@@ -133129,7 +134069,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -133138,7 +134078,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -133215,7 +134155,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -133341,7 +134281,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -133382,7 +134322,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33263, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33333, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -133398,7 +134338,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33284, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33354, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -133471,10 +134411,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33303, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33373, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33329, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33399, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -133520,7 +134460,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6381, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6441, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -133533,19 +134473,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33359, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33429, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33403,
+						ts+33473,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33474, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33544, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11286) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11348) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -133596,14 +134536,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33534, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33588, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33564, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33658, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33634, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -134851,7 +135791,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33616, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33686, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135139,7 +136079,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33644, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33714, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -135326,7 +136266,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33675, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33745, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -135394,7 +136334,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33682
+		var zErr uintptr = ts + 33752
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135576,7 +136516,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33732
+		var zErr uintptr = ts + 33802
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -135900,13 +136840,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33780, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33850, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33788, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33858, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33798, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33868, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -136457,7 +137397,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33803, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33873, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -136484,14 +137424,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*uint8)(unsafe.Pointer(p))) < '0' || int32(*(*uint8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33810, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33880, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33841, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33911, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136502,7 +137442,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33874, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33944, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -136515,7 +137455,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33911, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33981, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -136524,7 +137464,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33920, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33990, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*uint8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -136543,7 +137483,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33953, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34023, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -136558,14 +137498,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33987, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34057, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33995, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34065, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*uint8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34027, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34097, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -136573,9 +137513,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34033, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34103, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34047, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34117, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -136583,9 +137523,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34085, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34155, zCmd, nCmd) == 0 {
 		if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || int32(*(*uint8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34096, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34166, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(zArg))) == '1')
@@ -136595,19 +137535,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5075, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 7958, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17329},
-			{FzName: ts + 34131, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8026, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17345},
+			{FzName: ts + 34201, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34139, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34209, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34170, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34240, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -136654,15 +137594,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22130) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16251) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34198, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22191) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16267) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34268, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34228) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34298) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34238, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34308, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -136679,13 +137619,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34269, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34339, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34274, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34344, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34281, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34351, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -136723,8 +137663,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22130) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34289, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22191) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34359, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -136756,7 +137696,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34318, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34388, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -136793,19 +137733,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33987
+			zTail = ts + 34057
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34338
+			zTail = ts + 34408
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34346, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34416, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16251, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16267, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -136849,18 +137789,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34357, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34427, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1554
 			}
-			return ts + 14604
+			return ts + 14614
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34373, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34443, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34380,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22130))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34450,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22191))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -136970,7 +137910,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34406) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34476) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -136980,7 +137920,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34411) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34481) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -136990,7 +137930,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34420) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34490) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -137003,7 +137943,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34430) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34500) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -137013,7 +137953,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34440) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34510) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -137029,7 +137969,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22130) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22191) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -137052,7 +137992,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34452
+	var zSelect uintptr = ts + 34522
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -137074,7 +138014,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34484) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34554) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -137088,7 +138028,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34492,
+				ts+34562,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -137186,7 +138126,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*uint8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34557, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34627, 0)
 					return FTS5_EOF
 				}
 			}
@@ -137199,20 +138139,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34577, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34647, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*uint8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34608, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34678, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34611, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34681, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29993, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30063, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -137298,6 +138238,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*uint8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -137326,7 +138277,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 1))) || int32(*(*uint8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*uint8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*uint8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = uint8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -138979,9 +139930,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34615, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34685, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33644, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33714, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -138997,7 +139948,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c uint8 = *(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34620, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34690, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*uint8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -139084,7 +140035,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20467, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20528, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -139165,7 +140116,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34649, 0)
+			ts+34719, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -139335,12 +140286,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34702,
+								ts+34772,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34752
+										return ts + 34822
 									}
-									return ts + 34615
+									return ts + 34685
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -140283,7 +141234,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34759, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34829, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -140362,7 +141313,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+34765,
+			ts+34835,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -140387,7 +141338,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34816,
+			ts+34886,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -140410,7 +141361,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+34865,
+			ts+34935,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -140649,7 +141600,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+34905, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34975, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -141848,7 +142799,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+34928,
+			ts+34998,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -143314,7 +144265,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+35012,
+			ts+35082,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -143805,10 +144756,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -144391,13 +145347,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35069, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35139, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24986, ts+35077, 0, pzErr)
+				pConfig, ts+25056, ts+35147, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11426,
-					ts+35112,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11488,
+					ts+35182,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -144650,7 +145606,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34759, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+34829, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -144764,7 +145720,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35156,
+		ts+35226,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -144934,7 +145890,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35242)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35312)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -145205,7 +146161,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35247, 0)
+			ts+35317, 0)
 		return SQLITE_ERROR
 	}
 
@@ -145629,11 +146585,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35286,
+		ts+35356,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14604
+					return ts + 14614
 				}
 				return ts + 1554
 			}(),
@@ -145645,9 +146601,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35341
+					return ts + 35411
 				}
-				return ts + 35346
+				return ts + 35416
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -145693,12 +146649,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35350, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35420, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5057, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35356, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35426, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -145729,7 +146685,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35384, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35454, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -145760,7 +146716,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35394, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35464, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -145792,14 +146748,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35415, libc.VaList(bp, z))
+				ts+35485, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33798
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33868
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -145855,7 +146811,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35247, 0)
+		ts+35317, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -146072,7 +147028,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35448, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35518, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -146217,28 +147173,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35484, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35554, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35495, 0)
+				ts+35565, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35575, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35583, 0)
+				ts+35653, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16918, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16934, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35639, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35709, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35645, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35715, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -146296,7 +147252,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17463, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17479, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -146309,12 +147265,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35661,
+				ts+35731,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20368
+						return ts + 20429
 					}
-					return ts + 35698
+					return ts + 35768
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -146944,7 +147900,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35710, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35780, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -147188,7 +148144,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35731, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35801, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -147207,7 +148163,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35753, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35823, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -147254,7 +148210,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35784)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35854)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -147263,7 +148219,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35797, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35867, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -147277,7 +148233,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35888, ts + 33987, ts + 24986, ts + 34338, ts + 11426,
+	ts + 35958, ts + 34057, ts + 25056, ts + 34408, ts + 11488,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -147301,7 +148257,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35895, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35965, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -147319,13 +148275,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35895, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35965, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35900, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35970, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -147380,17 +148338,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35915,
-			ts + 35983,
-			ts + 36052,
-			ts + 36085,
-			ts + 36124,
-			ts + 36164,
-			ts + 36203,
-			ts + 36244,
-			ts + 36283,
-			ts + 36325,
-			ts + 36365,
+			ts + 35985,
+			ts + 36053,
+			ts + 36122,
+			ts + 36155,
+			ts + 36194,
+			ts + 36234,
+			ts + 36273,
+			ts + 36314,
+			ts + 36353,
+			ts + 36395,
+			ts + 36435,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -147492,18 +148450,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36388,
+		ts+36458,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36492,
+			ts+36562,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36530,
+			ts+36600,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -147515,7 +148473,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36568,
+			ts+36638,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -147527,14 +148485,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24986, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11426, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35888, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25056, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11488, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35958, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34338, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34408, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33987, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34057, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -147546,17 +148504,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36610,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36680,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29639
+					return ts + 29709
 				}
 				return ts + 1554
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36640,
+			ts+36710,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -147593,27 +148551,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36684, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36754, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36707, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36777, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33987, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34057, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34338, ts+36713, 0, pzErr)
+				pConfig, ts+34408, ts+36783, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35888, ts+36745, 1, pzErr)
+				pConfig, ts+35958, ts+36815, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -147819,12 +148777,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36762,
+		ts+36832,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36812,
+			ts+36882,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -147832,7 +148790,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34484, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34554, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -148008,7 +148966,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36841,
+	zSql = Xsqlite3_mprintf(tls, ts+36911,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -148190,14 +149148,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33987, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34057, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34338, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34408, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -148392,9 +149350,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36873) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36943) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -148609,7 +149567,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36895
+			var zCat uintptr = ts + 36965
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -148621,7 +149579,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36904) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -148632,18 +149590,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36915) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36985) {
 					if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '2' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*uint8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36873) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36943) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36884) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36954) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36904) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36974) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -148919,7 +149877,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36933
+	var zBase uintptr = ts + 37003
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -149061,7 +150019,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36943, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149069,11 +150027,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36946, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36951, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149081,7 +150039,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36956, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149089,7 +150047,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36959, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37029, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149097,11 +150055,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36962, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36967, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37037, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149109,19 +150067,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36972, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37042, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36976, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37046, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36982, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37052, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36987, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37057, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149129,11 +150087,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36991, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37061, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36995, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -149141,7 +150099,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36998, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149149,11 +150107,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37002, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37076, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149161,7 +150119,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37010, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149169,7 +150127,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37014, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149177,7 +150135,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37018, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37088, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149193,24 +150151,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37022, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37002, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37092, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37025, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37028, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37095, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37098, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37032, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37018, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37088, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -149225,137 +150183,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37035, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37105, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37043, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37113, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37050, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37120, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37055, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37125, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36951, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37021, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37060, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37130, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36946, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37016, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37065, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37018, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37088, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37070, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37140, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15464, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15480, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37075, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37028, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37098, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37079, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37149, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37084, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37154, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36987, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37057, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37090, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37160, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37094, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37164, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37096, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37166, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37010, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37080, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37102, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37172, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37018, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37088, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37110, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37116, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37121, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37191, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37127, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37014, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37084, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37135, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37205, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37143, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37213, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37147, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37217, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37010, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37080, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37155, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37225, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37161, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37231, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37014, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37084, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37167, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37237, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37028, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37098, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -149370,16 +150328,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37174, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37244, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37179, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37249, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -149387,21 +150345,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37184, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37254, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37190, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37260, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36959, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37029, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37143, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37213, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -149409,7 +150367,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37196, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37266, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -149417,9 +150375,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37202, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -149434,12 +150392,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*uint8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37208, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37278, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37212, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37282, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37215, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37285, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -149448,7 +150406,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37218, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37288, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -149604,7 +150562,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37222) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37292) {
 				if int32(*(*uint8)(unsafe.Pointer(zArg))) != '0' && int32(*(*uint8)(unsafe.Pointer(zArg))) != '1' || *(*uint8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -149784,22 +150742,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36933, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37003, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37237, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37307, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37243, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37313, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37250, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37320, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -150942,14 +151900,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37258) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37328) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37262) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37332) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37266) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37336) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37275, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37345, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -150975,19 +151933,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 37309,
-		ts + 37349,
-		ts + 37384,
+		ts + 37379,
+		ts + 37419,
+		ts + 37454,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23282, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23352, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37427, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37497, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -151120,11 +152078,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37460, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37530, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37491,
+		ts+37561,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -151148,7 +152106,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37542, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37612, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -151543,7 +152501,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37568, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37638, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -151565,7 +152523,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37578
+	return ts + 37648
 }
 
 func init() {
@@ -151620,114 +152578,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -152188,6 +153148,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -152506,6 +153478,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -152527,5 +153500,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=1\x00COMPILER=gcc-10.2.1 20210110\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_openbsd_amd64.go b/vendor/modernc.org/sqlite/lib/sqlite_openbsd_amd64.go
index a58faba5..9f8fb208 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_openbsd_amd64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_openbsd_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_openbsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_openbsd_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -398,6 +398,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -488,6 +489,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -725,6 +727,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1197,6 +1200,7 @@ const (
 	SF_Resolved                           = 0x0000004
 	SF_SETTABLE                           = 0xffff0000
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1227,6 +1231,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1345,6 +1350,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -1711,6 +1717,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -1807,11 +1814,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -1826,7 +1836,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -1934,8 +1944,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2331,6 +2341,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -3451,6 +3462,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -4875,10 +4887,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -4934,12 +4944,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -5191,7 +5199,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -5312,7 +5319,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -5336,11 +5343,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -5348,11 +5357,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -5984,7 +5993,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -6122,10 +6131,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -6140,12 +6147,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -6335,10 +6340,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -6541,7 +6548,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1083))
@@ -6693,7 +6700,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -6742,8 +6748,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -6754,6 +6770,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -6870,7 +6895,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7685,14 +7710,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = int8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -7700,7 +7725,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -9508,7 +9533,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -9764,6 +9789,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -10754,6 +10781,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -10762,11 +10790,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -10778,30 +10830,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1538
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -10810,83 +10862,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -10900,17 +10952,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -10918,90 +10970,90 @@ __219:
 		}
 		return ts + 1544
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(j))) = int8(0)
 	length = int32(j)
@@ -11009,89 +11061,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1551, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1553, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1563, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -11104,32 +11156,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -11188,7 +11240,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -11204,8 +11256,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -11234,12 +11285,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -11248,7 +11300,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -12363,6 +12415,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -12968,10 +13038,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -12997,6 +13070,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = int8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]int8{}))-uint64(1)-uint64(i))
+	return int32(uint64(unsafe.Sizeof([22]int8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14005,11 +14079,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -14749,7 +14824,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -14972,7 +15047,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -14988,113 +15063,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -15225,7 +15300,7 @@ func unixUnlock(tls *libc.TLS, id uintptr, eFileLock int32) int32 {
 func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15503,7 +15578,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3362, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3362, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15520,14 +15595,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3650, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3650, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15547,7 +15622,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3281, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3281, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		return SQLITE_OK
 	}
@@ -15802,7 +15877,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -15830,7 +15905,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3281, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3281, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -15929,7 +16004,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3245, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3245, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -16059,7 +16134,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3316, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3316, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -16105,7 +16180,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3403, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3403, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -16377,7 +16452,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+16)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16398,7 +16473,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -16714,7 +16789,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3245, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3245, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -16805,7 +16880,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__errno(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3355, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3355, zPath, 43337)
 		}
 		return rc
 	}
@@ -16813,9 +16888,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3772, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3772, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16858,12 +16933,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*int8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -16882,18 +16954,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*24 + 8)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__errno(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3443, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3443, zIn, 43443)
 			}
 		} else if (*stat)(unsafe.Pointer(bp)).Fst_mode&Mode_t(0170000) == Mode_t(0120000) {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls, zIn, bp+128, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2))
 			if got <= int64(0) || got >= Ssize_t(unsafe.Sizeof([1026]int8{}))-int64(2) {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3434, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3434, zIn, 43454)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 128 + uintptr(got))) = int8(0)
@@ -16933,14 +17005,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 1032)).FzOut = zOut
 	if int32(*(*int8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, bp, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3263, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3263, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+1032, bp)
 	}
 	appendAllPathElements(tls, bp+1032, zPath)
 	*(*int8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+1032)).FnUsed))) = int8(0)
 	if (*DbPath)(unsafe.Pointer(bp+1032)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+1032)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17015,7 +17087,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__errno(tls))) == EINTR {
 				got = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*24 + 8)))(tls, fd, zBuf, uint64(nBuf)))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -20935,7 +21007,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -21949,7 +22021,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -21966,7 +22037,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -22032,7 +22102,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -22042,7 +22111,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22233,36 +22302,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -22434,7 +22492,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -22558,7 +22616,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -22597,7 +22655,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23538,10 +23596,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]int8{int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0)}
@@ -23627,7 +23687,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -24384,7 +24444,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -24483,7 +24543,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -25069,7 +25129,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -25344,7 +25404,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -25817,7 +25877,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26322,7 +26382,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -26557,8 +26617,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -26566,23 +26626,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -26978,7 +27040,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27115,7 +27177,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -27132,7 +27194,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -27140,7 +27202,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -27183,7 +27245,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27193,7 +27255,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -27443,7 +27505,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -27490,7 +27552,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -27500,7 +27562,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -27513,7 +27575,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -27522,14 +27584,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -27539,7 +27601,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -27603,7 +27665,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -27613,7 +27675,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -27635,7 +27697,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -27670,7 +27732,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -27683,13 +27745,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -27714,7 +27776,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -27725,7 +27787,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -27777,22 +27839,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -27802,7 +27864,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -27810,7 +27872,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -27818,10 +27880,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -27845,13 +27907,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -27859,7 +27920,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -27867,32 +27967,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -27920,11 +28009,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -27935,15 +28024,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -27971,14 +28060,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2) + 1)))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -27992,7 +28081,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28004,7 +28093,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28107,7 +28196,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28135,7 +28224,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28174,7 +28263,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29046,7 +29135,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -29461,7 +29550,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -29487,7 +29576,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -29496,7 +29585,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -29507,7 +29596,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -29523,7 +29612,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -29584,7 +29673,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -29619,7 +29708,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -29679,7 +29768,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -29718,7 +29807,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -29749,7 +29838,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30090,7 +30179,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -30334,14 +30423,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -30386,7 +30475,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -30435,7 +30524,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -30515,7 +30604,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -30606,7 +30695,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -30626,7 +30715,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -30690,18 +30779,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -30717,6 +30796,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -30838,7 +30925,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -31042,7 +31129,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31107,7 +31194,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -31155,7 +31242,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -31274,7 +31361,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -31434,7 +31521,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -31499,7 +31586,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -31535,7 +31622,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -31579,7 +31666,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -31691,7 +31778,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -31849,7 +31936,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -31906,7 +31993,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -31922,7 +32009,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -31996,7 +32083,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32008,7 +32095,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -32019,7 +32106,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32184,7 +32271,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -32208,9 +32295,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -32233,16 +32320,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -32263,9 +32348,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -32399,11 +32490,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -32456,12 +32550,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -32469,7 +32563,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -32529,7 +32623,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -32618,7 +32712,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -32734,7 +32828,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -32777,8 +32871,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -32860,6 +32954,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -33052,7 +33148,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -33063,7 +33159,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -33221,7 +33317,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -33295,7 +33391,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -33321,9 +33417,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -33334,8 +33431,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -33357,7 +33454,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -33385,7 +33482,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -33646,11 +33743,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -33838,7 +33935,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -33876,7 +33973,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -33953,7 +34050,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -33965,19 +34062,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -33990,7 +34079,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34009,6 +34098,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -34044,7 +34150,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -34053,13 +34158,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -34070,7 +34174,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -34183,7 +34287,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -34197,20 +34301,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -34220,7 +34324,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -34228,100 +34338,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx) + 1)))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -34330,30 +34440,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -34376,7 +34486,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -34395,13 +34504,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, uint64(nIn))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -34418,7 +34529,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -34477,9 +34588,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -34519,7 +34630,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -34527,11 +34638,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx) + 1)))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -34606,7 +34717,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)) + 1)))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -34616,7 +34727,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -34675,7 +34786,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -34704,7 +34815,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -34780,7 +34891,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -34794,7 +34905,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -34928,7 +35039,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35103,12 +35214,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -35116,15 +35256,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+4046, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4046, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -35148,9 +35288,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4071, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if *(*int32)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb + 432)) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -35164,7 +35301,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4096, libc.VaList(bp, iChild))
 		return
@@ -35238,7 +35375,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -35323,48 +35462,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4292
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4302, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4340, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4378, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -35379,29 +35525,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4426
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -35409,28 +35555,28 @@ __9:
 	pc = U32(int32(*(*U8)(unsafe.Pointer(pCellIdx)))<<8 | int32(*(*U8)(unsafe.Pointer(pCellIdx + 1))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4454,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4484, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -35438,97 +35584,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4508, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4532, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2) + 1))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -35538,48 +35684,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4557, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4594,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -35608,9 +35754,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -35642,19 +35788,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -35666,7 +35806,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -35674,7 +35814,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -35759,7 +35899,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -35802,22 +35942,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -36044,8 +36181,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -36544,7 +36681,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 	defer tls.Free(40)
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+8, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+8, ts+4909,
@@ -36556,6 +36693,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*int8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+8)).FnChar))) = int8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 8)).FnChar)
 	}
 }
 
@@ -36743,7 +36881,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -36917,16 +37054,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -37369,7 +37508,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -37606,43 +37745,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -38027,7 +38157,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38042,14 +38172,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -38419,7 +38549,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -38431,13 +38563,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -38514,6 +38648,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -39402,7 +39539,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -39411,7 +39548,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -39445,7 +39582,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -39487,7 +39623,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -40239,7 +40375,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -40347,7 +40483,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -40898,7 +41034,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -40963,7 +41099,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -40997,7 +41133,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41047,7 +41183,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -41193,7 +41329,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -41364,7 +41500,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -41390,7 +41526,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -41664,7 +41800,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42016,8 +42152,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -42027,15 +42166,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -42223,6 +42362,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -42275,7 +42415,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -42339,6 +42479,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -42350,9 +42499,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5341)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -42586,7 +42736,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -42610,8 +42760,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -42785,15 +42935,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5351, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5341, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -42904,14 +43054,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -43195,7 +43348,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -43339,7 +43492,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -43511,7 +43664,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*int8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5391, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5381, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -43566,21 +43719,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5395, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5385, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5402, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5392, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5415, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5405, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5418, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5408, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5423, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5413, 1)
 			}
 		}
 	}
@@ -43672,11 +43825,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity int8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -43807,8 +43960,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -44043,7 +44196,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -44144,594 +44296,598 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
-		goto __100
-	case OP_NotFound:
-		goto __101
-	case OP_Found:
-		goto __102
 
-	case OP_SeekRowid:
+	case OP_IfNoHope:
+		goto __100
+	case OP_NoConflict:
+		goto __101
+	case OP_NotFound:
+		goto __102
+	case OP_Found:
 		goto __103
 
-	case OP_NotExists:
+	case OP_SeekRowid:
 		goto __104
 
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -44740,56 +44896,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -44797,20 +44953,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -44818,124 +44975,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5425, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5446, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5415, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5436, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5453, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5443, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -44943,10 +45100,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -44957,9 +45114,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -44967,171 +45124,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint64(uintptr(0)+24))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -45139,95 +45296,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = int8(0)
@@ -45235,231 +45392,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -45468,95 +45625,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -45566,189 +45723,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -45757,38 +45918,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -45796,9 +45957,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -45809,298 +45970,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -46110,144 +46272,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -46255,353 +46417,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len))
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = int8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5477,
+	Xsqlite3VdbeError(tls, p, ts+5467,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*int8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -46615,319 +46777,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*int8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -46935,467 +47086,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5518, 0)
+	Xsqlite3VdbeError(tls, p, ts+5508, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5569, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5559, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5591, 0)
+		ts+5581, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5645, 0)
+		ts+5635, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5700
+				return ts + 5690
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5748
+					return ts + 5738
 				}
-				return ts + 5791
+				return ts + 5781
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5832)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5822)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -47403,67 +47565,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -47474,24 +47636,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -47499,30 +47661,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -47538,22 +47700,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -47567,133 +47729,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1538
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -47701,18 +47863,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -47723,92 +47885,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -47826,106 +47988,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -47934,108 +48096,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48043,14 +48205,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -48060,108 +48222,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, int8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -48180,35 +48342,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -48216,123 +48378,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -48342,52 +48504,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -48399,15 +48561,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -48415,13 +48578,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -48434,11 +48597,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -48449,38 +48612,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -48492,47 +48655,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -48541,35 +48704,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -48578,51 +48741,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -48632,72 +48795,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48705,43 +48868,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48749,84 +48912,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48836,34 +49004,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -48872,10 +49040,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -48892,14 +49060,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48912,21 +49080,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48938,62 +49106,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5860)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5850)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -49006,56 +49174,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -49066,54 +49234,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -49121,72 +49289,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -49195,55 +49363,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5877
+	goto __799
+__798:
+	zSchema = ts + 5867
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5891,
+		ts+5881,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -49253,66 +49421,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -49321,151 +49489,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5934, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5924, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -49473,10 +49642,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -49496,26 +49665,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -49527,7 +49696,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -49538,170 +49707,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -49718,146 +49887,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -49865,70 +50034,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5971,
+		ts+5961,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6023
+				return ts + 6013
 			}
-			return ts + 6028
+			return ts + 6018
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -49936,17 +50105,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -49956,14 +50125,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -49973,197 +50142,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6035, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6025, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5341, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6054, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -50177,27 +50346,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -50205,72 +50374,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.Xmemset(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -50280,192 +50449,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -50474,63 +50643,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= int8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -50540,104 +50709,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6064, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -50645,52 +50814,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6070,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -50809,8 +50982,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -50830,7 +51003,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -50850,8 +51023,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -50882,8 +51055,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -50916,8 +51089,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6290, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6290, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -50997,8 +51170,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6331, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6331, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51067,7 +51240,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -51095,12 +51268,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 3647
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51144,7 +51317,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51227,7 +51400,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -53747,6 +53920,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6365, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6373+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6392+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5867+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6411+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6411+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -53766,7 +53967,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -53821,7 +54021,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6365, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6425, zDb) == 0) {
 		goto __8
 	}
 
@@ -53942,7 +54142,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6370) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6430) != 0) {
 		goto __33
 	}
 	goto __14
@@ -53950,73 +54150,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -54028,28 +54246,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -54060,160 +54278,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6372, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6432, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6376, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6436, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6380, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6440, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -54222,8 +54441,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -54231,19 +54450,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -54251,81 +54470,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6389, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6449, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6420, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6480, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6457, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -54338,141 +54557,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6475, libc.VaList(bp+16, zCol))
+		ts+6535, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6510
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6570
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6519
+		zErr = ts + 6579
 	} else {
-		zErr = ts + 6534
+		zErr = ts + 6594
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6556, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6616, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6569, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6579, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6629, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6639, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -54516,15 +54735,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6586
+	var zIn uintptr = ts + 6646
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6614
+		zIn = ts + 6674
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6632
+		zIn = ts + 6692
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6650
+		zIn = ts + 6710
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6668, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6728, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -54603,10 +54822,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6688
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6748
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6693
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6753
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -54653,7 +54872,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6699, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6759, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -54717,7 +54936,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6716, libc.VaList(bp, pExpr))
+								ts+6776, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -54733,7 +54952,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6780,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6840,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -54747,7 +54966,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6816, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6876, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -54770,30 +54989,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6844, libc.VaList(bp+16, pExpr))
+						ts+6904, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6887
+						zType = ts + 6947
 					} else {
-						zType = ts + 6894
+						zType = ts + 6954
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6904, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6964, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6932, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6992, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6954,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7014,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6998,
+						ts+7058,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -54865,7 +55084,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7046, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7106, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -54881,7 +55100,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7057, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7117, pExpr, pExpr)
 			}
 
 			break
@@ -54937,7 +55156,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6457, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55012,7 +55231,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7068, libc.VaList(bp, i, zType, mx))
+		ts+7128, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55032,7 +55251,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7124, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7184, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55067,7 +55286,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7158, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7218, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55124,7 +55343,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7164, libc.VaList(bp, i+1))
+				ts+7224, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -55152,7 +55371,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7225, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7285, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -55366,7 +55585,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7256, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7316, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -55406,7 +55625,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7158) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7218) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -55417,7 +55636,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7295) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7355) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -55429,7 +55648,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7301, 0)
+						ts+7361, 0)
 					return WRC_Abort
 				}
 
@@ -55529,12 +55748,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -55570,12 +55789,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -55685,33 +55904,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) int8 {
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) int8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -55781,7 +56101,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -56116,7 +56437,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6457, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
 		return
 	}
 
@@ -56191,7 +56512,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7360, libc.VaList(bp, mxHeight))
+			ts+7420, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -56440,10 +56761,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7408,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7468,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7452
+						return ts + 7512
 					}
 					return ts + 1538
 				}(), nElem))
@@ -56484,7 +56805,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7454)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7514)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -56510,7 +56831,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7456, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7516, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -56538,7 +56859,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7490, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7550, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -56585,7 +56906,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7510,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7570,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -56610,7 +56931,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7553, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7613, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -57185,7 +57506,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7576,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7636,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -57308,7 +57629,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7606, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7666, libc.VaList(bp, zObject))
 	}
 }
 
@@ -57364,10 +57685,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6688) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6748) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6693) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6753) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -57798,13 +58119,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff int8) int32
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7629) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7689) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7637) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7697) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7643) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7703) == 0 {
 		return 1
 	}
 	return 0
@@ -58008,7 +58329,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7647, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7707, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -58086,7 +58407,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7694, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7754, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -58180,7 +58501,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7725
+		var zFmt uintptr = ts + 7785
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -58198,7 +58519,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6457, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
 	}
 }
 
@@ -58239,7 +58560,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7769, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7829, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -58269,11 +58590,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7792, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7852, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1538
 			}
-			return ts + 7811
+			return ts + 7871
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -58400,7 +58721,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7823, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7883, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -58415,12 +58736,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7841, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7901, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1538
 		}
-		return ts + 7811
+		return ts + 7871
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -58441,7 +58763,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7454)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7514)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -58450,7 +58772,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7862)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7922)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -58836,8 +59158,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7864, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7867,
+			if Xsqlite3_strnicmp(tls, z, ts+7924, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7927,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4916
@@ -58913,7 +59235,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7894,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7954,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -58999,8 +59321,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -59086,14 +59408,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 7924, ts + 7929, ts + 7934, ts + 6175, ts + 6170}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 7984, ts + 7989, ts + 7994, ts + 6175,
+				ts + 6170, ts + 8002}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7942
+						return ts + 8010
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -59107,7 +59431,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -59130,10 +59454,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -59233,7 +59557,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -59363,12 +59687,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -59377,110 +59702,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7894,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7954,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -59523,13 +59861,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -59539,11 +59877,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -59566,11 +59904,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -59579,15 +59917,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -59614,20 +59952,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -59636,9 +59974,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -59676,14 +60014,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7947, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8015, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -59694,17 +60034,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -59716,128 +60056,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7974, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8042, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -59845,42 +60185,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7576,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7636,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -59903,23 +60243,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -59936,42 +60276,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6457, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -59992,15 +60334,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60010,22 +60352,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -60034,21 +60376,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -60058,27 +60400,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7998, 0)
+		ts+8066, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -60087,7 +60429,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -60098,7 +60440,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]int8)(unsafe.Pointer(ts + 8048))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8116))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -61473,18 +61815,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -61514,7 +61856,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -61527,12 +61869,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -61540,6 +61980,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -61554,81 +62034,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -61650,34 +62057,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -61767,7 +62173,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -61775,7 +62181,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -61826,11 +62232,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8056, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8064, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8126, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -61842,13 +62248,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8092,
+		ts+8154,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8267,
+			ts+8329,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -61858,10 +62264,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8441, libc.VaList(bp, zDb, zDb))
+		ts+8503, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8588, 0)
+			ts+8650, 0)
 	}
 }
 
@@ -61925,7 +62331,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8739, libc.VaList(bp, zName))
+		ts+8801, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -61935,7 +62341,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8798, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8860, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -61944,7 +62350,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8804, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8866, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -61985,19 +62391,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8831, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8893, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9015,
+		ts+9077,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9320, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9382, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9336,
+		ts+9398,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -62005,7 +62411,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9394, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9456, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -62017,7 +62423,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9659, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9721, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -62029,7 +62435,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9672,
+		ts+9734,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -62075,12 +62481,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9710, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9772, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9742, 0)
+			ts+9804, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -62090,11 +62496,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9769)
+				ts+9831)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9828)
+				ts+9890)
 		}
 
 		if pDflt != 0 {
@@ -62107,12 +62513,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9881)
+					ts+9943)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9927)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9989)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -62123,7 +62529,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9954,
+			ts+10016,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -62145,7 +62551,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10100,
+				ts+10162,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -62193,14 +62599,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10330, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10392, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10364, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10426, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -62228,7 +62634,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10394, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10456, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -62268,18 +62674,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10413
+		zType = ts + 10475
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10418
+		zType = ts + 10480
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10432,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10494,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10450
+					return ts + 10512
 				}
-				return ts + 10467
+				return ts + 10529
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -62363,7 +62769,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10485, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10547, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -62380,17 +62786,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10506,
+		ts+10568,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10688,
+		ts+10750,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9659, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9721, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -62585,7 +62991,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -62648,10 +63054,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10819,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10881,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10842
+				return ts + 10904
 			}
 			return ts + 1538
 		}(), zWhen,
@@ -62693,8 +63099,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10844, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10906, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -62711,7 +63117,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -62733,7 +63139,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10852, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10914, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -62773,10 +63179,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))
 				*(*int8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = int8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10858, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10920, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*int8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10842
+							return ts + 10904
 						}
 						return ts + 1538
 					}()))
@@ -62952,8 +63358,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -63036,15 +63442,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -63072,7 +63478,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -63105,13 +63511,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63124,7 +63530,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63139,7 +63545,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -63195,8 +63601,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -63244,7 +63650,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -63312,8 +63718,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -63355,11 +63761,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.Xmemset(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.Xmemset(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -63452,8 +63858,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -63471,16 +63877,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -63495,31 +63901,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -63537,8 +63943,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -63564,9 +63970,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -63594,8 +64000,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -63632,7 +64038,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -63656,7 +64062,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10863, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10925, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -63737,17 +64143,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10485, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10547, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10870,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10932,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10898
+				return ts + 10960
 			}
 			return ts + 6111
 		}(),
@@ -63758,7 +64164,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10910, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10972, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -63775,10 +64181,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1538, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10958, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11020, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11079, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11141, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -63896,11 +64302,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11097},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11118},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11138},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11157},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11176}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11159},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11180},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11200},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11219},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11238}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -63934,7 +64340,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11199, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11261, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -63943,10 +64349,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11222,
+					ts+11284,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11252, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11314, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -63964,9 +64370,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11270, FzCols: ts + 11283},
-	{FzName: ts + 11296, FzCols: ts + 11309},
-	{FzName: ts + 11337},
+	{FzName: ts + 11332, FzCols: ts + 11345},
+	{FzName: ts + 11358, FzCols: ts + 11371},
+	{FzName: ts + 11399},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -63985,7 +64391,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -64064,7 +64469,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -64110,13 +64515,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -64129,11 +64534,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -64157,17 +64562,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11350}
+	FzName:     ts + 11412}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -64178,8 +64583,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -64222,7 +64627,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -64250,7 +64655,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -64317,7 +64722,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -64333,8 +64738,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -64351,9 +64756,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -64361,14 +64766,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -64376,31 +64781,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -64408,7 +64813,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11360}
+	FzName:     ts + 11422}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -64422,20 +64827,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11370,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11432,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11375, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11437, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -64477,7 +64882,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+11381, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11443, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -64491,7 +64896,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11387}
+	FzName:     ts + 11449}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -64535,7 +64940,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11396, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11458, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -64552,7 +64957,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11270, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11332, uint64(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -64708,7 +65113,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11406, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11468, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -64765,7 +65170,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11406, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11468, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -64812,9 +65217,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11410)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11472)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11414)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11476)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -64900,16 +65305,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1538
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*int8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -64919,15 +65324,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*int8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11418, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11480, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11429, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11491, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11439, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11501, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -65007,7 +65412,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -65021,42 +65426,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -65130,15 +65535,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -65203,11 +65608,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11296, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11358, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11451,
-			ts+11505,
+			ts+11513,
+			ts+11567,
 			zDb)
 	}
 	return rc
@@ -65254,10 +65659,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11270, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11332, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11557, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11619, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -65315,12 +65720,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6365, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6425, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -65331,13 +65736,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -65358,128 +65766,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3819)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3819)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11660, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11598, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11601,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11638, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11663,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11700, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.Xmemset(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11668, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11730, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+11697, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+11759, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -65489,89 +65920,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1474, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1474, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11765, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11827, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -65625,14 +66056,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11793, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11855, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11814, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11876, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -65640,7 +66071,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11840, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11902, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -65682,42 +66113,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -65726,13 +66163,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -65751,7 +66188,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11862}
+	FzName:     ts + 11924}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -65764,7 +66201,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11876}
+	FzName:     ts + 11938}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -65778,7 +66215,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11890, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11952, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -65810,7 +66247,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11914,
+						ts+11976,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -65985,7 +66422,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11960, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12022, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -66011,11 +66448,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11983, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12045, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+11989, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12051, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+11995, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12057, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -66062,7 +66499,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 7637
+		zCol = ts + 7697
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -66086,7 +66523,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12022, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12084, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -66311,6 +66748,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -66323,13 +66763,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -66354,25 +66794,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6365) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6425) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8056, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6365, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12037+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12056+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5877+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6392+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6411+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5867+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+12070)
+						ts+6373)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12056+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6411+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5877)
+						ts+5867)
 				}
 			}
 		}
@@ -66393,12 +66833,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8056, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12056+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5877)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12037+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6365, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6411+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5867)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6392+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+12070)
+					ts+6373)
 			}
 		}
 	}
@@ -66429,7 +66869,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12089, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12099, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -66447,14 +66887,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12097
+			zMsg = ts + 12107
 		} else {
-			zMsg = ts + 12110
+			zMsg = ts + 12120
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6569, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6629, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6579, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6639, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -66484,12 +66924,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8056, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5877+7) == 0 {
-			return ts + 12056
+	if Xsqlite3_strnicmp(tls, zName, ts+6365, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5867+7) == 0 {
+			return ts + 6411
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12070+7) == 0 {
-			return ts + 12037
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6373+7) == 0 {
+			return ts + 6392
 		}
 	}
 	return zName
@@ -66847,7 +67287,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5877)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5867)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -66873,7 +67313,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6365, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6425, zName) {
 				goto __3
 			}
 
@@ -66926,13 +67366,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12124, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12134, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12141, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12151, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -66974,9 +67414,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8056, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6365, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12161,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12171,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -67136,9 +67576,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -67154,7 +67594,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12203, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12213, 0)
 	return
 __4:
 	;
@@ -67182,9 +67622,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10413
+			return ts + 10475
 		}
-		return ts + 8798
+		return ts + 8860
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -67200,9 +67640,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -67233,12 +67673,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12244,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12254,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10413
+				return ts + 10475
 			}
-			return ts + 8798
+			return ts + 8860
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -67253,7 +67693,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12265, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12275, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -67340,7 +67780,7 @@ var nullRow = [6]int8{int8(6), int8(0), int8(0), int8(0), int8(0), int8(0)}
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+12300, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12310, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -67364,7 +67804,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12317, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12327, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -67384,7 +67824,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12300
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12310
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -67396,7 +67836,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12300, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12310, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -67430,7 +67870,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12351, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12361, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -67438,13 +67878,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12374, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12384, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12381, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12391, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -67481,7 +67921,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12391, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12401, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -67645,10 +68085,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12417,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12427,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12462, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12472, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -67679,7 +68119,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12503, 0)
+			ts+12513, 0)
 	}
 }
 
@@ -67724,7 +68164,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12555, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12565, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -67813,7 +68253,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12596, 0)
+		ts+12606, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -67908,7 +68348,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12652, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12662, 0)
 	goto generated_done
 __2:
 	;
@@ -67921,13 +68361,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12695, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12705, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12703, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12713, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -67954,13 +68394,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12710,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12720,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -68082,12 +68529,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1538
-		zSep2 = ts + 12741
+		zSep2 = ts + 12751
 		zEnd = ts + 4941
 	} else {
-		zSep = ts + 12743
-		zSep2 = ts + 12747
-		zEnd = ts + 12752
+		zSep = ts + 12753
+		zSep2 = ts + 12757
+		zEnd = ts + 12762
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -68095,7 +68542,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12755, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12765, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*int8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = int8('(')
@@ -68133,11 +68580,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1538,
-	ts + 12769,
-	ts + 12775,
-	ts + 12780,
+	ts + 12779,
+	ts + 12785,
+	ts + 12790,
+	ts + 12795,
 	ts + 12785,
 }
 
@@ -68545,10 +68993,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12791,
+						ts+12801,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1538)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12824,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12834,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -68567,11 +69015,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12851, 0)
+				ts+12861, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12901, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12911, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -68605,7 +69053,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12933, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12943, 0)
 			return
 		}
 	}
@@ -68630,11 +69078,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8798
-			zType2 = ts + 12977
+			zType = ts + 8860
+			zType2 = ts + 12987
 		} else {
-			zType = ts + 10413
-			zType2 = ts + 12983
+			zType = ts + 10475
+			zType2 = ts + 12993
 		}
 
 		if pSelect != 0 {
@@ -68696,7 +69144,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -68705,11 +69153,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+12988, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+12998, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13003,
+			ts+13013,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -68725,13 +69173,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13101,
+					ts+13111,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13143, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13153, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -68746,7 +69194,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9320) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9382) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -68776,7 +69224,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13177, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13187, 0)
 	goto create_view_fail
 __1:
 	;
@@ -68792,7 +69240,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10413, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10475, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -68874,7 +69322,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13213, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13223, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -68902,8 +69350,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, int8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -69000,13 +69447,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13243, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13253, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13258,
+		ts+13268,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -69047,10 +69494,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13325, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13335, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11222,
+				ts+11284,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -69082,12 +69529,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13339,
+			ts+13349,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13384,
+		ts+13394,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -69115,11 +69562,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8056, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3270, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7057, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7117, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -69197,9 +69644,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -69258,21 +69705,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13451, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13461, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13479, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13489, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13513, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13523, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -69284,7 +69731,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11414, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11476, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -69348,7 +69795,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13545,
+		ts+13555,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -69360,7 +69807,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13608, 0)
+		ts+13618, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -69445,7 +69892,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13702,
+		ts+13712,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -69672,12 +70119,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13748,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13758,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13776
+							return ts + 13786
 						}
-						return ts + 13782
+						return ts + 13792
 					}()))
 				return 1
 			}
@@ -69798,7 +70245,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13787, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13797, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -69817,7 +70264,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13793,
+		ts+13803,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -69843,26 +70290,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8056, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13843, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13853, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13881, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13896, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13906, 0)
 	goto exit_create_index
 __17:
 	;
@@ -69876,7 +70323,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13787, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13797, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -69891,7 +70338,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13930, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13940, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -69903,7 +70350,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13964, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13974, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -69932,7 +70379,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+13988, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+13998, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -69953,9 +70400,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -69994,7 +70441,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13787)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13797)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -70095,7 +70542,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14011, 0)
+		ts+14021, 0)
 	goto exit_create_index
 __56:
 	;
@@ -70312,7 +70759,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14072, libc.VaList(bp+48, 0))
+		ts+14082, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -70364,8 +70811,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14114, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14124, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -70411,12 +70858,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14131,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14141,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1538
 			}
-			return ts + 14151
+			return ts + 14161
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -70424,7 +70871,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14159,
+		ts+14169,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -70438,7 +70885,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14218, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14228, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -70599,7 +71046,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14245, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14255, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -70614,7 +71061,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14263, libc.VaList(bp+8, 0))
+		ts+14273, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -70625,9 +71072,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -70653,9 +71100,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14336,
+		ts+14346,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11410, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11472, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -70790,7 +71237,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14396,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14406,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -70998,12 +71445,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14432,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14442,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14468
+				return ts + 14478
 			}
-			return ts + 14471
+			return ts + 14481
 		}()))
 	goto append_from_error
 __1:
@@ -71172,7 +71619,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14477, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14487, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -71208,9 +71655,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14483
+				return ts + 14493
 			}
-			return ts + 14492
+			return ts + 14502
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -71235,7 +71682,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14477, ts + 14499, ts + 14483}
+var az = [3]uintptr{ts + 14487, ts + 14509, ts + 14493}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -71250,7 +71697,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14507, 0)
+				ts+14517, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -71387,14 +71834,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14577, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14587, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14588, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14598, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1551, 1)
@@ -71420,11 +71867,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11983, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14591, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14601, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -71554,7 +72001,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14600, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14610, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -71650,7 +72097,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14646, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14656, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -71843,7 +72290,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14676, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14686, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -72123,7 +72570,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14707,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14717,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -72155,11 +72602,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14740, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14750, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14769, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14779, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -72663,7 +73110,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14807)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14817)
 __62:
 	;
 delete_from_cleanup:
@@ -72778,7 +73225,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11270) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11332) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -73008,7 +73455,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6175, ts + 6170, ts + 7929, ts + 7924, ts + 6165}
+var azType2 = [5]uintptr{ts + 6175, ts + 6170, ts + 7989, ts + 7984, ts + 6165}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -73067,7 +73514,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14820, -1)
+					Xsqlite3_result_error(tls, context, ts+14830, -1)
 					return
 				}
 				iVal = -iVal
@@ -73371,7 +73818,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14837, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14847, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -73717,7 +74164,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14842, -1)
+		Xsqlite3_result_error(tls, context, ts+14852, -1)
 		return
 	}
 	if argc == 3 {
@@ -73727,7 +74174,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14875, -1)
+				ts+14885, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -73826,7 +74273,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14920, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14930, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -73841,21 +74288,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = int8('\'')
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = int8(0)
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = int8('\'')
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = int8(0)
 				*(*int8)(unsafe.Pointer(zText)) = int8('X')
 				*(*int8)(unsafe.Pointer(zText + 1)) = int8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -73863,7 +74310,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14927, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14937, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -73977,6 +74424,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1538
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -74179,7 +74739,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10842}
+var azOne = [1]uintptr{ts + 10904}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -74215,7 +74775,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(j))) = int8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14930, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14940, 4, uintptr(0))
 	}
 }
 
@@ -74240,7 +74800,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12022, -1)
+		Xsqlite3_result_error(tls, context, ts+12084, -1)
 		return
 	}
 
@@ -74318,7 +74878,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14820, -1)
+			Xsqlite3_result_error(tls, context, ts+14830, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -74580,7 +75140,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14935, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14945, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -74600,14 +75160,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14941, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14951, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14941, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14951, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14941, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14941, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14951, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14951, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -74737,17 +75297,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -74806,6 +75366,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -74846,108 +75407,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14946},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14966},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14979},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 14997},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15006},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15014},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15014},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15029},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15055},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15080},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15089},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15100},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15107},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15121},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15121},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15127},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15127},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15133},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15133},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15138},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15138},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15138},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15142},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15142},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15142},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15146},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15153},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15161},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15168},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15174},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15181},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15188},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15196},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15201},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15205},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15205},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14956},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14976},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14989},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15007},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15016},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15024},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15024},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15039},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15065},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15090},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15099},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15110},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15117},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15131},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15131},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15137},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15137},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15143},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15143},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15148},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15148},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15148},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15152},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15152},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15152},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15156},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15163},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15171},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15178},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15184},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15198},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15206},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15211},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15217},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15223},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15227},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15234},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15241},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15252},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15259},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15274},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15291},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15302},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15308},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15326},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15334},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15348},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15356},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15365},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15365},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15382},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15386},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15392},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15396},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15396},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15215},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15215},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15227},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15233},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15237},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15237},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15243},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15257},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15275},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15290},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15307},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15318},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15324},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15350},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15364},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15398},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15402},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15402},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15415},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14941},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14941},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6510},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6510},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15420},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15425},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15433},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15439},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15445},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15448},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15452},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15458},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15448},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15463},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15467},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15471},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15477},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15481},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15486},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15491},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15496},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15408},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15431},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14951},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14951},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6570},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6570},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15436},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15441},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15449},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15455},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15461},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15464},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15468},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15474},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15464},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15479},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15483},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15487},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15493},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15497},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15506},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15510},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15514},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15524},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15529},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15507},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15512},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15526},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15530},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15541},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15547},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15552},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15560},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15568},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15571},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6510},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15576}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15540},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15545},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15551},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15557},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15563},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15568},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15576},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15584},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15587},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6570},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15592}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -75068,7 +75631,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15580,
+				ts+15596,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -75728,8 +76291,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6376, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6372, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6436, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6432, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -76229,7 +76792,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7894, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7954, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -76697,7 +77260,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15625,
+		ts+15641,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -76722,7 +77285,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15666,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15682,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -76871,7 +77434,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15698,
+		ts+15714,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -76881,7 +77444,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15750, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15766, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -76933,7 +77496,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15775,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15791,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -76941,7 +77504,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15821, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15837, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -77353,7 +77916,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15842)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15858)
 __125:
 	;
 insert_cleanup:
@@ -77669,8 +78232,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11983, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 							onError, iReg)
 						Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -78759,7 +79323,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -79205,6 +79769,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -79243,7 +79808,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12022, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12084, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -79252,7 +79817,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15856
+		zEntry = ts + 15872
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -79267,7 +79832,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11983, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12045, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -79303,7 +79868,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15879, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15895, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -79317,7 +79882,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15888, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15904, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -79341,7 +79906,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15892, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15908, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -79359,7 +79924,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15898, libc.VaList(bp+16, zEntry, zFile))
+		ts+15914, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -79386,7 +79951,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15941, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15957, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -79424,7 +79989,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15973, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+15989, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -79434,7 +79999,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16010,
+	ts + 16026,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -79590,7 +80155,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16013, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16029, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -79599,62 +80164,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5041,
-	ts + 16052,
-	ts + 8798,
-	ts + 16056,
-	ts + 16061,
-	ts + 16064,
-	ts + 16074,
-	ts + 16084,
+	ts + 16068,
+	ts + 8860,
+	ts + 16072,
+	ts + 16077,
+	ts + 16080,
 	ts + 16090,
-	ts + 16094,
-	ts + 16099,
-	ts + 16104,
-	ts + 16112,
-	ts + 16123,
-	ts + 16126,
-	ts + 16133,
-	ts + 16094,
-	ts + 16099,
-	ts + 16140,
-	ts + 16145,
-	ts + 16148,
-	ts + 16155,
-	ts + 16090,
-	ts + 16094,
+	ts + 16100,
+	ts + 16106,
+	ts + 16110,
+	ts + 16115,
+	ts + 16120,
+	ts + 16128,
+	ts + 16139,
+	ts + 16142,
+	ts + 16149,
+	ts + 16110,
+	ts + 16115,
+	ts + 16156,
 	ts + 16161,
-	ts + 16166,
+	ts + 16164,
 	ts + 16171,
-	ts + 16094,
-	ts + 16175,
-	ts + 16099,
-	ts + 16183,
+	ts + 16106,
+	ts + 16110,
+	ts + 16177,
+	ts + 16182,
 	ts + 16187,
-	ts + 16192,
-	ts + 11414,
-	ts + 11410,
-	ts + 16198,
+	ts + 16110,
+	ts + 16191,
+	ts + 16115,
+	ts + 16199,
 	ts + 16203,
 	ts + 16208,
-	ts + 16052,
-	ts + 16094,
-	ts + 16213,
-	ts + 16220,
-	ts + 16227,
-	ts + 8798,
-	ts + 16235,
-	ts + 5044,
-	ts + 16241,
-	ts + 16052,
-	ts + 16094,
-	ts + 16246,
+	ts + 11476,
+	ts + 11472,
+	ts + 16214,
+	ts + 16219,
+	ts + 16224,
+	ts + 16068,
+	ts + 16110,
+	ts + 16229,
+	ts + 16236,
+	ts + 16243,
+	ts + 8860,
 	ts + 16251,
-	ts + 15448,
-	ts + 16256,
-	ts + 16269,
-	ts + 16278,
+	ts + 5044,
+	ts + 16257,
+	ts + 16068,
+	ts + 16110,
+	ts + 16262,
+	ts + 16267,
+	ts + 15464,
+	ts + 16272,
 	ts + 16285,
-	ts + 16296,
+	ts + 16294,
+	ts + 16301,
+	ts + 16312,
 }
 
 // Definitions of all built-in pragmas
@@ -79672,238 +80237,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16304,
+	{FzName: ts + 16320,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16319,
+	{FzName: ts + 16335,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16334,
+	{FzName: ts + 16350,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16346,
+	{FzName: ts + 16362,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16362,
+	{FzName: ts + 16378,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16285,
+	{FzName: ts + 16301,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16375,
+	{FzName: ts + 16391,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16387,
+	{FzName: ts + 16403,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16407,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16423,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16439,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16444,
+	{FzName: ts + 16460,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16459,
+	{FzName: ts + 16475,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16475,
+	{FzName: ts + 16491,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16489,
+	{FzName: ts + 16505,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16502,
+	{FzName: ts + 16518,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16516,
+	{FzName: ts + 16532,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16535,
+	{FzName: ts + 16551,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16554,
+	{FzName: ts + 16570,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16577,
+	{FzName: ts + 16593,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16586,
+	{FzName: ts + 16602,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16604,
+	{FzName: ts + 16620,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16621,
+	{FzName: ts + 16637,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16634,
+	{FzName: ts + 16650,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16649,
+	{FzName: ts + 16665,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16667,
+	{FzName: ts + 16683,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16677,
+	{FzName: ts + 16693,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16691,
+	{FzName: ts + 16707,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16723,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16732,
+	{FzName: ts + 16748,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16751,
+	{FzName: ts + 16767,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16762,
+	{FzName: ts + 16778,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16773,
+	{FzName: ts + 16789,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16785,
+	{FzName: ts + 16801,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16801,
+	{FzName: ts + 16817,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16814,
+	{FzName: ts + 16830,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16833,
+	{FzName: ts + 16849,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16852,
+	{FzName: ts + 16868,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16865,
+	{FzName: ts + 16881,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16880,
+	{FzName: ts + 16896,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16890,
+	{FzName: ts + 16906,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16902,
+	{FzName: ts + 16918,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16911,
+	{FzName: ts + 16927,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16922,
+	{FzName: ts + 16938,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16932,
+	{FzName: ts + 16948,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16944,
+	{FzName: ts + 16960,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16955,
+	{FzName: ts + 16971,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16967,
+	{FzName: ts + 16983,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 16984,
+	{FzName: ts + 17000,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17003,
+	{FzName: ts + 17019,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17029,
+	{FzName: ts + 17045,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17044,
+	{FzName: ts + 17060,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17058,
+	{FzName: ts + 17074,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17077,
+	{FzName: ts + 17093,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17091,
+	{FzName: ts + 17107,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17107,
+	{FzName: ts + 17123,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17119,
+	{FzName: ts + 17135,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17130,
+	{FzName: ts + 17146,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17141,
+	{FzName: ts + 17157,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17153,
+	{FzName: ts + 17169,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17164,
+	{FzName: ts + 17180,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17185,
+	{FzName: ts + 17201,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17193,
+	{FzName: ts + 17209,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17208,
+	{FzName: ts + 17224,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17221,
+	{FzName: ts + 17237,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17240,
+	{FzName: ts + 17256,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17255,
+	{FzName: ts + 17271,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -79925,7 +80490,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17271))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17287))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -79937,10 +80502,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17296) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17312) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17306) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -79949,13 +80514,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7942) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8010) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17313) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17329) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17318) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17334) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -79970,9 +80535,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*int8)(unsafe.Pointer(z))) >= '0' && int32(*(*int8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*int8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16246) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16262) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17330) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17346) == 0 {
 		return 2
 	} else {
 		return 0
@@ -79986,7 +80551,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17337, 0)
+				ts+17353, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -80077,19 +80642,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17399
+		zName = ts + 17415
 		break
 	case OE_SetDflt:
-		zName = ts + 17408
+		zName = ts + 17424
 		break
 	case OE_Cascade:
-		zName = ts + 17420
+		zName = ts + 17436
 		break
 	case OE_Restrict:
-		zName = ts + 17428
+		zName = ts + 17444
 		break
 	default:
-		zName = ts + 17437
+		zName = ts + 17453
 		break
 	}
 	return zName
@@ -80106,7 +80671,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17447, ts + 17454, ts + 17462, ts + 17466, ts + 17330, ts + 17475,
+	ts + 17463, ts + 17470, ts + 17478, ts + 17482, ts + 17346, ts + 17491,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -80153,13 +80718,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17479
+			zType = ts + 17495
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17481
+			zType = ts + 17497
 		} else {
-			zType = ts + 7452
+			zType = ts + 7512
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17483,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17499,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -80167,7 +80732,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17490, ts + 17495, ts + 17503}
+var azEnc = [4]uintptr{uintptr(0), ts + 17506, ts + 17511, ts + 17519}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -80318,14 +80883,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -80412,7 +80979,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17511, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17527, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -80673,7 +81240,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17515) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17531) == 0) {
 		goto __64
 	}
 	b = 2
@@ -80745,7 +81312,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17306
+	zRet = ts + 17322
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -80783,7 +81350,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17296
+	zRet = ts + 17312
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -81033,7 +81600,7 @@ __116:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 544)) == 0) {
 		goto __119
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17520, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17536, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __119:
@@ -81074,7 +81641,7 @@ __123:
 		goto __125
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17545, 0)
+		ts+17561, 0)
 	goto __126
 __125:
 	if !(iDb != 1) {
@@ -81128,7 +81695,7 @@ __132:
 __134:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17598) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17614) == 0) {
 		goto __135
 	}
 
@@ -81225,9 +81792,9 @@ __148:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17604
+			return ts + 17620
 		}
-		return ts + 17612
+		return ts + 17628
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -81296,7 +81863,7 @@ __163:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __164
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17619, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17635, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __165
 	}
@@ -81342,29 +81909,29 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __171
 	}
-	zType = ts + 10413
+	zType = ts + 10475
 	goto __172
 __171:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __173
 	}
-	zType = ts + 12695
+	zType = ts + 12705
 	goto __174
 __173:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __175
 	}
-	zType = ts + 17635
+	zType = ts + 17651
 	goto __176
 __175:
-	zType = ts + 8798
+	zType = ts + 8860
 __176:
 	;
 __174:
 	;
 __172:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17642,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii3)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -81430,7 +81997,7 @@ __183:
 		goto __185
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17649, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17665, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -81440,7 +82007,7 @@ __183:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __186
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17654,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17670,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -81477,8 +82044,8 @@ __189:
 	if !(pIdx1 != 0) {
 		goto __191
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 560)) = [3]uintptr{ts + 17659, ts + 17661, ts + 16123}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17663,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 560)) = [3]uintptr{ts + 17675, ts + 17677, ts + 16139}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17679,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -81511,7 +82078,7 @@ __192:
 	goto __193
 __195:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17669,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -81533,7 +82100,7 @@ __196:
 		goto __198
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17673, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17689, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __197
 __197:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -81597,7 +82164,7 @@ __208:
 		goto __210
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7452, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7512, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __209
 __209:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -81613,7 +82180,7 @@ __211:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __213
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7452, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7512, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __212
 __212:
 	i6++
@@ -81648,7 +82215,7 @@ __219:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __221
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17676,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17692,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -81656,7 +82223,7 @@ __219:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+17685))
+			ts+17701))
 	goto __220
 __220:
 	j2++
@@ -81845,7 +82412,7 @@ __249:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __250:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17690, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17706, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 592)))
@@ -82062,7 +82629,7 @@ __277:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17694, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17710, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -82123,262 +82690,284 @@ __292:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 604)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__293:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __294
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __293
+	}
+	mxCol = -1
+	j4 = 0
+__295:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __297
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __298
+	}
+	mxCol++
+__298:
+	;
+	goto __296
+__296:
+	j4++
+	goto __295
+	goto __297
+__297:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __299
 	}
 	mxCol--
-	goto __293
+__299:
+	;
+	goto __294
+__293:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __294:
 	;
 	if !(mxCol >= 0) {
-		goto __295
+		goto __300
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 604)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 604)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__295:
+__300:
 	;
 	if !!(isQuick != 0) {
-		goto __296
+		goto __301
 	}
 	if !(pPk1 != 0) {
-		goto __297
+		goto __302
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 604)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17718,
+		ts+17734,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__298:
+__303:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __300
+		goto __305
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 604)), j4, r2+j4)
-	goto __299
-__299:
+	goto __304
+__304:
 	j4++
-	goto __298
-	goto __300
-__300:
+	goto __303
+	goto __305
+__305:
 	;
-__297:
+__302:
 	;
-__296:
+__301:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__301:
+__306:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __303
+		goto __308
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __304
+		goto __309
 	}
-	goto __302
-__304:
+	goto __307
+__309:
 	;
 	if !(bStrict != 0) {
-		goto __305
+		goto __310
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __306
-__305:
+	goto __311
+__310:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__306:
+__311:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __307
+		goto __312
 	}
-	goto __302
-__307:
+	goto __307
+__312:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __308
+		goto __313
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 604)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __309
-__308:
+	goto __314
+__313:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __310
+		goto __315
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 616)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		uint8((*Column)(unsafe.Pointer(pCol1)).Faffinity), bp+616)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 616)) != 0) {
-		goto __311
+		goto __316
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 616)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 616)))
-__311:
+__316:
 	;
-__310:
+__315:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 604))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __312
+		goto __317
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __313
-__312:
+	goto __318
+__317:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__313:
+__318:
 	;
-__309:
+__314:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __314
+		goto __319
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17754, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17770, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __316
-__315:
+	goto __321
+__320:
 	;
-__316:
+__321:
 	;
-__314:
+__319:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __317
+		goto __322
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17774,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17790,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __318
-__317:
+	goto __323
+__322:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __319
+		goto __324
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17796,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17812,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __320
-__319:
+	goto __325
+__324:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __321
+		goto __326
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 604)), j4, 3)
-__322:
+__327:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17819, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17835, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17821,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17837,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__321:
+__326:
 	;
-__320:
+__325:
 	;
-__318:
+__323:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __302
-__302:
+	goto __307
+__307:
 	j4++
-	goto __301
-	goto __303
-__303:
+	goto __306
+	goto __308
+__308:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __323
+		goto __328
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __324
+		goto __329
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 604)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__325:
+__330:
 	if !(k3 > 0) {
-		goto __327
+		goto __332
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __326
-__326:
+	goto __331
+__331:
 	k3--
-	goto __325
-	goto __327
-__327:
+	goto __330
+	goto __332
+__332:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17841,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17857,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__324:
+__329:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__323:
+__328:
 	;
 	if !!(isQuick != 0) {
-		goto __328
+		goto __333
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__329:
+__334:
 	if !(pIdx5 != 0) {
-		goto __331
+		goto __336
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __332
+		goto __337
 	}
-	goto __330
-__332:
+	goto __335
+__337:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 604)), 0, 0, bp+624,
 		pPrior, r1)
@@ -82387,80 +82976,119 @@ __332:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 608))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17871)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17876)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17892)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__338:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __340
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __341
+	}
+	goto __339
+__341:
+	;
+	if !(label6 == 0) {
+		goto __342
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__342:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 608))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __339
+__339:
+	kk++
+	goto __338
+	goto __340
+__340:
+	;
+	if !(label6 != 0) {
+		goto __343
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17913)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__343:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __333
+		goto __344
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__334:
+__345:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __336
+		goto __347
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __337
+		goto __348
 	}
-	goto __335
-__337:
+	goto __346
+__348:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 608))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 608))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17940)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__344:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 624)))
 	goto __335
 __335:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __334
 	goto __336
 __336:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 608))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 608))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17897)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __333:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 624)))
-	goto __330
-__330:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __329
-	goto __331
-__331:
-	;
-__328:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 604)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __338
+		goto __349
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17924)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17967)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__339:
+__350:
 	if !(pIdx5 != 0) {
-		goto __341
+		goto __352
 	}
 	if !(pPk1 == pIdx5) {
-		goto __342
+		goto __353
 	}
-	goto __340
-__342:
+	goto __351
+__353:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 608))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -82469,21 +83097,21 @@ __342:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __340
-__340:
+	goto __351
+__351:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __339
-	goto __341
-__341:
+	goto __350
+	goto __352
+__352:
 	;
 	if !(pPk1 != 0) {
-		goto __343
+		goto __354
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__343:
+__354:
 	;
-__338:
+__349:
 	;
 	goto __284
 __284:
@@ -82501,14 +83129,14 @@ __259:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __344
+		goto __355
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 600))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 17953
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 17996
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__344:
+__355:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -82516,27 +83144,27 @@ __344:
 
 __45:
 	if !!(zRight != 0) {
-		goto __345
+		goto __356
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __347
+		goto __358
 	}
 	goto pragma_out
-__347:
+__358:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __346
-__345:
+	goto __357
+__356:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __348
+		goto __359
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__349:
+__360:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __351
+		goto __362
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __352
+		goto __363
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -82545,25 +83173,25 @@ __349:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __351
-__352:
+	goto __362
+__363:
 	;
-	goto __350
-__350:
+	goto __361
+__361:
 	pEnc += 16
-	goto __349
-	goto __351
-__351:
+	goto __360
+	goto __362
+__362:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __353
+		goto __364
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17956, libc.VaList(bp+456, zRight))
-__353:
+	Xsqlite3ErrorMsg(tls, pParse, ts+17999, libc.VaList(bp+456, zRight))
+__364:
 	;
-__348:
+__359:
 	;
-__346:
+__357:
 	;
 	goto __15
 
@@ -82571,15 +83199,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __354
+		goto __365
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __356
+		goto __367
 	}
 	goto __15
-__356:
+__367:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -82587,41 +83215,41 @@ __356:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __357
+		goto __368
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__357:
+__368:
 	;
-	goto __355
-__354:
+	goto __366
+__365:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __358
+		goto __369
 	}
 	goto __15
-__358:
+__369:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__355:
+__366:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__359:
+__370:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __360
+		goto __371
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __359
-__360:
+	goto __370
+__371:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -82636,31 +83264,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __361
+		goto __372
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17313) == 0) {
-		goto __362
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17329) == 0) {
+		goto __373
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __363
-__362:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17981) == 0) {
-		goto __364
+	goto __374
+__373:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18024) == 0) {
+		goto __375
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __365
-__364:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17466) == 0) {
-		goto __366
+	goto __376
+__375:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17482) == 0) {
+		goto __377
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__366:
+__377:
 	;
-__365:
+__376:
 	;
-__363:
+__374:
 	;
-__361:
+__372:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -82670,10 +83298,10 @@ __361:
 
 __49:
 	if !(zRight != 0) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__367:
+__378:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -82693,19 +83321,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __370
+		goto __381
 	}
 	goto __15
-__370:
+__381:
 	;
-	goto __369
-__368:
+	goto __380
+__379:
 	opMask = U32(0xfffe)
-__369:
+__380:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -82714,86 +83342,86 @@ __369:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__371:
+__382:
 	if !(iDb <= iDbLast) {
-		goto __373
+		goto __384
 	}
 	if !(iDb == 1) {
-		goto __374
+		goto __385
 	}
-	goto __372
-__374:
+	goto __383
+__385:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__375:
+__386:
 	if !(k4 != 0) {
-		goto __377
+		goto __388
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __378
+		goto __389
 	}
-	goto __376
-__378:
+	goto __387
+__389:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__379:
+__390:
 	if !(pIdx6 != 0) {
-		goto __381
+		goto __392
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __382
+		goto __393
 	}
 	szThreshold = int16(0)
-	goto __381
-__382:
+	goto __392
+__393:
 	;
-	goto __380
-__380:
+	goto __391
+__391:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __379
-	goto __381
-__381:
+	goto __390
+	goto __392
+__392:
 	;
 	if !(szThreshold != 0) {
-		goto __383
+		goto __394
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__383:
+__394:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+17989,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18032,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __384
+		goto __395
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __385
-__384:
+	goto __396
+__395:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__385:
+__396:
 	;
-	goto __376
-__376:
+	goto __387
+__387:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __375
-	goto __377
-__377:
+	goto __386
+	goto __388
+__388:
 	;
-	goto __372
-__372:
+	goto __383
+__383:
 	iDb++
-	goto __371
-	goto __373
-__373:
+	goto __382
+	goto __384
+__384:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -82801,36 +83429,36 @@ __373:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __386
+		goto __397
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__386:
+__397:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+632) == SQLITE_OK) {
-		goto __387
+		goto __398
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 632)))
-__387:
+__398:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __388
+		goto __399
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 640)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))) {
-		goto __389
+		goto __400
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__389:
+__400:
 	;
-__388:
+__399:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -82839,10 +83467,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 648)) >= int64(0)) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 648))&int64(0x7fffffff)))
-__390:
+__401:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -82851,10 +83479,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __391
+		goto __402
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) & int64(0x7fffffff))
-__391:
+__402:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -82862,10 +83490,10 @@ __391:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __392
+		goto __403
 	}
 
-__392:
+__403:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -82917,14 +83545,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18007, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18012, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18018, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18027, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18036, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18044, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18052},
-	{FzName: ts + 18059},
+	{FzName: ts + 18050, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18055, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18061, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18070, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18079, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18087, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18095},
+	{FzName: ts + 18102},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -82976,7 +83604,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18065)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18108)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -82984,7 +83612,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18080, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18123, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -82997,16 +83625,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18087, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18130, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18093)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18136)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18105)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18148)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4941, 1)
@@ -83189,13 +83817,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18120)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18163)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18128, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18171, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18132, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18175, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -83272,12 +83900,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18136, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18179, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -83286,19 +83914,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 4992
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18164, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18207, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18195, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18238, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18203,
-	ts + 18210,
-	ts + 18222,
+	ts + 18246,
+	ts + 18253,
+	ts + 18265,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -83358,7 +83986,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14114)
+				corruptSchema(tls, pData, argv, ts+14124)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -83390,13 +84018,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18233)
+			corruptSchema(tls, pData, argv, ts+18276)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14114)
+				corruptSchema(tls, pData, argv, ts+14124)
 			}
 		}
 	}
@@ -83429,16 +84057,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8798
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8860
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7862
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18246
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7922
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18289
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -83516,17 +84144,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11697)
+		ts+11759)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -83535,44 +84172,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18318)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18361)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18342,
+		ts+18385,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -83583,57 +84220,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -83722,8 +84359,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -83836,8 +84475,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -83848,8 +84487,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -83861,8 +84500,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -83902,7 +84541,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18376, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18419, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -83932,7 +84571,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18406, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18449, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -84028,7 +84667,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -84127,7 +84766,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -84445,8 +85084,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10842
-		var zSp2 uintptr = ts + 10842
+		var zSp1 uintptr = ts + 10904
+		var zSp2 uintptr = ts + 10904
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -84454,13 +85093,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18425, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18468, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18455))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18498))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -84635,7 +85274,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18489, libc.VaList(bp, 0))
+					ts+18532, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -84680,7 +85319,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18539, libc.VaList(bp+8, zName))
+						ts+18582, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -84691,7 +85330,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18603,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18646,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -84735,7 +85374,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6510, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6570, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -85082,9 +85721,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -85322,16 +85958,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18640
+		z = ts + 18683
 		break
 	case TK_INTERSECT:
-		z = ts + 18650
+		z = ts + 18693
 		break
 	case TK_EXCEPT:
-		z = ts + 18660
+		z = ts + 18703
 		break
 	default:
-		z = ts + 18667
+		z = ts + 18710
 		break
 	}
 	return z
@@ -85341,10 +85977,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18673, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18716, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -85364,6 +86003,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18739, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18770
+		}
+		return ts + 1538
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -85430,6 +86076,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -85494,6 +86141,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -85548,7 +86196,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1103
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16235
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16251
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -85687,13 +86335,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16235
+				zCol = ts + 16251
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11983, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -85701,7 +86349,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18696, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18785, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -85766,7 +86414,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -85791,7 +86439,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16235
+					zName = ts + 16251
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -85801,7 +86449,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18696, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18785, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -85817,7 +86465,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18705, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -85842,45 +86491,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -85890,14 +86542,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18802
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -85907,9 +86591,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -85953,7 +86634,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -86104,7 +86785,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18713, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18806, 0)
 	return
 __1:
 	;
@@ -86195,7 +86876,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18762, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18855, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -86215,7 +86896,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18804, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18897, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -86252,7 +86933,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18810, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18903, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -86286,11 +86967,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18825, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18918, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1538
 		}
-		return ts + 18848
+		return ts + 18941
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -86391,8 +87072,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18850, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18865, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18943, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18958, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -86439,7 +87120,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18640, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18683, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -86506,7 +87187,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18884, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18977, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -86568,7 +87249,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18884, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18977, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -86721,10 +87402,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18905, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+18998, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18951,
+			ts+19044,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -86978,8 +87659,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7158)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7158)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7218)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7218)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -87006,13 +87687,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19033, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19126, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19044, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19137, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -87024,7 +87705,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19049, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19142, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -87439,6 +88120,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff int8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -87558,15 +88258,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff int8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -87942,16 +88635,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -88011,12 +88721,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15138) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15148) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15142) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15152) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -88082,7 +88792,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19055, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19148, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -88165,7 +88875,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19073, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19166, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -88294,15 +89004,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19096, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19189, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -88320,7 +89027,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19116, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19209, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -88336,7 +89043,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19159
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19252
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -88362,7 +89069,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19182,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19275,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -88373,9 +89080,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19220
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19313
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19254
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19347
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -88422,7 +89129,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19292, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19385, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -88534,7 +89241,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19296,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19389,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -88553,7 +89260,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19335,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19428,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -88561,7 +89268,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14707,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14717,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -88662,7 +89369,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6370
+							zSchemaName = ts + 6430
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -88677,7 +89384,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19366, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19459, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -88742,7 +89449,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19371,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19464,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -88754,7 +89461,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11983, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12045, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -88773,9 +89480,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19380, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19473, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19398, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19491, 0)
 					}
 				}
 			}
@@ -88785,7 +89492,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19418, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19511, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -88844,11 +89551,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, int8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -88907,6 +89610,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -88922,7 +89700,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -88935,13 +89714,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19449, 0)
+					ts+19542, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19500, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19593, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -88949,7 +89728,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -88969,19 +89748,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -88995,6 +89777,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -89069,7 +89854,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -89081,7 +89868,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -89099,13 +89886,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -89122,11 +89909,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19533,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19626,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19545
+						return ts + 19638
 					}
 					return ts + 1538
 				}(),
@@ -89147,7 +89934,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7862)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7922)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -89179,14 +89966,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -89240,6 +90028,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -89304,7 +90143,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -89403,7 +90241,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19568,
+		ts+19661,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -89464,7 +90302,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19622,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19715,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -89578,7 +90416,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -89595,11 +90433,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -89610,7 +90444,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19662, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19755, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -89636,7 +90470,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -89668,11 +90502,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19677, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19770, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -89706,7 +90538,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -90015,12 +90847,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -90049,39 +90880,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -90092,24 +90899,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -90142,27 +90949,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19693
+				return ts + 19786
 			}
-			return ts + 19702
+			return ts + 19795
 		}())
 
 	groupBySort = 1
@@ -90170,47 +90984,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -90226,45 +91040,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -90283,16 +91103,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -90323,16 +91143,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -90345,98 +91165,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -90445,79 +91268,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19693)
-__148:
+	explainTempTable(tls, pParse, ts+19786)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19711
-			}
-			return ts + 19734
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -90614,7 +91432,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19743, 0)
+		ts+19804, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -90847,7 +91665,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19808, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19869, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -90891,7 +91709,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19854, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19915, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -90909,7 +91727,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19862, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19923, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -90921,7 +91739,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19854, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19915, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -90936,7 +91754,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19903, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19964, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -90948,22 +91766,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8056, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19929, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19990, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19967,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20028,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20004
+				return ts + 20065
 			}
-			return ts + 20011
+			return ts + 20072
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -90972,7 +91790,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20017, libc.VaList(bp+24, pTableName+8))
+		ts+20078, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -91001,9 +91819,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -91121,7 +91939,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19854, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19915, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -91154,7 +91972,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20063,
+		ts+20124,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -91179,13 +91997,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20111,
+		ts+20172,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20186, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20247, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -91441,7 +92259,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20215, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20276, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -91480,9 +92298,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12070
+				return ts + 6373
 			}
-			return ts + 5877
+			return ts + 5867
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -91494,7 +92312,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20235,
+			ts+20296,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -91608,12 +92426,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20297,
+		ts+20358,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20345
+				return ts + 20406
 			}
-			return ts + 20352
+			return ts + 20413
 		}()))
 __15:
 	;
@@ -91727,7 +92545,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20359, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20420, 0)
 	return 1
 }
 
@@ -91910,8 +92728,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -91944,8 +92762,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -91957,13 +92775,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20401, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20462, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -92279,7 +93097,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -92549,7 +93368,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20415,
+		ts+20476,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -92581,7 +93400,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20451, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20512, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -92591,7 +93410,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7637
+				return ts + 7697
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -93461,7 +94280,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20470)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20531)
 __169:
 	;
 update_cleanup:
@@ -93767,10 +94586,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*int8)(unsafe.Pointer(bp + 216)) = int8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20483, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20544, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20487, libc.VaList(bp+8, bp+216))
+				ts+20548, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -93861,7 +94680,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12124, -1)
+				ts+12134, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -93893,7 +94712,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20560, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20564, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20621, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20625, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -94041,14 +94860,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20568)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20629)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20608)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20669)
 	return SQLITE_ERROR
 __2:
 	;
@@ -94059,7 +94878,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20651)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20712)
 	return SQLITE_ERROR
 __5:
 	;
@@ -94087,7 +94906,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20669, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20730, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -94107,7 +94926,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20692)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20753)
 	goto end_of_vacuum
 __8:
 	;
@@ -94122,7 +94941,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14477)
+	rc = execSql(tls, db, pzErrMsg, ts+14487)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -94167,7 +94986,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20719,
+		ts+20780,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -94176,7 +94995,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20827,
+		ts+20888,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -94187,7 +95006,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20881,
+		ts+20942,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -94198,7 +95017,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21032,
+		ts+21093,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -94420,12 +95239,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -94543,7 +95362,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12351, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12361, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -94627,11 +95446,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21162, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21223, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21186,
+			ts+21247,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -94641,7 +95460,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21285, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21346, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -94675,7 +95494,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -94702,7 +95521,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21304, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21365, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -94740,7 +95559,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21346, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21407, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3647, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -94752,7 +95571,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21376
+			var zFormat uintptr = ts + 21437
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -94769,7 +95588,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16126, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16142, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -94826,7 +95645,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21422, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21483, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -94884,7 +95703,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21422, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21483, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -94904,8 +95723,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -94918,7 +95737,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -95371,7 +96190,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -95398,7 +96217,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -95629,10 +96448,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21441
+		return ts + 21502
 	}
 	if i == -1 {
-		return ts + 16235
+		return ts + 16251
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -95641,15 +96460,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21448, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21509, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21454, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21515, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12741, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12751, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -95660,11 +96479,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21454, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21515, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12741, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12751, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+4992, 1)
 	}
@@ -95686,27 +96505,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21456, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21517, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21448, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21509, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21459
+				return ts + 21520
 			}
-			return ts + 21464
+			return ts + 21525
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21472)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21533)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21474)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21535)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4941, 1)
 }
@@ -95749,11 +96568,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21476, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21537, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21482
+				return ts + 21543
 			}
-			return ts + 21489
+			return ts + 21550
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -95763,43 +96582,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10898
+					zFmt = ts + 10960
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21494
+				zFmt = ts + 21555
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21527
+				zFmt = ts + 21588
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21552
+				zFmt = ts + 21613
 			} else {
-				zFmt = ts + 21570
+				zFmt = ts + 21631
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21579, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21640, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp int8
-			var zRowid uintptr = ts + 16235
-			Xsqlite3_str_appendf(tls, bp+64, ts+21587, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16251
+			Xsqlite3_str_appendf(tls, bp+64, ts+21648, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = int8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21618, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21679, libc.VaList(bp+32, zRowid))
 				cRangeOp = int8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = int8('>')
 			} else {
 				cRangeOp = int8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21628, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21689, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21633,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21694,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21660, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21721, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -95831,28 +96650,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21671, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21732, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21459, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21520, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21692, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21753, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21448, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21509, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21459, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21520, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4941, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -95913,52 +96733,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -97436,7 +98262,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21700, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21761, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -97464,7 +98290,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21715, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21776, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -97982,7 +98808,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21724, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21785, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -98340,10 +99166,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16084, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15415, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14941, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21738, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16100, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15431, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14951, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21799, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -98720,49 +99546,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -98770,13 +99585,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -98841,12 +99659,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21745, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21806, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21745, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21806, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -98870,7 +99688,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -98880,7 +99698,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -98925,7 +99743,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6693
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6753
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -99019,7 +99837,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21786
+				return ts + 21847
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -99030,7 +99848,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -99038,6 +99855,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -99071,7 +99889,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -99224,6 +100042,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -99392,7 +100213,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21793,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21854,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100126,7 +100947,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21829, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21890, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -100197,7 +101018,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21855
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21916
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -100704,7 +101525,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -100724,7 +101545,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -100735,10 +101556,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -100749,29 +101570,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -100873,8 +101694,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -100886,7 +101707,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -100896,17 +101717,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -100926,19 +101747,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -100950,19 +101771,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -100972,10 +101793,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -100989,9 +101810,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -101016,8 +101837,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -101029,7 +101850,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -101043,23 +101864,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -101070,7 +101891,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -101392,6 +102213,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -101485,8 +102307,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -101510,8 +102332,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -101663,7 +102486,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -101682,7 +102505,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -101696,7 +102519,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -101705,9 +102528,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -101726,6 +102553,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -101853,30 +102683,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -101884,20 +102733,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -101906,9 +102760,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -101949,7 +102809,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -101989,7 +102849,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -102055,19 +102916,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -102248,7 +103114,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21866, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21927, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -102306,7 +103172,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21866, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21927, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -102704,7 +103570,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21892, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21953, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -102915,8 +103781,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -103035,14 +103901,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -103194,7 +104069,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -103302,7 +104177,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21927, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+21988, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -103564,19 +104439,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -103588,9 +104465,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -103623,13 +104500,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -103781,7 +104658,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21945, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22006, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -103845,7 +104722,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21973, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22034, 0)
 	goto __5
 __4:
 	ii = 0
@@ -104546,7 +105423,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -104727,7 +105604,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+21991, -1)
+		pCtx, ts+22052, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -104860,7 +105737,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22047, -1)
+					pCtx, ts+22108, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -104950,17 +105827,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22092))
-var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22103))
-var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22114))
-var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22119))
-var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22132))
-var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22142))
-var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22148))
-var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22159))
-var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22169))
-var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22181))
-var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22186))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22153))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22164))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22175))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22180))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22193))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22203))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22209))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22220))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22230))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22242))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22247))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -105006,7 +105883,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22190, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22251, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -105050,12 +105927,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22209, 0)
+			ts+22270, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22280, 0)
+				ts+22341, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -105078,7 +105955,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7862)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7922)
 					}
 					break
 				}
@@ -105282,7 +106159,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22343, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22404, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -105398,7 +106275,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7454))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7514))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -105409,6 +106286,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, int8(SQLITE_AFF_NONE))
@@ -105512,7 +106390,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22369, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22430, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -105577,15 +106455,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22401
+				zErr = ts + 22462
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22418
+				zErr = ts + 22479
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22434
+				zErr = ts + 22495
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22454, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22515, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -105606,7 +106484,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22487, 0)
+				ts+22548, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -105762,11 +106640,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22534,
-	ts + 22587,
-	ts + 21991,
-	ts + 22638,
-	ts + 22690,
+	ts + 22595,
+	ts + 22648,
+	ts + 22052,
+	ts + 22699,
+	ts + 22751,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -106963,8 +107841,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -106975,13 +107852,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -107165,19 +108039,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22740,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22801,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19734
+							return ts + 22843
 						}
-						return ts + 22782
+						return ts + 22852
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22788, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22858, 0)
 		}
 	}
 
@@ -107245,7 +108119,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22822,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22892,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -108342,7 +109216,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22860, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22930, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -109317,21 +110191,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16235, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16251, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22882, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22952, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16148, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16164, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22882, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22952, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -110074,7 +110948,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22909)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22979)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -110238,7 +111112,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22918, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+22988, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -110455,9 +111329,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 6688
+							return ts + 6748
 						}
-						return ts + 6693
+						return ts + 6753
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -110469,6 +111343,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -110736,19 +111615,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22942, 0)
+					ts+23012, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23037, 0)
+					ts+23107, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23121, 0)
+					ts+23191, 0)
 			}
 			break
 		case uint32(273):
@@ -111127,9 +112006,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22918, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22988, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23206, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23276, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -111897,7 +112776,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23223, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23293, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -111920,7 +112799,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3647, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23248, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23318, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -112093,7 +112972,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23259, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23329, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -112106,11 +112985,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19854, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19915, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23266, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23336, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23271, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23341, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -112123,9 +113002,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23281, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23351, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23285, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23355, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -112359,7 +113238,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -112934,7 +113813,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -112949,7 +113828,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23293, 0)
+			ts+23363, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -113140,23 +114019,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23361
+	var zErr uintptr = ts + 23431
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23375
+			zErr = ts + 23445
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23397
+			zErr = ts + 23467
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23419
+			zErr = ts + 23489
 			break
 
 		}
@@ -113174,35 +114053,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23442,
-	ts + 23455,
+	ts + 23512,
+	ts + 23525,
 	uintptr(0),
-	ts + 23471,
-	ts + 23496,
-	ts + 23510,
-	ts + 23529,
+	ts + 23541,
+	ts + 23566,
+	ts + 23580,
+	ts + 23599,
 	ts + 1474,
-	ts + 23554,
-	ts + 23591,
-	ts + 23603,
-	ts + 23618,
-	ts + 23651,
-	ts + 23669,
-	ts + 23694,
-	ts + 23723,
+	ts + 23624,
+	ts + 23661,
+	ts + 23673,
+	ts + 23688,
+	ts + 23721,
+	ts + 23739,
+	ts + 23764,
+	ts + 23793,
 	uintptr(0),
-	ts + 5832,
+	ts + 5822,
 	ts + 5318,
-	ts + 23740,
-	ts + 23758,
-	ts + 23776,
-	uintptr(0),
 	ts + 23810,
+	ts + 23828,
+	ts + 23846,
 	uintptr(0),
-	ts + 23831,
-	ts + 23857,
 	ts + 23880,
+	uintptr(0),
 	ts + 23901,
+	ts + 23927,
+	ts + 23950,
+	ts + 23971,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -113303,6 +114182,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	*(*int32)(unsafe.Pointer(db + 432)) = 1
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(*(*int32)(unsafe.Pointer(db + 432)) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -113317,7 +114202,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -113362,7 +114247,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23917, 0)
+				ts+23987, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -113479,7 +114364,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23980, libc.VaList(bp, zName))
+		ts+24050, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -113715,7 +114600,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24031, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24101, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -113808,7 +114693,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -113878,7 +114763,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -113888,7 +114773,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -113920,14 +114805,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24052, 0)
+				ts+24122, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -114057,7 +114942,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24120, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24190, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -114102,10 +114987,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24126, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24196, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24136,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24206,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -114210,7 +115095,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24164, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24234, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -114221,17 +115106,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24168, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24238, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24168
+	zModeType = ts + 24238
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24174, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24244, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -114269,7 +115154,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24179, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24249, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -114277,7 +115162,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24199,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24269,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -114317,7 +115202,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24223, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24293, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -114341,15 +115226,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24239, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24246, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24309, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24316, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24254, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24257, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24260, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17330, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24324, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24327, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24330, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17346, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -114495,10 +115380,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21786, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21847, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24264, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24334, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -114512,7 +115397,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -114563,9 +115448,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6365
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6425
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23266
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23336
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -114670,7 +115555,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24270
+		zFilename = ts + 24340
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -114773,21 +115658,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24273,
+	Xsqlite3_log(tls, iErr, ts+24343,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24298)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24368)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24318)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24388)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24325)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24395)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -114945,7 +115830,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24342, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24412, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -115601,7 +116486,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24370, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24440, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -115719,7 +116604,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24378
+			return ts + 24448
 		}
 		return uintptr(0)
 	}(), 0)
@@ -115897,7 +116782,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6165, ts + 6688, ts + 6693, ts + 6175, ts + 6170, ts + 7929, ts + 24401, ts + 24407,
+	ts + 6165, ts + 6748, ts + 6753, ts + 6175, ts + 6170, ts + 7989, ts + 24471, ts + 24477,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -116050,7 +116935,7 @@ __10:
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0' + int32(c)>>4)
-	c = uint8(*(*int8)(unsafe.Pointer(ts + 24414 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24484 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -116105,7 +116990,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24431, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24501, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -116169,13 +117054,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6688, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6748, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6693, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6753, uint32(5))
 			break
 
 		}
@@ -116725,12 +117610,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6688, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6748, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6693, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6753, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(5)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -116831,7 +117716,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24460, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24530, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -117137,7 +118022,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*int8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24475, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24545, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -117152,7 +118037,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24479, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24549, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -117206,7 +118091,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24505,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24575,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -117311,11 +118196,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*int8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zPath)))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24548, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24618, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4982, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24551, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24621, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -117472,14 +118357,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24554, -1)
+			ts+24624, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, int8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24605, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24675, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -117574,7 +118459,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15348)
+	jsonWrongNumArgs(tls, ctx, ts+15364)
 	return
 __2:
 	;
@@ -117649,9 +118534,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24639
+			return ts + 24709
 		}
-		return ts + 24643
+		return ts + 24713
 	}())
 	return
 __2:
@@ -117784,7 +118669,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24650, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24720, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -117881,7 +118766,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24653, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24723, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -117925,7 +118810,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24656)
+		ts+24726)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -118056,7 +118941,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24739, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24809, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -118075,7 +118960,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24745, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24815, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -118171,7 +119056,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, int8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24745, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24815, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -118195,7 +119080,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24750
+				zRoot = ts + 24820
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -118260,6 +119145,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -118311,7 +119202,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24460, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24530, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -118406,25 +119297,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24752},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24757},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24768},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24768},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24786},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24799},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24802},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24806},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24818},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24830},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24841},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24852},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24864},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24877},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24886},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24886},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24896},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24907},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24924}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24822},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24827},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24838},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24838},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24856},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24869},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24872},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24876},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24888},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24900},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24911},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24922},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24934},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24947},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24956},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24956},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24966},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24977},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24994}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -118443,8 +119334,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24942, FpModule: 0},
-	{FzName: ts + 24952, FpModule: 0},
+	{FzName: ts + 25012, FpModule: 0},
+	{FzName: ts + 25022, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -118704,11 +119595,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24962, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25032, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24970, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25040, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -118919,7 +119810,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24975,
+		ts+25045,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -119622,7 +120513,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25057)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25127)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -120963,7 +121854,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25071, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25141, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -120975,12 +121866,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25091, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25161, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25123, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25193, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -121206,7 +122097,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25160, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25230, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -121229,14 +122120,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25305
+	var zFmt uintptr = ts + 25375
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11270, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11332, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -121277,7 +122168,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25361, ts + 5044, ts + 16235,
+	ts + 25431, ts + 5044, ts + 16251,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -121320,19 +122211,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25366,
+			ts+25436,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25428, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25498, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25433,
+			ts+25503,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25497,
+			ts+25567,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25567,
+			ts+25637,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -121361,7 +122252,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25616
+			zFormat = ts + 25686
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -121373,7 +122264,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25724,
+			ts+25794,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -121381,18 +122272,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25769, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25839, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12741, 1)
+					Xsqlite3_str_append(tls, p, ts+12751, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25796, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25866, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25818, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25888, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25826, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25896, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -121407,14 +122298,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25842,
-	ts + 25895,
-	ts + 25940,
-	ts + 25992,
-	ts + 26046,
-	ts + 26091,
-	ts + 26149,
-	ts + 26204,
+	ts + 25912,
+	ts + 25965,
+	ts + 26010,
+	ts + 26062,
+	ts + 26116,
+	ts + 26161,
+	ts + 26219,
+	ts + 26274,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -121443,7 +122334,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26251, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26321, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -121455,7 +122346,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26271,
+			ts+26341,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -121463,7 +122354,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26328,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26398,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -121505,10 +122396,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26363,
-		ts + 26406,
-		ts + 26441,
-		ts + 26477,
+		ts + 26433,
+		ts + 26476,
+		ts + 26511,
+		ts + 26547,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -121539,7 +122430,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26514,
+	Xsqlite3_str_appendf(tls, pSql, ts+26584,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -121551,7 +122442,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26538, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26608, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -121574,7 +122465,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26544, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26614, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -121670,7 +122561,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26547, ts + 26558}
+var azFormat = [2]uintptr{ts + 26617, ts + 26628}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -121708,13 +122599,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10842, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10904, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26568, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26638, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26574, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26644, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26578, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26648, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -121725,7 +122616,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26580, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26650, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -121803,7 +122694,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26613,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26683,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4046
@@ -121827,7 +122718,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26620,
+			ts+26690,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -121846,7 +122737,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26665, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26735, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -121860,8 +122751,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26697,
-		ts + 26751,
+		ts + 26767,
+		ts + 26821,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -121876,23 +122767,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26799,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26869,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26844
+					return ts + 26914
 				}
-				return ts + 26852
+				return ts + 26922
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26861,
+				ts+26931,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26844
+						return ts + 26914
 					}
-					return ts + 26852
+					return ts + 26922
 				}(), iKey, iVal))
 		}
 	}
@@ -121916,7 +122807,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26919, libc.VaList(bp, i, iCell, iNode))
+				ts+26989, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -121936,7 +122827,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26967, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27037, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -121953,14 +122844,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27034, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27104, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27068, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27138, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -121968,7 +122859,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27098,
+					ts+27168,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -121997,14 +122888,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27153,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27223,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27184, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27254, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -122026,12 +122917,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14477, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14487, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27251, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27321, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -122040,12 +122931,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25071, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25141, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27279, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27349, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -122059,8 +122950,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27310, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27317, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27380, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27387, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -122068,7 +122959,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27325, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27395, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -122083,7 +122974,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27329, -1)
+			ts+27399, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -122091,7 +122982,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6365
+			zDb = ts + 6425
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -122101,7 +122992,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17953
+				return ts + 17996
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -122396,7 +123287,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -122454,6 +123345,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -122466,15 +123358,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27380, 1)
+		Xsqlite3_str_append(tls, x, ts+27450, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27382, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27452, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27393, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27463, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -122494,19 +123387,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep int8 = int8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27404, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27474, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27422, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27492, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = int8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27430, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27500, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*int8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27438, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27508, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27442, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27512, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -122525,6 +123418,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -122556,6 +123450,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -122564,6 +123459,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -122622,6 +123518,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -122790,6 +123687,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -122811,6 +123709,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -122895,6 +123794,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -122923,6 +123824,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -123361,6 +124263,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -123374,6 +124277,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -123388,6 +124294,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -123412,7 +124319,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27455, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27525, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -123421,7 +124328,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27477, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27547, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -123429,7 +124336,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26544, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26614, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -123508,6 +124415,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -123636,6 +124544,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -123654,7 +124563,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16235
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16251
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -123664,7 +124573,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27481
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27551
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -123672,7 +124581,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27487
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27557
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -123784,7 +124693,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27496, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27566, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -123914,14 +124823,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27536) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27606) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27552) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -123958,8 +124869,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -123976,7 +124887,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -123986,7 +124897,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27567, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27637, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -123998,25 +124909,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27575},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27588},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27601},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27614},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27552},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27626},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27536},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27649},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27663},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27676},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27690},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27706},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27645},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27658},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27671},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27684},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27622},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27696},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27606},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27719},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27733},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27746},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27760},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27776},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27718},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27788},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -124026,26 +124937,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27737, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27807, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27747, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27817, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27758, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27828, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27481, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27551, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27769, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27839, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -124099,7 +125010,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25057, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25127, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -124426,7 +125337,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27779, -1)
+		Xsqlite3_result_error(tls, context, ts+27849, -1)
 		return
 	}
 
@@ -124437,7 +125348,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27779, -1)
+			Xsqlite3_result_error(tls, context, ts+27849, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -124538,7 +125449,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27800, uintptr(0), uintptr(0), p+64)
+				ts+27870, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -124602,7 +125513,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+24970, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25040, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -124623,16 +125534,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+27971, libc.VaList(bp, func() uintptr {
+			ts+28041, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28121
+					return ts + 28191
 				}
 				return ts + 1538
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28162)
+			ts+28232)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -124748,7 +125659,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28287, libc.VaList(bp, zTab)))
+			ts+28357, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -124766,7 +125677,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28406, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28476, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -124784,7 +125695,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28427, libc.VaList(bp+16, zIdx)))
+			ts+28497, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -124807,7 +125718,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28478, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28548, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -124853,7 +125764,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+28499, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28569, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -124868,7 +125779,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+28527, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -124908,7 +125819,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19380, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19473, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -124918,18 +125829,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+28556, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28626, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+28575, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28645, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28580, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28650, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -124941,18 +125852,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28590, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28660, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28619
+							return ts + 28689
 						}
-						return ts + 28632
+						return ts + 28702
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+28641, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28711, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -124966,7 +125877,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28663,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28733,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -125013,8 +125924,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+28690, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14588
+		zList = rbuMPrintf(tls, p, ts+28760, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14598
 	}
 	return zList
 }
@@ -125031,7 +125942,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+28699, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28769, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -125053,25 +125964,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+28712, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28782, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28744, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28814, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14588, ts+28767)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28773, ts+28780, ts+4941)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14588, ts+1538)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14598, ts+28837)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28843, ts+28850, ts+4941)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14598, ts+1538)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+28788,
+					ts+28858,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28830, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28900, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -125113,7 +126024,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+28527, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -125148,7 +126059,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28850
+	zCol = ts + 28920
 __7:
 	;
 	goto __5
@@ -125156,13 +126067,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28858,
+	zLhs = rbuMPrintf(tls, p, ts+28928,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28879,
+	zOrder = rbuMPrintf(tls, p, ts+28949,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28915,
+	zSelect = rbuMPrintf(tls, p, ts+28985,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14588
+	zSep = ts + 14598
 	iCol++
 	goto __1
 __2:
@@ -125180,7 +126091,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+28942,
+		Xsqlite3_mprintf(tls, ts+29012,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -125207,8 +126118,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+28990, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14588
+	zVector = rbuMPrintf(tls, p, ts+29060, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14598
 	goto __15
 __15:
 	iCol++
@@ -125219,7 +126130,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+28997, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29067, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -125252,7 +126163,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28527, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -125264,7 +126175,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29009, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29079, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1538
 		} else {
@@ -125276,37 +126187,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28850
+					zCol = ts + 28920
 				} else {
-					zCol = ts + 28580
+					zCol = ts + 28650
 				}
 				zType = ts + 1103
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29031, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29101, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28767
+					return ts + 28837
 				}
 				return ts + 1538
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29051,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29121,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29072,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29142,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29105, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29175, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14588
-		zAnd = ts + 21448
+		zCom = ts + 14598
+		zAnd = ts + 21509
 		nBind++
 	}
 
@@ -125345,11 +126256,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+29129, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29199, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29141, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29211, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14588
+			zS = ts + 14598
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -125357,7 +126268,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29150, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29220, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -125369,18 +126280,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29165, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29235, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1538
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29179, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21448
+				zList = rbuMPrintf(tls, p, ts+29249, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21509
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29191, libc.VaList(bp+40, zList))
+			ts+29261, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1538
@@ -125388,8 +126299,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29241, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21448
+				zList = rbuMPrintf(tls, p, ts+29311, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21509
 			}
 		}
 	}
@@ -125398,7 +126309,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29254, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29324, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -125416,17 +126327,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c int8 = *(*int8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29241,
+					zList = rbuMPrintf(tls, p, ts+29311,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14588
+					zSep = ts + 14598
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29280,
+					zList = rbuMPrintf(tls, p, ts+29350,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14588
+					zSep = ts + 14598
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29310,
+					zList = rbuMPrintf(tls, p, ts+29380,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14588
+					zSep = ts + 14598
 				}
 			}
 		}
@@ -125461,19 +126372,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29347
+		var zSep uintptr = ts + 29417
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+28499, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28569, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16123) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16139) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+28527, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -125485,15 +126396,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 28767
+					zDesc = ts + 28837
 				} else {
 					zDesc = ts + 1538
 				}
-				z = rbuMPrintf(tls, p, ts+29360, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14588
+				z = rbuMPrintf(tls, p, ts+29430, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14598
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29371, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29441, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -125513,7 +126424,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29375)
+			ts+29445)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -125522,7 +126433,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+28527, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -125532,25 +126443,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29425, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29495, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29447, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29517, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28767
+						return ts + 28837
 					}
 					return ts + 1538
 				}()))
-				zComma = ts + 14588
+				zComma = ts + 14598
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29527, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29472,
+			ts+29542,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 0))
 	}
 }
 
@@ -125563,7 +126474,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1538
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1538
@@ -125571,39 +126482,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29534
+				zPk = ts + 29604
 			}
-			zSql = rbuMPrintf(tls, p, ts+29547,
+			zSql = rbuMPrintf(tls, p, ts+29617,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29574
+							return ts + 29644
 						}
 						return ts + 1538
 					}()))
-			zComma = ts + 14588
+			zComma = ts + 14598
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29584, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29654, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29591,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29661,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29623
+						return ts + 29693
 					}
 					return ts + 1538
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 0))
 	}
 }
 
@@ -125616,7 +126527,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+29638,
+				ts+29708,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -125653,7 +126564,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+29695)
+			ts+29765)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -125758,7 +126669,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29761, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29831, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -125778,24 +126689,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29781,
+				ts+29851,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+29846, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29916, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+29882, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+29952, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -125811,7 +126722,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29916,
+						ts+29986,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -125819,9 +126730,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29977
+											return ts + 30047
 										}
-										return ts + 29981
+										return ts + 30051
 									}()
 								}
 								return ts + 1538
@@ -125830,20 +126741,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29987,
+						ts+30057,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30048,
+						ts+30118,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29977
+									return ts + 30047
 								}
-								return ts + 29981
+								return ts + 30051
 							}(),
 							zCollist, zLimit))
 				}
@@ -125868,8 +126779,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6376)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6372)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6436)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6432)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -125880,16 +126791,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1538
 				}
-				return ts + 30207
+				return ts + 30277
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30216,
+						ts+30286,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30252
+								return ts + 30322
 							}
 							return ts + 1538
 						}(), zBindings)))
@@ -125898,32 +126809,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30262, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30332, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1538
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30290
+					zRbuRowid = ts + 30360
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30302, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30372, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30378
+							return ts + 30448
 						}
 						return ts + 1538
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30395,
+					ts+30465,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30694,
+						ts+30764,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -125936,9 +126847,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30793
+						zRbuRowid = ts + 30863
 					} else {
-						zRbuRowid = ts + 30803
+						zRbuRowid = ts + 30873
 					}
 				}
 
@@ -125951,20 +126862,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28850, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28920, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14588, ts+1538)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14598, ts+1538)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30814,
+							ts+30884,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30862
+										return ts + 30932
 									}
 									return ts + 1538
 								}(),
@@ -125977,7 +126888,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19734
+										return ts + 22843
 									}
 									return ts + 1538
 								}(), zOrder,
@@ -126045,9 +126956,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1538
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30207
+				zPrefix = ts + 30277
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30868,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30938,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -126106,7 +127017,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+30898, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+30968, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -126176,28 +127087,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6365, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6365)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30928, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30998, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30956, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31026, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+48, ts+3270, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6365, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6425, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30974, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31044, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6365, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -126230,11 +127141,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31040, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31110, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24120, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24190, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*int8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -126246,13 +127157,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31072,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6365),
+			zTarget = Xsqlite3_mprintf(tls, ts+31142,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1538
 						}
-						return ts + 31104
+						return ts + 31174
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1538
@@ -126271,37 +127182,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31106, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31176, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31121, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31191, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31138, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31208, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31154, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31224, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31182, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31252, 0)
 	}
 }
 
@@ -126330,15 +127241,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31154, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31224, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31200, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31270, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -126386,7 +127297,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -126446,7 +127357,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6365, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6425, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -126463,23 +127374,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31235, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31305, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6365)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31260, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31267, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31330, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31337, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -126596,7 +127507,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23758, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23828, 0)
 			return
 		}
 
@@ -126689,7 +127600,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+31274)
+			ts+31344)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -126697,7 +127608,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31296, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31366, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -126718,7 +127629,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+31323,
+				ts+31393,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -126748,9 +127659,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+31481, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31551, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31496,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31566,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -126764,10 +127675,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31516, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31586, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31541)
+			ts+31611)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -126781,12 +127692,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31649)
+			ts+31719)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+31714)
+			ts+31784)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -126798,7 +127709,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31758, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31828, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -126818,15 +127729,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17208)
-					rbuCopyPragma(tls, p, ts+16319)
+					rbuCopyPragma(tls, p, ts+17224)
+					rbuCopyPragma(tls, p, ts+16335)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31783, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31853, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -126850,10 +127761,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14492, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14502, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14492, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14502, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -126948,7 +127859,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31811, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31881, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -126961,16 +127872,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31260, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31330, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -126980,7 +127892,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31836, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31906, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -127014,7 +127926,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31847, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31917, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -127044,13 +127956,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31919, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31989, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31933)
+				ts+32003)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -127061,7 +127973,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31990)
+				ts+32060)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -127135,7 +128047,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32064, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32134, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -127153,12 +128065,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32096,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32166,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32128
+							return ts + 32198
 						}
-						return ts + 32135
+						return ts + 32205
 					}()))
 			}
 		}
@@ -127166,7 +128078,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14477, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14487, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -127177,19 +128089,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16922)
-						rbuCopyPragma(tls, p, ts+16334)
+						rbuCopyPragma(tls, p, ts+16938)
+						rbuCopyPragma(tls, p, ts+16350)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32142, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32212, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6365, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6425, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32158, uintptr(0), uintptr(0), p+64)
+								db, ts+32228, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -127243,7 +128155,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32182, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32252, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -127270,7 +128182,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30207, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30277, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -127287,7 +128199,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14492, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14502, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -127300,13 +128212,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14492, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14502, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32190, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32260, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -127401,7 +128313,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14492, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14502, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -127418,19 +128330,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14492, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14502, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14477
+				zBegin = ts + 14487
 			} else {
-				zBegin = ts + 32142
+				zBegin = ts + 32212
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32142, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32212, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -127553,11 +128465,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -127696,7 +128611,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -127773,7 +128688,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32217, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32287, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -127798,7 +128713,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32240, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32310, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -127943,7 +128858,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6365)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6425)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -127958,7 +128873,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32251, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32321, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -127969,7 +128884,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -127999,6 +128920,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -128762,11 +129698,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11270, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11332, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32262, 0)
+				ts+32332, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1538, 0)
 		} else {
@@ -128779,7 +129715,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32383, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32453, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -128877,7 +129813,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11270, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11332, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -129344,6 +130280,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -129426,6 +130365,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -129455,9 +130395,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32412,
+			zRet = Xsqlite3_mprintf(tls, ts+32482,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 21448
+			zSep = ts + 21509
 			if zRet == uintptr(0) {
 				break
 			}
@@ -129480,9 +130420,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32446,
+				ts+32516,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 32487
+			zSep = ts + 32557
 			if zRet == uintptr(0) {
 				break
 			}
@@ -129490,18 +130430,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7454, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7514, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32492,
+		ts+32562,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -129511,7 +130451,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -129544,7 +130484,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32570,
+			ts+32640,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129671,7 +130611,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32623, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32693, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -130145,9 +131085,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11270, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11332, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32650, libc.VaList(bp, zDb))
+			ts+32720, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -130156,18 +131096,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1538
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32760, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32830, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1551, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32775, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32845, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+32783, bp+24)
+				sessionAppendStr(tls, bp+8, ts+32853, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21448
+				zSep = ts + 21509
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -130276,7 +131216,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32789, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32859, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -130368,7 +131308,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32809, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32879, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -130631,7 +131571,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -130654,7 +131594,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -130696,7 +131636,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -130757,7 +131697,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -130831,13 +131771,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -130899,7 +131839,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -131272,7 +132212,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -131440,7 +132380,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11270) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11332) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -131451,34 +132391,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32827, bp+16)
+				sessionAppendStr(tls, bp, ts+32897, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32840, bp+16)
+				sessionAppendStr(tls, bp, ts+32910, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+32846, bp+16)
+						sessionAppendStr(tls, bp, ts+32916, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14588
+						zSep = ts + 14598
 					}
 				}
 
 				zSep = ts + 1538
-				sessionAppendStr(tls, bp, ts+32775, bp+16)
+				sessionAppendStr(tls, bp, ts+32845, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32851, bp+16)
+								ts+32921, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32783, bp+16)
+							sessionAppendStr(tls, bp, ts+32853, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21448
+						zSep = ts + 21509
 					}
 				}
 
@@ -131530,34 +132470,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32926, bp+16)
+	sessionAppendStr(tls, bp, ts+32996, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32775, bp+16)
+	sessionAppendStr(tls, bp, ts+32845, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+32846, bp+16)
+			sessionAppendStr(tls, bp, ts+32916, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21448
+			zSep = ts + 21509
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32944, bp+16)
+		sessionAppendStr(tls, bp, ts+33014, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32487, bp+16)
+		sessionAppendStr(tls, bp, ts+32557, bp+16)
 
 		zSep = ts + 1538
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+32783, bp+16)
+				sessionAppendStr(tls, bp, ts+32853, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 32952
+				zSep = ts + 33022
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4941, bp+16)
@@ -131573,7 +132513,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6365, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6425, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -131584,19 +132524,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32957, bp+16)
+	sessionAppendStr(tls, bp, ts+33027, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21454, bp+16)
+	sessionAppendStr(tls, bp, ts+21515, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14588, bp+16)
+			sessionAppendStr(tls, bp, ts+14598, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+32975, bp+16)
+	sessionAppendStr(tls, bp, ts+33045, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+32986, bp+16)
+		sessionAppendStr(tls, bp, ts+33056, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+4941, bp+16)
 
@@ -131612,14 +132552,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11270, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11332, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+32990)
+			ts+33060)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33103)
+			ts+33173)
 	}
 	return rc
 }
@@ -131647,7 +132587,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -131656,7 +132596,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -131733,7 +132673,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -131859,7 +132799,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -131900,7 +132840,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33247, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33317, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -131916,7 +132856,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33268, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33338, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -131989,10 +132929,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33287, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33357, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33313, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33383, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -132038,7 +132978,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6365, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6425, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -132051,19 +132991,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33343, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33413, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33387,
+						ts+33457,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33458, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33528, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11270) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11332) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -132114,14 +133054,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33518, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33588, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33548, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33618, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33572, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33548, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33642, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33618, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -133369,7 +134309,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33600, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33670, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -133657,7 +134597,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33628, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33698, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -133844,7 +134784,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33659, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33729, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -133912,7 +134852,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33666
+		var zErr uintptr = ts + 33736
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -134094,7 +135034,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33716
+		var zErr uintptr = ts + 33786
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -134418,13 +135358,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33764, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33834, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33772, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33842, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33782, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33852, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -134975,7 +135915,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33787, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33857, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -135002,14 +135942,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*int8)(unsafe.Pointer(p))) < '0' || int32(*(*int8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33794, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33864, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33825, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33895, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135020,7 +135960,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33858, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33928, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135033,7 +135973,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33895, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33965, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -135042,7 +135982,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33904, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33974, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -135061,7 +136001,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33937, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34007, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -135076,14 +136016,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33971, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34041, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33979, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34049, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*int8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34011, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34081, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -135091,9 +136031,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34017, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34087, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34031, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34101, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -135101,9 +136041,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34069, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34139, zCmd, nCmd) == 0 {
 		if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || int32(*(*int8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34080, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34150, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -135113,19 +136053,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5059, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 7942, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17313},
-			{FzName: ts + 34115, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8010, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17329},
+			{FzName: ts + 34185, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34123, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34193, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34154, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34224, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -135172,15 +136112,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22114) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16235) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34182, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22175) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16251) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34252, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34212) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34282) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34222, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34292, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -135197,13 +136137,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34253, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34323, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34258, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34328, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34265, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34335, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -135241,8 +136181,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22114) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34273, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22175) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34343, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -135274,7 +136214,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34302, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34372, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -135311,19 +136251,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33971
+			zTail = ts + 34041
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34322
+			zTail = ts + 34392
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34330, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34400, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16235, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16251, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -135367,18 +136307,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34341, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34411, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1538
 			}
-			return ts + 14588
+			return ts + 14598
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34357, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34427, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34364,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22114))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34434,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22175))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -135488,7 +136428,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34390) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34460) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -135498,7 +136438,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34395) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34465) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -135508,7 +136448,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34404) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34474) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -135521,7 +136461,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34414) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34484) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -135531,7 +136471,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34424) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34494) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -135547,7 +136487,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22114) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22175) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -135570,7 +136510,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34436
+	var zSelect uintptr = ts + 34506
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -135592,7 +136532,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34468) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34538) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -135606,7 +136546,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34476,
+				ts+34546,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -135704,7 +136644,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34541, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34611, 0)
 					return FTS5_EOF
 				}
 			}
@@ -135717,20 +136657,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34561, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34631, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34592, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34662, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34595, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34665, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29977, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30047, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -135816,6 +136756,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*int8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -135844,7 +136795,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 1))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*int8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = int8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -137497,9 +138448,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34599, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34669, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33628, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33698, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -137515,7 +138466,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c int8 = *(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34604, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34674, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -137602,7 +138553,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20451, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20512, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -137683,7 +138634,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34633, 0)
+			ts+34703, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -137853,12 +138804,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34686,
+								ts+34756,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34736
+										return ts + 34806
 									}
-									return ts + 34599
+									return ts + 34669
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -138801,7 +139752,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34743, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34813, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -138880,7 +139831,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+34749,
+			ts+34819,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -138905,7 +139856,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34800,
+			ts+34870,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -138928,7 +139879,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+34849,
+			ts+34919,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -139167,7 +140118,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+34889, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34959, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -140366,7 +141317,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+34912,
+			ts+34982,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -141832,7 +142783,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+34996,
+			ts+35066,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -142323,10 +143274,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -142909,13 +143865,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35053, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35123, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24970, ts+35061, 0, pzErr)
+				pConfig, ts+25040, ts+35131, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11410,
-					ts+35096,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11472,
+					ts+35166,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -143168,7 +144124,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34743, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+34813, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -143282,7 +144238,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35140,
+		ts+35210,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -143452,7 +144408,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35226)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35296)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -143723,7 +144679,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35231, 0)
+			ts+35301, 0)
 		return SQLITE_ERROR
 	}
 
@@ -144147,11 +145103,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35270,
+		ts+35340,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14588
+					return ts + 14598
 				}
 				return ts + 1538
 			}(),
@@ -144163,9 +145119,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35325
+					return ts + 35395
 				}
-				return ts + 35330
+				return ts + 35400
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -144211,12 +145167,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35334, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35404, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5041, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35340, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35410, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -144247,7 +145203,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35368, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35438, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -144278,7 +145234,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35378, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35448, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -144310,14 +145266,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35399, libc.VaList(bp, z))
+				ts+35469, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33782
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33852
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -144373,7 +145329,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35231, 0)
+		ts+35301, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -144590,7 +145546,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35432, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35502, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -144735,28 +145691,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35468, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35538, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35479, 0)
+				ts+35549, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35559, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35629, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35567, 0)
+				ts+35637, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16902, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16918, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35623, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35693, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35629, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35699, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -144814,7 +145770,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17447, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17463, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -144827,12 +145783,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35645,
+				ts+35715,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20352
+						return ts + 20413
 					}
-					return ts + 35682
+					return ts + 35752
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -145462,7 +146418,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35694, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35764, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -145706,7 +146662,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35715, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35785, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -145725,7 +146681,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35737, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35807, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -145772,7 +146728,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35768)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35838)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -145781,7 +146737,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35781, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35851, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -145795,7 +146751,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35872, ts + 33971, ts + 24970, ts + 34322, ts + 11410,
+	ts + 35942, ts + 34041, ts + 25040, ts + 34392, ts + 11472,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -145819,7 +146775,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35879, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35949, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -145837,13 +146793,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35879, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35949, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35884, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35954, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -145898,17 +146856,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35899,
-			ts + 35967,
-			ts + 36036,
-			ts + 36069,
-			ts + 36108,
-			ts + 36148,
-			ts + 36187,
-			ts + 36228,
-			ts + 36267,
-			ts + 36309,
-			ts + 36349,
+			ts + 35969,
+			ts + 36037,
+			ts + 36106,
+			ts + 36139,
+			ts + 36178,
+			ts + 36218,
+			ts + 36257,
+			ts + 36298,
+			ts + 36337,
+			ts + 36379,
+			ts + 36419,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -146010,18 +146968,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36372,
+		ts+36442,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36476,
+			ts+36546,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36514,
+			ts+36584,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -146033,7 +146991,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36552,
+			ts+36622,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -146045,14 +147003,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24970, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11410, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35872, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25040, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11472, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35942, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34322, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34392, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33971, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34041, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -146064,17 +147022,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36594,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36664,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29623
+					return ts + 29693
 				}
 				return ts + 1538
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36624,
+			ts+36694,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -146111,27 +147069,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36668, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36738, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36691, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36761, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33971, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34041, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34322, ts+36697, 0, pzErr)
+				pConfig, ts+34392, ts+36767, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35872, ts+36729, 1, pzErr)
+				pConfig, ts+35942, ts+36799, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34468, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34538, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -146337,12 +147295,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36746,
+		ts+36816,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36796,
+			ts+36866,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -146350,7 +147308,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34468, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34538, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -146526,7 +147484,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36825,
+	zSql = Xsqlite3_mprintf(tls, ts+36895,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -146708,14 +147666,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33971, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34041, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34322, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34392, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -146910,9 +147868,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36857) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36927) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36868) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36938) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -147127,7 +148085,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36879
+			var zCat uintptr = ts + 36949
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -147139,7 +148097,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36888) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36958) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -147150,18 +148108,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36899) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36969) {
 					if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' && int32(*(*int8)(unsafe.Pointer(zArg))) != '2' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*int8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36857) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36927) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36868) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36938) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36888) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36958) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -147437,7 +148395,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36917
+	var zBase uintptr = ts + 36987
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -147579,7 +148537,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36927, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36997, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -147587,11 +148545,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36930, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37000, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36935, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37005, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -147599,7 +148557,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36940, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37010, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -147607,7 +148565,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36943, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -147615,11 +148573,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36946, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36951, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -147627,19 +148585,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36956, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36960, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37030, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36966, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37036, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36971, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37041, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147647,11 +148605,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36975, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37045, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36979, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37049, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -147659,7 +148617,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36982, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37052, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147667,11 +148625,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36986, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37056, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36990, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37060, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147679,7 +148637,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36994, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37064, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147687,7 +148645,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36998, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147695,7 +148653,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37002, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147711,24 +148669,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+36986, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37076, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37056, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37009, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37012, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37079, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37082, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37002, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37086, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -147743,137 +148701,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37019, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37089, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+36986, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37056, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37027, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37097, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37034, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37104, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37039, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37109, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36935, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37005, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37044, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37114, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36930, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37000, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37049, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37119, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37054, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37124, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15448, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15464, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37059, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37129, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37012, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37082, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37063, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36927, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36997, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36971, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37041, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37074, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37144, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37078, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37148, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37150, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36994, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37064, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37086, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37156, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37094, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37164, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36986, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37056, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37100, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37170, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36986, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37056, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37105, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37175, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36927, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37111, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37181, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+36998, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37068, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37119, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37189, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37127, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37197, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37131, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37201, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+36994, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37064, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37139, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37209, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36927, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37215, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36998, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37068, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37151, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37221, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37012, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37082, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -147888,16 +148846,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37158, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37228, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37163, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37233, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -147905,21 +148863,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37168, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37238, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37174, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37244, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37127, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147927,7 +148885,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37250, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -147935,9 +148893,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37256, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36927, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -147952,12 +148910,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37192, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37262, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37196, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37266, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37199, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37269, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -147966,7 +148924,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37202, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -148122,7 +149080,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37206) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37276) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -148302,22 +149260,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36917, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 36987, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37221, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37291, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37227, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37297, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37234, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37304, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -149460,14 +150418,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37242) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37312) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37246) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37316) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37250) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37320) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37259, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37329, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -149493,19 +150451,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 37293,
-		ts + 37333,
-		ts + 37368,
+		ts + 37363,
+		ts + 37403,
+		ts + 37438,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23266, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23336, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37411, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37481, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -149638,11 +150596,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37444, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37514, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37475,
+		ts+37545,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -149666,7 +150624,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37526, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37596, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -150061,7 +151019,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37552, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37622, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -150083,7 +151041,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37562
+	return ts + 37632
 }
 
 func init() {
@@ -150138,114 +151096,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -150703,6 +151663,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -151021,6 +151993,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -151042,5 +152015,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_openbsd_arm64.go b/vendor/modernc.org/sqlite/lib/sqlite_openbsd_arm64.go
index a9532862..f29d76ae 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_openbsd_arm64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_openbsd_arm64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_openbsd_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_openbsd_arm64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_UNIX=1', DO NOT EDIT.
 
 package sqlite3
 
@@ -398,6 +398,7 @@ const (
 	FTS5_LCP                              = 7
 	FTS5_LP                               = 10
 	FTS5_MAIN_PREFIX                      = 48
+	FTS5_MAX_LEVEL                        = 64
 	FTS5_MAX_PAGE_SIZE                    = 65536
 	FTS5_MAX_PREFIX_INDEXES               = 31
 	FTS5_MAX_SEGMENT                      = 2000
@@ -488,6 +489,7 @@ const (
 	HASHTABLE_HASH_1                      = 383
 	HASHTABLE_NPAGE                       = 4096
 	HASHTABLE_NSLOT                       = 8192
+	HAVE_FCHMOD                           = 0
 	HAVE_FCHOWN                           = 1
 	HAVE_FULLFSYNC                        = 0
 	HAVE_GETHOSTUUID                      = 0
@@ -725,6 +727,7 @@ const (
 	OPFLG_IN2                             = 0x04
 	OPFLG_IN3                             = 0x08
 	OPFLG_JUMP                            = 0x01
+	OPFLG_NCYCLE                          = 0x40
 	OPFLG_OUT2                            = 0x10
 	OPFLG_OUT3                            = 0x20
 	OP_Abortable                          = 186
@@ -1197,6 +1200,7 @@ const (
 	SF_Resolved                           = 0x0000004
 	SF_SETTABLE                           = 0xffff0000
 	SF_UFSrcCheck                         = 0x0800000
+	SF_UpdateFrom                         = 0x10000000
 	SF_UsesEphemeral                      = 0x0000020
 	SF_Values                             = 0x0000200
 	SF_View                               = 0x0200000
@@ -1228,6 +1232,7 @@ const (
 	SQLITE_ACCESS_READ                    = 2
 	SQLITE_ACCESS_READWRITE               = 1
 	SQLITE_AFF_BLOB                       = 0x41
+	SQLITE_AFF_FLEXNUM                    = 0x46
 	SQLITE_AFF_INTEGER                    = 0x44
 	SQLITE_AFF_MASK                       = 0x47
 	SQLITE_AFF_NONE                       = 0x40
@@ -1346,6 +1351,7 @@ const (
 	SQLITE_CacheSpill                     = 0x00000020
 	SQLITE_CellSizeCk                     = 0x00200000
 	SQLITE_CkptFullFSync                  = 0x00000010
+	SQLITE_Coroutines                     = 0x02000000
 	SQLITE_CountOfView                    = 0x00000200
 	SQLITE_CoverIdxScan                   = 0x00000020
 	SQLITE_CursorHints                    = 0x00000400
@@ -1712,6 +1718,7 @@ const (
 	SQLITE_NOTADB                         = 26
 	SQLITE_NOTFOUND                       = 12
 	SQLITE_NOTICE                         = 27
+	SQLITE_NOTICE_RBU                     = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK        = 539
 	SQLITE_NOTICE_RECOVER_WAL             = 283
 	SQLITE_NOTNULL                        = 0x90
@@ -1808,11 +1815,14 @@ const (
 	SQLITE_ResetDatabase                  = 0x02000000
 	SQLITE_ReverseOrder                   = 0x00001000
 	SQLITE_SAVEPOINT                      = 32
+	SQLITE_SCANSTAT_COMPLEX               = 0x0001
 	SQLITE_SCANSTAT_EST                   = 2
 	SQLITE_SCANSTAT_EXPLAIN               = 4
 	SQLITE_SCANSTAT_NAME                  = 3
+	SQLITE_SCANSTAT_NCYCLE                = 7
 	SQLITE_SCANSTAT_NLOOP                 = 0
 	SQLITE_SCANSTAT_NVISIT                = 1
+	SQLITE_SCANSTAT_PARENTID              = 6
 	SQLITE_SCANSTAT_SELECTID              = 5
 	SQLITE_SCHEMA                         = 17
 	SQLITE_SELECT                         = 21
@@ -1827,7 +1837,7 @@ const (
 	SQLITE_SHM_UNLOCK                     = 1
 	SQLITE_SORTER_PMASZ                   = 250
 	SQLITE_SOUNDEX                        = 1
-	SQLITE_SOURCE_ID                      = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                      = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                         = 0
 	SQLITE_SO_DESC                        = 1
 	SQLITE_SO_UNDEFINED                   = -1
@@ -1935,8 +1945,8 @@ const (
 	SQLITE_UTF8                           = 1
 	SQLITE_VDBEINT_H                      = 0
 	SQLITE_VDBE_H                         = 0
-	SQLITE_VERSION                        = "3.40.1"
-	SQLITE_VERSION_NUMBER                 = 3040001
+	SQLITE_VERSION                        = "3.41.0"
+	SQLITE_VERSION_NUMBER                 = 3041000
 	SQLITE_VTABRISK_High                  = 2
 	SQLITE_VTABRISK_Low                   = 0
 	SQLITE_VTABRISK_Normal                = 1
@@ -2332,6 +2342,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                 = 1
 	WHERE_DISTINCT_UNORDERED              = 3
 	WHERE_DUPLICATES_OK                   = 0x0010
+	WHERE_EXPRIDX                         = 0x04000000
 	WHERE_GROUPBY                         = 0x0040
 	WHERE_IDX_ONLY                        = 0x00000040
 	WHERE_INDEXED                         = 0x00000200
@@ -3452,6 +3463,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -4880,10 +4892,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -4939,12 +4949,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -5196,7 +5204,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -5317,7 +5324,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -5341,11 +5348,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -5353,11 +5362,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -5989,7 +5998,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -6127,10 +6136,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -6145,12 +6152,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -6340,10 +6345,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -6546,7 +6553,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1083))
@@ -6698,7 +6705,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -6747,8 +6753,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -6759,6 +6775,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -6875,7 +6900,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -7690,14 +7715,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = int8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -7705,7 +7730,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -9513,7 +9538,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -9769,6 +9794,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -10759,6 +10786,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -10767,11 +10795,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -10783,30 +10835,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1538
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -10815,83 +10867,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -10905,17 +10957,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -10923,90 +10975,90 @@ __219:
 		}
 		return ts + 1544
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(j))) = int8(0)
 	length = int32(j)
@@ -11014,89 +11066,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1551, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1553, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1563, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -11109,32 +11161,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -11193,7 +11245,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -11209,8 +11261,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -11239,12 +11290,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -11253,7 +11305,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -12368,6 +12420,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -12973,10 +13043,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -13002,6 +13075,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = int8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]int8{}))-uint64(1)-uint64(i))
+	return int32(uint64(unsafe.Sizeof([22]int8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -14010,11 +14084,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -14754,7 +14829,7 @@ func closePendingFds(tls *libc.TLS, pFile uintptr) {
 
 	for p = (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused; p != 0; p = pNext {
 		pNext = (*UnixUnusedFd)(unsafe.Pointer(p)).FpNext
-		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 37980)
+		robust_close(tls, pFile, (*UnixUnusedFd)(unsafe.Pointer(p)).Ffd, 38271)
 		Xsqlite3_free(tls, p)
 	}
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FpUnused = uintptr(0)
@@ -14977,7 +15052,7 @@ __3:
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_whence = int16(SEEK_SET)
 	if !(eFileLock == SHARED_LOCK ||
-		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) < PENDING_LOCK) {
+		eFileLock == EXCLUSIVE_LOCK && int32((*UnixFile)(unsafe.Pointer(pFile)).FeFileLock) == RESERVED_LOCK) {
 		goto __4
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_type = func() int16 {
@@ -14993,113 +15068,113 @@ __3:
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __6
+		goto __7
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__6:
+__7:
 	;
 	goto end_lock
+	goto __6
 __5:
+	if !(eFileLock == EXCLUSIVE_LOCK) {
+		goto __8
+	}
+	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
+	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
+__8:
+	;
+__6:
 	;
 __4:
 	;
 	if !(eFileLock == SHARED_LOCK) {
-		goto __7
+		goto __9
 	}
 
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __9
+		goto __11
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
-__9:
+__11:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_UNLCK)
 	if !(unixFileLock(tls, pFile, bp) != 0 && rc == SQLITE_OK) {
-		goto __10
+		goto __12
 	}
 
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno(tls)))
 	rc = SQLITE_IOERR | int32(8)<<8
-__10:
+__12:
 	;
 	if !(rc != 0) {
-		goto __11
-	}
-	if !(rc != SQLITE_BUSY) {
 		goto __13
 	}
+	if !(rc != SQLITE_BUSY) {
+		goto __15
+	}
 	storeLastErrno(tls, pFile, tErrno)
-__13:
+__15:
 	;
 	goto end_lock
-	goto __12
-__11:
+	goto __14
+__13:
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(SHARED_LOCK)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnLock++
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared = 1
-__12:
+__14:
 	;
-	goto __8
-__7:
+	goto __10
+__9:
 	if !(eFileLock == EXCLUSIVE_LOCK && (*UnixInodeInfo)(unsafe.Pointer(pInode)).FnShared > 1) {
-		goto __14
+		goto __16
 	}
 
 	rc = SQLITE_BUSY
-	goto __15
-__14:
+	goto __17
+__16:
 	;
 	(*flock)(unsafe.Pointer(bp)).Fl_type = int16(F_WRLCK)
 
 	if !(eFileLock == RESERVED_LOCK) {
-		goto __16
+		goto __18
 	}
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 1)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = 1
-	goto __17
-__16:
+	goto __19
+__18:
 	(*flock)(unsafe.Pointer(bp)).Fl_start = Off_t(Xsqlite3PendingByte + 2)
 	(*flock)(unsafe.Pointer(bp)).Fl_len = int64(SHARED_SIZE)
-__17:
+__19:
 	;
 	if !(unixFileLock(tls, pFile, bp) != 0) {
-		goto __18
+		goto __20
 	}
 	tErrno = *(*int32)(unsafe.Pointer(libc.X__errno(tls)))
 	rc = sqliteErrorFromPosixError(tls, tErrno, SQLITE_IOERR|int32(15)<<8)
 	if !(rc != SQLITE_BUSY) {
-		goto __19
+		goto __21
 	}
 	storeLastErrno(tls, pFile, tErrno)
-__19:
+__21:
 	;
-__18:
+__20:
 	;
-__15:
+__17:
 	;
-__8:
+__10:
 	;
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(eFileLock)
 	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(eFileLock)
-	goto __21
-__20:
-	if !(eFileLock == EXCLUSIVE_LOCK) {
-		goto __22
-	}
-	(*UnixFile)(unsafe.Pointer(pFile)).FeFileLock = uint8(PENDING_LOCK)
-	(*UnixInodeInfo)(unsafe.Pointer(pInode)).FeFileLock = uint8(PENDING_LOCK)
 __22:
 	;
-__21:
-	;
 end_lock:
 	Xsqlite3_mutex_leave(tls, (*UnixInodeInfo)(unsafe.Pointer(pInode)).FpLockMutex)
 
@@ -15230,7 +15305,7 @@ func unixUnlock(tls *libc.TLS, id uintptr, eFileLock int32) int32 {
 func closeUnixFile(tls *libc.TLS, id uintptr) int32 {
 	var pFile uintptr = id
 	if (*UnixFile)(unsafe.Pointer(pFile)).Fh >= 0 {
-		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 38764)
+		robust_close(tls, pFile, (*UnixFile)(unsafe.Pointer(pFile)).Fh, 39055)
 		(*UnixFile)(unsafe.Pointer(pFile)).Fh = -1
 	}
 
@@ -15508,7 +15583,7 @@ func openDirectory(tls *libc.TLS, zFilename uintptr, pFd uintptr) int32 {
 	if fd >= 0 {
 		return SQLITE_OK
 	}
-	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40385), ts+3362, bp+8, 40385)
+	return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 40676), ts+3362, bp+8, 40676)
 }
 
 func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
@@ -15525,14 +15600,14 @@ func unixSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3650, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40426)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, ts+3650, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40717)
 	}
 
 	if int32((*UnixFile)(unsafe.Pointer(pFile)).FctrlFlags)&UNIXFILE_DIRSYNC != 0 {
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, bp)
 		if rc == SQLITE_OK {
 			full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0)
-			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40440)
+			robust_close(tls, pFile, *(*int32)(unsafe.Pointer(bp)), 40731)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -15552,7 +15627,7 @@ func unixTruncate(tls *libc.TLS, id uintptr, nByte I64) int32 {
 	rc = robust_ftruncate(tls, (*UnixFile)(unsafe.Pointer(pFile)).Fh, nByte)
 	if rc != 0 {
 		storeLastErrno(tls, pFile, *(*int32)(unsafe.Pointer(libc.X__errno(tls))))
-		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3281, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40471)
+		return unixLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, ts+3281, (*UnixFile)(unsafe.Pointer(pFile)).FzPath, 40762)
 	} else {
 		return SQLITE_OK
 	}
@@ -15807,7 +15882,7 @@ func unixShmPurge(tls *libc.TLS, pFd uintptr) {
 		}
 		Xsqlite3_free(tls, (*UnixShmNode)(unsafe.Pointer(p)).FapRegion)
 		if (*UnixShmNode)(unsafe.Pointer(p)).FhShm >= 0 {
-			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41151)
+			robust_close(tls, pFd, (*UnixShmNode)(unsafe.Pointer(p)).FhShm, 41442)
 			(*UnixShmNode)(unsafe.Pointer(p)).FhShm = -1
 		}
 		(*UnixInodeInfo)(unsafe.Pointer((*UnixShmNode)(unsafe.Pointer(p)).FpInode)).FpShmNode = uintptr(0)
@@ -15835,7 +15910,7 @@ func unixLockSharedMemory(tls *libc.TLS, pDbFd uintptr, pShmNode uintptr) int32
 			rc = unixShmSystemLock(tls, pDbFd, F_WRLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
 
 			if rc == SQLITE_OK && robust_ftruncate(tls, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FhShm, int64(3)) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3281, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41208)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, ts+3281, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41499)
 			}
 		}
 	} else if int32((*flock)(unsafe.Pointer(bp+8)).Fl_type) == F_WRLCK {
@@ -15934,7 +16009,7 @@ __8:
 	if !((*unixShmNode)(unsafe.Pointer(pShmNode)).FhShm < 0) {
 		goto __10
 	}
-	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41333), ts+3245, zShm, 41333)
+	rc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 41624), ts+3245, zShm, 41624)
 	goto shm_open_err
 __10:
 	;
@@ -16064,7 +16139,7 @@ __11:
 		goto __14
 	}
 	zFile = (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3316, zFile, 41477)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, ts+3316, zFile, 41768)
 	goto shmpage_out
 __14:
 	;
@@ -16110,7 +16185,7 @@ __16:
 	if !(pMem == libc.UintptrFromInt32(-1)) {
 		goto __20
 	}
-	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3403, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41504)
+	rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, ts+3403, (*UnixShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 41795)
 	goto shmpage_out
 __20:
 	;
@@ -16382,7 +16457,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 		unixEnterMutex(tls)
 		rc = findInodeInfo(tls, pNew, pNew+16)
 		if rc != SQLITE_OK {
-			robust_close(tls, pNew, h, 42381)
+			robust_close(tls, pNew, h, 42672)
 			h = -1
 		}
 		unixLeaveMutex(tls)
@@ -16403,7 +16478,7 @@ func fillInUnixFile(tls *libc.TLS, pVfs uintptr, h int32, pId uintptr, zFilename
 	storeLastErrno(tls, pNew, 0)
 	if rc != SQLITE_OK {
 		if h >= 0 {
-			robust_close(tls, pNew, h, 42466)
+			robust_close(tls, pNew, h, 42757)
 		}
 	} else {
 		(*Sqlite3_file)(unsafe.Pointer(pId)).FpMethods = pLockingStyle
@@ -16719,7 +16794,7 @@ __15:
 	if !(fd < 0) {
 		goto __19
 	}
-	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 42907), ts+3245, zName, 42907)
+	rc2 = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43198), ts+3245, zName, 43198)
 	if !(rc == SQLITE_OK) {
 		goto __20
 	}
@@ -16810,7 +16885,7 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		if *(*int32)(unsafe.Pointer(libc.X__errno(tls))) == ENOENT {
 			rc = SQLITE_IOERR | int32(23)<<8
 		} else {
-			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3355, zPath, 43046)
+			rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, ts+3355, zPath, 43337)
 		}
 		return rc
 	}
@@ -16818,9 +16893,9 @@ func unixDelete(tls *libc.TLS, NotUsed uintptr, zPath uintptr, dirSync int32) in
 		rc = (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 17*24 + 8)))(tls, zPath, bp)
 		if rc == SQLITE_OK {
 			if full_fsync(tls, *(*int32)(unsafe.Pointer(bp)), 0, 0) != 0 {
-				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3772, zPath, 43056)
+				rc = unixLogErrorAtLine(tls, SQLITE_IOERR|int32(5)<<8, ts+3772, zPath, 43347)
 			}
-			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43058)
+			robust_close(tls, uintptr(0), *(*int32)(unsafe.Pointer(bp)), 43349)
 		} else {
 			rc = SQLITE_OK
 		}
@@ -16863,12 +16938,9 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 			return
 		}
 		if int32(*(*int8)(unsafe.Pointer(zName + 1))) == '.' && nName == 2 {
-			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed <= 1 {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = SQLITE_ERROR
-				return
-			}
-
-			for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+			if (*DbPath)(unsafe.Pointer(pPath)).FnUsed > 1 {
+				for int32(*(*int8)(unsafe.Pointer((*DbPath)(unsafe.Pointer(pPath)).FzOut + uintptr(libc.PreDecInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnUsed, 1))))) != '/' {
+				}
 			}
 			return
 		}
@@ -16887,18 +16959,18 @@ func appendOnePathElement(tls *libc.TLS, pPath uintptr, zName uintptr, nName int
 		zIn = (*DbPath)(unsafe.Pointer(pPath)).FzOut
 		if (*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 27*24 + 8)))(tls, zIn, bp) != 0 {
 			if *(*int32)(unsafe.Pointer(libc.X__errno(tls))) != ENOENT {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43154), ts+3443, zIn, 43154)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43443), ts+3443, zIn, 43443)
 			}
 		} else if (*stat)(unsafe.Pointer(bp)).Fst_mode&Mode_t(0170000) == Mode_t(0120000) {
 			var got Ssize_t
 
 			if libc.PostIncInt32(&(*DbPath)(unsafe.Pointer(pPath)).FnSymlink, 1) > SQLITE_MAX_SYMLINK {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43160)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = Xsqlite3CantopenError(tls, 43449)
 				return
 			}
 			got = (*(*func(*libc.TLS, uintptr, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls, zIn, bp+128, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2))
 			if got <= int64(0) || got >= Ssize_t(unsafe.Sizeof([1026]int8{}))-int64(2) {
-				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43165), ts+3434, zIn, 43165)
+				(*DbPath)(unsafe.Pointer(pPath)).Frc = unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43454), ts+3434, zIn, 43454)
 				return
 			}
 			*(*int8)(unsafe.Pointer(bp + 128 + uintptr(got))) = int8(0)
@@ -16938,14 +17010,14 @@ func unixFullPathname(tls *libc.TLS, pVfs uintptr, zPath uintptr, nOut int32, zO
 	(*DbPath)(unsafe.Pointer(bp + 1032)).FzOut = zOut
 	if int32(*(*int8)(unsafe.Pointer(zPath))) != '/' {
 		if (*(*func(*libc.TLS, uintptr, Size_t) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, bp, uint64(unsafe.Sizeof([1026]int8{}))-uint64(2)) == uintptr(0) {
-			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43223), ts+3263, zPath, 43223)
+			return unixLogErrorAtLine(tls, Xsqlite3CantopenError(tls, 43512), ts+3263, zPath, 43512)
 		}
 		appendAllPathElements(tls, bp+1032, bp)
 	}
 	appendAllPathElements(tls, bp+1032, zPath)
 	*(*int8)(unsafe.Pointer(zOut + uintptr((*DbPath)(unsafe.Pointer(bp+1032)).FnUsed))) = int8(0)
 	if (*DbPath)(unsafe.Pointer(bp+1032)).Frc != 0 || (*DbPath)(unsafe.Pointer(bp+1032)).FnUsed < 2 {
-		return Xsqlite3CantopenError(tls, 43229)
+		return Xsqlite3CantopenError(tls, 43518)
 	}
 	if (*DbPath)(unsafe.Pointer(bp+1032)).FnSymlink != 0 {
 		return SQLITE_OK | int32(2)<<8
@@ -17020,7 +17092,7 @@ func unixRandomness(tls *libc.TLS, NotUsed uintptr, nBuf int32, zBuf uintptr) in
 			for __ccgo := true; __ccgo; __ccgo = got < 0 && *(*int32)(unsafe.Pointer(libc.X__errno(tls))) == EINTR {
 				got = int32((*(*func(*libc.TLS, int32, uintptr, Size_t) Ssize_t)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8*24 + 8)))(tls, fd, zBuf, uint64(nBuf)))
 			}
-			robust_close(tls, uintptr(0), fd, 43330)
+			robust_close(tls, uintptr(0), fd, 43619)
 		}
 
 	}
@@ -20940,7 +21012,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -21954,7 +22026,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -21971,7 +22042,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -22037,7 +22107,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -22047,7 +22116,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -22238,36 +22307,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -22439,7 +22497,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -22563,7 +22621,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -22602,7 +22660,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -23543,10 +23601,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]int8{int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0)}
@@ -23632,7 +23692,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -24389,7 +24449,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -24488,7 +24548,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -25074,7 +25134,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -25349,7 +25409,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -25822,7 +25882,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -26327,7 +26387,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -26562,8 +26622,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -26571,23 +26631,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -26983,7 +27045,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -27120,7 +27182,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -27137,7 +27199,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -27145,7 +27207,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -27188,7 +27250,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -27198,7 +27260,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -27448,7 +27510,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -27495,7 +27557,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -27505,7 +27567,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -27518,7 +27580,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -27527,14 +27589,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -27544,7 +27606,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -27608,7 +27670,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -27618,7 +27680,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -27640,7 +27702,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -27675,7 +27737,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -27688,13 +27750,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -27719,7 +27781,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -27730,7 +27792,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -27782,22 +27844,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -27807,7 +27869,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -27815,7 +27877,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -27823,10 +27885,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -27850,13 +27912,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -27864,7 +27925,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -27872,32 +27972,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -27925,11 +28014,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -27940,15 +28029,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -27976,14 +28065,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellOffset+i*2) + 1)))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -27997,7 +28086,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -28009,7 +28098,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -28112,7 +28201,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -28140,7 +28229,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -28179,7 +28268,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -29051,7 +29140,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -29466,7 +29555,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -29492,7 +29581,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -29501,7 +29590,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -29512,7 +29601,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -29528,7 +29617,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -29589,7 +29678,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -29624,7 +29713,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -29684,7 +29773,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -29723,7 +29812,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -29754,7 +29843,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -30095,7 +30184,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -30339,14 +30428,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -30391,7 +30480,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -30440,7 +30529,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -30520,7 +30609,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -30611,7 +30700,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -30631,7 +30720,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -30695,18 +30784,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -30722,6 +30801,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -30843,7 +30930,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -31047,7 +31134,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -31112,7 +31199,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -31160,7 +31247,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -31279,7 +31366,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -31439,7 +31526,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -31504,7 +31591,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -31540,7 +31627,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -31584,7 +31671,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -31696,7 +31783,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -31854,7 +31941,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -31911,7 +31998,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -31927,7 +32014,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -32001,7 +32088,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -32013,7 +32100,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -32024,7 +32111,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -32189,7 +32276,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -32213,9 +32300,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -32238,16 +32325,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -32268,9 +32353,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -32404,11 +32495,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -32461,12 +32555,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -32474,7 +32568,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -32534,7 +32628,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -32623,7 +32717,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -32739,7 +32833,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -32782,8 +32876,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -32865,6 +32959,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -33057,7 +33153,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -33068,7 +33164,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -33226,7 +33322,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -33300,7 +33396,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -33326,9 +33422,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -33339,8 +33436,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -33362,7 +33459,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -33390,7 +33487,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -33651,11 +33748,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -33843,7 +33940,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -33881,7 +33978,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -33958,7 +34055,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -33970,19 +34067,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -33995,7 +34084,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -34014,6 +34103,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -34049,7 +34155,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -34058,13 +34163,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -34075,7 +34179,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -34188,7 +34292,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -34202,20 +34306,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -34225,7 +34329,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -34233,100 +34343,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx) + 1)))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -34335,30 +34445,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -34381,7 +34491,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -34400,13 +34509,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, uint64(nIn))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -34423,7 +34534,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -34482,9 +34593,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -34524,7 +34635,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -34532,11 +34643,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx) + 1)))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -34611,7 +34722,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))<<8|int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)) + 1)))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -34621,7 +34732,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -34680,7 +34791,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -34709,7 +34820,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -34785,7 +34896,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -34799,7 +34910,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -34933,7 +35044,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -35108,12 +35219,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if *(*int32)(unsafe.Pointer(db + 432)) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -35121,15 +35261,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+4046, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+4046, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -35153,9 +35293,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+4071, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if *(*int32)(unsafe.Pointer((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb + 432)) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -35169,7 +35306,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+4096, libc.VaList(bp, iChild))
 		return
@@ -35243,7 +35380,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -35328,48 +35467,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4292
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4302, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+4340, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+4378, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -35384,29 +35530,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 4426
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -35414,28 +35560,28 @@ __9:
 	pc = U32(int32(*(*U8)(unsafe.Pointer(pCellIdx)))<<8 | int32(*(*U8)(unsafe.Pointer(pCellIdx + 1))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+4454,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+4484, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -35443,97 +35589,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+4508, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+4532, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(cellStart+i*2) + 1))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -35543,48 +35689,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4557, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+4594,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -35613,9 +35759,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -35647,19 +35793,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -35671,7 +35811,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -35679,7 +35819,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -35764,7 +35904,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -35807,22 +35947,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -36049,8 +36186,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -36549,7 +36686,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 	defer tls.Free(40)
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(p)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+8, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+8, ts+4909,
@@ -36561,6 +36698,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*int8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+8)).FnChar))) = int8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 8)).FnChar)
 	}
 }
 
@@ -36748,7 +36886,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -36922,16 +37059,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -37374,7 +37513,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -37611,43 +37750,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -38032,7 +38162,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -38047,14 +38177,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -38424,7 +38554,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -38436,13 +38568,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -38519,6 +38653,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -39407,7 +39544,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -39416,7 +39553,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -39450,7 +39587,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -39492,7 +39628,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -40244,7 +40380,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -40352,7 +40488,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -40903,7 +41039,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -40968,7 +41104,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -41002,7 +41138,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -41052,7 +41188,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -41198,7 +41334,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -41369,7 +41505,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -41395,7 +41531,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -41669,7 +41805,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -42021,8 +42157,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -42032,15 +42171,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -42228,6 +42367,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -42280,7 +42420,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -42344,6 +42484,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -42355,9 +42504,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+5341)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -42591,7 +42741,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -42615,8 +42765,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -42790,15 +42940,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+5351, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+5341, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -42909,14 +43059,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -43200,7 +43353,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -43344,7 +43497,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -43516,7 +43669,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*int8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+5391, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+5381, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -43571,21 +43724,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+5395, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5385, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+5402, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+5392, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+5415, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+5405, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+5418, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+5408, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+5423, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+5413, 1)
 			}
 		}
 	}
@@ -43677,11 +43830,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity int8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -43812,8 +43965,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -44048,7 +44201,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -44149,594 +44301,598 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
-		goto __100
-	case OP_NotFound:
-		goto __101
-	case OP_Found:
-		goto __102
 
-	case OP_SeekRowid:
+	case OP_IfNoHope:
+		goto __100
+	case OP_NoConflict:
+		goto __101
+	case OP_NotFound:
+		goto __102
+	case OP_Found:
 		goto __103
 
-	case OP_NotExists:
+	case OP_SeekRowid:
 		goto __104
 
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(*(*int32)(unsafe.Pointer(db + 432)) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -44745,56 +44901,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -44802,20 +44958,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -44823,124 +44980,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+5425, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5446, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+5415, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+5436, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5453, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+5443, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -44948,10 +45105,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -44962,9 +45119,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -44972,171 +45129,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint64(uintptr(0)+24))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -45144,95 +45301,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = int8(0)
@@ -45240,231 +45397,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -45473,95 +45630,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -45571,189 +45728,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -45762,38 +45923,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -45801,9 +45962,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -45814,298 +45975,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -46115,144 +46277,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -46260,353 +46422,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len))
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = int8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+5477,
+	Xsqlite3VdbeError(tls, p, ts+5467,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*int8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -46620,319 +46782,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*int8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -46940,467 +47091,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+5518, 0)
+	Xsqlite3VdbeError(tls, p, ts+5508, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+5569, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+5559, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5591, 0)
+		ts+5581, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+5645, 0)
+		ts+5635, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 5700
+				return ts + 5690
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 5748
+					return ts + 5738
 				}
-				return ts + 5791
+				return ts + 5781
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5832)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+5822)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -47408,67 +47570,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -47479,24 +47641,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -47504,30 +47666,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -47543,22 +47705,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -47572,133 +47734,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1538
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -47706,18 +47868,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -47728,92 +47890,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -47831,106 +47993,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -47939,108 +48101,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48048,14 +48210,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -48065,108 +48227,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, int8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -48185,35 +48347,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -48221,123 +48383,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -48347,52 +48509,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -48404,15 +48566,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -48420,13 +48583,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -48439,11 +48602,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -48454,38 +48617,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -48497,47 +48660,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -48546,35 +48709,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -48583,51 +48746,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -48637,72 +48800,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48710,43 +48873,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48754,84 +48917,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48841,34 +49009,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -48877,10 +49045,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -48897,14 +49065,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48917,21 +49085,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -48943,62 +49111,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+5860)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+5850)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -49011,56 +49179,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -49071,54 +49239,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -49126,72 +49294,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -49200,55 +49368,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 5877
+	goto __799
+__798:
+	zSchema = ts + 5867
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+5891,
+		ts+5881,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -49258,66 +49426,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -49326,151 +49494,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+5934, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+5924, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -49478,10 +49647,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -49501,26 +49670,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -49532,7 +49701,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -49543,170 +49712,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -49723,146 +49892,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -49870,70 +50039,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+5971,
+		ts+5961,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 6023
+				return ts + 6013
 			}
-			return ts + 6028
+			return ts + 6018
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -49941,17 +50110,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -49961,14 +50130,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -49978,197 +50147,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+6035, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+6025, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+5341, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6054, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -50182,27 +50351,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -50210,72 +50379,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.Xmemset(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -50285,192 +50454,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -50479,63 +50648,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= int8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -50545,104 +50714,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+6064, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+3647, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -50650,52 +50819,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+6070,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -50814,8 +50987,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -50835,7 +51008,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -50855,8 +51028,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -50887,8 +51060,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -50921,8 +51094,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6290, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6290, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51002,8 +51175,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+6331, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+6331, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -51072,7 +51245,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -51100,12 +51273,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 3647
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51149,7 +51322,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -51232,7 +51405,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -53752,6 +53925,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+6365, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+6373+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6392+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+5867+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6411+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+6411+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -53771,7 +53972,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -53826,7 +54026,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6365, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+6425, zDb) == 0) {
 		goto __8
 	}
 
@@ -53947,7 +54147,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6370) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+6430) != 0) {
 		goto __33
 	}
 	goto __14
@@ -53955,73 +54155,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -54033,28 +54251,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -54065,160 +54283,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6372, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+6432, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6376, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+6436, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6380, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+6440, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -54227,8 +54446,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -54236,19 +54455,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -54256,81 +54475,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6389, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6449, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6420, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6480, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6457, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -54343,141 +54562,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+6475, libc.VaList(bp+16, zCol))
+		ts+6535, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6510
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6570
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 6519
+		zErr = ts + 6579
 	} else {
-		zErr = ts + 6534
+		zErr = ts + 6594
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6556, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6616, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6569, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6579, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6629, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+6639, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -54521,15 +54740,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 6586
+	var zIn uintptr = ts + 6646
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 6614
+		zIn = ts + 6674
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 6632
+		zIn = ts + 6692
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 6650
+		zIn = ts + 6710
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+6668, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+6728, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -54608,10 +54827,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6688
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6748
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6693
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6753
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -54658,7 +54877,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+6699, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+6759, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -54722,7 +54941,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+6716, libc.VaList(bp, pExpr))
+								ts+6776, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -54738,7 +54957,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+6780,
+							Xsqlite3ErrorMsg(tls, pParse, ts+6840,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -54752,7 +54971,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+6816, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+6876, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -54775,30 +54994,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6844, libc.VaList(bp+16, pExpr))
+						ts+6904, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 6887
+						zType = ts + 6947
 					} else {
-						zType = ts + 6894
+						zType = ts + 6954
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+6904, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6964, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6932, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+6992, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+6954,
+					Xsqlite3ErrorMsg(tls, pParse, ts+7014,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+6998,
+						ts+7058,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -54870,7 +55089,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+7046, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+7106, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -54886,7 +55105,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+7057, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+7117, pExpr, pExpr)
 			}
 
 			break
@@ -54942,7 +55161,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+6457, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -55017,7 +55236,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7068, libc.VaList(bp, i, zType, mx))
+		ts+7128, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -55037,7 +55256,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7124, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7184, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -55072,7 +55291,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+7158, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+7218, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -55129,7 +55348,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+7164, libc.VaList(bp, i+1))
+				ts+7224, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -55157,7 +55376,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7225, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7285, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -55371,7 +55590,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7256, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7316, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -55411,7 +55630,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7158) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7218) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -55422,7 +55641,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7295) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+7355) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -55434,7 +55653,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+7301, 0)
+						ts+7361, 0)
 					return WRC_Abort
 				}
 
@@ -55534,12 +55753,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -55575,12 +55794,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -55690,33 +55909,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) int8 {
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) int8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -55786,7 +56106,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -56121,7 +56442,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6457, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
 		return
 	}
 
@@ -56196,7 +56517,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+7360, libc.VaList(bp, mxHeight))
+			ts+7420, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -56445,10 +56766,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7408,
+			Xsqlite3ErrorMsg(tls, pParse, ts+7468,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 7452
+						return ts + 7512
 					}
 					return ts + 1538
 				}(), nElem))
@@ -56489,7 +56810,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7454)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+7514)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -56515,7 +56836,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7456, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7516, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -56543,7 +56864,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7490, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7550, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -56590,7 +56911,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7510,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7570,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -56615,7 +56936,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7553, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7613, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -57190,7 +57511,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7576,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7636,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -57313,7 +57634,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7606, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7666, libc.VaList(bp, zObject))
 	}
 }
 
@@ -57369,10 +57690,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+6688) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6748) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+6693) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+6753) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -57803,13 +58124,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff int8) int32
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+7629) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7689) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7637) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7697) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+7643) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+7703) == 0 {
 		return 1
 	}
 	return 0
@@ -58013,7 +58334,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7647, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7707, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -58091,7 +58412,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7694, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7754, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -58185,7 +58506,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 7725
+		var zFmt uintptr = ts + 7785
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -58203,7 +58524,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+6457, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
 	}
 }
 
@@ -58244,7 +58565,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7769, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7829, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -58274,11 +58595,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7792, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7852, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1538
 			}
-			return ts + 7811
+			return ts + 7871
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -58405,7 +58726,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7823, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+7883, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -58420,12 +58741,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7841, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+7901, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1538
 		}
-		return ts + 7811
+		return ts + 7871
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -58446,7 +58768,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7454)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7514)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -58455,7 +58777,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7862)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+7922)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -58841,8 +59163,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+7864, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7867,
+			if Xsqlite3_strnicmp(tls, z, ts+7924, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+7927,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 4916
@@ -58918,7 +59240,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7894,
+				Xsqlite3ErrorMsg(tls, pParse, ts+7954,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -59004,8 +59326,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -59091,14 +59413,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 7924, ts + 7929, ts + 7934, ts + 6175, ts + 6170}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 7984, ts + 7989, ts + 7994, ts + 6175,
+				ts + 6170, ts + 8002}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 7942
+						return ts + 8010
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -59112,7 +59436,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -59135,10 +59459,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -59238,7 +59562,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -59368,12 +59692,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -59382,110 +59707,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7894,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7954,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -59528,13 +59866,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -59544,11 +59882,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -59571,11 +59909,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -59584,15 +59922,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -59619,20 +59957,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -59641,9 +59979,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -59681,14 +60019,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+7947, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8015, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -59699,17 +60039,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -59721,128 +60061,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7974, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8042, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -59850,42 +60190,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7576,
+	Xsqlite3ErrorMsg(tls, pParse, ts+7636,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -59908,23 +60248,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -59941,42 +60281,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+6457, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+6517, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -59997,15 +60339,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -60015,22 +60357,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -60039,21 +60381,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -60063,27 +60405,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+7998, 0)
+		ts+8066, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -60092,7 +60434,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -60103,7 +60445,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]int8)(unsafe.Pointer(ts + 8048))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 8116))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -61478,18 +61820,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -61519,7 +61861,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -61532,12 +61874,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -61545,6 +61985,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -61559,81 +62039,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -61655,34 +62062,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -61772,7 +62178,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -61780,7 +62186,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -61831,11 +62237,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8056, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8064, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8126, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -61847,13 +62253,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8092,
+		ts+8154,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8267,
+			ts+8329,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -61863,10 +62269,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8441, libc.VaList(bp, zDb, zDb))
+		ts+8503, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+8588, 0)
+			ts+8650, 0)
 	}
 }
 
@@ -61930,7 +62336,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8739, libc.VaList(bp, zName))
+		ts+8801, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -61940,7 +62346,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8798, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+8860, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -61949,7 +62355,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8804, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8866, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -61990,19 +62396,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+8831, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+8893, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9015,
+		ts+9077,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+9320, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+9382, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9336,
+		ts+9398,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -62010,7 +62416,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9394, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+9456, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -62022,7 +62428,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9659, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+9721, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -62034,7 +62440,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9672,
+		ts+9734,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -62080,12 +62486,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9710, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+9772, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+9742, 0)
+			ts+9804, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -62095,11 +62501,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9769)
+				ts+9831)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+9828)
+				ts+9890)
 		}
 
 		if pDflt != 0 {
@@ -62112,12 +62518,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+9881)
+					ts+9943)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9927)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+9989)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -62128,7 +62534,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9954,
+			ts+10016,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -62150,7 +62556,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+10100,
+				ts+10162,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -62198,14 +62604,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10330, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10392, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10364, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+10426, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -62233,7 +62639,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10394, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+10456, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -62273,18 +62679,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 10413
+		zType = ts + 10475
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 10418
+		zType = ts + 10480
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+10432,
+		Xsqlite3ErrorMsg(tls, pParse, ts+10494,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 10450
+					return ts + 10512
 				}
-				return ts + 10467
+				return ts + 10529
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -62368,7 +62774,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10485, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10547, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -62385,17 +62791,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10506,
+		ts+10568,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10688,
+		ts+10750,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9659, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+9721, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -62590,7 +62996,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -62653,10 +63059,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10819,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+10881,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 10842
+				return ts + 10904
 			}
 			return ts + 1538
 		}(), zWhen,
@@ -62698,8 +63104,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+10844, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+10906, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -62716,7 +63122,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -62738,7 +63144,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+10852, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+10914, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -62778,10 +63184,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))
 				*(*int8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = int8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10858, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+10920, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*int8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 10842
+							return ts + 10904
 						}
 						return ts + 1538
 					}()))
@@ -62957,8 +63363,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -63041,15 +63447,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -63077,7 +63483,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -63110,13 +63516,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63129,7 +63535,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -63144,7 +63550,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -63200,8 +63606,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -63249,7 +63655,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -63317,8 +63723,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -63360,11 +63766,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.Xmemset(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.Xmemset(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -63457,8 +63863,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -63476,16 +63882,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -63500,31 +63906,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -63542,8 +63948,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -63569,9 +63975,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -63599,8 +64005,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -63637,7 +64043,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -63661,7 +64067,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+10863, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+10925, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -63742,17 +64148,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10485, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10547, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10870,
+	Xsqlite3ErrorMsg(tls, pParse, ts+10932,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 10898
+				return ts + 10960
 			}
 			return ts + 6111
 		}(),
@@ -63763,7 +64169,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10910, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10972, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -63780,10 +64186,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1538, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10958, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+11020, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11079, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11141, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -63901,11 +64307,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11097},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11118},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11138},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11157},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11176}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11159},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11180},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11200},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11219},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 11238}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -63939,7 +64345,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11199, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+11261, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -63948,10 +64354,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+11222,
+					ts+11284,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+11252, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+11314, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -63969,9 +64375,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 11270, FzCols: ts + 11283},
-	{FzName: ts + 11296, FzCols: ts + 11309},
-	{FzName: ts + 11337},
+	{FzName: ts + 11332, FzCols: ts + 11345},
+	{FzName: ts + 11358, FzCols: ts + 11371},
+	{FzName: ts + 11399},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -63990,7 +64396,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -64069,7 +64474,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -64115,13 +64520,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -64134,11 +64539,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -64162,17 +64567,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11350}
+	FzName:     ts + 11412}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -64183,8 +64588,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -64227,7 +64632,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -64255,7 +64660,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -64322,7 +64727,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -64338,8 +64743,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -64356,9 +64761,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -64366,14 +64771,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -64381,31 +64786,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -64413,7 +64818,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11360}
+	FzName:     ts + 11422}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -64427,20 +64832,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+11370,
+		Xsqlite3_str_appendf(tls, bp+24, ts+11432,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+11375, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+11437, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -64482,7 +64887,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+11381, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+11443, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -64496,7 +64901,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11387}
+	FzName:     ts + 11449}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -64540,7 +64945,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+11396, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+11458, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -64557,7 +64962,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11270, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+11332, uint64(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -64713,7 +65118,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11406, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11468, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -64770,7 +65175,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11406, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+11468, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -64817,9 +65222,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11410)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+11472)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11414)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11476)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -64905,16 +65310,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1538
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*int8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -64924,15 +65329,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*int8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+11418, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+11480, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+11429, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11491, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+11439, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+11501, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -65012,7 +65417,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -65026,42 +65431,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -65135,15 +65540,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -65208,11 +65613,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11296, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+11358, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+11451,
-			ts+11505,
+			ts+11513,
+			ts+11567,
 			zDb)
 	}
 	return rc
@@ -65259,10 +65664,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11270, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+11332, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+11557, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+11619, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -65320,12 +65725,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+6365, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+6425, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -65336,13 +65741,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -65363,128 +65771,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+3819)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+3819)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+11660, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+11598, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11601,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11638, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11663,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11700, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.Xmemset(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11668, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11730, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+11697, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+11759, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -65494,89 +65925,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1474, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1474, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+11765, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+11827, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -65630,14 +66061,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11793, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11855, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11814, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11876, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -65645,7 +66076,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11840, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+11902, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -65687,42 +66118,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -65731,13 +66168,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -65756,7 +66193,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11862}
+	FzName:     ts + 11924}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -65769,7 +66206,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 11876}
+	FzName:     ts + 11938}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -65783,7 +66220,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11890, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+11952, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -65815,7 +66252,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+11914,
+						ts+11976,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -65990,7 +66427,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+11960, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12022, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -66016,11 +66453,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+11983, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+12045, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+11989, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+12051, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+11995, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12057, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -66067,7 +66504,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 7637
+		zCol = ts + 7697
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -66091,7 +66528,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12022, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12084, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -66316,6 +66753,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -66328,13 +66768,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -66359,25 +66799,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+6365) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+6425) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8056, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6365, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12037+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12056+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5877+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6392+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6411+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5867+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+12070)
+						ts+6373)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12056+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6411+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+5877)
+						ts+5867)
 				}
 			}
 		}
@@ -66398,12 +66838,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+8056, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12056+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5877)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12037+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+6365, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6411+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+5867)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6392+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+12070)
+					ts+6373)
 			}
 		}
 	}
@@ -66434,7 +66874,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12089, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+12099, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -66452,14 +66892,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 12097
+			zMsg = ts + 12107
 		} else {
-			zMsg = ts + 12110
+			zMsg = ts + 12120
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6569, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6629, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+6579, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+6639, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -66489,12 +66929,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+8056, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5877+7) == 0 {
-			return ts + 12056
+	if Xsqlite3_strnicmp(tls, zName, ts+6365, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+5867+7) == 0 {
+			return ts + 6411
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+12070+7) == 0 {
-			return ts + 12037
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+6373+7) == 0 {
+			return ts + 6392
 		}
 	}
 	return zName
@@ -66852,7 +67292,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5877)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+5867)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -66878,7 +67318,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6365, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+6425, zName) {
 				goto __3
 			}
 
@@ -66931,13 +67371,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12124, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12134, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12141, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12151, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -66979,9 +67419,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+8056, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+6365, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12161,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12171,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -67141,9 +67581,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -67159,7 +67599,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+12203, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12213, 0)
 	return
 __4:
 	;
@@ -67187,9 +67627,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 10413
+			return ts + 10475
 		}
-		return ts + 8798
+		return ts + 8860
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -67205,9 +67645,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -67238,12 +67678,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12244,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12254,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 10413
+				return ts + 10475
 			}
-			return ts + 8798
+			return ts + 8860
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -67258,7 +67698,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12265, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12275, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -67345,7 +67785,7 @@ var nullRow = [6]int8{int8(6), int8(0), int8(0), int8(0), int8(0), int8(0)}
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+12300, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+12310, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -67369,7 +67809,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12317, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+12327, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -67389,7 +67829,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12300
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 12310
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -67401,7 +67841,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+12300, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+12310, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -67435,7 +67875,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12351, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12361, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -67443,13 +67883,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12374, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+12384, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12381, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+12391, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -67486,7 +67926,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12391, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12401, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -67650,10 +68090,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12417,
+			Xsqlite3ErrorMsg(tls, pParse, ts+12427,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12462, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12472, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -67684,7 +68124,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+12503, 0)
+			ts+12513, 0)
 	}
 }
 
@@ -67729,7 +68169,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12555, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12565, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -67818,7 +68258,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+12596, 0)
+		ts+12606, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -67913,7 +68353,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12652, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+12662, 0)
 	goto generated_done
 __2:
 	;
@@ -67926,13 +68366,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12695, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+12705, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12703, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+12713, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -67959,13 +68399,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+12710,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12720,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -68087,12 +68534,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1538
-		zSep2 = ts + 12741
+		zSep2 = ts + 12751
 		zEnd = ts + 4941
 	} else {
-		zSep = ts + 12743
-		zSep2 = ts + 12747
-		zEnd = ts + 12752
+		zSep = ts + 12753
+		zSep2 = ts + 12757
+		zEnd = ts + 12762
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -68100,7 +68547,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+12755, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+12765, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*int8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = int8('(')
@@ -68138,11 +68585,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1538,
-	ts + 12769,
-	ts + 12775,
-	ts + 12780,
+	ts + 12779,
+	ts + 12785,
+	ts + 12790,
+	ts + 12795,
 	ts + 12785,
 }
 
@@ -68550,10 +68998,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+12791,
+						ts+12801,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1538)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+12824,
+					Xsqlite3ErrorMsg(tls, pParse, ts+12834,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -68572,11 +69020,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+12851, 0)
+				ts+12861, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12901, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+12911, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -68610,7 +69058,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+12933, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+12943, 0)
 			return
 		}
 	}
@@ -68635,11 +69083,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 8798
-			zType2 = ts + 12977
+			zType = ts + 8860
+			zType2 = ts + 12987
 		} else {
-			zType = ts + 10413
-			zType2 = ts + 12983
+			zType = ts + 10475
+			zType2 = ts + 12993
 		}
 
 		if pSelect != 0 {
@@ -68701,7 +69149,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -68710,11 +69158,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+12988, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+12998, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13003,
+			ts+13013,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -68730,13 +69178,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+13101,
+					ts+13111,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+13143, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+13153, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -68751,7 +69199,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9320) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+9382) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -68781,7 +69229,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13177, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13187, 0)
 	goto create_view_fail
 __1:
 	;
@@ -68797,7 +69245,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10413, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+10475, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -68879,7 +69327,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13213, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13223, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -68907,8 +69355,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, int8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -69005,13 +69452,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13243, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13253, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13258,
+		ts+13268,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -69052,10 +69499,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13325, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+13335, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11222,
+				ts+11284,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -69087,12 +69534,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+13339,
+			ts+13349,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+13384,
+		ts+13394,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -69120,11 +69567,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8056, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) == 0 {
 		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+3270, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7057, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+7117, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -69202,9 +69649,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -69263,21 +69710,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13451, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13461, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13479, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13489, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13513, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13523, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -69289,7 +69736,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11414, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11476, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -69353,7 +69800,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13545,
+		ts+13555,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -69365,7 +69812,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13608, 0)
+		ts+13618, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -69450,7 +69897,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13702,
+		ts+13712,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -69677,12 +70124,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+13748,
+				Xsqlite3ErrorMsg(tls, pParse, ts+13758,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 13776
+							return ts + 13786
 						}
-						return ts + 13782
+						return ts + 13792
 					}()))
 				return 1
 			}
@@ -69803,7 +70250,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13787, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+13797, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -69822,7 +70269,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13793,
+		ts+13803,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -69848,26 +70295,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8056, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13843, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13853, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13871, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13881, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13896, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13906, 0)
 	goto exit_create_index
 __17:
 	;
@@ -69881,7 +70328,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13787, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+13797, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -69896,7 +70343,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13930, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13940, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -69908,7 +70355,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13964, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13974, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -69937,7 +70384,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+13988, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+13998, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -69958,9 +70405,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -69999,7 +70446,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13787)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+13797)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -70100,7 +70547,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14011, 0)
+		ts+14021, 0)
 	goto exit_create_index
 __56:
 	;
@@ -70317,7 +70764,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14072, libc.VaList(bp+48, 0))
+		ts+14082, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -70369,8 +70816,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14114, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14124, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -70416,12 +70863,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+14131,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+14141,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1538
 			}
-			return ts + 14151
+			return ts + 14161
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -70429,7 +70876,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14159,
+		ts+14169,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -70443,7 +70890,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+14218, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+14228, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -70604,7 +71051,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14245, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14255, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -70619,7 +71066,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14263, libc.VaList(bp+8, 0))
+		ts+14273, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -70630,9 +71077,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -70658,9 +71105,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14336,
+		ts+14346,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+11410, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+11472, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -70795,7 +71242,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14396,
+			Xsqlite3ErrorMsg(tls, pParse, ts+14406,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -71003,12 +71450,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14432,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14442,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 14468
+				return ts + 14478
 			}
-			return ts + 14471
+			return ts + 14481
 		}()))
 	goto append_from_error
 __1:
@@ -71177,7 +71624,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14477, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+14487, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -71213,9 +71660,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 14483
+				return ts + 14493
 			}
-			return ts + 14492
+			return ts + 14502
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -71240,7 +71687,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 14477, ts + 14499, ts + 14483}
+var az = [3]uintptr{ts + 14487, ts + 14509, ts + 14493}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -71255,7 +71702,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14507, 0)
+				ts+14517, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -71392,14 +71839,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+14577, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+14587, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+14588, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+14598, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1551, 1)
@@ -71425,11 +71872,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+11983, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14591, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+14601, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -71559,7 +72006,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14600, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14610, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -71655,7 +72102,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+14646, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+14656, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -71848,7 +72295,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14676, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14686, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -72128,7 +72575,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14707,
+		Xsqlite3ErrorMsg(tls, pParse, ts+14717,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -72160,11 +72607,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14740, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14750, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14769, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14779, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -72668,7 +73115,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14807)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+14817)
 __62:
 	;
 delete_from_cleanup:
@@ -72783,7 +73230,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11270) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+11332) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -73013,7 +73460,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 6175, ts + 6170, ts + 7929, ts + 7924, ts + 6165}
+var azType2 = [5]uintptr{ts + 6175, ts + 6170, ts + 7989, ts + 7984, ts + 6165}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -73072,7 +73519,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+14820, -1)
+					Xsqlite3_result_error(tls, context, ts+14830, -1)
 					return
 				}
 				iVal = -iVal
@@ -73376,7 +73823,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+14837, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+14847, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -73722,7 +74169,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+14842, -1)
+		Xsqlite3_result_error(tls, context, ts+14852, -1)
 		return
 	}
 	if argc == 3 {
@@ -73732,7 +74179,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+14875, -1)
+				ts+14885, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -73831,7 +74278,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+14920, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+14930, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -73846,21 +74293,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = int8('\'')
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = int8(0)
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = int8('\'')
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = int8(0)
 				*(*int8)(unsafe.Pointer(zText)) = int8('X')
 				*(*int8)(unsafe.Pointer(zText + 1)) = int8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -73868,7 +74315,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+14927, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+14937, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -73982,6 +74429,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1538
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -74184,7 +74744,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 10842}
+var azOne = [1]uintptr{ts + 10904}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -74220,7 +74780,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(j))) = int8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+14930, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+14940, 4, uintptr(0))
 	}
 }
 
@@ -74245,7 +74805,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+12022, -1)
+		Xsqlite3_result_error(tls, context, ts+12084, -1)
 		return
 	}
 
@@ -74323,7 +74883,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+14820, -1)
+			Xsqlite3_result_error(tls, context, ts+14830, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -74585,7 +75145,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14935, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+14945, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -74605,14 +75165,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+14941, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14951, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+14941, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+14951, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14941, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14941, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14951, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+14951, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -74742,17 +75302,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -74811,6 +75371,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -74851,108 +75412,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14946},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14966},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14979},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 14997},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15006},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15014},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15014},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15029},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15055},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15080},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15089},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15100},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15107},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15121},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15121},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15127},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15127},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15133},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15133},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15138},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15138},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15138},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15142},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15142},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15142},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15146},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15153},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15161},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15168},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15174},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15181},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15188},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15196},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15201},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15205},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15205},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 14956},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 14976},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 14989},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 15007},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15016},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15024},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 15024},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15039},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15065},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15090},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15099},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 15110},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 15117},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15131},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15131},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15137},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15137},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15143},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 15143},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15148},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 15148},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15148},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15152},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 15152},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 15152},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15156},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 15163},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 15171},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15178},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15184},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15191},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15198},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15206},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15211},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15217},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15223},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15227},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15234},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15241},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15252},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15259},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15274},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15291},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15302},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15308},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15326},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15334},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15348},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15356},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15365},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15365},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15382},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15386},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15392},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15396},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15396},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15215},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15215},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15221},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15227},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15233},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15237},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15237},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 15243},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15250},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15257},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15268},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15275},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 15290},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15307},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15318},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15324},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15342},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15350},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15364},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15372},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15381},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15388},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15398},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15402},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15402},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15415},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14941},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14941},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6510},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6510},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15420},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15425},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15433},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15439},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15445},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15448},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15452},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15458},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15448},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15463},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15467},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15471},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15477},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15481},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15486},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15491},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15496},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15408},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 15418},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 15431},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14951},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 14951},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6570},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 6570},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15436},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15441},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15449},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15455},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15461},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15464},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 15468},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 15474},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15464},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15479},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15483},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15487},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15493},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15497},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15502},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15506},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15510},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15514},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15524},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15529},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15507},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15512},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15518},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15522},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15526},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15530},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15535},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15541},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15547},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15552},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15560},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15568},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15571},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6510},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15576}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15540},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15545},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15551},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15557},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15563},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15568},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 15576},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15584},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 15587},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 6570},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 15592}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -75073,7 +75636,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15580,
+				ts+15596,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -75733,8 +76296,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6376, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6372, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 6436, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 6432, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -76234,7 +76797,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7894, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+7954, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -76702,7 +77265,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15625,
+		ts+15641,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -76727,7 +77290,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+15666,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15682,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -76876,7 +77439,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15698,
+		ts+15714,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -76886,7 +77449,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15750, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15766, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -76938,7 +77501,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15775,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15791,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -76946,7 +77509,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15821, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15837, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -77358,7 +77921,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15842)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+15858)
 __125:
 	;
 insert_cleanup:
@@ -77674,8 +78237,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 					fallthrough
 				case OE_Fail:
 					{
-						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+11983, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+						var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 							(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 						Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 							onError, iReg)
 						Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -78764,7 +79328,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -79210,6 +79774,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -79248,7 +79813,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12022, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+12084, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -79257,7 +79822,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 15856
+		zEntry = ts + 15872
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -79272,7 +79837,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+11983, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+12045, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -79308,7 +79873,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+15879, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+15895, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/')) {
@@ -79322,7 +79887,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15888, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+15904, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -79346,7 +79911,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15892, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+15908, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -79364,7 +79929,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15898, libc.VaList(bp+16, zEntry, zFile))
+		ts+15914, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -79391,7 +79956,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15941, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+15957, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -79429,7 +79994,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+15973, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+15989, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -79439,7 +80004,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 16010,
+	ts + 16026,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -79595,7 +80160,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+16013, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+16029, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -79604,62 +80169,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 5041,
-	ts + 16052,
-	ts + 8798,
-	ts + 16056,
-	ts + 16061,
-	ts + 16064,
-	ts + 16074,
-	ts + 16084,
+	ts + 16068,
+	ts + 8860,
+	ts + 16072,
+	ts + 16077,
+	ts + 16080,
 	ts + 16090,
-	ts + 16094,
-	ts + 16099,
-	ts + 16104,
-	ts + 16112,
-	ts + 16123,
-	ts + 16126,
-	ts + 16133,
-	ts + 16094,
-	ts + 16099,
-	ts + 16140,
-	ts + 16145,
-	ts + 16148,
-	ts + 16155,
-	ts + 16090,
-	ts + 16094,
+	ts + 16100,
+	ts + 16106,
+	ts + 16110,
+	ts + 16115,
+	ts + 16120,
+	ts + 16128,
+	ts + 16139,
+	ts + 16142,
+	ts + 16149,
+	ts + 16110,
+	ts + 16115,
+	ts + 16156,
 	ts + 16161,
-	ts + 16166,
+	ts + 16164,
 	ts + 16171,
-	ts + 16094,
-	ts + 16175,
-	ts + 16099,
-	ts + 16183,
+	ts + 16106,
+	ts + 16110,
+	ts + 16177,
+	ts + 16182,
 	ts + 16187,
-	ts + 16192,
-	ts + 11414,
-	ts + 11410,
-	ts + 16198,
+	ts + 16110,
+	ts + 16191,
+	ts + 16115,
+	ts + 16199,
 	ts + 16203,
 	ts + 16208,
-	ts + 16052,
-	ts + 16094,
-	ts + 16213,
-	ts + 16220,
-	ts + 16227,
-	ts + 8798,
-	ts + 16235,
-	ts + 5044,
-	ts + 16241,
-	ts + 16052,
-	ts + 16094,
-	ts + 16246,
+	ts + 11476,
+	ts + 11472,
+	ts + 16214,
+	ts + 16219,
+	ts + 16224,
+	ts + 16068,
+	ts + 16110,
+	ts + 16229,
+	ts + 16236,
+	ts + 16243,
+	ts + 8860,
 	ts + 16251,
-	ts + 15448,
-	ts + 16256,
-	ts + 16269,
-	ts + 16278,
+	ts + 5044,
+	ts + 16257,
+	ts + 16068,
+	ts + 16110,
+	ts + 16262,
+	ts + 16267,
+	ts + 15464,
+	ts + 16272,
 	ts + 16285,
-	ts + 16296,
+	ts + 16294,
+	ts + 16301,
+	ts + 16312,
 }
 
 // Definitions of all built-in pragmas
@@ -79677,238 +80242,238 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [66]PragmaName{
-	{FzName: ts + 16304,
+	{FzName: ts + 16320,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16319,
+	{FzName: ts + 16335,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 16334,
+	{FzName: ts + 16350,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16346,
+	{FzName: ts + 16362,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 16362,
+	{FzName: ts + 16378,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 16285,
+	{FzName: ts + 16301,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16375,
+	{FzName: ts + 16391,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16387,
+	{FzName: ts + 16403,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 16407,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 16423,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 16439,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 16444,
+	{FzName: ts + 16460,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 16459,
+	{FzName: ts + 16475,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16475,
+	{FzName: ts + 16491,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 16489,
+	{FzName: ts + 16505,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 16502,
+	{FzName: ts + 16518,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 16516,
+	{FzName: ts + 16532,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 16535,
+	{FzName: ts + 16551,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 16554,
+	{FzName: ts + 16570,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 16577,
+	{FzName: ts + 16593,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 16586,
+	{FzName: ts + 16602,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 16604,
+	{FzName: ts + 16620,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 16621,
+	{FzName: ts + 16637,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 16634,
+	{FzName: ts + 16650,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 16649,
+	{FzName: ts + 16665,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 16667,
+	{FzName: ts + 16683,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 16677,
+	{FzName: ts + 16693,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 16691,
+	{FzName: ts + 16707,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 16707,
+	{FzName: ts + 16723,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 16732,
+	{FzName: ts + 16748,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 16751,
+	{FzName: ts + 16767,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 16762,
+	{FzName: ts + 16778,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 16773,
+	{FzName: ts + 16789,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 16785,
+	{FzName: ts + 16801,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16801,
+	{FzName: ts + 16817,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16814,
+	{FzName: ts + 16830,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16833,
+	{FzName: ts + 16849,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 16852,
+	{FzName: ts + 16868,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16865,
+	{FzName: ts + 16881,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16880,
+	{FzName: ts + 16896,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 16890,
+	{FzName: ts + 16906,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16902,
+	{FzName: ts + 16918,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 16911,
+	{FzName: ts + 16927,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 16922,
+	{FzName: ts + 16938,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 16932,
+	{FzName: ts + 16948,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 16944,
+	{FzName: ts + 16960,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 16955,
+	{FzName: ts + 16971,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 16967,
+	{FzName: ts + 16983,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 16984,
+	{FzName: ts + 17000,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 17003,
+	{FzName: ts + 17019,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 17029,
+	{FzName: ts + 17045,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 17044,
+	{FzName: ts + 17060,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17058,
+	{FzName: ts + 17074,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 17077,
+	{FzName: ts + 17093,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17091,
+	{FzName: ts + 17107,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17107,
+	{FzName: ts + 17123,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17119,
+	{FzName: ts + 17135,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 17130,
+	{FzName: ts + 17146,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 17141,
+	{FzName: ts + 17157,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 17153,
+	{FzName: ts + 17169,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17164,
+	{FzName: ts + 17180,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17185,
+	{FzName: ts + 17201,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17193,
+	{FzName: ts + 17209,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 17208,
+	{FzName: ts + 17224,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 17221,
+	{FzName: ts + 17237,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 17240,
+	{FzName: ts + 17256,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 17255,
+	{FzName: ts + 17271,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -79930,7 +80495,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 17271))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 17287))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -79942,10 +80507,10 @@ func Xsqlite3GetBoolean(tls *libc.TLS, z uintptr, dflt U8) U8 {
 
 func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 	if z != 0 {
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17296) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17312) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+17306) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+17322) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -79954,13 +80519,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+7942) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+8010) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17313) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17329) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+17318) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+17334) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -79975,9 +80540,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*int8)(unsafe.Pointer(z))) >= '0' && int32(*(*int8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*int8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+16246) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+16262) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+17330) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17346) == 0 {
 		return 2
 	} else {
 		return 0
@@ -79991,7 +80556,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+17337, 0)
+				ts+17353, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -80082,19 +80647,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 17399
+		zName = ts + 17415
 		break
 	case OE_SetDflt:
-		zName = ts + 17408
+		zName = ts + 17424
 		break
 	case OE_Cascade:
-		zName = ts + 17420
+		zName = ts + 17436
 		break
 	case OE_Restrict:
-		zName = ts + 17428
+		zName = ts + 17444
 		break
 	default:
-		zName = ts + 17437
+		zName = ts + 17453
 		break
 	}
 	return zName
@@ -80111,7 +80676,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 17447, ts + 17454, ts + 17462, ts + 17466, ts + 17330, ts + 17475,
+	ts + 17463, ts + 17470, ts + 17478, ts + 17482, ts + 17346, ts + 17491,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -80158,13 +80723,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 17479
+			zType = ts + 17495
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 17481
+			zType = ts + 17497
 		} else {
-			zType = ts + 7452
+			zType = ts + 7512
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17483,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17499,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -80172,7 +80737,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 17490, ts + 17495, ts + 17503}
+var azEnc = [4]uintptr{uintptr(0), ts + 17506, ts + 17511, ts + 17519}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -80323,14 +80888,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -80417,7 +80984,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+17511, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+17527, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -80678,7 +81245,7 @@ __18:
 	if !(zRight != 0) {
 		goto __63
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+17515) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+17531) == 0) {
 		goto __64
 	}
 	b = 2
@@ -80750,7 +81317,7 @@ __71:
 	goto __15
 
 __20:
-	zRet = ts + 17306
+	zRet = ts + 17322
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -80788,7 +81355,7 @@ __78:
 	if !(eMode == PAGER_LOCKINGMODE_EXCLUSIVE) {
 		goto __83
 	}
-	zRet = ts + 17296
+	zRet = ts + 17312
 __83:
 	;
 	returnSingleText(tls, v, zRet)
@@ -81038,7 +81605,7 @@ __116:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 544)) == 0) {
 		goto __119
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17520, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17536, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __119:
@@ -81079,7 +81646,7 @@ __123:
 		goto __125
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17545, 0)
+		ts+17561, 0)
 	goto __126
 __125:
 	if !(iDb != 1) {
@@ -81133,7 +81700,7 @@ __132:
 __134:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+17598) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+17614) == 0) {
 		goto __135
 	}
 
@@ -81230,9 +81797,9 @@ __148:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 17604
+			return ts + 17620
 		}
-		return ts + 17612
+		return ts + 17628
 	}(),
 		libc.VaList(bp+24, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -81301,7 +81868,7 @@ __163:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __164
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+17619, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+17635, libc.VaList(bp+80, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __165
 	}
@@ -81347,29 +81914,29 @@ __170:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __171
 	}
-	zType = ts + 10413
+	zType = ts + 10475
 	goto __172
 __171:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __173
 	}
-	zType = ts + 12695
+	zType = ts + 12705
 	goto __174
 __173:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __175
 	}
-	zType = ts + 17635
+	zType = ts + 17651
 	goto __176
 __175:
-	zType = ts + 8798
+	zType = ts + 8860
 __176:
 	;
 __174:
 	;
 __172:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17642,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17658,
 		libc.VaList(bp+88, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii3)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -81435,7 +82002,7 @@ __183:
 		goto __185
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17649, libc.VaList(bp+136, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17665, libc.VaList(bp+136, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -81445,7 +82012,7 @@ __183:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __186
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17654,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+17670,
 		libc.VaList(bp+160, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -81482,8 +82049,8 @@ __189:
 	if !(pIdx1 != 0) {
 		goto __191
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 560)) = [3]uintptr{ts + 17659, ts + 17661, ts + 16123}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17663,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 560)) = [3]uintptr{ts + 17675, ts + 17677, ts + 16139}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17679,
 		libc.VaList(bp+184, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -81516,7 +82083,7 @@ __192:
 	goto __193
 __195:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17669,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17685,
 		libc.VaList(bp+224, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -81538,7 +82105,7 @@ __196:
 		goto __198
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17673, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17689, libc.VaList(bp+248, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __197
 __197:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -81602,7 +82169,7 @@ __208:
 		goto __210
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7452, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7512, libc.VaList(bp+264, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __209
 __209:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -81618,7 +82185,7 @@ __211:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __213
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7452, libc.VaList(bp+272, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+7512, libc.VaList(bp+272, aPragmaName[i6].FzName))
 	goto __212
 __212:
 	i6++
@@ -81653,7 +82220,7 @@ __219:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __221
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17676,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+17692,
 		libc.VaList(bp+280, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -81661,7 +82228,7 @@ __219:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+17685))
+			ts+17701))
 	goto __220
 __220:
 	j2++
@@ -81850,7 +82417,7 @@ __249:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __250:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17690, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+17706, libc.VaList(bp+344, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 592)))
@@ -82067,7 +82634,7 @@ __277:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+17694, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+17710, libc.VaList(bp+360, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -82128,262 +82695,284 @@ __292:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 604)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__293:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __294
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __293
+	}
+	mxCol = -1
+	j4 = 0
+__295:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __297
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __298
+	}
+	mxCol++
+__298:
+	;
+	goto __296
+__296:
+	j4++
+	goto __295
+	goto __297
+__297:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __299
 	}
 	mxCol--
-	goto __293
+__299:
+	;
+	goto __294
+__293:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __294:
 	;
 	if !(mxCol >= 0) {
-		goto __295
+		goto __300
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 604)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 604)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__295:
+__300:
 	;
 	if !!(isQuick != 0) {
-		goto __296
+		goto __301
 	}
 	if !(pPk1 != 0) {
-		goto __297
+		goto __302
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 604)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+17718,
+		ts+17734,
 		libc.VaList(bp+368, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__298:
+__303:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __300
+		goto __305
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 604)), j4, r2+j4)
-	goto __299
-__299:
+	goto __304
+__304:
 	j4++
-	goto __298
-	goto __300
-__300:
+	goto __303
+	goto __305
+__305:
 	;
-__297:
+__302:
 	;
-__296:
+__301:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__301:
+__306:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __303
+		goto __308
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __304
+		goto __309
 	}
-	goto __302
-__304:
+	goto __307
+__309:
 	;
 	if !(bStrict != 0) {
-		goto __305
+		goto __310
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __306
-__305:
+	goto __311
+__310:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__306:
+__311:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __307
+		goto __312
 	}
-	goto __302
-__307:
+	goto __307
+__312:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __308
+		goto __313
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 604)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __309
-__308:
+	goto __314
+__313:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __310
+		goto __315
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 616)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		uint8((*Column)(unsafe.Pointer(pCol1)).Faffinity), bp+616)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 616)) != 0) {
-		goto __311
+		goto __316
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 616)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 616)))
-__311:
+__316:
 	;
-__310:
+__315:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 604))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __312
+		goto __317
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __313
-__312:
+	goto __318
+__317:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__313:
+__318:
 	;
-__309:
+__314:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __314
+		goto __319
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17754, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17770, libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __315
+		goto __320
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __316
-__315:
+	goto __321
+__320:
 	;
-__316:
+__321:
 	;
-__314:
+__319:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __317
+		goto __322
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17774,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17790,
 		libc.VaList(bp+392, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __318
-__317:
+	goto __323
+__322:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __319
+		goto __324
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17796,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17812,
 		libc.VaList(bp+416, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __320
-__319:
+	goto __325
+__324:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __321
+		goto __326
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 604)), j4, 3)
-__322:
+__327:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17819, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+17835, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+17821,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+17837,
 		libc.VaList(bp+432, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__321:
+__326:
 	;
-__320:
+__325:
 	;
-__318:
+__323:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __302
-__302:
+	goto __307
+__307:
 	j4++
-	goto __301
-	goto __303
-__303:
+	goto __306
+	goto __308
+__308:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __323
+		goto __328
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __324
+		goto __329
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 604)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__325:
+__330:
 	if !(k3 > 0) {
-		goto __327
+		goto __332
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __326
-__326:
+	goto __331
+__331:
 	k3--
-	goto __325
-	goto __327
-__327:
+	goto __330
+	goto __332
+__332:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+17841,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+17857,
 		libc.VaList(bp+448, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__324:
+__329:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__323:
+__328:
 	;
 	if !!(isQuick != 0) {
-		goto __328
+		goto __333
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__329:
+__334:
 	if !(pIdx5 != 0) {
-		goto __331
+		goto __336
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __332
+		goto __337
 	}
-	goto __330
-__332:
+	goto __335
+__337:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 604)), 0, 0, bp+624,
 		pPrior, r1)
@@ -82392,80 +82981,119 @@ __332:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 608))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17871)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+17876)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17892)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__338:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __340
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __341
+	}
+	goto __339
+__341:
+	;
+	if !(label6 == 0) {
+		goto __342
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__342:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 608))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __339
+__339:
+	kk++
+	goto __338
+	goto __340
+__340:
+	;
+	if !(label6 != 0) {
+		goto __343
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17887)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+17913)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__343:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __333
+		goto __344
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__334:
+__345:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __336
+		goto __347
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __337
+		goto __348
 	}
-	goto __335
-__337:
+	goto __346
+__348:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __346
+__346:
+	kk++
+	goto __345
+	goto __347
+__347:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 608))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 608))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+17940)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__344:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 624)))
 	goto __335
 __335:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __334
 	goto __336
 __336:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 608))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 608))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+17897)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __333:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 624)))
-	goto __330
-__330:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __329
-	goto __331
-__331:
-	;
-__328:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 604)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __338
+		goto __349
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+17924)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+17967)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__339:
+__350:
 	if !(pIdx5 != 0) {
-		goto __341
+		goto __352
 	}
 	if !(pPk1 == pIdx5) {
-		goto __342
+		goto __353
 	}
-	goto __340
-__342:
+	goto __351
+__353:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 608))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -82474,21 +83102,21 @@ __342:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __340
-__340:
+	goto __351
+__351:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __339
-	goto __341
-__341:
+	goto __350
+	goto __352
+__352:
 	;
 	if !(pPk1 != 0) {
-		goto __343
+		goto __354
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__343:
+__354:
 	;
-__338:
+__349:
 	;
 	goto __284
 __284:
@@ -82506,14 +83134,14 @@ __259:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __344
+		goto __355
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 600))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 17953
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 17996
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__344:
+__355:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -82521,27 +83149,27 @@ __344:
 
 __45:
 	if !!(zRight != 0) {
-		goto __345
+		goto __356
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __347
+		goto __358
 	}
 	goto pragma_out
-__347:
+__358:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __346
-__345:
+	goto __357
+__356:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __348
+		goto __359
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__349:
+__360:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __351
+		goto __362
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __352
+		goto __363
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -82550,25 +83178,25 @@ __349:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __351
-__352:
+	goto __362
+__363:
 	;
-	goto __350
-__350:
+	goto __361
+__361:
 	pEnc += 16
-	goto __349
-	goto __351
-__351:
+	goto __360
+	goto __362
+__362:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __353
+		goto __364
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17956, libc.VaList(bp+456, zRight))
-__353:
+	Xsqlite3ErrorMsg(tls, pParse, ts+17999, libc.VaList(bp+456, zRight))
+__364:
 	;
-__348:
+__359:
 	;
-__346:
+__357:
 	;
 	goto __15
 
@@ -82576,15 +83204,15 @@ __46:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __354
+		goto __365
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __356
+		goto __367
 	}
 	goto __15
-__356:
+__367:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -82592,41 +83220,41 @@ __356:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __357
+		goto __368
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__357:
+__368:
 	;
-	goto __355
-__354:
+	goto __366
+__365:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __358
+		goto __369
 	}
 	goto __15
-__358:
+__369:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__355:
+__366:
 	;
 	goto __15
 
 __47:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__359:
+__370:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __360
+		goto __371
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __359
-__360:
+	goto __370
+__371:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -82641,31 +83269,31 @@ __48:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __361
+		goto __372
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17313) == 0) {
-		goto __362
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17329) == 0) {
+		goto __373
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __363
-__362:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17981) == 0) {
-		goto __364
+	goto __374
+__373:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18024) == 0) {
+		goto __375
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __365
-__364:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+17466) == 0) {
-		goto __366
+	goto __376
+__375:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+17482) == 0) {
+		goto __377
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__366:
+__377:
 	;
-__365:
+__376:
 	;
-__363:
+__374:
 	;
-__361:
+__372:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -82675,10 +83303,10 @@ __361:
 
 __49:
 	if !(zRight != 0) {
-		goto __367
+		goto __378
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__367:
+__378:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -82698,19 +83326,19 @@ __50:
 
 __51:
 	if !(zRight != 0) {
-		goto __368
+		goto __379
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __370
+		goto __381
 	}
 	goto __15
-__370:
+__381:
 	;
-	goto __369
-__368:
+	goto __380
+__379:
 	opMask = U32(0xfffe)
-__369:
+__380:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -82719,86 +83347,86 @@ __369:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__371:
+__382:
 	if !(iDb <= iDbLast) {
-		goto __373
+		goto __384
 	}
 	if !(iDb == 1) {
-		goto __374
+		goto __385
 	}
-	goto __372
-__374:
+	goto __383
+__385:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__375:
+__386:
 	if !(k4 != 0) {
-		goto __377
+		goto __388
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __378
+		goto __389
 	}
-	goto __376
-__378:
+	goto __387
+__389:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__379:
+__390:
 	if !(pIdx6 != 0) {
-		goto __381
+		goto __392
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __382
+		goto __393
 	}
 	szThreshold = int16(0)
-	goto __381
-__382:
+	goto __392
+__393:
 	;
-	goto __380
-__380:
+	goto __391
+__391:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __379
-	goto __381
-__381:
+	goto __390
+	goto __392
+__392:
 	;
 	if !(szThreshold != 0) {
-		goto __383
+		goto __394
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__383:
+__394:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+17989,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+18032,
 		libc.VaList(bp+464, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __384
+		goto __395
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __385
-__384:
+	goto __396
+__395:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__385:
+__396:
 	;
-	goto __376
-__376:
+	goto __387
+__387:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __375
-	goto __377
-__377:
+	goto __386
+	goto __388
+__388:
 	;
-	goto __372
-__372:
+	goto __383
+__383:
 	iDb++
-	goto __371
-	goto __373
-__373:
+	goto __382
+	goto __384
+__384:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -82806,36 +83434,36 @@ __373:
 __52:
 	;
 	if !(zRight != 0) {
-		goto __386
+		goto __397
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__386:
+__397:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __53:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+632) == SQLITE_OK) {
-		goto __387
+		goto __398
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 632)))
-__387:
+__398:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+640) == SQLITE_OK) {
-		goto __388
+		goto __399
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 640)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))) {
-		goto __389
+		goto __400
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 640)))
-__389:
+__400:
 	;
-__388:
+__399:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -82844,10 +83472,10 @@ __55:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 648)) >= int64(0)) {
-		goto __390
+		goto __401
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 648))&int64(0x7fffffff)))
-__390:
+__401:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -82856,10 +83484,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) >= int64(0)) {
-		goto __391
+		goto __402
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) & int64(0x7fffffff))
-__391:
+__402:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -82867,10 +83495,10 @@ __391:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __392
+		goto __403
 	}
 
-__392:
+__403:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -82922,14 +83550,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 18007, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18012, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 18018, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18027, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18036, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 18044, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 18052},
-	{FzName: ts + 18059},
+	{FzName: ts + 18050, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18055, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 18061, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18070, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18079, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 18087, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 18095},
+	{FzName: ts + 18102},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -82981,7 +83609,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+18065)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18108)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -82989,7 +83617,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+18080, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18123, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -83002,16 +83630,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18087, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18130, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18093)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18136)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+18105)
+		Xsqlite3_str_appendall(tls, bp+32, ts+18148)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+4941, 1)
@@ -83194,13 +83822,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+18120)
+	Xsqlite3_str_appendall(tls, bp+32, ts+18163)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18128, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18171, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+18132, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+18175, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -83277,12 +83905,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+18136, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+18179, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -83291,19 +83919,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 4992
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+18164, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+18207, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+18195, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+18238, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 18203,
-	ts + 18210,
-	ts + 18222,
+	ts + 18246,
+	ts + 18253,
+	ts + 18265,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -83363,7 +83991,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14114)
+				corruptSchema(tls, pData, argv, ts+14124)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -83395,13 +84023,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+18233)
+			corruptSchema(tls, pData, argv, ts+18276)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+14114)
+				corruptSchema(tls, pData, argv, ts+14124)
 			}
 		}
 	}
@@ -83434,16 +84062,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8798
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 8860
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7862
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18246
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 7922
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 18289
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -83521,17 +84149,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+11697)
+		ts+11759)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -83540,44 +84177,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+18318)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+18361)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+18342,
+		ts+18385,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -83588,57 +84225,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -83727,8 +84364,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -83841,8 +84480,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -83853,8 +84492,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -83866,8 +84505,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -83907,7 +84546,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18376, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+18419, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -83937,7 +84576,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18406, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+18449, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -84033,7 +84672,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -84132,7 +84771,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -84450,8 +85089,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 10842
-		var zSp2 uintptr = ts + 10842
+		var zSp1 uintptr = ts + 10904
+		var zSp2 uintptr = ts + 10904
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -84459,13 +85098,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18425, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+18468, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18455))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 18498))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -84640,7 +85279,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+18489, libc.VaList(bp, 0))
+					ts+18532, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -84685,7 +85324,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+18539, libc.VaList(bp+8, zName))
+						ts+18582, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -84696,7 +85335,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+18603,
+							Xsqlite3ErrorMsg(tls, pParse, ts+18646,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -84740,7 +85379,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 6510, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 6570, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -85087,9 +85726,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -85327,16 +85963,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 18640
+		z = ts + 18683
 		break
 	case TK_INTERSECT:
-		z = ts + 18650
+		z = ts + 18693
 		break
 	case TK_EXCEPT:
-		z = ts + 18660
+		z = ts + 18703
 		break
 	default:
-		z = ts + 18667
+		z = ts + 18710
 		break
 	}
 	return z
@@ -85346,10 +85982,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18673, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18716, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -85369,6 +86008,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18739, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 18770
+		}
+		return ts + 1538
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -85435,6 +86081,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -85499,6 +86146,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -85553,7 +86201,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1103
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16235
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 16251
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -85692,13 +86340,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 16235
+				zCol = ts + 16251
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+11983, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+12045, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -85706,7 +86354,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+18696, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+18785, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -85771,7 +86419,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -85796,7 +86444,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 16235
+					zName = ts + 16251
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -85806,7 +86454,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+18696, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+18785, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -85822,7 +86470,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+18705, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+18794, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -85847,45 +86496,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -85895,14 +86547,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 18802
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -85912,9 +86596,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -85958,7 +86639,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -86109,7 +86790,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18713, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18806, 0)
 	return
 __1:
 	;
@@ -86200,7 +86881,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18762, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18855, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -86220,7 +86901,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18804, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18897, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -86257,7 +86938,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18810, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18903, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -86291,11 +86972,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18825, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+18918, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1538
 		}
-		return ts + 18848
+		return ts + 18941
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -86396,8 +87077,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18850, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18865, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18943, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18958, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -86444,7 +87125,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18640, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18683, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -86511,7 +87192,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18884, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18977, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -86573,7 +87254,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18884, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+18977, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -86726,10 +87407,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+18905, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+18998, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+18951,
+			ts+19044,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -86983,8 +87664,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7158)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7158)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+7218)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+7218)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -87011,13 +87692,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19033, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19126, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19044, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19137, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -87029,7 +87710,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19049, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19142, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -87444,6 +88125,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff int8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -87563,15 +88263,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff int8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -87947,16 +88640,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -88016,12 +88726,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+15138) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+15148) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+15142) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+15152) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -88087,7 +88797,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19055, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19148, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -88170,7 +88880,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+19073, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+19166, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -88299,15 +89009,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19096, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+19189, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -88325,7 +89032,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+19116, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+19209, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -88341,7 +89048,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19159
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19252
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -88367,7 +89074,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19182,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19275,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -88378,9 +89085,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19220
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19313
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19254
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 19347
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -88427,7 +89134,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19292, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+19385, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -88539,7 +89246,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+19296,
+				Xsqlite3ErrorMsg(tls, pParse, ts+19389,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -88558,7 +89265,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19335,
+						Xsqlite3ErrorMsg(tls, pParse, ts+19428,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -88566,7 +89273,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14707,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14717,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -88667,7 +89374,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 6370
+							zSchemaName = ts + 6430
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -88682,7 +89389,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19366, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19459, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -88747,7 +89454,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19371,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+19464,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -88759,7 +89466,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+11983, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+12045, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -88778,9 +89485,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19380, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+19473, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+19398, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+19491, 0)
 					}
 				}
 			}
@@ -88790,7 +89497,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+19418, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+19511, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -88849,11 +89556,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, int8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -88912,6 +89615,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -88927,7 +89705,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -88940,13 +89719,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19449, 0)
+					ts+19542, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19500, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19593, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -88954,7 +89733,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -88974,19 +89753,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -89000,6 +89782,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -89074,7 +89859,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -89086,7 +89873,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -89104,13 +89891,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -89127,11 +89914,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19533,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+19626,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 19545
+						return ts + 19638
 					}
 					return ts + 1538
 				}(),
@@ -89152,7 +89939,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7862)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7922)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -89184,14 +89971,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -89245,6 +90033,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -89309,7 +90148,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -89408,7 +90246,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+19568,
+		ts+19661,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -89469,7 +90307,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19622,
+	Xsqlite3ErrorMsg(tls, pParse, ts+19715,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -89583,7 +90421,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -89600,11 +90438,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -89615,7 +90449,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19662, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19755, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -89641,7 +90475,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -89673,11 +90507,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19677, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+19770, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -89711,7 +90543,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -90020,12 +90852,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -90054,39 +90885,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -90097,24 +90904,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -90147,27 +90954,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 19693
+				return ts + 19786
 			}
-			return ts + 19702
+			return ts + 19795
 		}())
 
 	groupBySort = 1
@@ -90175,47 +90989,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -90231,45 +91045,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -90288,16 +91108,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -90328,16 +91148,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -90350,98 +91170,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -90450,79 +91273,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+19693)
-__148:
+	explainTempTable(tls, pParse, ts+19786)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 19711
-			}
-			return ts + 19734
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -90619,7 +91437,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+19743, 0)
+		ts+19804, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -90852,7 +91670,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19808, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19869, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -90896,7 +91714,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19854, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+19915, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -90914,7 +91732,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19862, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19923, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -90926,7 +91744,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19854, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+19915, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -90941,7 +91759,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19903, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+19964, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -90953,22 +91771,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+8056, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+6365, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19929, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+19990, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19967,
+	Xsqlite3ErrorMsg(tls, pParse, ts+20028,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 20004
+				return ts + 20065
 			}
-			return ts + 20011
+			return ts + 20072
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -90977,7 +91795,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20017, libc.VaList(bp+24, pTableName+8))
+		ts+20078, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -91006,9 +91824,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 12070
+			return ts + 6373
 		}
-		return ts + 5877
+		return ts + 5867
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -91126,7 +91944,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19854, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+19915, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -91159,7 +91977,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20063,
+		ts+20124,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -91184,13 +92002,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+20111,
+		ts+20172,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+20186, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+20247, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -91446,7 +92264,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20215, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20276, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -91485,9 +92303,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 12070
+				return ts + 6373
 			}
-			return ts + 5877
+			return ts + 5867
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -91499,7 +92317,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+20235,
+			ts+20296,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -91613,12 +92431,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20297,
+		ts+20358,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 20345
+				return ts + 20406
 			}
-			return ts + 20352
+			return ts + 20413
 		}()))
 __15:
 	;
@@ -91732,7 +92550,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20359, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20420, 0)
 	return 1
 }
 
@@ -91915,8 +92733,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -91949,8 +92767,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -91962,13 +92780,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+20401, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+20462, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -92284,7 +93102,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -92554,7 +93373,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20415,
+		ts+20476,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -92586,7 +93405,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+20451, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+20512, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -92596,7 +93415,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 7637
+				return ts + 7697
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -93466,7 +94285,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20470)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+20531)
 __169:
 	;
 update_cleanup:
@@ -93772,10 +94591,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*int8)(unsafe.Pointer(bp + 216)) = int8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20483, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+20544, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+20487, libc.VaList(bp+8, bp+216))
+				ts+20548, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -93866,7 +94685,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+12124, -1)
+				ts+12134, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -93898,7 +94717,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+20560, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20564, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+20621, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+20625, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -94046,14 +94865,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20568)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20629)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20608)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20669)
 	return SQLITE_ERROR
 __2:
 	;
@@ -94064,7 +94883,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20651)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20712)
 	return SQLITE_ERROR
 __5:
 	;
@@ -94092,7 +94911,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+20669, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+20730, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -94112,7 +94931,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+20692)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+20753)
 	goto end_of_vacuum
 __8:
 	;
@@ -94127,7 +94946,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+14477)
+	rc = execSql(tls, db, pzErrMsg, ts+14487)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -94172,7 +94991,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20719,
+		ts+20780,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -94181,7 +95000,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20827,
+		ts+20888,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -94192,7 +95011,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+20881,
+		ts+20942,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -94203,7 +95022,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+21032,
+		ts+21093,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -94425,12 +95244,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -94548,7 +95367,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+12351, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+12361, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -94632,11 +95451,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+21162, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+21223, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21186,
+			ts+21247,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -94646,7 +95465,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+21285, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+21346, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -94680,7 +95499,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -94707,7 +95526,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+21304, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+21365, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -94745,7 +95564,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21346, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21407, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+3647, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -94757,7 +95576,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 21376
+			var zFormat uintptr = ts + 21437
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -94774,7 +95593,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+16126, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+16142, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -94831,7 +95650,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+21422, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+21483, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -94889,7 +95708,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21422, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+21483, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -94909,8 +95728,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -94923,7 +95742,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -95376,7 +96195,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -95403,7 +96222,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -95634,10 +96453,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 21441
+		return ts + 21502
 	}
 	if i == -1 {
-		return ts + 16235
+		return ts + 16251
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -95646,15 +96465,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+21448, 5)
+		Xsqlite3_str_append(tls, pStr, ts+21509, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21454, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21515, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12741, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12751, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -95665,11 +96484,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+21454, 1)
+		Xsqlite3_str_append(tls, pStr, ts+21515, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+12741, 1)
+			Xsqlite3_str_append(tls, pStr, ts+12751, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+4992, 1)
 	}
@@ -95691,27 +96510,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+21456, 2)
+	Xsqlite3_str_append(tls, pStr, ts+21517, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+21448, 5)
+			Xsqlite3_str_append(tls, pStr, ts+21509, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 21459
+				return ts + 21520
 			}
-			return ts + 21464
+			return ts + 21525
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21472)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+21533)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21474)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+21535)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+4941, 1)
 }
@@ -95754,11 +96573,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+21476, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+21537, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 21482
+				return ts + 21543
 			}
-			return ts + 21489
+			return ts + 21550
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -95768,43 +96587,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 10898
+					zFmt = ts + 10960
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 21494
+				zFmt = ts + 21555
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 21527
+				zFmt = ts + 21588
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 21552
+				zFmt = ts + 21613
 			} else {
-				zFmt = ts + 21570
+				zFmt = ts + 21631
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+21579, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+21640, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp int8
-			var zRowid uintptr = ts + 16235
-			Xsqlite3_str_appendf(tls, bp+64, ts+21587, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 16251
+			Xsqlite3_str_appendf(tls, bp+64, ts+21648, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = int8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+21618, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+21679, libc.VaList(bp+32, zRowid))
 				cRangeOp = int8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = int8('>')
 			} else {
 				cRangeOp = int8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+21628, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+21689, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21633,
+			Xsqlite3_str_appendf(tls, bp+64, ts+21694,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+21660, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+21721, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -95836,28 +96655,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+21671, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+21732, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21459, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21520, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+21692, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+21753, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+21448, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+21509, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+21459, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+21520, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+4941, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -95918,52 +96738,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -97441,7 +98267,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21700, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21761, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -97469,7 +98295,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21715, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21776, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -97987,7 +98813,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21724, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21785, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -98345,10 +99171,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 16084, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 15415, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 14941, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 21738, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 16100, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 15431, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 14951, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 21799, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -98725,49 +99551,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -98775,13 +99590,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -98846,12 +99664,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21745, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21806, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21745, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+21806, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -98875,7 +99693,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -98885,7 +99703,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -98930,7 +99748,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6693
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 6753
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -99024,7 +99842,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 21786
+				return ts + 21847
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -99035,7 +99853,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -99043,6 +99860,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -99076,7 +99894,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -99229,6 +100047,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -99397,7 +100218,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21793,
+			Xsqlite3ErrorMsg(tls, pParse, ts+21854,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -100131,7 +100952,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+21829, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+21890, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -100202,7 +101023,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21855
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 21916
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -100709,7 +101530,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -100729,7 +101550,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -100740,10 +101561,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -100754,29 +101575,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -100878,8 +101699,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -100891,7 +101712,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -100901,17 +101722,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -100931,19 +101752,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -100955,19 +101776,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -100977,10 +101798,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -100994,9 +101815,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -101021,8 +101842,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -101034,7 +101855,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -101048,23 +101869,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -101075,7 +101896,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -101397,6 +102218,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -101490,8 +102312,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -101515,8 +102337,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -101668,7 +102491,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -101687,7 +102510,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -101701,7 +102524,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -101710,9 +102533,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -101731,6 +102558,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -101858,30 +102688,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -101889,20 +102738,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -101911,9 +102765,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -101954,7 +102814,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -101994,7 +102854,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -102060,19 +102921,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -102253,7 +103119,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+21866, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+21927, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -102311,7 +103177,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+21866, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+21927, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -102709,7 +103575,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+21892, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+21953, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -102920,8 +103786,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -103040,14 +103906,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -103199,7 +104074,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -103307,7 +104182,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+21927, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+21988, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -103569,19 +104444,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -103593,9 +104470,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -103628,13 +104505,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -103786,7 +104663,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21945, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+22006, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -103850,7 +104727,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21973, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+22034, 0)
 	goto __5
 __4:
 	ii = 0
@@ -104551,7 +105428,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -104732,7 +105609,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+21991, -1)
+		pCtx, ts+22052, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -104865,7 +105742,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+22047, -1)
+					pCtx, ts+22108, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -104955,17 +105832,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22092))
-var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22103))
-var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22114))
-var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22119))
-var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22132))
-var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22142))
-var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22148))
-var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22159))
-var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22169))
-var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22181))
-var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22186))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 22153))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 22164))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 22175))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 22180))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 22193))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 22203))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 22209))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 22220))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 22230))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 22242))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 22247))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -105011,7 +105888,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22190, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22251, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -105055,12 +105932,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+22209, 0)
+			ts+22270, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22280, 0)
+				ts+22341, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -105083,7 +105960,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7862)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+7922)
 					}
 					break
 				}
@@ -105287,7 +106164,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+22343, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+22404, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -105403,7 +106280,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7454))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+7514))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -105414,6 +106291,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, int8(SQLITE_AFF_NONE))
@@ -105517,7 +106395,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+22369, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22430, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -105582,15 +106460,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 22401
+				zErr = ts + 22462
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 22418
+				zErr = ts + 22479
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 22434
+				zErr = ts + 22495
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22454, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+22515, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -105611,7 +106489,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+22487, 0)
+				ts+22548, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -105767,11 +106645,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 22534,
-	ts + 22587,
-	ts + 21991,
-	ts + 22638,
-	ts + 22690,
+	ts + 22595,
+	ts + 22648,
+	ts + 22052,
+	ts + 22699,
+	ts + 22751,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -106968,8 +107846,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -106980,13 +107857,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -107170,19 +108044,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+22740,
+				Xsqlite3ErrorMsg(tls, pParse, ts+22801,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 19734
+							return ts + 22843
 						}
-						return ts + 22782
+						return ts + 22852
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+22788, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+22858, 0)
 		}
 	}
 
@@ -107250,7 +108124,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22822,
+		Xsqlite3ErrorMsg(tls, pParse, ts+22892,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -108347,7 +109221,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+22860, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+22930, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -109322,21 +110196,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16235, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16251, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22882, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22952, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16148, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+16164, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+22882, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+22952, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -110079,7 +110953,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22909)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+22979)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -110243,7 +111117,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+22918, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+22988, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -110460,9 +111334,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 6688
+							return ts + 6748
 						}
-						return ts + 6693
+						return ts + 6753
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -110474,6 +111348,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -110741,19 +111620,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+22942, 0)
+					ts+23012, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23037, 0)
+					ts+23107, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23121, 0)
+					ts+23191, 0)
 			}
 			break
 		case uint32(273):
@@ -111132,9 +112011,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+22918, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22988, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23206, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23276, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -111902,7 +112781,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+23223, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23293, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -111925,7 +112804,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+3647, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23248, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+23318, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -112098,7 +112977,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23259, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+23329, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -112111,11 +112990,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19854, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+19915, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23266, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+23336, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23271, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+23341, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -112128,9 +113007,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23281, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+23351, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23285, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+23355, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -112364,7 +113243,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -112939,7 +113818,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -112954,7 +113833,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+23293, 0)
+			ts+23363, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -113145,23 +114024,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 23361
+	var zErr uintptr = ts + 23431
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 23375
+			zErr = ts + 23445
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 23397
+			zErr = ts + 23467
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 23419
+			zErr = ts + 23489
 			break
 
 		}
@@ -113179,35 +114058,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 23442,
-	ts + 23455,
+	ts + 23512,
+	ts + 23525,
 	uintptr(0),
-	ts + 23471,
-	ts + 23496,
-	ts + 23510,
-	ts + 23529,
+	ts + 23541,
+	ts + 23566,
+	ts + 23580,
+	ts + 23599,
 	ts + 1474,
-	ts + 23554,
-	ts + 23591,
-	ts + 23603,
-	ts + 23618,
-	ts + 23651,
-	ts + 23669,
-	ts + 23694,
-	ts + 23723,
+	ts + 23624,
+	ts + 23661,
+	ts + 23673,
+	ts + 23688,
+	ts + 23721,
+	ts + 23739,
+	ts + 23764,
+	ts + 23793,
 	uintptr(0),
-	ts + 5832,
+	ts + 5822,
 	ts + 5318,
-	ts + 23740,
-	ts + 23758,
-	ts + 23776,
-	uintptr(0),
 	ts + 23810,
+	ts + 23828,
+	ts + 23846,
 	uintptr(0),
-	ts + 23831,
-	ts + 23857,
 	ts + 23880,
+	uintptr(0),
 	ts + 23901,
+	ts + 23927,
+	ts + 23950,
+	ts + 23971,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -113308,6 +114187,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	*(*int32)(unsafe.Pointer(db + 432)) = 1
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(*(*int32)(unsafe.Pointer(db + 432)) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -113322,7 +114207,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -113367,7 +114252,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+23917, 0)
+				ts+23987, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -113484,7 +114369,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+23980, libc.VaList(bp, zName))
+		ts+24050, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -113720,7 +114605,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24031, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+24101, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -113813,7 +114698,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -113883,7 +114768,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -113893,7 +114778,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -113925,14 +114810,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+24052, 0)
+				ts+24122, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -114062,7 +114947,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24120, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+24190, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -114107,10 +114992,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24126, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+24196, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24136,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24206,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -114215,7 +115100,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24164, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+24234, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -114226,17 +115111,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24168, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+24238, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 24168
+	zModeType = ts + 24238
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24174, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+24244, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -114274,7 +115159,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24179, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24249, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -114282,7 +115167,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24199,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24269,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -114322,7 +115207,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24223, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+24293, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -114346,15 +115231,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 24239, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 24246, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 24309, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 24316, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 24254, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 24257, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 24260, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 17330, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 24324, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 24327, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 24330, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 17346, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -114500,10 +115385,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+21786, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+21847, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+24264, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+24334, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -114517,7 +115402,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -114568,9 +115453,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6365
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 6425
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23266
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 23336
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -114675,7 +115560,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 24270
+		zFilename = ts + 24340
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -114778,21 +115663,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+24273,
+	Xsqlite3_log(tls, iErr, ts+24343,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24298)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+24368)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24318)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+24388)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24325)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+24395)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -114950,7 +115835,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24342, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+24412, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -115606,7 +116491,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+24370, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+24440, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -115724,7 +116609,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 24378
+			return ts + 24448
 		}
 		return uintptr(0)
 	}(), 0)
@@ -115902,7 +116787,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 6165, ts + 6688, ts + 6693, ts + 6175, ts + 6170, ts + 7929, ts + 24401, ts + 24407,
+	ts + 6165, ts + 6748, ts + 6753, ts + 6175, ts + 6170, ts + 7989, ts + 24471, ts + 24477,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -116055,7 +116940,7 @@ __10:
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0' + int32(c)>>4)
-	c = uint8(*(*int8)(unsafe.Pointer(ts + 24414 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 24484 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -116110,7 +116995,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24431, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+24501, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -116174,13 +117059,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6688, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+6748, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+6693, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+6753, uint32(5))
 			break
 
 		}
@@ -116730,12 +117615,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6688, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6748, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+6693, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+6753, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(5)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -116836,7 +117721,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+24460, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+24530, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -117142,7 +118027,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*int8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+24475, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+24545, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -117157,7 +118042,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+24479, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+24549, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -117211,7 +118096,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24505,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+24575,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -117316,11 +118201,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*int8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zPath)))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+24548, uint32(2))
+					jsonAppendRaw(tls, bp, ts+24618, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+4982, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+24551, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+24621, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -117477,14 +118362,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+24554, -1)
+			ts+24624, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, int8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+24605, -1)
+			Xsqlite3_result_error(tls, ctx, ts+24675, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -117579,7 +118464,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+15348)
+	jsonWrongNumArgs(tls, ctx, ts+15364)
 	return
 __2:
 	;
@@ -117654,9 +118539,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 24639
+			return ts + 24709
 		}
-		return ts + 24643
+		return ts + 24713
 	}())
 	return
 __2:
@@ -117789,7 +118674,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24650, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24720, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -117886,7 +118771,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+24653, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+24723, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -117930,7 +118815,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+24656)
+		ts+24726)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -118061,7 +118946,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+24739, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+24809, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -118080,7 +118965,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+24745, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+24815, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -118176,7 +119061,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, int8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+24745, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+24815, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -118200,7 +119085,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 24750
+				zRoot = ts + 24820
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -118265,6 +119150,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -118316,7 +119207,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24460, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+24530, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -118411,25 +119302,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24752},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24757},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24768},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24768},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24786},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24799},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24802},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24806},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24818},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24830},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24841},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24852},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24864},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24877},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24886},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24886},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24896},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24907},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24924}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24822},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24827},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24838},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24838},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24856},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 24869},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 24872},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24876},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24888},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24900},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24911},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24922},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24934},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 24947},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24956},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24956},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 24966},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24977},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 24994}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -118448,8 +119339,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 24942, FpModule: 0},
-	{FzName: ts + 24952, FpModule: 0},
+	{FzName: ts + 25012, FpModule: 0},
+	{FzName: ts + 25022, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -118709,11 +119600,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+24962, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+25032, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+24970, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+25040, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -118924,7 +119815,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+24975,
+		ts+25045,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -119627,7 +120518,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25057)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+25127)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -120968,7 +121859,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+25071, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+25141, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -120980,12 +121871,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25091, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+25161, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+25123, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+25193, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -121211,7 +122102,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+25160, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+25230, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -121234,14 +122125,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 25305
+	var zFmt uintptr = ts + 25375
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11270, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+11332, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -121282,7 +122173,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 25361, ts + 5044, ts + 16235,
+	ts + 25431, ts + 5044, ts + 16251,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -121325,19 +122216,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+25366,
+			ts+25436,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+25428, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+25498, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+25433,
+			ts+25503,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25497,
+			ts+25567,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+25567,
+			ts+25637,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -121366,7 +122257,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 25616
+			zFormat = ts + 25686
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -121378,7 +122269,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+25724,
+			ts+25794,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -121386,18 +122277,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+25769, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+25839, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+12741, 1)
+					Xsqlite3_str_append(tls, p, ts+12751, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+25796, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+25866, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+25818, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+25888, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+25826, 0)
+			Xsqlite3_str_appendf(tls, p, ts+25896, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -121412,14 +122303,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 25842,
-	ts + 25895,
-	ts + 25940,
-	ts + 25992,
-	ts + 26046,
-	ts + 26091,
-	ts + 26149,
-	ts + 26204,
+	ts + 25912,
+	ts + 25965,
+	ts + 26010,
+	ts + 26062,
+	ts + 26116,
+	ts + 26161,
+	ts + 26219,
+	ts + 26274,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -121448,7 +122339,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+26251, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+26321, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -121460,7 +122351,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+26271,
+			ts+26341,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -121468,7 +122359,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26328,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+26398,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -121510,10 +122401,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 26363,
-		ts + 26406,
-		ts + 26441,
-		ts + 26477,
+		ts + 26433,
+		ts + 26476,
+		ts + 26511,
+		ts + 26547,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -121544,7 +122435,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+26514,
+	Xsqlite3_str_appendf(tls, pSql, ts+26584,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -121556,7 +122447,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+26538, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+26608, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -121579,7 +122470,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26544, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26614, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -121675,7 +122566,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 26547, ts + 26558}
+var azFormat = [2]uintptr{ts + 26617, ts + 26628}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -121713,13 +122604,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+10842, 1)
+			Xsqlite3_str_append(tls, pOut, ts+10904, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+26568, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+26638, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+26574, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+26644, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+26578, 1)
+		Xsqlite3_str_append(tls, pOut, ts+26648, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -121730,7 +122621,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+26580, -1)
+		Xsqlite3_result_error(tls, ctx, ts+26650, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -121808,7 +122699,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26613,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+26683,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 4046
@@ -121832,7 +122723,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+26620,
+			ts+26690,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -121851,7 +122742,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+26665, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+26735, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -121865,8 +122756,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 26697,
-		ts + 26751,
+		ts + 26767,
+		ts + 26821,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -121881,23 +122772,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+26799,
+		rtreeCheckAppendMsg(tls, pCheck, ts+26869,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 26844
+					return ts + 26914
 				}
-				return ts + 26852
+				return ts + 26922
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26861,
+				ts+26931,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 26844
+						return ts + 26914
 					}
-					return ts + 26852
+					return ts + 26922
 				}(), iKey, iVal))
 		}
 	}
@@ -121921,7 +122812,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+26919, libc.VaList(bp, i, iCell, iNode))
+				ts+26989, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -121941,7 +122832,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+26967, libc.VaList(bp+24, i, iCell, iNode))
+					ts+27037, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -121958,14 +122849,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+27034, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+27104, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+27068, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+27138, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -121973,7 +122864,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+27098,
+					ts+27168,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -122002,14 +122893,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+27153,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+27223,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+27184, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+27254, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -122031,12 +122922,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14477, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+14487, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27251, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+27321, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -122045,12 +122936,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25071, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+25141, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+27279, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+27349, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -122064,8 +122955,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+27310, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+27317, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27380, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+27387, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -122073,7 +122964,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+27325, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+27395, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -122088,7 +122979,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+27329, -1)
+			ts+27399, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -122096,7 +122987,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 6365
+			zDb = ts + 6425
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -122106,7 +122997,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 17953
+				return ts + 17996
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -122401,7 +123292,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -122459,6 +123350,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -122471,15 +123363,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+27380, 1)
+		Xsqlite3_str_append(tls, x, ts+27450, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27382, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27452, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27393, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27463, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -122499,19 +123392,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep int8 = int8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+27404, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27474, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+27422, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+27492, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = int8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27430, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+27500, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*int8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+27438, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+27508, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+27442, 0)
+		Xsqlite3_str_appendf(tls, x, ts+27512, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -122530,6 +123423,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -122561,6 +123455,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -122569,6 +123464,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -122627,6 +123523,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -122795,6 +123692,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -122816,6 +123714,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -122900,6 +123799,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -122928,6 +123829,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -123366,6 +124268,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -123379,6 +124282,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -123393,6 +124299,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -123417,7 +124324,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27455, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+27525, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -123426,7 +124333,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27477, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+27547, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -123434,7 +124341,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+26544, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+26614, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -123513,6 +124420,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -123641,6 +124549,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -123659,7 +124568,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16235
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 16251
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -123669,7 +124578,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27481
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27551
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -123677,7 +124586,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27487
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 27557
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -123789,7 +124698,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27496, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+27566, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -123919,14 +124828,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+27536) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+27606) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+27552) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+27622) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -123963,8 +124874,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -123981,7 +124892,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -123991,7 +124902,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27567, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27637, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -124003,25 +124914,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27575},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27588},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27601},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27614},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27552},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27626},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27536},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27649},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27663},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27676},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27690},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27706},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27645},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27658},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27671},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 27684},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27622},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 27696},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 27606},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 27719},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27733},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 27746},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 27760},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 27776},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 27718},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 27788},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -124031,26 +124942,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+27737, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+27807, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27747, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27817, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+27758, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+27828, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27481, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27551, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+27769, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+27839, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -124104,7 +125015,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25057, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+25127, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -124431,7 +125342,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+27779, -1)
+		Xsqlite3_result_error(tls, context, ts+27849, -1)
 		return
 	}
 
@@ -124442,7 +125353,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+27779, -1)
+			Xsqlite3_result_error(tls, context, ts+27849, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -124543,7 +125454,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+27800, uintptr(0), uintptr(0), p+64)
+				ts+27870, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -124607,7 +125518,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+24970, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+25040, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -124628,16 +125539,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+27971, libc.VaList(bp, func() uintptr {
+			ts+28041, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 28121
+					return ts + 28191
 				}
 				return ts + 1538
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+28162)
+			ts+28232)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -124753,7 +125664,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28287, libc.VaList(bp, zTab)))
+			ts+28357, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -124771,7 +125682,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28406, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+28476, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -124789,7 +125700,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+28427, libc.VaList(bp+16, zIdx)))
+			ts+28497, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -124812,7 +125723,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+28478, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+28548, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -124858,7 +125769,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+28499, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28569, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -124873,7 +125784,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+28527, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -124913,7 +125824,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19380, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+19473, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -124923,18 +125834,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+28556, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+28626, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+28575, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+28645, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+28580, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+28650, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -124946,18 +125857,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+28590, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+28660, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 28619
+							return ts + 28689
 						}
-						return ts + 28632
+						return ts + 28702
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+28641, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+28711, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -124971,7 +125882,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28663,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+28733,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -125018,8 +125929,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+28690, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 14588
+		zList = rbuMPrintf(tls, p, ts+28760, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 14598
 	}
 	return zList
 }
@@ -125036,7 +125947,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+28699, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+28769, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -125058,25 +125969,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+28712, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+28782, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+28744, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+28814, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14588, ts+28767)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28773, ts+28780, ts+4941)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14588, ts+1538)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14598, ts+28837)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+28843, ts+28850, ts+4941)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14598, ts+1538)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+28788,
+					ts+28858,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+28830, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+28900, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -125118,7 +126029,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+28527, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -125153,7 +126064,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 28850
+	zCol = ts + 28920
 __7:
 	;
 	goto __5
@@ -125161,13 +126072,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+28858,
+	zLhs = rbuMPrintf(tls, p, ts+28928,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+28879,
+	zOrder = rbuMPrintf(tls, p, ts+28949,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+28915,
+	zSelect = rbuMPrintf(tls, p, ts+28985,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 14588
+	zSep = ts + 14598
 	iCol++
 	goto __1
 __2:
@@ -125185,7 +126096,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+28942,
+		Xsqlite3_mprintf(tls, ts+29012,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -125212,8 +126123,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+28990, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 14588
+	zVector = rbuMPrintf(tls, p, ts+29060, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 14598
 	goto __15
 __15:
 	iCol++
@@ -125224,7 +126135,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+28997, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+29067, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -125257,7 +126168,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+28527, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -125269,7 +126180,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+29009, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+29079, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1538
 		} else {
@@ -125281,37 +126192,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 28850
+					zCol = ts + 28920
 				} else {
-					zCol = ts + 28580
+					zCol = ts + 28650
 				}
 				zType = ts + 1103
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+29031, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+29101, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 28767
+					return ts + 28837
 				}
 				return ts + 1538
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+29051,
+			zImpPK = Xsqlite3_mprintf(tls, ts+29121,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+29072,
+		zImpCols = Xsqlite3_mprintf(tls, ts+29142,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+29105, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+29175, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 14588
-		zAnd = ts + 21448
+		zCom = ts + 14598
+		zAnd = ts + 21509
 		nBind++
 	}
 
@@ -125350,11 +126261,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+29129, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+29199, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+29141, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+29211, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 14588
+			zS = ts + 14598
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -125362,7 +126273,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+29150, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+29220, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -125374,18 +126285,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+29165, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+29235, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1538
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+29179, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 21448
+				zList = rbuMPrintf(tls, p, ts+29249, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 21509
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+29191, libc.VaList(bp+40, zList))
+			ts+29261, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1538
@@ -125393,8 +126304,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+29241, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 21448
+				zList = rbuMPrintf(tls, p, ts+29311, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 21509
 			}
 		}
 	}
@@ -125403,7 +126314,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29254, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+29324, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -125421,17 +126332,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c int8 = *(*int8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+29241,
+					zList = rbuMPrintf(tls, p, ts+29311,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14588
+					zSep = ts + 14598
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+29280,
+					zList = rbuMPrintf(tls, p, ts+29350,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14588
+					zSep = ts + 14598
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+29310,
+					zList = rbuMPrintf(tls, p, ts+29380,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 14588
+					zSep = ts + 14598
 				}
 			}
 		}
@@ -125466,19 +126377,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 29347
+		var zSep uintptr = ts + 29417
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+28499, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+28569, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16123) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+16139) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+28527, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -125490,15 +126401,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 28767
+					zDesc = ts + 28837
 				} else {
 					zDesc = ts + 1538
 				}
-				z = rbuMPrintf(tls, p, ts+29360, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 14588
+				z = rbuMPrintf(tls, p, ts+29430, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 14598
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+29371, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+29441, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -125518,7 +126429,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+29375)
+			ts+29445)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -125527,7 +126438,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+28527, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+28597, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -125537,25 +126448,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+29425, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+29495, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+29447, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+29517, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 28767
+						return ts + 28837
 					}
 					return ts + 1538
 				}()))
-				zComma = ts + 14588
+				zComma = ts + 14598
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+29457, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+29527, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+29472,
+			ts+29542,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 0))
 	}
 }
 
@@ -125568,7 +126479,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1538
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1538
@@ -125576,39 +126487,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 29534
+				zPk = ts + 29604
 			}
-			zSql = rbuMPrintf(tls, p, ts+29547,
+			zSql = rbuMPrintf(tls, p, ts+29617,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 29574
+							return ts + 29644
 						}
 						return ts + 1538
 					}()))
-			zComma = ts + 14588
+			zComma = ts + 14598
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+29584, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+29654, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29591,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+29661,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 29623
+						return ts + 29693
 					}
 					return ts + 1538
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 0))
 	}
 }
 
@@ -125621,7 +126532,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+29638,
+				ts+29708,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -125658,7 +126569,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+29695)
+			ts+29765)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -125763,7 +126674,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+29761, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+29831, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -125783,24 +126694,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29781,
+				ts+29851,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+29846, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+29916, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+29882, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+29952, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -125816,7 +126727,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29916,
+						ts+29986,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -125824,9 +126735,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 29977
+											return ts + 30047
 										}
-										return ts + 29981
+										return ts + 30051
 									}()
 								}
 								return ts + 1538
@@ -125835,20 +126746,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+29987,
+						ts+30057,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+30048,
+						ts+30118,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 29977
+									return ts + 30047
 								}
-								return ts + 29981
+								return ts + 30051
 							}(),
 							zCollist, zLimit))
 				}
@@ -125873,8 +126784,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6376)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6372)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6436)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+6432)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -125885,16 +126796,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1538
 				}
-				return ts + 30207
+				return ts + 30277
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30216,
+						ts+30286,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 30252
+								return ts + 30322
 							}
 							return ts + 1538
 						}(), zBindings)))
@@ -125903,32 +126814,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+30262, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+30332, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1538
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 30290
+					zRbuRowid = ts + 30360
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+30302, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+30372, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 30378
+							return ts + 30448
 						}
 						return ts + 1538
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+30395,
+					ts+30465,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+30694,
+						ts+30764,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -125941,9 +126852,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 30793
+						zRbuRowid = ts + 30863
 					} else {
-						zRbuRowid = ts + 30803
+						zRbuRowid = ts + 30873
 					}
 				}
 
@@ -125956,20 +126867,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+28850, 0)
+						zOrder = rbuMPrintf(tls, p, ts+28920, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14588, ts+1538)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1538, ts+14598, ts+1538)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+30814,
+							ts+30884,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 30862
+										return ts + 30932
 									}
 									return ts + 1538
 								}(),
@@ -125982,7 +126893,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 19734
+										return ts + 22843
 									}
 									return ts + 1538
 								}(), zOrder,
@@ -126050,9 +126961,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1538
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 30207
+				zPrefix = ts + 30277
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+30868,
+			zUpdate = Xsqlite3_mprintf(tls, ts+30938,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -126111,7 +127022,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+30898, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+30968, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -126181,28 +127092,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6365, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6365)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30928, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+30998, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30956, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31026, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
 		libc.Xmemcpy(tls, p+48, ts+3270, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+6365, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+6425, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+30974, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+31044, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6365, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -126235,11 +127146,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31040, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31110, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24120, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+24190, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*int8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -126251,13 +127162,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+31072,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6365),
+			zTarget = Xsqlite3_mprintf(tls, ts+31142,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1538
 						}
-						return ts + 31104
+						return ts + 31174
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1538
@@ -126276,37 +127187,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31106, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31176, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+31121, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31191, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31138, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31208, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31154, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31224, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31182, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31252, 0)
 	}
 }
 
@@ -126335,15 +127246,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31154, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31224, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31200, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31270, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -126391,7 +127302,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -126451,7 +127362,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+6365, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+6425, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -126468,23 +127379,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+31235, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+31305, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6365)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6365)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+6425)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+31260, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+31267, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+31330, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+31337, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -126601,7 +127512,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23758, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+23828, 0)
 			return
 		}
 
@@ -126694,7 +127605,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+31274)
+			ts+31344)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -126702,7 +127613,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31296, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31366, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -126723,7 +127634,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+31323,
+				ts+31393,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -126753,9 +127664,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+31481, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+31551, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31496,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31566,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -126769,10 +127680,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31516, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31586, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31541)
+			ts+31611)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -126786,12 +127697,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+31649)
+			ts+31719)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+31714)
+			ts+31784)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -126803,7 +127714,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31758, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31828, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -126823,15 +127734,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+17208)
-					rbuCopyPragma(tls, p, ts+16319)
+					rbuCopyPragma(tls, p, ts+17224)
+					rbuCopyPragma(tls, p, ts+16335)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+31783, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+31853, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -126855,10 +127766,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14492, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14502, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14492, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14502, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -126953,7 +127864,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31811, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+31881, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -126966,16 +127877,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+31260, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+31330, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+6425, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -126985,7 +127897,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31836, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+31906, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -127019,7 +127931,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+31847, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+31917, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -127049,13 +127961,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+31919, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+31989, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31933)
+				ts+32003)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -127066,7 +127978,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+31990)
+				ts+32060)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -127140,7 +128052,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32064, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32134, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -127158,12 +128070,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32096,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32166,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 32128
+							return ts + 32198
 						}
-						return ts + 32135
+						return ts + 32205
 					}()))
 			}
 		}
@@ -127171,7 +128083,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14477, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14487, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -127182,19 +128094,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+16922)
-						rbuCopyPragma(tls, p, ts+16334)
+						rbuCopyPragma(tls, p, ts+16938)
+						rbuCopyPragma(tls, p, ts+16350)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32142, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+32212, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+6365, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+6425, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+32158, uintptr(0), uintptr(0), p+64)
+								db, ts+32228, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -127248,7 +128160,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32182, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+32252, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -127275,7 +128187,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30207, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+30277, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -127292,7 +128204,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14492, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14502, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -127305,13 +128217,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14492, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14502, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32190, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32260, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -127406,7 +128318,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14492, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+14502, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -127423,19 +128335,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14492, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+14502, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 14477
+				zBegin = ts + 14487
 			} else {
-				zBegin = ts + 32142
+				zBegin = ts + 32212
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32142, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32212, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -127558,11 +128470,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -127701,7 +128616,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -127778,7 +128693,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32217, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32287, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -127803,7 +128718,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32240, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+32310, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -127948,7 +128863,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6365)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+6425)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -127963,7 +128878,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+32251, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+32321, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -127974,7 +128889,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -128004,6 +128925,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -128767,11 +129703,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11270, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+11332, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+32262, 0)
+				ts+32332, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1538, 0)
 		} else {
@@ -128784,7 +129720,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+32383, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+32453, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -128882,7 +129818,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+11270, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+11332, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -129349,6 +130285,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -129431,6 +130370,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -129460,9 +130400,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+32412,
+			zRet = Xsqlite3_mprintf(tls, ts+32482,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 21448
+			zSep = ts + 21509
 			if zRet == uintptr(0) {
 				break
 			}
@@ -129485,9 +130425,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+32446,
+				ts+32516,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 32487
+			zSep = ts + 32557
 			if zRet == uintptr(0) {
 				break
 			}
@@ -129495,18 +130435,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+7454, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+7514, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+32492,
+		ts+32562,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -129516,7 +130456,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -129549,7 +130489,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+32570,
+			ts+32640,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -129676,7 +130616,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32623, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+32693, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -130150,9 +131090,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+11270, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+11332, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+32650, libc.VaList(bp, zDb))
+			ts+32720, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -130161,18 +131101,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1538
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+32760, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32830, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1551, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+32775, bp+24)
+		sessionAppendStr(tls, bp+8, ts+32845, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+32783, bp+24)
+				sessionAppendStr(tls, bp+8, ts+32853, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 21448
+				zSep = ts + 21509
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -130281,7 +131221,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32789, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+32859, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -130373,7 +131313,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+32809, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+32879, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -130636,7 +131576,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -130659,7 +131599,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -130701,7 +131641,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -130762,7 +131702,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -130836,13 +131776,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -130904,7 +131844,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -131277,7 +132217,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -131445,7 +132385,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11270) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+11332) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -131456,34 +132396,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+32827, bp+16)
+				sessionAppendStr(tls, bp, ts+32897, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+32840, bp+16)
+				sessionAppendStr(tls, bp, ts+32910, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+32846, bp+16)
+						sessionAppendStr(tls, bp, ts+32916, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 14588
+						zSep = ts + 14598
 					}
 				}
 
 				zSep = ts + 1538
-				sessionAppendStr(tls, bp, ts+32775, bp+16)
+				sessionAppendStr(tls, bp, ts+32845, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+32851, bp+16)
+								ts+32921, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+32783, bp+16)
+							sessionAppendStr(tls, bp, ts+32853, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 21448
+						zSep = ts + 21509
 					}
 				}
 
@@ -131535,34 +132475,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+32926, bp+16)
+	sessionAppendStr(tls, bp, ts+32996, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+32775, bp+16)
+	sessionAppendStr(tls, bp, ts+32845, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+32846, bp+16)
+			sessionAppendStr(tls, bp, ts+32916, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 21448
+			zSep = ts + 21509
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+32944, bp+16)
+		sessionAppendStr(tls, bp, ts+33014, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+32487, bp+16)
+		sessionAppendStr(tls, bp, ts+32557, bp+16)
 
 		zSep = ts + 1538
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+32783, bp+16)
+				sessionAppendStr(tls, bp, ts+32853, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 32952
+				zSep = ts + 33022
 			}
 		}
 		sessionAppendStr(tls, bp, ts+4941, bp+16)
@@ -131578,7 +132518,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+6365, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+6425, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -131589,19 +132529,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+32957, bp+16)
+	sessionAppendStr(tls, bp, ts+33027, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+21454, bp+16)
+	sessionAppendStr(tls, bp, ts+21515, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+14588, bp+16)
+			sessionAppendStr(tls, bp, ts+14598, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+32975, bp+16)
+	sessionAppendStr(tls, bp, ts+33045, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+32986, bp+16)
+		sessionAppendStr(tls, bp, ts+33056, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+4941, bp+16)
 
@@ -131617,14 +132557,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+11270, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+11332, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+32990)
+			ts+33060)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+33103)
+			ts+33173)
 	}
 	return rc
 }
@@ -131652,7 +132592,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -131661,7 +132601,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -131738,7 +132678,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -131864,7 +132804,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -131905,7 +132845,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+33247, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33317, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -131921,7 +132861,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+33268, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+33338, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -131994,10 +132934,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+33287, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33357, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+33313, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+33383, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -132043,7 +132983,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+6365, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+6425, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -132056,19 +132996,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33343, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33413, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33387,
+						ts+33457,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+33458, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+33528, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11270) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+11332) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -132119,14 +133059,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+33518, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+33588, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+33548, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+33618, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+33572, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+33548, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33642, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+33618, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -133374,7 +134314,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+33600, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+33670, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -133662,7 +134602,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+33628, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+33698, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -133849,7 +134789,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33659, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+33729, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -133917,7 +134857,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 33666
+		var zErr uintptr = ts + 33736
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -134099,7 +135039,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 33716
+		var zErr uintptr = ts + 33786
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -134423,13 +135363,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 33764, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33834, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 33772, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33842, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 33782, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 33852, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -134980,7 +135920,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+33787, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33857, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -135007,14 +135947,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*int8)(unsafe.Pointer(p))) < '0' || int32(*(*int8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33794, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33864, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+33825, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+33895, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135025,7 +135965,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33858, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33928, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -135038,7 +135978,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33895, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+33965, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -135047,7 +135987,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33904, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33974, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -135066,7 +136006,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33937, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34007, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -135081,14 +136021,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+33971, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34041, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+33979, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34049, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*int8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34011, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+34081, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -135096,9 +136036,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34017, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34087, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34031, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34101, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -135106,9 +136046,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+34069, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+34139, zCmd, nCmd) == 0 {
 		if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || int32(*(*int8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34080, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34150, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -135118,19 +136058,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+5059, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 7942, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 17313},
-			{FzName: ts + 34115, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 8010, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 17329},
+			{FzName: ts + 34185, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34123, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34193, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34154, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34224, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -135177,15 +136117,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22114) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+16235) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34182, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+22175) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+16251) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34252, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34212) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+34282) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34222, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34292, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -135202,13 +136142,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34253, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34323, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34258, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34328, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34265, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+34335, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -135246,8 +136186,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22114) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34273, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+22175) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34343, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -135279,7 +136219,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34302, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+34372, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -135316,19 +136256,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 33971
+			zTail = ts + 34041
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 34322
+			zTail = ts + 34392
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+34330, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+34400, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16235, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+16251, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -135372,18 +136312,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34341, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34411, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1538
 			}
-			return ts + 14588
+			return ts + 14598
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34357, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34427, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34364,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22114))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+34434,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+22175))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -135493,7 +136433,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34390) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+34460) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -135503,7 +136443,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34395) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34465) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -135513,7 +136453,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34404) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34474) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -135526,7 +136466,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34414) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34484) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -135536,7 +136476,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34424) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+34494) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -135552,7 +136492,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22114) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+22175) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -135575,7 +136515,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 34436
+	var zSelect uintptr = ts + 34506
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -135597,7 +136537,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+34468) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+34538) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -135611,7 +136551,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+34476,
+				ts+34546,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -135709,7 +136649,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+34541, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+34611, 0)
 					return FTS5_EOF
 				}
 			}
@@ -135722,20 +136662,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+34561, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+34631, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34592, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34662, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34595, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+34665, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+29977, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+30047, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -135821,6 +136761,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*int8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -135849,7 +136800,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 1))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*int8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = int8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -137502,9 +138453,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34599, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+34669, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+33628, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+33698, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -137520,7 +138471,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c int8 = *(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+34604, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+34674, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -137607,7 +138558,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+20451, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+20512, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -137688,7 +138639,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+34633, 0)
+			ts+34703, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -137858,12 +138809,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+34686,
+								ts+34756,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 34736
+										return ts + 34806
 									}
-									return ts + 34599
+									return ts + 34669
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -138806,7 +139757,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34743, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+34813, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -138885,7 +139836,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+34749,
+			ts+34819,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -138910,7 +139861,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+34800,
+			ts+34870,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -138933,7 +139884,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+34849,
+			ts+34919,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -139172,7 +140123,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+34889, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+34959, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -140371,7 +141322,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+34912,
+			ts+34982,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -141837,7 +142788,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+34996,
+			ts+35066,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -142328,10 +143279,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -142914,13 +143870,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35053, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+35123, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+24970, ts+35061, 0, pzErr)
+				pConfig, ts+25040, ts+35131, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11410,
-					ts+35096,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+11472,
+					ts+35166,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -143173,7 +144129,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+34743, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+34813, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -143287,7 +144243,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+35140,
+		ts+35210,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -143457,7 +144413,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35226)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+35296)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -143728,7 +144684,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+35231, 0)
+			ts+35301, 0)
 		return SQLITE_ERROR
 	}
 
@@ -144152,11 +145108,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+35270,
+		ts+35340,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 14588
+					return ts + 14598
 				}
 				return ts + 1538
 			}(),
@@ -144168,9 +145124,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 35325
+					return ts + 35395
 				}
-				return ts + 35330
+				return ts + 35400
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -144216,12 +145172,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35334, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+35404, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+5041, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35340, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35410, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -144252,7 +145208,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35368, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+35438, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -144283,7 +145239,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35378, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+35448, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -144315,14 +145271,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35399, libc.VaList(bp, z))
+				ts+35469, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33782
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 33852
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -144378,7 +145334,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+35231, 0)
+		ts+35301, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -144595,7 +145551,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+35432, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+35502, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -144740,28 +145696,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+35468, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+35538, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+35479, 0)
+				ts+35549, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35559, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35629, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+35567, 0)
+				ts+35637, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+16902, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+16918, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35623, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35693, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+35629, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+35699, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -144819,7 +145775,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+17447, z) {
+			0 == Xsqlite3_stricmp(tls, ts+17463, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -144832,12 +145788,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+35645,
+				ts+35715,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 20352
+						return ts + 20413
 					}
-					return ts + 35682
+					return ts + 35752
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -145467,7 +146423,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35694, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+35764, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -145711,7 +146667,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35715, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35785, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -145730,7 +146686,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35737, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35807, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -145777,7 +146733,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35768)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+35838)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -145786,7 +146742,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+35781, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+35851, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -145800,7 +146756,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 35872, ts + 33971, ts + 24970, ts + 34322, ts + 11410,
+	ts + 35942, ts + 34041, ts + 25040, ts + 34392, ts + 11472,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -145824,7 +146780,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+35879, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+35949, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -145842,13 +146798,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35879, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35949, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+35884, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+35954, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -145903,17 +146861,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 35899,
-			ts + 35967,
-			ts + 36036,
-			ts + 36069,
-			ts + 36108,
-			ts + 36148,
-			ts + 36187,
-			ts + 36228,
-			ts + 36267,
-			ts + 36309,
-			ts + 36349,
+			ts + 35969,
+			ts + 36037,
+			ts + 36106,
+			ts + 36139,
+			ts + 36178,
+			ts + 36218,
+			ts + 36257,
+			ts + 36298,
+			ts + 36337,
+			ts + 36379,
+			ts + 36419,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -146015,18 +146973,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36372,
+		ts+36442,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36476,
+			ts+36546,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36514,
+			ts+36584,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -146038,7 +146996,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36552,
+			ts+36622,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -146050,14 +147008,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+24970, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+11410, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+35872, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+25040, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+11472, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+35942, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+34322, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34392, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+33971, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+34041, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -146069,17 +147027,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36594,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+36664,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 29623
+					return ts + 29693
 				}
 				return ts + 1538
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+36624,
+			ts+36694,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -146116,27 +147074,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36668, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+36738, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36691, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+36761, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+33971, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+34041, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+34322, ts+36697, 0, pzErr)
+				pConfig, ts+34392, ts+36767, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35872, ts+36729, 1, pzErr)
+				pConfig, ts+35942, ts+36799, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34468, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34538, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -146342,12 +147300,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+36746,
+		ts+36816,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+36796,
+			ts+36866,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -146355,7 +147313,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34468, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+34538, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -146531,7 +147489,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+36825,
+	zSql = Xsqlite3_mprintf(tls, ts+36895,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -146713,14 +147671,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+33971, bp+48)
+			rc = fts5StorageCount(tls, p, ts+34041, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+34322, bp+56)
+			rc = fts5StorageCount(tls, p, ts+34392, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -146915,9 +147873,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36857) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36927) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36868) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36938) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -147132,7 +148090,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 36879
+			var zCat uintptr = ts + 36949
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -147144,7 +148102,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36888) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36958) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -147155,18 +148113,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36899) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36969) {
 					if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' && int32(*(*int8)(unsafe.Pointer(zArg))) != '2' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*int8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36857) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36927) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36868) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36938) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36888) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+36958) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -147442,7 +148400,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 36917
+	var zBase uintptr = ts + 36987
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -147584,7 +148542,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36927, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36997, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -147592,11 +148550,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36930, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37000, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36935, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37005, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -147604,7 +148562,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36940, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37010, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -147612,7 +148570,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36943, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37013, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -147620,11 +148578,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36946, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36951, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37021, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -147632,19 +148590,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36956, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37026, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+36960, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37030, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+36966, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37036, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36971, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37041, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147652,11 +148610,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36975, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37045, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+36979, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37049, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -147664,7 +148622,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36982, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37052, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147672,11 +148630,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36986, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37056, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36990, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37060, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147684,7 +148642,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36994, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37064, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147692,7 +148650,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+36998, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147700,7 +148658,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37002, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37072, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147716,24 +148674,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37006, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+36986, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37076, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37056, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37009, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37012, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37079, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37082, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37016, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37002, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37086, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+37072, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -147748,137 +148706,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37019, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37089, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+36986, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37056, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37027, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37097, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37034, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37104, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37039, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37109, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36935, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37005, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37044, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37114, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36930, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37000, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37049, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37119, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37054, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37124, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15448, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+15464, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37059, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37129, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37012, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37082, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37063, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37133, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36927, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36997, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37068, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37138, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36971, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37041, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37074, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37144, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37078, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37148, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37080, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37150, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36994, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37064, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37086, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37156, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37002, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37072, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37094, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37164, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36986, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37056, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37100, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37170, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36986, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37056, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37105, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37175, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36927, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37111, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37181, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+36998, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37068, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37119, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37189, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37127, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37197, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37131, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+37201, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+36994, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+37064, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37139, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37209, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36927, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37145, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37215, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36998, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37068, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37151, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+37221, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37012, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+37082, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -147893,16 +148851,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37158, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37228, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37163, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+37233, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -147910,21 +148868,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37168, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37238, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37174, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37244, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36943, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+37013, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37127, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37197, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -147932,7 +148890,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37180, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37250, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -147940,9 +148898,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37186, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+37256, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36927, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+36997, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -147957,12 +148915,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37192, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37262, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37196, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+37266, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37199, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+37269, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -147971,7 +148929,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37202, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+37272, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -148127,7 +149085,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37206) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+37276) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -148307,22 +149265,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 36917, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 36987, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 37221, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37291, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 37227, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37297, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 37234, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 37304, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -149465,14 +150423,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+37242) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+37312) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37246) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37316) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+37250) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+37320) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37259, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37329, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -149498,19 +150456,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 37293,
-		ts + 37333,
-		ts + 37368,
+		ts + 37363,
+		ts + 37403,
+		ts + 37438,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23266, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+23336, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37411, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37481, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -149643,11 +150601,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+37444, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+37514, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+37475,
+		ts+37545,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -149671,7 +150629,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+37526, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+37596, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -150066,7 +151024,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+37552, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+37622, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -150088,7 +151046,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 37562
+	return ts + 37632
 }
 
 func init() {
@@ -150143,114 +151101,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -150708,6 +151668,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -151026,6 +151998,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -151047,5 +152020,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&vfs_template)) + 128)) = rbuVfsGetLastError
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=0\x00COMPILER=clang-13.0.0\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00open\x00close\x00access\x00getcwd\x00stat\x00fstat\x00ftruncate\x00fcntl\x00read\x00pread\x00pread64\x00write\x00pwrite\x00pwrite64\x00fchmod\x00fallocate\x00unlink\x00openDirectory\x00mkdir\x00rmdir\x00fchown\x00geteuid\x00mmap\x00munmap\x00mremap\x00getpagesize\x00readlink\x00lstat\x00ioctl\x00attempt to open \"%s\" as file descriptor %d\x00/dev/null\x00os_unix.c:%d: (%d) %s(%s) - %s\x00cannot fstat db file %s\x00file unlinked while open: %s\x00multiple links to file: %s\x00file renamed while open: %s\x00%s\x00full_fsync\x00%s-shm\x00readonly_shm\x00psow\x00unix-excl\x00%s.lock\x00/var/tmp\x00/usr/tmp\x00/tmp\x00SQLITE_TMPDIR\x00TMPDIR\x00%s/etilqs_%llx%c\x00modeof\x00fsync\x00/dev/urandom\x00unix\x00unix-none\x00unix-dotfile\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00so\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00exclusive\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_windows_amd64.go b/vendor/modernc.org/sqlite/lib/sqlite_windows_amd64.go
index 740fae3a..57c8fcdb 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_windows_amd64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_windows_amd64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_windows_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_WIN=1 -D_MSC_VER=1900', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_windows_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_WIN=1 -D_MSC_VER=1900', DO NOT EDIT.
 
 package sqlite3
 
@@ -6800,6 +6800,7 @@ const (
 	FTS5_LCP                                                                       = 7
 	FTS5_LP                                                                        = 10
 	FTS5_MAIN_PREFIX                                                               = 48
+	FTS5_MAX_LEVEL                                                                 = 64
 	FTS5_MAX_PAGE_SIZE                                                             = 65536
 	FTS5_MAX_PREFIX_INDEXES                                                        = 31
 	FTS5_MAX_SEGMENT                                                               = 2000
@@ -10899,6 +10900,7 @@ const (
 	OPFLG_IN2                                                                      = 0x04
 	OPFLG_IN3                                                                      = 0x08
 	OPFLG_JUMP                                                                     = 0x01
+	OPFLG_NCYCLE                                                                   = 0x40
 	OPFLG_OUT2                                                                     = 0x10
 	OPFLG_OUT3                                                                     = 0x20
 	OPTIONAL                                                                       = 0
@@ -13881,6 +13883,7 @@ const (
 	SF_Recursive                                                                   = 0x0002000
 	SF_Resolved                                                                    = 0x0000004
 	SF_UFSrcCheck                                                                  = 0x0800000
+	SF_UpdateFrom                                                                  = 0x10000000
 	SF_UsesEphemeral                                                               = 0x0000020
 	SF_Values                                                                      = 0x0000200
 	SF_View                                                                        = 0x0200000
@@ -14478,6 +14481,7 @@ const (
 	SQLITE_ACCESS_READ                                                             = 2
 	SQLITE_ACCESS_READWRITE                                                        = 1
 	SQLITE_AFF_BLOB                                                                = 0x41
+	SQLITE_AFF_FLEXNUM                                                             = 0x46
 	SQLITE_AFF_INTEGER                                                             = 0x44
 	SQLITE_AFF_MASK                                                                = 0x47
 	SQLITE_AFF_NONE                                                                = 0x40
@@ -14596,6 +14600,7 @@ const (
 	SQLITE_CacheSpill                                                              = 0x00000020
 	SQLITE_CellSizeCk                                                              = 0x00200000
 	SQLITE_CkptFullFSync                                                           = 0x00000010
+	SQLITE_Coroutines                                                              = 0x02000000
 	SQLITE_CountOfView                                                             = 0x00000200
 	SQLITE_CoverIdxScan                                                            = 0x00000020
 	SQLITE_CursorHints                                                             = 0x00000400
@@ -14959,6 +14964,7 @@ const (
 	SQLITE_NOTADB                                                                  = 26
 	SQLITE_NOTFOUND                                                                = 12
 	SQLITE_NOTICE                                                                  = 27
+	SQLITE_NOTICE_RBU                                                              = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK                                                 = 539
 	SQLITE_NOTICE_RECOVER_WAL                                                      = 283
 	SQLITE_NOTNULL                                                                 = 0x90
@@ -15061,11 +15067,14 @@ const (
 	SQLITE_ResetDatabase                                                           = 0x02000000
 	SQLITE_ReverseOrder                                                            = 0x00001000
 	SQLITE_SAVEPOINT                                                               = 32
+	SQLITE_SCANSTAT_COMPLEX                                                        = 0x0001
 	SQLITE_SCANSTAT_EST                                                            = 2
 	SQLITE_SCANSTAT_EXPLAIN                                                        = 4
 	SQLITE_SCANSTAT_NAME                                                           = 3
+	SQLITE_SCANSTAT_NCYCLE                                                         = 7
 	SQLITE_SCANSTAT_NLOOP                                                          = 0
 	SQLITE_SCANSTAT_NVISIT                                                         = 1
+	SQLITE_SCANSTAT_PARENTID                                                       = 6
 	SQLITE_SCANSTAT_SELECTID                                                       = 5
 	SQLITE_SCHEMA                                                                  = 17
 	SQLITE_SELECT                                                                  = 21
@@ -15080,7 +15089,7 @@ const (
 	SQLITE_SHM_UNLOCK                                                              = 1
 	SQLITE_SORTER_PMASZ                                                            = 250
 	SQLITE_SOUNDEX                                                                 = 1
-	SQLITE_SOURCE_ID                                                               = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                                                               = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                                                                  = 0
 	SQLITE_SO_DESC                                                                 = 1
 	SQLITE_SO_UNDEFINED                                                            = -1
@@ -15191,8 +15200,8 @@ const (
 	SQLITE_UTF8                                                                    = 1
 	SQLITE_VDBEINT_H                                                               = 0
 	SQLITE_VDBE_H                                                                  = 0
-	SQLITE_VERSION                                                                 = "3.40.1"
-	SQLITE_VERSION_NUMBER                                                          = 3040001
+	SQLITE_VERSION                                                                 = "3.41.0"
+	SQLITE_VERSION_NUMBER                                                          = 3041000
 	SQLITE_VTABRISK_High                                                           = 2
 	SQLITE_VTABRISK_Low                                                            = 0
 	SQLITE_VTABRISK_Normal                                                         = 1
@@ -17082,6 +17091,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                                                          = 1
 	WHERE_DISTINCT_UNORDERED                                                       = 3
 	WHERE_DUPLICATES_OK                                                            = 0x0010
+	WHERE_EXPRIDX                                                                  = 0x04000000
 	WHERE_GROUPBY                                                                  = 0x0040
 	WHERE_IDX_ONLY                                                                 = 0x00000040
 	WHERE_INDEXED                                                                  = 0x00000200
@@ -22543,6 +22553,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -24004,10 +24015,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -24063,12 +24072,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -24320,7 +24327,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -24441,7 +24447,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -24465,11 +24471,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -24477,11 +24485,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -25116,7 +25124,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -25254,10 +25262,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -25272,12 +25278,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -25467,10 +25471,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -25674,7 +25680,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1089))
@@ -25826,7 +25832,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -25875,8 +25880,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -25887,6 +25902,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -26003,7 +26027,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -26865,14 +26889,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = int8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -26880,7 +26904,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -55288,7 +55312,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -55544,6 +55568,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -56530,6 +56556,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -56538,11 +56565,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -56554,30 +56605,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1544
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -56586,83 +56637,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -56676,17 +56727,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -56694,90 +56745,90 @@ __219:
 		}
 		return ts + 1550
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(j))) = int8(0)
 	length = int32(j)
@@ -56785,89 +56836,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1557, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1559, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -56880,32 +56931,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -56964,7 +57015,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -56980,8 +57031,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -57010,12 +57060,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -57024,7 +57075,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -58237,6 +58288,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -58864,10 +58933,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -58893,6 +58965,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = int8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]int8{}))-uint64(1)-uint64(i))
+	return int32(uint64(unsafe.Sizeof([22]int8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -59854,11 +59927,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -60837,7 +60911,7 @@ func winSeekFile(tls *libc.TLS, pFile uintptr, iOffset Sqlite3_int64) int32 {
 	if dwRet == libc.Uint32(libc.Uint32FromInt32(-1)) &&
 		libc.AssignUint32(&lastErrno, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)) != DWORD(0) {
 		(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = lastErrno
-		winLogErrorAtLine(tls, SQLITE_IOERR|int32(22)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4597, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47395)
+		winLogErrorAtLine(tls, SQLITE_IOERR|int32(22)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4597, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47684)
 
 		return 1
 	}
@@ -60863,7 +60937,7 @@ func winClose(tls *libc.TLS, id uintptr) int32 {
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	return winLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4609, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47491)
+	return winLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4609, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47780)
 }
 
 func winRead(tls *libc.TLS, id uintptr, pBuf uintptr, amt int32, offset Sqlite3_int64) int32 {
@@ -60897,9 +60971,9 @@ func winRead(tls *libc.TLS, id uintptr, pBuf uintptr, amt int32, offset Sqlite3_
 		}
 		(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = *(*DWORD)(unsafe.Pointer(bp + 40))
 
-		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(1)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4618, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47559)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(1)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4618, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47848)
 	}
-	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47562)
+	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47851)
 	if *(*DWORD)(unsafe.Pointer(bp + 32)) < DWORD(amt) {
 		libc.Xmemset(tls, pBuf+uintptr(*(*DWORD)(unsafe.Pointer(bp + 32))), 0, uint64(DWORD(amt)-*(*DWORD)(unsafe.Pointer(bp + 32))))
 
@@ -60955,12 +61029,12 @@ func winWrite(tls *libc.TLS, id uintptr, pBuf uintptr, amt int32, offset Sqlite3
 	if rc != 0 {
 		if (*WinFile)(unsafe.Pointer(pFile)).FlastErrno == DWORD(39) ||
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno == DWORD(112) {
-			return winLogErrorAtLine(tls, SQLITE_FULL, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4626, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47671)
+			return winLogErrorAtLine(tls, SQLITE_FULL, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4626, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47960)
 		}
 
-		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(3)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4636, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47676)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(3)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4636, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47965)
 	} else {
-		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47679)
+		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47968)
 	}
 
 	return SQLITE_OK
@@ -60987,10 +61061,10 @@ func winTruncate(tls *libc.TLS, id uintptr, nByte Sqlite3_int64) int32 {
 	winUnmapfile(tls, pFile)
 
 	if winSeekFile(tls, pFile, nByte) != 0 {
-		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4646, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47742)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4646, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48031)
 	} else if 0 == (*(*func(*libc.TLS, HANDLE) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 53*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFile)).Fh) && libc.AssignUint32(&lastErrno, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)) != DWORD(1224) {
 		(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = lastErrno
-		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4659, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47747)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4659, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48036)
 	}
 
 	if rc == SQLITE_OK && oldMmapSize > int64(0) {
@@ -61016,7 +61090,7 @@ func winSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 		} else {
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
 
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4672, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47839)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4672, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48128)
 		}
 	}
 	rc = (*(*func(*libc.TLS, HANDLE) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 13*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFile)).Fh)
@@ -61026,7 +61100,7 @@ func winSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 	} else {
 		(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
 
-		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4681, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47854)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4681, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48143)
 	}
 	return int32(0)
 }
@@ -61047,7 +61121,7 @@ func winFileSize(tls *libc.TLS, id uintptr, pSize uintptr) int32 {
 		if lowerBits == 0xffffffff &&
 			libc.AssignUint32(&lastErrno, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)) != DWORD(0) {
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = lastErrno
-			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(7)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4690, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47895)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(7)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4690, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48184)
 		}
 
 	}
@@ -61089,7 +61163,7 @@ func winUnlockReadLock(tls *libc.TLS, pFile uintptr) int32 {
 	}
 	if res == 0 && libc.AssignUint32(&lastErrno, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)) != DWORD(158) {
 		(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = lastErrno
-		winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4702, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47990)
+		winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4702, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48279)
 	}
 
 	return res
@@ -61215,7 +61289,7 @@ func winUnlock(tls *libc.TLS, id uintptr, locktype int32) int32 {
 	if type1 >= EXCLUSIVE_LOCK {
 		winUnlockFile(tls, pFile+16, uint32(Xsqlite3PendingByte+2), uint32(0), uint32(SHARED_SIZE), uint32(0))
 		if locktype == SHARED_LOCK && !(winGetReadLock(tls, pFile) != 0) {
-			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4720, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48216)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4720, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48505)
 		}
 	}
 	if type1 >= RESERVED_LOCK {
@@ -61518,7 +61592,7 @@ func winLockSharedMemory(tls *libc.TLS, pShmNode uintptr) int32 {
 			return SQLITE_READONLY | int32(5)<<8
 		} else if winTruncate(tls, pShmNode+16, int64(0)) != 0 {
 			winShmSystemLock(tls, pShmNode, WINSHM_UNLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4730, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 48682)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4730, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 48971)
 		}
 	}
 
@@ -61625,7 +61699,7 @@ __12:
 	if !(rc != SQLITE_OK) {
 		goto __13
 	}
-	rc = winLogErrorAtLine(tls, rc, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4770, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 48764)
+	rc = winLogErrorAtLine(tls, rc, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4770, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 49053)
 	goto shm_open_err
 __13:
 	;
@@ -61853,7 +61927,7 @@ __3:
 	if !(rc != SQLITE_OK) {
 		goto __6
 	}
-	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4781, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49035)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4781, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49324)
 	goto shmpage_out
 __6:
 	;
@@ -61871,7 +61945,7 @@ __8:
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
-	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4792, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49050)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4792, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49339)
 	goto shmpage_out
 __9:
 	;
@@ -61919,7 +61993,7 @@ __14:
 		goto __15
 	}
 	(*WinShmNode)(unsafe.Pointer(pShmNode)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
-	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, (*WinShmNode)(unsafe.Pointer(pShmNode)).FlastErrno, ts+4803, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49109)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, (*WinShmNode)(unsafe.Pointer(pShmNode)).FlastErrno, ts+4803, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49398)
 	if !(hMap != 0) {
 		goto __16
 	}
@@ -61965,7 +62039,7 @@ func winUnmapfile(tls *libc.TLS, pFile uintptr) int32 {
 		if !((*(*func(*libc.TLS, LPCVOID) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 59*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFile)).FpMapRegion) != 0) {
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
 
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4814, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49158)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4814, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49447)
 		}
 		(*WinFile)(unsafe.Pointer(pFile)).FpMapRegion = uintptr(0)
 		(*WinFile)(unsafe.Pointer(pFile)).FmmapSize = int64(0)
@@ -61974,7 +62048,7 @@ func winUnmapfile(tls *libc.TLS, pFile uintptr) int32 {
 		if !((*(*func(*libc.TLS, HANDLE) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFile)).FhMap) != 0) {
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
 
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4828, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49169)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4828, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49458)
 		}
 		(*WinFile)(unsafe.Pointer(pFile)).FhMap = uintptr(0)
 	}
@@ -62018,7 +62092,7 @@ func winMapfile(tls *libc.TLS, pFd uintptr, nByte Sqlite3_int64) int32 {
 			DWORD(*(*Sqlite3_int64)(unsafe.Pointer(bp))&int64(0xffffffff)), uintptr(0))
 		if (*WinFile)(unsafe.Pointer(pFd)).FhMap == uintptr(0) {
 			(*WinFile)(unsafe.Pointer(pFd)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
-			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4842, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49246)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4842, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49535)
 
 			return SQLITE_OK
 		}
@@ -62028,7 +62102,7 @@ func winMapfile(tls *libc.TLS, pFd uintptr, nByte Sqlite3_int64) int32 {
 			(*(*func(*libc.TLS, HANDLE) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFd)).FhMap)
 			(*WinFile)(unsafe.Pointer(pFd)).FhMap = uintptr(0)
 			(*WinFile)(unsafe.Pointer(pFd)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
-			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4854, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49264)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4854, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49553)
 
 			return SQLITE_OK
 		}
@@ -62192,7 +62266,7 @@ func winGetTempname(tls *libc.TLS, pVfs uintptr, pzBuf uintptr) int32 {
 				Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 				Xsqlite3_free(tls, zBuf)
 
-				return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4874, uintptr(0), 49566)
+				return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4874, uintptr(0), 49855)
 			}
 			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4493, libc.VaList(bp, Xsqlite3_temp_directory))
 		}
@@ -62209,7 +62283,7 @@ func winGetTempname(tls *libc.TLS, pVfs uintptr, pzBuf uintptr) int32 {
 			Xsqlite3_free(tls, zWidePath)
 			Xsqlite3_free(tls, zBuf)
 
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4890, uintptr(0), 49666)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4890, uintptr(0), 49955)
 		}
 		zMulti = winUnicodeToUtf8(tls, zWidePath)
 		if zMulti != 0 {
@@ -62233,7 +62307,7 @@ func winGetTempname(tls *libc.TLS, pVfs uintptr, pzBuf uintptr) int32 {
 		if (*(*func(*libc.TLS, DWORD, LPSTR) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 31*24 + 8)))(tls, uint32(nMax), zMbcsPath) == DWORD(0) {
 			Xsqlite3_free(tls, zBuf)
 
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4906, uintptr(0), 49693)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4906, uintptr(0), 49982)
 		}
 		zUtf8 = winMbcsToUtf8(tls, zMbcsPath, (*(*func(*libc.TLS) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls))
 		if zUtf8 != 0 {
@@ -62249,14 +62323,14 @@ func winGetTempname(tls *libc.TLS, pVfs uintptr, pzBuf uintptr) int32 {
 	if !(winMakeEndInDirSep(tls, nDir+1, zBuf) != 0) {
 		Xsqlite3_free(tls, zBuf)
 
-		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4922, uintptr(0), 49717)
+		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4922, uintptr(0), 50006)
 	}
 
 	nLen = Xsqlite3Strlen30(tls, zBuf)
 	if nLen+nPre+17 > nBuf {
 		Xsqlite3_free(tls, zBuf)
 
-		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4938, uintptr(0), 49735)
+		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4938, uintptr(0), 50024)
 	}
 
 	Xsqlite3_snprintf(tls, nBuf-16-nLen, zBuf+uintptr(nLen), ts+4866, 0)
@@ -62438,7 +62512,7 @@ func winOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, id uintptr, flags int32
 			}
 		}
 	}
-	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 8)), 50024)
+	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 8)), 50313)
 
 	if h == libc.UintptrFromInt64(int64(-1)) {
 		Xsqlite3_free(tls, zConverted)
@@ -62449,8 +62523,8 @@ func winOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, id uintptr, flags int32
 				pOutFlags)
 		} else {
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = *(*DWORD)(unsafe.Pointer(bp + 12))
-			winLogErrorAtLine(tls, SQLITE_CANTOPEN, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+5027, zUtf8Name, 50039)
-			return Xsqlite3CantopenError(tls, 50040)
+			winLogErrorAtLine(tls, SQLITE_CANTOPEN, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+5027, zUtf8Name, 50328)
+			return Xsqlite3CantopenError(tls, 50329)
 		}
 	}
 
@@ -62565,9 +62639,9 @@ func winDelete(tls *libc.TLS, pVfs uintptr, zFilename uintptr, syncDir int32) in
 		}
 	}
 	if rc != 0 && rc != SQLITE_IOERR|int32(23)<<8 {
-		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, *(*DWORD)(unsafe.Pointer(bp + 4)), ts+5040, zFilename, 50212)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, *(*DWORD)(unsafe.Pointer(bp + 4)), ts+5040, zFilename, 50501)
 	} else {
-		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp)), 50214)
+		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp)), 50503)
 	}
 	Xsqlite3_free(tls, zConverted)
 
@@ -62605,10 +62679,10 @@ func winAccess(tls *libc.TLS, pVfs uintptr, zFilename uintptr, flags int32, pRes
 				attr = (*WIN32_FILE_ATTRIBUTE_DATA)(unsafe.Pointer(bp)).FdwFileAttributes
 			}
 		} else {
-			winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 50264)
+			winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 50553)
 			if *(*DWORD)(unsafe.Pointer(bp + 40)) != DWORD(2) && *(*DWORD)(unsafe.Pointer(bp + 40)) != DWORD(3) {
 				Xsqlite3_free(tls, zConverted)
-				return winLogErrorAtLine(tls, SQLITE_IOERR|int32(13)<<8, *(*DWORD)(unsafe.Pointer(bp + 40)), ts+5050, zFilename, 50267)
+				return winLogErrorAtLine(tls, SQLITE_IOERR|int32(13)<<8, *(*DWORD)(unsafe.Pointer(bp + 40)), ts+5050, zFilename, 50556)
 			} else {
 				attr = libc.Uint32(libc.Uint32FromInt32(-1))
 			}
@@ -62686,7 +62760,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 		nByte = (*(*func(*libc.TLS, LPCWSTR, DWORD, LPWSTR, uintptr) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 25*24 + 8)))(tls, zConverted, uint32(0), uintptr(0), uintptr(0))
 		if nByte == DWORD(0) {
 			Xsqlite3_free(tls, zConverted)
-			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5067, zRelative, 50484)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5067, zRelative, 50773)
 		}
 		nByte = nByte + DWORD(3)
 		zTemp = Xsqlite3MallocZero(tls, uint64(nByte)*uint64(unsafe.Sizeof(WCHAR(0))))
@@ -62698,7 +62772,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 		if nByte == DWORD(0) {
 			Xsqlite3_free(tls, zConverted)
 			Xsqlite3_free(tls, zTemp)
-			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5084, zRelative, 50497)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5084, zRelative, 50786)
 		}
 		Xsqlite3_free(tls, zConverted)
 		zOut = winUnicodeToUtf8(tls, zTemp)
@@ -62708,7 +62782,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 		nByte = (*(*func(*libc.TLS, LPCSTR, DWORD, LPSTR, uintptr) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 24*24 + 8)))(tls, zConverted, uint32(0), uintptr(0), uintptr(0))
 		if nByte == DWORD(0) {
 			Xsqlite3_free(tls, zConverted)
-			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5101, zRelative, 50510)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5101, zRelative, 50799)
 		}
 		nByte = nByte + DWORD(3)
 		zTemp = Xsqlite3MallocZero(tls, uint64(nByte)*uint64(unsafe.Sizeof(int8(0))))
@@ -62720,7 +62794,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 		if nByte == DWORD(0) {
 			Xsqlite3_free(tls, zConverted)
 			Xsqlite3_free(tls, zTemp)
-			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5118, zRelative, 50523)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5118, zRelative, 50812)
 		}
 		Xsqlite3_free(tls, zConverted)
 		zOut = winMbcsToUtf8(tls, zTemp, (*(*func(*libc.TLS) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls))
@@ -66841,7 +66915,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -67893,7 +67967,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -67910,7 +67983,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -67976,7 +68048,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -67986,7 +68057,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -68177,36 +68248,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -68378,7 +68438,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -68502,7 +68562,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -68541,7 +68601,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -68618,7 +68678,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -69530,10 +69590,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]int8{int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0)}
@@ -69619,7 +69681,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -70376,7 +70438,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -70475,7 +70537,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -71061,7 +71123,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -71336,7 +71398,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -71809,7 +71871,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -72314,7 +72376,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -72549,8 +72611,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -72558,23 +72620,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -72970,7 +73034,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -73107,7 +73171,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -73124,7 +73188,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -73132,7 +73196,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -73175,7 +73239,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -73185,7 +73249,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -73435,7 +73499,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -73482,7 +73546,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -73492,7 +73556,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -73505,7 +73569,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -73514,14 +73578,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -73531,7 +73595,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -73595,7 +73659,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -73605,7 +73669,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -73627,7 +73691,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -73662,7 +73726,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -73675,13 +73739,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -73706,7 +73770,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -73717,7 +73781,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -73769,22 +73833,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -73794,7 +73858,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -73802,7 +73866,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -73810,10 +73874,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -73837,13 +73901,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -73851,7 +73914,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -73859,32 +73961,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -73912,11 +74003,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -73927,15 +74018,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -73963,14 +74054,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellOffset+i*2)))))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -73984,7 +74075,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -73996,7 +74087,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -74099,7 +74190,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -74127,7 +74218,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -74166,7 +74257,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -75049,7 +75140,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -75464,7 +75555,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -75490,7 +75581,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -75499,7 +75590,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -75510,7 +75601,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -75526,7 +75617,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -75587,7 +75678,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -75622,7 +75713,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -75682,7 +75773,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -75721,7 +75812,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -75752,7 +75843,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -76093,7 +76184,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -76337,14 +76428,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -76389,7 +76480,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -76438,7 +76529,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -76518,7 +76609,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -76609,7 +76700,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -76629,7 +76720,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -76693,18 +76784,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -76720,6 +76801,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -76841,7 +76930,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -77045,7 +77134,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -77110,7 +77199,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -77158,7 +77247,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -77277,7 +77366,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -77437,7 +77526,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -77502,7 +77591,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -77538,7 +77627,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -77582,7 +77671,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -77694,7 +77783,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -77852,7 +77941,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -77909,7 +77998,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -77925,7 +78014,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -77999,7 +78088,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -78011,7 +78100,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -78022,7 +78111,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -78187,7 +78276,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -78211,9 +78300,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -78236,16 +78325,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -78266,9 +78353,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -78402,11 +78495,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -78459,12 +78555,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -78472,7 +78568,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -78532,7 +78628,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -78621,7 +78717,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -78737,7 +78833,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -78780,8 +78876,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -78863,6 +78959,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -79055,7 +79153,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -79066,7 +79164,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -79224,7 +79322,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -79298,7 +79396,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -79324,9 +79422,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -79337,8 +79436,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -79360,7 +79459,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -79388,7 +79487,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -79649,11 +79748,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -79841,7 +79940,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -79879,7 +79978,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -79956,7 +80055,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -79968,19 +80067,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -79993,7 +80084,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -80012,6 +80103,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -80047,7 +80155,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -80056,13 +80163,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -80073,7 +80179,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -80186,7 +80292,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -80200,20 +80306,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -80223,7 +80329,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -80231,100 +80343,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -80333,30 +80445,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -80379,7 +80491,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -80398,13 +80509,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, uint64(nIn))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -80421,7 +80534,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -80480,9 +80593,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -80522,7 +80635,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -80530,11 +80643,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -80609,7 +80722,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -80619,7 +80732,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -80678,7 +80791,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -80707,7 +80820,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -80783,7 +80896,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -80797,7 +80910,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -80931,7 +81044,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -81106,12 +81219,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -81119,15 +81261,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+5414, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+5414, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -81151,9 +81293,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+5439, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if libc.AtomicLoadNInt32((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb+432, 0) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -81167,7 +81306,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+5464, libc.VaList(bp, iChild))
 		return
@@ -81241,7 +81380,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -81326,48 +81467,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5660
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+5670, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+5708, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+5746, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -81382,29 +81530,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5794
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -81412,28 +81560,28 @@ __9:
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(pCellIdx))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+5822,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+5852, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -81441,97 +81589,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+5876, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+5900, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellStart+i*2)))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -81541,48 +81689,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+5925, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+5962,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -81611,9 +81759,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -81645,19 +81793,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -81669,7 +81811,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -81677,7 +81819,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -81762,7 +81904,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -81805,22 +81947,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -82047,8 +82186,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -82548,7 +82687,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
 		libc.Xmemcpy(tls, bp+8, p, uint64(int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int*2))
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+16, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+16, ts+6277,
@@ -82560,6 +82699,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*int8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+16)).FnChar))) = int8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 16)).FnChar)
 	}
 }
 
@@ -82747,7 +82887,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -82921,16 +83060,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -83373,7 +83514,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -83610,43 +83751,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -84031,7 +84163,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -84046,14 +84178,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -84423,7 +84555,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -84435,13 +84569,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -84518,6 +84654,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -85406,7 +85545,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -85415,7 +85554,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -85449,7 +85588,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -85491,7 +85629,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -86243,7 +86381,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -86351,7 +86489,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -86902,7 +87040,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -86967,7 +87105,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -87001,7 +87139,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -87051,7 +87189,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -87197,7 +87335,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -87368,7 +87506,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -87394,7 +87532,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -87668,7 +87806,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -88020,8 +88158,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -88031,15 +88172,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -88227,6 +88368,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -88279,7 +88421,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -88343,6 +88485,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -88354,9 +88505,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+6709)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -88590,7 +88742,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -88614,8 +88766,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -88789,15 +88941,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+6719, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+6709, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -88908,14 +89060,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -89199,7 +89354,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -89343,7 +89498,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -89515,7 +89670,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*int8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+6759, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+6749, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -89570,21 +89725,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+6763, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+6753, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+6770, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+6760, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+6783, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+6773, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+6786, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+6776, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+6791, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+6781, 1)
 			}
 		}
 	}
@@ -89676,11 +89831,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity int8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -89811,8 +89966,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -90047,7 +90202,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -90148,593 +90302,597 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
+
+	case OP_IfNoHope:
 		goto __100
-	case OP_NotFound:
+	case OP_NoConflict:
 		goto __101
-	case OP_Found:
+	case OP_NotFound:
 		goto __102
+	case OP_Found:
+		goto __103
 
 	case OP_SeekRowid:
-		goto __103
-	case OP_NotExists:
 		goto __104
-
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -90743,56 +90901,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -90800,20 +90958,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -90821,124 +90980,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+6793, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+6814, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+6783, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+6804, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+6821, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+6811, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -90946,10 +91105,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -90960,9 +91119,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -90970,171 +91129,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint64(uintptr(0)+24))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -91142,95 +91301,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = int8(0)
@@ -91238,231 +91397,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -91471,95 +91630,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -91569,189 +91728,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -91760,38 +91923,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -91799,9 +91962,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -91812,298 +91975,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -92113,144 +92277,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -92258,353 +92422,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len))
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = int8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+6845,
+	Xsqlite3VdbeError(tls, p, ts+6835,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*int8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -92618,319 +92782,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*int8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -92938,467 +93091,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+6886, 0)
+	Xsqlite3VdbeError(tls, p, ts+6876, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+6937, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+6927, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6959, 0)
+		ts+6949, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+7013, 0)
+		ts+7003, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 7068
+				return ts + 7058
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 7116
+					return ts + 7106
 				}
-				return ts + 7159
+				return ts + 7149
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+7200)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+7190)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -93406,67 +93570,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -93477,24 +93641,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -93502,30 +93666,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -93541,22 +93705,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -93570,133 +93734,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1544
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -93704,18 +93868,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -93726,92 +93890,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -93829,106 +93993,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -93937,108 +94101,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94046,14 +94210,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -94063,108 +94227,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, int8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -94183,35 +94347,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -94219,123 +94383,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -94345,52 +94509,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -94402,15 +94566,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -94418,13 +94583,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -94437,11 +94602,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -94452,38 +94617,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -94495,47 +94660,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -94544,35 +94709,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -94581,51 +94746,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -94635,72 +94800,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94708,43 +94873,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94752,84 +94917,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94839,34 +95009,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -94875,10 +95045,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -94895,14 +95065,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94915,21 +95085,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94941,62 +95111,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+7228)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+7218)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -95009,56 +95179,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -95069,54 +95239,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -95124,72 +95294,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -95198,55 +95368,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 7245
+	goto __799
+__798:
+	zSchema = ts + 7235
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+7259,
+		ts+7249,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -95256,66 +95426,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -95324,151 +95494,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+7302, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+7292, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -95476,10 +95647,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -95499,26 +95670,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -95530,7 +95701,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -95541,170 +95712,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -95721,146 +95892,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -95868,70 +96039,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+7339,
+		ts+7329,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 7391
+				return ts + 7381
 			}
-			return ts + 7396
+			return ts + 7386
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -95939,17 +96110,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -95959,14 +96130,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -95976,197 +96147,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+7403, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+7393, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6709, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+7422, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -96180,27 +96351,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -96208,72 +96379,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.Xmemset(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -96283,192 +96454,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -96477,63 +96648,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= int8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -96543,104 +96714,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+7432, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -96648,52 +96819,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+7438,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -96812,8 +96987,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -96833,7 +97008,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -96853,8 +97028,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -96885,8 +97060,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -96919,8 +97094,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+7658, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7658, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -97000,8 +97175,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+7699, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7699, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -97070,7 +97245,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -97098,12 +97273,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 4493
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -97147,7 +97322,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -97230,7 +97405,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -99769,6 +99944,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+7733, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+7741+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7760+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7235+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7779+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7779+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -99788,7 +99991,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -99843,7 +100045,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+7733, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+7793, zDb) == 0) {
 		goto __8
 	}
 
@@ -99964,7 +100166,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+7738) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+7798) != 0) {
 		goto __33
 	}
 	goto __14
@@ -99972,73 +100174,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -100050,28 +100270,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -100082,160 +100302,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+7740, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+7800, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+7744, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+7804, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+7748, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+7808, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -100244,8 +100465,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -100253,19 +100474,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -100273,81 +100494,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7757, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7817, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7788, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7848, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7825, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -100360,141 +100581,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+7843, libc.VaList(bp+16, zCol))
+		ts+7903, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7878
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7938
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 7887
+		zErr = ts + 7947
 	} else {
-		zErr = ts + 7902
+		zErr = ts + 7962
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7924, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+7984, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7937, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+7947, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+7997, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8007, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -100538,15 +100759,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 7954
+	var zIn uintptr = ts + 8014
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 7982
+		zIn = ts + 8042
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 8000
+		zIn = ts + 8060
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 8018
+		zIn = ts + 8078
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8036, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8096, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -100625,10 +100846,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8056
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8116
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8061
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8121
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -100675,7 +100896,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+8067, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+8127, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -100739,7 +100960,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+8084, libc.VaList(bp, pExpr))
+								ts+8144, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -100755,7 +100976,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+8148,
+							Xsqlite3ErrorMsg(tls, pParse, ts+8208,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -100769,7 +100990,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+8184, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+8244, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -100792,30 +101013,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+8212, libc.VaList(bp+16, pExpr))
+						ts+8272, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 8255
+						zType = ts + 8315
 					} else {
-						zType = ts + 8262
+						zType = ts + 8322
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+8272, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+8332, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+8300, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+8360, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+8322,
+					Xsqlite3ErrorMsg(tls, pParse, ts+8382,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+8366,
+						ts+8426,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -100887,7 +101108,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+8414, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+8474, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -100903,7 +101124,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+8425, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+8485, pExpr, pExpr)
 			}
 
 			break
@@ -100959,7 +101180,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7825, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -101034,7 +101255,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8436, libc.VaList(bp, i, zType, mx))
+		ts+8496, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -101054,7 +101275,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8492, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8552, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -101089,7 +101310,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+8526, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+8586, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -101146,7 +101367,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+8532, libc.VaList(bp, i+1))
+				ts+8592, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -101174,7 +101395,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8593, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8653, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -101388,7 +101609,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+8624, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+8684, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -101428,7 +101649,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8526) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8586) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -101439,7 +101660,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+8663) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+8723) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -101451,7 +101672,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+8669, 0)
+						ts+8729, 0)
 					return WRC_Abort
 				}
 
@@ -101551,12 +101772,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -101592,12 +101813,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -101707,33 +101928,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) int8 {
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) int8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -101803,7 +102125,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -102138,7 +102461,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7825, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
 		return
 	}
 
@@ -102213,7 +102536,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+8728, libc.VaList(bp, mxHeight))
+			ts+8788, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -102462,10 +102785,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+8776,
+			Xsqlite3ErrorMsg(tls, pParse, ts+8836,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 8820
+						return ts + 8880
 					}
 					return ts + 1544
 				}(), nElem))
@@ -102506,7 +102829,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+8822)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+8882)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -102532,7 +102855,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8824, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8884, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -102560,7 +102883,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+8858, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+8918, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -102607,7 +102930,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+8878,
+				Xsqlite3ErrorMsg(tls, pParse, ts+8938,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -102632,7 +102955,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8921, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8981, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -103207,7 +103530,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8944,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9004,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -103330,7 +103653,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8974, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9034, libc.VaList(bp, zObject))
 	}
 }
 
@@ -103386,10 +103709,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+8056) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+8116) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+8061) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+8121) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -103819,13 +104142,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff int8) int32
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+8997) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9057) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+9005) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9065) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+9011) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9071) == 0 {
 		return 1
 	}
 	return 0
@@ -104029,7 +104352,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9015, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9075, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -104107,7 +104430,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9062, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9122, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -104201,7 +104524,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 9093
+		var zFmt uintptr = ts + 9153
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -104219,7 +104542,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7825, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
 	}
 }
 
@@ -104260,7 +104583,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9137, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9197, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -104290,11 +104613,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9160, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9220, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1544
 			}
-			return ts + 9179
+			return ts + 9239
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -104421,7 +104744,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9191, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9251, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -104436,12 +104759,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9209, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9269, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1544
 		}
-		return ts + 9179
+		return ts + 9239
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -104462,7 +104786,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8822)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8882)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -104471,7 +104795,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+9230)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+9290)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -104857,8 +105181,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+9232, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+9235,
+			if Xsqlite3_strnicmp(tls, z, ts+9292, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+9295,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 6284
@@ -104934,7 +105258,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+9262,
+				Xsqlite3ErrorMsg(tls, pParse, ts+9322,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -105020,8 +105344,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -105107,14 +105431,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 9292, ts + 9297, ts + 9302, ts + 7543, ts + 7538}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 9352, ts + 9357, ts + 9362, ts + 7543,
+				ts + 7538, ts + 9370}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 9310
+						return ts + 9378
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -105128,7 +105454,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -105151,10 +105477,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -105254,7 +105580,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -105384,12 +105710,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -105398,110 +105725,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9262,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9322,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -105544,13 +105884,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -105560,11 +105900,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -105587,11 +105927,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -105600,15 +105940,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -105635,20 +105975,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -105657,9 +105997,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -105697,14 +106037,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+9315, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+9383, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -105715,17 +106057,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -105737,128 +106079,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9342, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+9410, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -105866,42 +106208,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8944,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9004,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -105924,23 +106266,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -105957,42 +106299,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+7825, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -106013,15 +106357,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -106031,22 +106375,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -106055,21 +106399,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -106079,27 +106423,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+9366, 0)
+		ts+9434, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -106108,7 +106452,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -106119,7 +106463,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]int8)(unsafe.Pointer(ts + 9416))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 9484))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -107491,18 +107835,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -107532,7 +107876,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -107545,12 +107889,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -107558,6 +108000,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -107572,81 +108054,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -107668,34 +108077,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -107785,7 +108193,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -107793,7 +108201,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -107844,11 +108252,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+9424, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9432, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9494, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -107860,13 +108268,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9460,
+		ts+9522,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9635,
+			ts+9697,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -107876,10 +108284,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9809, libc.VaList(bp, zDb, zDb))
+		ts+9871, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9956, 0)
+			ts+10018, 0)
 	}
 }
 
@@ -107943,7 +108351,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+10107, libc.VaList(bp, zName))
+		ts+10169, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -107953,7 +108361,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+10166, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+10228, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -107962,7 +108370,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10172, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10234, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -108003,19 +108411,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10199, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+10261, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10383,
+		ts+10445,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+10688, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+10750, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10704,
+		ts+10766,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -108023,7 +108431,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10762, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+10824, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -108035,7 +108443,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11027, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11089, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -108047,7 +108455,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11040,
+		ts+11102,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -108093,12 +108501,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+11078, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+11140, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+11110, 0)
+			ts+11172, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -108108,11 +108516,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+11137)
+				ts+11199)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+11196)
+				ts+11258)
 		}
 
 		if pDflt != 0 {
@@ -108125,12 +108533,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+11249)
+					ts+11311)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+11295)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+11357)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -108141,7 +108549,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+11322,
+			ts+11384,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -108163,7 +108571,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11468,
+				ts+11530,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -108211,14 +108619,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11698, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+11760, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11732, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+11794, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -108246,7 +108654,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+11762, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+11824, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -108286,18 +108694,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 11781
+		zType = ts + 11843
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 11786
+		zType = ts + 11848
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+11800,
+		Xsqlite3ErrorMsg(tls, pParse, ts+11862,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 11818
+					return ts + 11880
 				}
-				return ts + 11835
+				return ts + 11897
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -108381,7 +108789,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11853, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11915, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -108398,17 +108806,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11874,
+		ts+11936,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+12056,
+		ts+12118,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+11027, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+11089, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -108603,7 +109011,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -108666,10 +109074,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12187,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12249,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 12210
+				return ts + 12272
 			}
 			return ts + 1544
 		}(), zWhen,
@@ -108711,8 +109119,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+12212, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+12274, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -108729,7 +109137,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -108751,7 +109159,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+12220, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+12282, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -108791,10 +109199,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))
 				*(*int8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = int8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+12226, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+12288, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*int8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 12210
+							return ts + 12272
 						}
 						return ts + 1544
 					}()))
@@ -108970,8 +109378,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -109054,15 +109462,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -109090,7 +109498,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -109123,13 +109531,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -109142,7 +109550,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -109157,7 +109565,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -109213,8 +109621,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -109262,7 +109670,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -109330,8 +109738,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -109373,11 +109781,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.Xmemset(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.Xmemset(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -109470,8 +109878,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -109489,16 +109897,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -109513,31 +109921,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -109555,8 +109963,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -109582,9 +109990,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -109612,8 +110020,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -109650,7 +110058,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -109674,7 +110082,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+12231, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+12293, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -109755,17 +110163,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11853, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11915, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12238,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12300,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 12266
+				return ts + 12328
 			}
 			return ts + 7479
 		}(),
@@ -109776,7 +110184,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12278, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12340, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -109793,10 +110201,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1544, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+12326, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12388, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+12447, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+12509, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -109914,11 +110322,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12465},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12486},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12506},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12525},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12544}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12527},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12548},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12568},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12587},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12606}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -109952,7 +110360,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+12567, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+12629, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -109961,10 +110369,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+12590,
+					ts+12652,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+12620, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+12682, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -109982,9 +110390,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 12638, FzCols: ts + 12651},
-	{FzName: ts + 12664, FzCols: ts + 12677},
-	{FzName: ts + 12705},
+	{FzName: ts + 12700, FzCols: ts + 12713},
+	{FzName: ts + 12726, FzCols: ts + 12739},
+	{FzName: ts + 12767},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -110003,7 +110411,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -110082,7 +110489,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -110128,13 +110535,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -110147,11 +110554,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -110175,17 +110582,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12718}
+	FzName:     ts + 12780}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -110196,8 +110603,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -110240,7 +110647,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -110268,7 +110675,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -110335,7 +110742,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -110351,8 +110758,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -110369,9 +110776,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -110379,14 +110786,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -110394,31 +110801,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -110426,7 +110833,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12728}
+	FzName:     ts + 12790}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -110440,20 +110847,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+12738,
+		Xsqlite3_str_appendf(tls, bp+24, ts+12800,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+12743, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+12805, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -110495,7 +110902,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+12749, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+12811, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -110509,7 +110916,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12755}
+	FzName:     ts + 12817}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -110553,7 +110960,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+12764, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+12826, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -110570,7 +110977,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+12638, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+12700, uint64(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -110726,7 +111133,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12774, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12836, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -110783,7 +111190,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12774, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12836, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -110830,9 +111237,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+12778)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+12840)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12782)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12844)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -110918,16 +111325,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1544
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*int8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -110937,15 +111344,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*int8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+12786, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+12848, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+12797, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+12859, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+12807, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+12869, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -111025,7 +111432,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -111039,42 +111446,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -111148,15 +111555,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -111221,11 +111628,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+12664, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+12726, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+12819,
-			ts+12873,
+			ts+12881,
+			ts+12935,
 			zDb)
 	}
 	return rc
@@ -111272,10 +111679,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+12638, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+12700, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+12925, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+12987, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -111333,12 +111740,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+7733, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+7793, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -111349,13 +111756,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -111376,128 +111786,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+5187)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+5187)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+13028, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+12966, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+12969,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+13006, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13031,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13068, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.Xmemset(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+13036, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13098, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+13065, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+13127, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -111507,89 +111940,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1480, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1480, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+13133, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13195, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -111643,14 +112076,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13161, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13223, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13182, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13244, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -111658,7 +112091,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13208, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13270, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -111700,42 +112133,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -111744,13 +112183,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -111769,7 +112208,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 13230}
+	FzName:     ts + 13292}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -111782,7 +112221,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 13244}
+	FzName:     ts + 13306}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -111796,7 +112235,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+13258, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+13320, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -111828,7 +112267,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+13282,
+						ts+13344,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -112003,7 +112442,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+13328, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13390, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -112029,11 +112468,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+13351, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+13413, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+13357, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+13419, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+13363, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13425, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -112080,7 +112519,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 9005
+		zCol = ts + 9065
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -112104,7 +112543,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13390, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13452, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -112329,6 +112768,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -112341,13 +112783,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -112372,25 +112814,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+7733) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+7793) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+9424, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+7733, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13405+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13424+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7245+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7760+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7235+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+13438)
+						ts+7741)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13424+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+7245)
+						ts+7235)
 				}
 			}
 		}
@@ -112411,12 +112853,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+9424, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13424+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+7245)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13405+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+7733, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+7235)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7760+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+13438)
+					ts+7741)
 			}
 		}
 	}
@@ -112447,7 +112889,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+13457, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+13467, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -112465,14 +112907,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 13465
+			zMsg = ts + 13475
 		} else {
-			zMsg = ts + 13478
+			zMsg = ts + 13488
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7937, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7997, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7947, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+8007, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -112502,12 +112944,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+9424, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7245+7) == 0 {
-			return ts + 13424
+	if Xsqlite3_strnicmp(tls, zName, ts+7733, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7235+7) == 0 {
+			return ts + 7779
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13438+7) == 0 {
-			return ts + 13405
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7741+7) == 0 {
+			return ts + 7760
 		}
 	}
 	return zName
@@ -112865,7 +113307,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+7245)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+7235)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -112891,7 +113333,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+7733, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+7793, zName) {
 				goto __3
 			}
 
@@ -112944,13 +113386,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13492, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13502, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13509, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13519, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -112992,9 +113434,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+9424, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+7733, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13529,
+			Xsqlite3ErrorMsg(tls, pParse, ts+13539,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -113154,9 +113596,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -113172,7 +113614,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+13571, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13581, 0)
 	return
 __4:
 	;
@@ -113200,9 +113642,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 11781
+			return ts + 11843
 		}
-		return ts + 10166
+		return ts + 10228
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -113218,9 +113660,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -113251,12 +113693,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13612,
+	Xsqlite3ErrorMsg(tls, pParse, ts+13622,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 11781
+				return ts + 11843
 			}
-			return ts + 10166
+			return ts + 10228
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -113271,7 +113713,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13633, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13643, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -113358,7 +113800,7 @@ var nullRow = [6]int8{int8(6), int8(0), int8(0), int8(0), int8(0), int8(0)}
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+13668, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+13678, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -113382,7 +113824,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13685, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13695, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -113402,7 +113844,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 13668
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 13678
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -113414,7 +113856,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+13668, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+13678, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -113448,7 +113890,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13719, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13729, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -113456,13 +113898,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+13742, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+13752, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+13749, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+13759, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -113499,7 +113941,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13759, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13769, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -113663,10 +114105,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13785,
+			Xsqlite3ErrorMsg(tls, pParse, ts+13795,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13830, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13840, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -113697,7 +114139,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+13871, 0)
+			ts+13881, 0)
 	}
 }
 
@@ -113742,7 +114184,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13923, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+13933, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -113831,7 +114273,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13964, 0)
+		ts+13974, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -113926,7 +114368,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14020, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14030, 0)
 	goto generated_done
 __2:
 	;
@@ -113939,13 +114381,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+14063, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+14073, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+14071, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+14081, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -113972,13 +114414,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+14078,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14088,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -114100,12 +114549,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1544
-		zSep2 = ts + 14109
+		zSep2 = ts + 14119
 		zEnd = ts + 6309
 	} else {
-		zSep = ts + 14111
-		zSep2 = ts + 14115
-		zEnd = ts + 14120
+		zSep = ts + 14121
+		zSep2 = ts + 14125
+		zEnd = ts + 14130
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -114113,7 +114562,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+14123, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+14133, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*int8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = int8('(')
@@ -114151,11 +114600,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1544,
-	ts + 14137,
-	ts + 14143,
-	ts + 14148,
+	ts + 14147,
+	ts + 14153,
+	ts + 14158,
+	ts + 14163,
 	ts + 14153,
 }
 
@@ -114563,10 +115013,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+14159,
+						ts+14169,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1544)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14192,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14202,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -114585,11 +115035,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14219, 0)
+				ts+14229, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14269, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+14279, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -114623,7 +115073,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14301, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+14311, 0)
 			return
 		}
 	}
@@ -114648,11 +115098,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 10166
-			zType2 = ts + 14345
+			zType = ts + 10228
+			zType2 = ts + 14355
 		} else {
-			zType = ts + 11781
-			zType2 = ts + 14351
+			zType = ts + 11843
+			zType2 = ts + 14361
 		}
 
 		if pSelect != 0 {
@@ -114714,7 +115164,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -114723,11 +115173,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+14356, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+14366, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+14371,
+			ts+14381,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -114743,13 +115193,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+14469,
+					ts+14479,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+14511, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+14521, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -114764,7 +115214,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+10688) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+10750) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -114794,7 +115244,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14545, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14555, 0)
 	goto create_view_fail
 __1:
 	;
@@ -114810,7 +115260,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+11781, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+11843, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -114892,7 +115342,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14591, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -114920,8 +115370,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, int8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -115018,13 +115467,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14611, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+14621, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14626,
+		ts+14636,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -115065,10 +115514,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+14693, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+14703, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+12590,
+				ts+12652,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -115100,12 +115549,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+14707,
+			ts+14717,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14752,
+		ts+14762,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -115133,11 +115582,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+9424, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+14819, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+14829, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+8425, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+8485, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -115215,9 +115664,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -115276,21 +115725,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14824, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14834, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14852, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14886, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14896, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -115302,7 +115751,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+12782, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+12844, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -115366,7 +115815,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14918,
+		ts+14928,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -115378,7 +115827,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14981, 0)
+		ts+14991, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -115463,7 +115912,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15075,
+		ts+15085,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -115690,12 +116139,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+15121,
+				Xsqlite3ErrorMsg(tls, pParse, ts+15131,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 15149
+							return ts + 15159
 						}
-						return ts + 15155
+						return ts + 15165
 					}()))
 				return 1
 			}
@@ -115816,7 +116265,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+15160, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+15170, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -115835,7 +116284,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15166,
+		ts+15176,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -115861,26 +116310,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+9424, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15216, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15226, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15244, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15254, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15269, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15279, 0)
 	goto exit_create_index
 __17:
 	;
@@ -115894,7 +116343,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+15160, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+15170, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -115909,7 +116358,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15303, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15313, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -115921,7 +116370,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15337, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15347, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -115950,7 +116399,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+15361, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+15371, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -115971,9 +116420,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -116012,7 +116461,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+15160)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+15170)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -116113,7 +116562,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15384, 0)
+		ts+15394, 0)
 	goto exit_create_index
 __56:
 	;
@@ -116330,7 +116779,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15445, libc.VaList(bp+48, 0))
+		ts+15455, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -116382,8 +116831,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15487, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15497, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -116429,12 +116878,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+15504,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+15514,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1544
 			}
-			return ts + 15524
+			return ts + 15534
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -116442,7 +116891,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+15532,
+		ts+15542,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -116456,7 +116905,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+15591, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+15601, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -116617,7 +117066,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15618, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15628, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -116632,7 +117081,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15636, libc.VaList(bp+8, 0))
+		ts+15646, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -116643,9 +117092,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -116671,9 +117120,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+15709,
+		ts+15719,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+12778, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+12840, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -116808,7 +117257,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+15769,
+			Xsqlite3ErrorMsg(tls, pParse, ts+15779,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -117016,12 +117465,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15805,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15815,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 15841
+				return ts + 15851
 			}
-			return ts + 15844
+			return ts + 15854
 		}()))
 	goto append_from_error
 __1:
@@ -117190,7 +117639,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+15850, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+15860, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -117226,9 +117675,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 15856
+				return ts + 15866
 			}
-			return ts + 15865
+			return ts + 15875
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -117253,7 +117702,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 15850, ts + 15872, ts + 15856}
+var az = [3]uintptr{ts + 15860, ts + 15882, ts + 15866}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -117268,7 +117717,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15880, 0)
+				ts+15890, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -117405,14 +117854,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+15950, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+15960, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+15961, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+15971, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1557, 1)
@@ -117438,11 +117887,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+13351, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15964, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15974, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -117572,7 +118021,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15973, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15983, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -117668,7 +118117,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+16019, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+16029, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -117861,7 +118310,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+16049, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16059, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -118141,7 +118590,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+16080,
+		Xsqlite3ErrorMsg(tls, pParse, ts+16090,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -118173,11 +118622,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+16113, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16123, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+16142, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16152, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -118681,7 +119130,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+16180)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+16190)
 __62:
 	;
 delete_from_cleanup:
@@ -118796,7 +119245,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12638) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12700) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -119026,7 +119475,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 7543, ts + 7538, ts + 9297, ts + 9292, ts + 7533}
+var azType2 = [5]uintptr{ts + 7543, ts + 7538, ts + 9357, ts + 9352, ts + 7533}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -119085,7 +119534,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+16193, -1)
+					Xsqlite3_result_error(tls, context, ts+16203, -1)
 					return
 				}
 				iVal = -iVal
@@ -119389,7 +119838,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+16210, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+16220, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -119735,7 +120184,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+16215, -1)
+		Xsqlite3_result_error(tls, context, ts+16225, -1)
 		return
 	}
 	if argc == 3 {
@@ -119745,7 +120194,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+16248, -1)
+				ts+16258, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -119844,7 +120293,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+16293, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+16303, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -119859,21 +120308,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = int8('\'')
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = int8(0)
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = int8('\'')
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = int8(0)
 				*(*int8)(unsafe.Pointer(zText)) = int8('X')
 				*(*int8)(unsafe.Pointer(zText + 1)) = int8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -119881,7 +120330,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+16300, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+16310, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -119995,6 +120444,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1544
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -120197,7 +120759,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 12210}
+var azOne = [1]uintptr{ts + 12272}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -120233,7 +120795,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(j))) = int8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+16303, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+16313, 4, uintptr(0))
 	}
 }
 
@@ -120258,7 +120820,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+13390, -1)
+		Xsqlite3_result_error(tls, context, ts+13452, -1)
 		return
 	}
 
@@ -120336,7 +120898,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+16193, -1)
+			Xsqlite3_result_error(tls, context, ts+16203, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -120598,7 +121160,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+16308, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+16318, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -120618,14 +121180,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+16314, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+16324, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+16314, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+16324, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16314, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16314, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16324, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16324, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -120755,17 +121317,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -120824,6 +121386,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -120864,108 +121427,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 16319},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 16339},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 16352},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 16370},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16379},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16387},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16387},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16402},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16428},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16453},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16462},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16473},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 16480},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16494},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16494},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16500},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16500},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 16506},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 16506},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16511},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 16511},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 16511},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16515},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 16515},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 16515},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 16534},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16541},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16547},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16554},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16561},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16569},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16574},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16578},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16578},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 16329},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 16349},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 16362},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 16380},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16389},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16397},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16397},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16438},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16463},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16472},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16483},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 16490},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16504},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16504},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16510},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16510},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 16516},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 16516},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16521},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 16521},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 16521},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16525},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 16525},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 16525},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16529},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16536},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 16544},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16551},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16557},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16564},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16571},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16579},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16584},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16590},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16596},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 16600},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16607},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16614},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16625},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16632},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16647},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16664},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16675},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16681},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16699},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16707},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16721},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16729},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16738},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16738},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16745},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16745},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16755},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16759},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16765},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16769},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16769},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16588},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16588},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16594},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16600},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16606},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16610},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16610},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 16616},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16623},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16630},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16641},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16648},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16663},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16680},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16691},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16697},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16715},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16723},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16737},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16745},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16754},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16754},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16761},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16761},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16771},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16775},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16775},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16788},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16314},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16314},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7878},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7878},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16793},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16798},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16806},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16812},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16818},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16821},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16825},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16831},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16821},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16836},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16840},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16844},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16850},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16854},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16859},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16864},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16869},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16781},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16785},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16785},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16791},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16791},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16804},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16324},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16324},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7938},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7938},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16809},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16814},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16822},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16828},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16834},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16837},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16841},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16847},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16837},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16852},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16856},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16860},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16866},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16870},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16875},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16879},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16883},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16887},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16892},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16897},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16902},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16880},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16885},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16891},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16895},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16899},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16903},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16908},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16914},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16920},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16925},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16933},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16941},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16944},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 7878},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 16949}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16913},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16918},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16924},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16930},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16936},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16941},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16949},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16957},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16960},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 7938},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 16965}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -121086,7 +121651,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+16953,
+				ts+16969,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -121746,8 +122311,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 7744, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 7740, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 7804, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 7800, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -122248,7 +122813,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9262, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9322, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -122716,7 +123281,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+16998,
+		ts+17014,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -122741,7 +123306,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+17039,
+	Xsqlite3ErrorMsg(tls, pParse, ts+17055,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -122890,7 +123455,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17071,
+		ts+17087,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -122900,7 +123465,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17123, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+17139, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -122952,7 +123517,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17148,
+	Xsqlite3ErrorMsg(tls, pParse, ts+17164,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -122960,7 +123525,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17194, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17210, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -123372,7 +123937,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+17215)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+17231)
 __125:
 	;
 insert_cleanup:
@@ -123688,8 +124253,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+13351, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 								onError, iReg)
 							Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -124779,7 +125345,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -125225,6 +125791,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -125263,7 +125830,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+13390, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+13452, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -125272,7 +125839,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 17229
+		zEntry = ts + 17245
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -125287,7 +125854,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+13351, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+13413, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -125323,7 +125890,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+17252, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+17268, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/' || int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '\\')) {
@@ -125337,7 +125904,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+17261, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+17277, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -125361,7 +125928,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+17265, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+17281, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -125379,7 +125946,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+17271, libc.VaList(bp+16, zEntry, zFile))
+		ts+17287, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -125406,7 +125973,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+17314, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+17330, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -125444,7 +126011,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+17346, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+17362, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -125454,7 +126021,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 17383,
+	ts + 17399,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -125610,7 +126177,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+17387, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+17403, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -125619,62 +126186,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 6409,
-	ts + 17426,
-	ts + 10166,
-	ts + 17430,
-	ts + 17435,
-	ts + 17438,
-	ts + 17448,
-	ts + 17458,
+	ts + 17442,
+	ts + 10228,
+	ts + 17446,
+	ts + 17451,
+	ts + 17454,
 	ts + 17464,
-	ts + 17468,
-	ts + 17473,
-	ts + 17478,
-	ts + 17486,
-	ts + 17497,
-	ts + 17500,
-	ts + 17507,
-	ts + 17468,
-	ts + 17473,
-	ts + 17514,
-	ts + 17519,
-	ts + 17522,
-	ts + 17529,
-	ts + 17464,
-	ts + 17468,
+	ts + 17474,
+	ts + 17480,
+	ts + 17484,
+	ts + 17489,
+	ts + 17494,
+	ts + 17502,
+	ts + 17513,
+	ts + 17516,
+	ts + 17523,
+	ts + 17484,
+	ts + 17489,
+	ts + 17530,
 	ts + 17535,
-	ts + 17540,
+	ts + 17538,
 	ts + 17545,
-	ts + 17468,
-	ts + 17549,
-	ts + 17473,
-	ts + 17557,
+	ts + 17480,
+	ts + 17484,
+	ts + 17551,
+	ts + 17556,
 	ts + 17561,
-	ts + 17566,
-	ts + 12782,
-	ts + 12778,
-	ts + 17572,
+	ts + 17484,
+	ts + 17565,
+	ts + 17489,
+	ts + 17573,
 	ts + 17577,
 	ts + 17582,
-	ts + 17426,
-	ts + 17468,
-	ts + 17587,
-	ts + 17594,
-	ts + 17601,
-	ts + 10166,
-	ts + 17609,
-	ts + 6412,
-	ts + 17615,
-	ts + 17426,
-	ts + 17468,
-	ts + 17620,
+	ts + 12844,
+	ts + 12840,
+	ts + 17588,
+	ts + 17593,
+	ts + 17598,
+	ts + 17442,
+	ts + 17484,
+	ts + 17603,
+	ts + 17610,
+	ts + 17617,
+	ts + 10228,
 	ts + 17625,
-	ts + 16821,
-	ts + 17630,
-	ts + 17643,
-	ts + 17652,
+	ts + 6412,
+	ts + 17631,
+	ts + 17442,
+	ts + 17484,
+	ts + 17636,
+	ts + 17641,
+	ts + 16837,
+	ts + 17646,
 	ts + 17659,
-	ts + 17670,
+	ts + 17668,
+	ts + 17675,
+	ts + 17686,
 }
 
 // Definitions of all built-in pragmas
@@ -125692,241 +126259,241 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [67]PragmaName{
-	{FzName: ts + 17678,
+	{FzName: ts + 17694,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17693,
+	{FzName: ts + 17709,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 17708,
+	{FzName: ts + 17724,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17720,
+	{FzName: ts + 17736,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 17736,
+	{FzName: ts + 17752,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 17659,
+	{FzName: ts + 17675,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17749,
+	{FzName: ts + 17765,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17761,
+	{FzName: ts + 17777,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17781,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 17797,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 17813,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 17818,
+	{FzName: ts + 17834,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 17833,
+	{FzName: ts + 17849,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17849,
+	{FzName: ts + 17865,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 17863,
+	{FzName: ts + 17879,
 		FePragTyp: U8(PragTyp_DATA_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17884,
+	{FzName: ts + 17900,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 17897,
+	{FzName: ts + 17913,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 17911,
+	{FzName: ts + 17927,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 17930,
+	{FzName: ts + 17946,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 17949,
+	{FzName: ts + 17965,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 17972,
+	{FzName: ts + 17988,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17981,
+	{FzName: ts + 17997,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 17999,
+	{FzName: ts + 18015,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 18016,
+	{FzName: ts + 18032,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 18029,
+	{FzName: ts + 18045,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 18044,
+	{FzName: ts + 18060,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 18062,
+	{FzName: ts + 18078,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 18072,
+	{FzName: ts + 18088,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 18086,
+	{FzName: ts + 18102,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18102,
+	{FzName: ts + 18118,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 18127,
+	{FzName: ts + 18143,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 18146,
+	{FzName: ts + 18162,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 18157,
+	{FzName: ts + 18173,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 18168,
+	{FzName: ts + 18184,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 18180,
+	{FzName: ts + 18196,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 18196,
+	{FzName: ts + 18212,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18209,
+	{FzName: ts + 18225,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18228,
+	{FzName: ts + 18244,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 18247,
+	{FzName: ts + 18263,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18260,
+	{FzName: ts + 18276,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18275,
+	{FzName: ts + 18291,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 18285,
+	{FzName: ts + 18301,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 18297,
+	{FzName: ts + 18313,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 18306,
+	{FzName: ts + 18322,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18317,
+	{FzName: ts + 18333,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 18327,
+	{FzName: ts + 18343,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 18339,
+	{FzName: ts + 18355,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 18350,
+	{FzName: ts + 18366,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 18362,
+	{FzName: ts + 18378,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 18379,
+	{FzName: ts + 18395,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 18398,
+	{FzName: ts + 18414,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 18424,
+	{FzName: ts + 18440,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 18439,
+	{FzName: ts + 18455,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18453,
+	{FzName: ts + 18469,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 18472,
+	{FzName: ts + 18488,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 18486,
+	{FzName: ts + 18502,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18502,
+	{FzName: ts + 18518,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 18514,
+	{FzName: ts + 18530,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 18525,
+	{FzName: ts + 18541,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 18536,
+	{FzName: ts + 18552,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 18548,
+	{FzName: ts + 18564,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 18559,
+	{FzName: ts + 18575,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 18580,
+	{FzName: ts + 18596,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18588,
+	{FzName: ts + 18604,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 18603,
+	{FzName: ts + 18619,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 18616,
+	{FzName: ts + 18632,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 18635,
+	{FzName: ts + 18651,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 18650,
+	{FzName: ts + 18666,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -125948,7 +126515,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 18666))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 18682))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -125963,7 +126530,7 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 		if 0 == Xsqlite3StrICmp(tls, z, ts+5017) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+18691) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+18707) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -125972,13 +126539,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+9310) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+9378) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+18698) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+18714) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+18703) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+18719) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -125993,9 +126560,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*int8)(unsafe.Pointer(z))) >= '0' && int32(*(*int8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*int8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+17620) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17636) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+18715) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+18731) == 0 {
 		return 2
 	} else {
 		return 0
@@ -126009,7 +126576,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+18722, 0)
+				ts+18738, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -126100,19 +126667,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 18784
+		zName = ts + 18800
 		break
 	case OE_SetDflt:
-		zName = ts + 18793
+		zName = ts + 18809
 		break
 	case OE_Cascade:
-		zName = ts + 18805
+		zName = ts + 18821
 		break
 	case OE_Restrict:
-		zName = ts + 18813
+		zName = ts + 18829
 		break
 	default:
-		zName = ts + 18822
+		zName = ts + 18838
 		break
 	}
 	return zName
@@ -126129,7 +126696,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 18832, ts + 18839, ts + 18847, ts + 18851, ts + 18715, ts + 18860,
+	ts + 18848, ts + 18855, ts + 18863, ts + 18867, ts + 18731, ts + 18876,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -126176,13 +126743,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 18864
+			zType = ts + 18880
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 18866
+			zType = ts + 18882
 		} else {
-			zType = ts + 8820
+			zType = ts + 8880
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18868,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18884,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -126190,7 +126757,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 18875, ts + 18880, ts + 18888}
+var azEnc = [4]uintptr{uintptr(0), ts + 18891, ts + 18896, ts + 18904}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -126341,14 +126908,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -126435,7 +127004,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+18896, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+18912, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -126699,7 +127268,7 @@ __18:
 	if !(zRight != 0) {
 		goto __64
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+18900) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+18916) == 0) {
 		goto __65
 	}
 	b = 2
@@ -126771,7 +127340,7 @@ __72:
 	goto __15
 
 __20:
-	zRet = ts + 18691
+	zRet = ts + 18707
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -127096,7 +127665,7 @@ __124:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 560)) == 0) {
 		goto __127
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18905, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __127:
@@ -127141,7 +127710,7 @@ __131:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 564)) == 0) {
 		goto __134
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18905, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __134:
@@ -127174,7 +127743,7 @@ __137:
 		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+18930, 0)
+		ts+18946, 0)
 	goto __140
 __139:
 	if !(iDb != 1) {
@@ -127228,7 +127797,7 @@ __146:
 __148:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+18983) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+18999) == 0) {
 		goto __149
 	}
 
@@ -127325,9 +127894,9 @@ __162:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 18989
+			return ts + 19005
 		}
-		return ts + 18997
+		return ts + 19013
 	}(),
 		libc.VaList(bp+32, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -127396,7 +127965,7 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __178
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+19004, libc.VaList(bp+88, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+19020, libc.VaList(bp+88, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __179
 	}
@@ -127442,29 +128011,29 @@ __184:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __185
 	}
-	zType = ts + 11781
+	zType = ts + 11843
 	goto __186
 __185:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __187
 	}
-	zType = ts + 14063
+	zType = ts + 14073
 	goto __188
 __187:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __189
 	}
-	zType = ts + 19020
+	zType = ts + 19036
 	goto __190
 __189:
-	zType = ts + 10166
+	zType = ts + 10228
 __190:
 	;
 __188:
 	;
 __186:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19027,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19043,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -127530,7 +128099,7 @@ __197:
 		goto __199
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19034, libc.VaList(bp+144, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19050, libc.VaList(bp+144, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -127540,7 +128109,7 @@ __197:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __200
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+19039,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+19055,
 		libc.VaList(bp+168, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -127577,8 +128146,8 @@ __203:
 	if !(pIdx1 != 0) {
 		goto __205
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 19044, ts + 19046, ts + 17497}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19048,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 19060, ts + 19062, ts + 17513}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19064,
 		libc.VaList(bp+192, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -127611,7 +128180,7 @@ __206:
 	goto __207
 __209:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19054,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19070,
 		libc.VaList(bp+232, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -127633,7 +128202,7 @@ __210:
 		goto __212
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19058, libc.VaList(bp+256, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19074, libc.VaList(bp+256, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __211
 __211:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -127697,7 +128266,7 @@ __222:
 		goto __224
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8820, libc.VaList(bp+272, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8880, libc.VaList(bp+272, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __223
 __223:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -127713,7 +128282,7 @@ __225:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __227
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8820, libc.VaList(bp+280, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8880, libc.VaList(bp+280, aPragmaName[i6].FzName))
 	goto __226
 __226:
 	i6++
@@ -127748,7 +128317,7 @@ __233:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __235
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19061,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19077,
 		libc.VaList(bp+288, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -127756,7 +128325,7 @@ __233:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+19070))
+			ts+19086))
 	goto __234
 __234:
 	j2++
@@ -127945,7 +128514,7 @@ __263:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __264:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+19075, libc.VaList(bp+352, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+19091, libc.VaList(bp+352, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 608)))
@@ -128162,7 +128731,7 @@ __291:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+19079, libc.VaList(bp+368, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+19095, libc.VaList(bp+368, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -128223,262 +128792,284 @@ __306:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 620)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__307:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __308
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __307
+	}
+	mxCol = -1
+	j4 = 0
+__309:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __311
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __312
+	}
+	mxCol++
+__312:
+	;
+	goto __310
+__310:
+	j4++
+	goto __309
+	goto __311
+__311:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __313
 	}
 	mxCol--
-	goto __307
+__313:
+	;
+	goto __308
+__307:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __308:
 	;
 	if !(mxCol >= 0) {
-		goto __309
+		goto __314
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 620)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__309:
+__314:
 	;
 	if !!(isQuick != 0) {
-		goto __310
+		goto __315
 	}
 	if !(pPk1 != 0) {
-		goto __311
+		goto __316
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 620)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+19103,
+		ts+19119,
 		libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__312:
+__317:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __314
+		goto __319
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 620)), j4, r2+j4)
-	goto __313
-__313:
+	goto __318
+__318:
 	j4++
-	goto __312
-	goto __314
-__314:
+	goto __317
+	goto __319
+__319:
 	;
-__311:
+__316:
 	;
-__310:
+__315:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__315:
+__320:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __317
+		goto __322
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __318
+		goto __323
 	}
-	goto __316
-__318:
+	goto __321
+__323:
 	;
 	if !(bStrict != 0) {
-		goto __319
+		goto __324
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __320
-__319:
+	goto __325
+__324:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__320:
+__325:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __321
+		goto __326
 	}
-	goto __316
-__321:
+	goto __321
+__326:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __323
-__322:
+	goto __328
+__327:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __324
+		goto __329
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 632)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		uint8((*Column)(unsafe.Pointer(pCol1)).Faffinity), bp+632)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 632)) != 0) {
-		goto __325
+		goto __330
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 632)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 632)))
-__325:
+__330:
 	;
-__324:
+__329:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 620))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __326
+		goto __331
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __327
-__326:
+	goto __332
+__331:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__327:
+__332:
 	;
-__323:
+__328:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __328
+		goto __333
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19139, libc.VaList(bp+384, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19155, libc.VaList(bp+384, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __330
-__329:
+	goto __335
+__334:
 	;
-__330:
+__335:
 	;
-__328:
+__333:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __331
+		goto __336
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19159,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19175,
 		libc.VaList(bp+400, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __332
-__331:
+	goto __337
+__336:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __333
+		goto __338
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19181,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19197,
 		libc.VaList(bp+424, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __334
-__333:
+	goto __339
+__338:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __335
+		goto __340
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __336
+		goto __341
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
-__336:
+__341:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+19204, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+19220, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19206,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19222,
 		libc.VaList(bp+440, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__335:
+__340:
 	;
-__334:
+__339:
 	;
-__332:
+__337:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __316
-__316:
+	goto __321
+__321:
 	j4++
-	goto __315
-	goto __317
-__317:
+	goto __320
+	goto __322
+__322:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __337
+		goto __342
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __338
+		goto __343
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 620)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__339:
+__344:
 	if !(k3 > 0) {
-		goto __341
+		goto __346
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __340
-__340:
+	goto __345
+__345:
 	k3--
-	goto __339
-	goto __341
-__341:
+	goto __344
+	goto __346
+__346:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+19226,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+19242,
 		libc.VaList(bp+456, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__338:
+__343:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__337:
+__342:
 	;
 	if !!(isQuick != 0) {
-		goto __342
+		goto __347
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__343:
+__348:
 	if !(pIdx5 != 0) {
-		goto __345
+		goto __350
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __346
+		goto __351
 	}
-	goto __344
-__346:
+	goto __349
+__351:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 620)), 0, 0, bp+640,
 		pPrior, r1)
@@ -128487,80 +129078,119 @@ __346:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 624))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+19256)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19272)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+19261)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+19277)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__352:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __354
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __355
+	}
+	goto __353
+__355:
+	;
+	if !(label6 == 0) {
+		goto __356
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__356:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 624))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	if !(label6 != 0) {
+		goto __357
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19272)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+19298)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__357:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __347
+		goto __358
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__348:
+__359:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __350
+		goto __361
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __351
+		goto __362
 	}
-	goto __349
-__351:
+	goto __360
+__362:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __360
+__360:
+	kk++
+	goto __359
+	goto __361
+__361:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 624))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 624))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19325)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__358:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
 	goto __349
 __349:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __348
 	goto __350
 __350:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 624))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 624))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+19282)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __347:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
-	goto __344
-__344:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __343
-	goto __345
-__345:
-	;
-__342:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 620)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __352
+		goto __363
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+19309)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+19352)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__353:
+__364:
 	if !(pIdx5 != 0) {
-		goto __355
+		goto __366
 	}
 	if !(pPk1 == pIdx5) {
-		goto __356
+		goto __367
 	}
-	goto __354
-__356:
+	goto __365
+__367:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 624))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -128569,21 +129199,21 @@ __356:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __354
-__354:
+	goto __365
+__365:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __353
-	goto __355
-__355:
+	goto __364
+	goto __366
+__366:
 	;
 	if !(pPk1 != 0) {
-		goto __357
+		goto __368
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__357:
+__368:
 	;
-__352:
+__363:
 	;
 	goto __298
 __298:
@@ -128601,14 +129231,14 @@ __273:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __358
+		goto __369
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 616))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 19338
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 19381
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__358:
+__369:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -128616,27 +129246,27 @@ __358:
 
 __46:
 	if !!(zRight != 0) {
-		goto __359
+		goto __370
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __361
+		goto __372
 	}
 	goto pragma_out
-__361:
+__372:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __360
-__359:
+	goto __371
+__370:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __362
+		goto __373
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__363:
+__374:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __365
+		goto __376
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __366
+		goto __377
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -128645,25 +129275,25 @@ __363:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __365
-__366:
+	goto __376
+__377:
 	;
-	goto __364
-__364:
+	goto __375
+__375:
 	pEnc += 16
-	goto __363
-	goto __365
-__365:
+	goto __374
+	goto __376
+__376:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __367
+		goto __378
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19341, libc.VaList(bp+464, zRight))
-__367:
+	Xsqlite3ErrorMsg(tls, pParse, ts+19384, libc.VaList(bp+464, zRight))
+__378:
 	;
-__362:
+__373:
 	;
-__360:
+__371:
 	;
 	goto __15
 
@@ -128671,15 +129301,15 @@ __47:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __368
+		goto __379
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __370
+		goto __381
 	}
 	goto __15
-__370:
+__381:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -128687,41 +129317,41 @@ __370:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __371
+		goto __382
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__371:
+__382:
 	;
-	goto __369
-__368:
+	goto __380
+__379:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __372
+		goto __383
 	}
 	goto __15
-__372:
+__383:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__369:
+__380:
 	;
 	goto __15
 
 __48:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__373:
+__384:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __373
-__374:
+	goto __384
+__385:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -128736,31 +129366,31 @@ __49:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18698) == 0) {
-		goto __376
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18714) == 0) {
+		goto __387
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __377
-__376:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+19366) == 0) {
-		goto __378
+	goto __388
+__387:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+19409) == 0) {
+		goto __389
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __379
-__378:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18851) == 0) {
-		goto __380
+	goto __390
+__389:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18867) == 0) {
+		goto __391
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__380:
+__391:
 	;
-__379:
+__390:
 	;
-__377:
+__388:
 	;
-__375:
+__386:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -128770,10 +129400,10 @@ __375:
 
 __50:
 	if !(zRight != 0) {
-		goto __381
+		goto __392
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__381:
+__392:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -128793,19 +129423,19 @@ __51:
 
 __52:
 	if !(zRight != 0) {
-		goto __382
+		goto __393
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __384
+		goto __395
 	}
 	goto __15
-__384:
+__395:
 	;
-	goto __383
-__382:
+	goto __394
+__393:
 	opMask = U32(0xfffe)
-__383:
+__394:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -128814,86 +129444,86 @@ __383:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__385:
+__396:
 	if !(iDb <= iDbLast) {
-		goto __387
+		goto __398
 	}
 	if !(iDb == 1) {
-		goto __388
+		goto __399
 	}
-	goto __386
-__388:
+	goto __397
+__399:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__389:
+__400:
 	if !(k4 != 0) {
-		goto __391
+		goto __402
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __392
+		goto __403
 	}
-	goto __390
-__392:
+	goto __401
+__403:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__393:
+__404:
 	if !(pIdx6 != 0) {
-		goto __395
+		goto __406
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __396
+		goto __407
 	}
 	szThreshold = int16(0)
-	goto __395
-__396:
+	goto __406
+__407:
 	;
-	goto __394
-__394:
+	goto __405
+__405:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __393
-	goto __395
-__395:
+	goto __404
+	goto __406
+__406:
 	;
 	if !(szThreshold != 0) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__397:
+__408:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+19374,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+19417,
 		libc.VaList(bp+472, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __398
+		goto __409
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __399
-__398:
+	goto __410
+__409:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__399:
+__410:
 	;
-	goto __390
-__390:
+	goto __401
+__401:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __389
-	goto __391
-__391:
+	goto __400
+	goto __402
+__402:
 	;
-	goto __386
-__386:
+	goto __397
+__397:
 	iDb++
-	goto __385
-	goto __387
-__387:
+	goto __396
+	goto __398
+__398:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -128901,36 +129531,36 @@ __387:
 __53:
 	;
 	if !(zRight != 0) {
-		goto __400
+		goto __411
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__400:
+__411:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __401
+		goto __412
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__401:
+__412:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __55:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK) {
-		goto __402
+		goto __413
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))) {
-		goto __403
+		goto __414
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))
-__403:
+__414:
 	;
-__402:
+__413:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -128939,10 +129569,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __404
+		goto __415
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664))&int64(0x7fffffff)))
-__404:
+__415:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -128951,10 +129581,10 @@ __57:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+672) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) >= int64(0)) {
-		goto __405
+		goto __416
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) & int64(0x7fffffff))
-__405:
+__416:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -128962,10 +129592,10 @@ __405:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __406
+		goto __417
 	}
 
-__406:
+__417:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -129017,14 +129647,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 19392, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 19397, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 19403, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 19412, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 19421, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 19429, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 19437},
-	{FzName: ts + 19444},
+	{FzName: ts + 19435, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 19440, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 19446, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 19455, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 19464, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 19472, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 19480},
+	{FzName: ts + 19487},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -129076,7 +129706,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+19450)
+	Xsqlite3_str_appendall(tls, bp+32, ts+19493)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -129084,7 +129714,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+19465, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19508, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -129097,16 +129727,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+19472, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19515, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+19478)
+		Xsqlite3_str_appendall(tls, bp+32, ts+19521)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+19490)
+		Xsqlite3_str_appendall(tls, bp+32, ts+19533)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+6309, 1)
@@ -129289,13 +129919,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+19505)
+	Xsqlite3_str_appendall(tls, bp+32, ts+19548)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+19513, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+19517, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19560, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -129372,12 +130002,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+19521, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+19564, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -129386,19 +130016,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 6360
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+19549, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+19592, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+19580, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+19623, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 19588,
-	ts + 19595,
-	ts + 19607,
+	ts + 19631,
+	ts + 19638,
+	ts + 19650,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -129458,7 +130088,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+15487)
+				corruptSchema(tls, pData, argv, ts+15497)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -129490,13 +130120,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+19618)
+			corruptSchema(tls, pData, argv, ts+19661)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+15487)
+				corruptSchema(tls, pData, argv, ts+15497)
 			}
 		}
 	}
@@ -129529,16 +130159,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 10166
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 10228
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 9230
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 19631
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 9290
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 19674
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -129616,17 +130246,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+13065)
+		ts+13127)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -129635,44 +130274,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+19703)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+19746)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+19727,
+		ts+19770,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -129683,57 +130322,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -129822,8 +130461,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -129936,8 +130577,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -129948,8 +130589,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -129961,8 +130602,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -130002,7 +130643,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+19761, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+19804, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -130032,7 +130673,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+19791, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+19834, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -130128,7 +130769,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -130227,7 +130868,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -130545,8 +131186,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 12210
-		var zSp2 uintptr = ts + 12210
+		var zSp1 uintptr = ts + 12272
+		var zSp2 uintptr = ts + 12272
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -130554,13 +131195,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19810, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+19853, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 19840))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 19883))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -130735,7 +131376,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19874, libc.VaList(bp, 0))
+					ts+19917, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -130780,7 +131421,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+19924, libc.VaList(bp+8, zName))
+						ts+19967, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -130791,7 +131432,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+19988,
+							Xsqlite3ErrorMsg(tls, pParse, ts+20031,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -130835,7 +131476,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 7878, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 7938, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -131182,9 +131823,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -131422,16 +132060,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 20025
+		z = ts + 20068
 		break
 	case TK_INTERSECT:
-		z = ts + 20035
+		z = ts + 20078
 		break
 	case TK_EXCEPT:
-		z = ts + 20045
+		z = ts + 20088
 		break
 	default:
-		z = ts + 20052
+		z = ts + 20095
 		break
 	}
 	return z
@@ -131441,10 +132079,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20058, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20101, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -131464,6 +132105,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20124, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 20155
+		}
+		return ts + 1544
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -131530,6 +132178,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -131594,6 +132243,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -131648,7 +132298,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1109
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 17609
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 17625
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -131787,13 +132437,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 17609
+				zCol = ts + 17625
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+13351, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -131801,7 +132451,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+20081, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+20170, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -131866,7 +132516,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -131891,7 +132541,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 17609
+					zName = ts + 17625
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -131901,7 +132551,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+20081, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+20170, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -131917,7 +132567,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+20090, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+20179, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -131942,45 +132593,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -131990,14 +132644,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 20187
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -132007,9 +132693,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -132053,7 +132736,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -132204,7 +132887,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20098, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20191, 0)
 	return
 __1:
 	;
@@ -132295,7 +132978,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20147, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20240, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -132315,7 +132998,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20189, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20282, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -132352,7 +133035,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20195, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20288, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -132386,11 +133069,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20210, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20303, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1544
 		}
-		return ts + 20233
+		return ts + 20326
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -132491,8 +133174,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20235, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20250, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20328, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20343, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -132539,7 +133222,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20025, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20068, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -132606,7 +133289,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20269, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20362, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -132668,7 +133351,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20269, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20362, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -132821,10 +133504,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+20290, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+20383, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+20336,
+			ts+20429,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -133078,8 +133761,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8526)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+8526)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8586)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+8586)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -133106,13 +133789,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20418, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20511, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20429, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20522, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -133124,7 +133807,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20434, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20527, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -133539,6 +134222,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff int8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -133658,15 +134360,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff int8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -134042,16 +134737,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -134111,12 +134823,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+16511) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+16521) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+16515) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+16525) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -134182,7 +134894,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+20440, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+20533, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -134265,7 +134977,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+20458, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+20551, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -134394,15 +135106,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+20481, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+20574, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -134420,7 +135129,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+20501, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+20594, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -134436,7 +135145,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20544
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20637
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -134462,7 +135171,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+20567,
+				Xsqlite3ErrorMsg(tls, pParse, ts+20660,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -134473,9 +135182,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20605
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20698
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20639
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20732
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -134522,7 +135231,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+20677, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+20770, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -134634,7 +135343,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+20681,
+				Xsqlite3ErrorMsg(tls, pParse, ts+20774,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -134653,7 +135362,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+20720,
+						Xsqlite3ErrorMsg(tls, pParse, ts+20813,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -134661,7 +135370,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+16080,
+					Xsqlite3ErrorMsg(tls, pParse, ts+16090,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -134762,7 +135471,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 7738
+							zSchemaName = ts + 7798
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -134777,7 +135486,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20751, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20844, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -134842,7 +135551,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20756,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20849,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -134854,7 +135563,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+13351, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+13413, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -134873,9 +135582,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+20765, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+20858, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+20783, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+20876, 0)
 					}
 				}
 			}
@@ -134885,7 +135594,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+20803, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+20896, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -134944,11 +135653,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, int8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -135007,6 +135712,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -135022,7 +135802,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -135035,13 +135816,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+20834, 0)
+					ts+20927, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20885, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20978, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -135049,7 +135830,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -135069,19 +135850,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -135095,6 +135879,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -135169,7 +135956,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -135181,7 +135970,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -135199,13 +135988,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -135222,11 +136011,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20918,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21011,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 20930
+						return ts + 21023
 					}
 					return ts + 1544
 				}(),
@@ -135247,7 +136036,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9230)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9290)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -135279,14 +136068,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -135340,6 +136130,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -135404,7 +136245,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -135503,7 +136343,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20953,
+		ts+21046,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -135564,7 +136404,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21007,
+	Xsqlite3ErrorMsg(tls, pParse, ts+21100,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -135678,7 +136518,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -135695,11 +136535,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -135710,7 +136546,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21047, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21140, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -135736,7 +136572,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -135768,11 +136604,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21062, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21155, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -135806,7 +136640,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -136115,12 +136949,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -136149,39 +136982,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -136192,24 +137001,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -136242,27 +137051,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 21078
+				return ts + 21171
 			}
-			return ts + 21087
+			return ts + 21180
 		}())
 
 	groupBySort = 1
@@ -136270,47 +137086,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -136326,45 +137142,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -136383,16 +137205,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -136423,16 +137245,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -136445,98 +137267,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -136545,79 +137370,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+21078)
-__148:
+	explainTempTable(tls, pParse, ts+21171)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 21096
-			}
-			return ts + 21119
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -136714,7 +137534,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+21128, 0)
+		ts+21189, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -136947,7 +137767,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21193, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21254, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -136991,7 +137811,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+21239, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+21300, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -137009,7 +137829,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21247, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21308, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -137021,7 +137841,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+21239, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+21300, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -137036,7 +137856,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21288, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21349, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -137048,22 +137868,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+9424, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21314, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21375, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21352,
+	Xsqlite3ErrorMsg(tls, pParse, ts+21413,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 21389
+				return ts + 21450
 			}
-			return ts + 21396
+			return ts + 21457
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -137072,7 +137892,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21402, libc.VaList(bp+24, pTableName+8))
+		ts+21463, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -137101,9 +137921,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -137221,7 +138041,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+21239, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+21300, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -137254,7 +138074,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21448,
+		ts+21509,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -137279,13 +138099,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+21496,
+		ts+21557,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+21571, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+21632, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -137541,7 +138361,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21600, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21661, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -137580,9 +138400,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 13438
+				return ts + 7741
 			}
-			return ts + 7245
+			return ts + 7235
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -137594,7 +138414,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21620,
+			ts+21681,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -137708,12 +138528,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21682,
+		ts+21743,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 21730
+				return ts + 21791
 			}
-			return ts + 21737
+			return ts + 21798
 		}()))
 __15:
 	;
@@ -137827,7 +138647,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21744, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21805, 0)
 	return 1
 }
 
@@ -138010,8 +138830,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -138044,8 +138864,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -138057,13 +138877,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+21786, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+21847, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -138379,7 +139199,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -138649,7 +139470,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21800,
+		ts+21861,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -138681,7 +139502,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+21836, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21897, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -138691,7 +139512,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 9005
+				return ts + 9065
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -139561,7 +140382,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+21855)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+21916)
 __169:
 	;
 update_cleanup:
@@ -139867,10 +140688,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*int8)(unsafe.Pointer(bp + 216)) = int8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+21868, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+21929, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+21872, libc.VaList(bp+8, bp+216))
+				ts+21933, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -139961,7 +140782,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+13492, -1)
+				ts+13502, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -139993,7 +140814,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+21945, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+21949, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+22006, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+22010, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -140141,14 +140962,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21953)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22014)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21993)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22054)
 	return SQLITE_ERROR
 __2:
 	;
@@ -140159,7 +140980,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+22036)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22097)
 	return SQLITE_ERROR
 __5:
 	;
@@ -140187,7 +141008,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+22054, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+22115, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -140207,7 +141028,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+22077)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22138)
 	goto end_of_vacuum
 __8:
 	;
@@ -140222,7 +141043,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+15850)
+	rc = execSql(tls, db, pzErrMsg, ts+15860)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -140267,7 +141088,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22104,
+		ts+22165,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -140276,7 +141097,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22212,
+		ts+22273,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -140287,7 +141108,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22266,
+		ts+22327,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -140298,7 +141119,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22417,
+		ts+22478,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -140520,12 +141341,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -140643,7 +141464,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13719, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13729, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -140727,11 +141548,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+22547, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+22608, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+22571,
+			ts+22632,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -140741,7 +141562,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+22670, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+22731, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -140775,7 +141596,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -140802,7 +141623,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+22689, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+22750, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -140840,7 +141661,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22731, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22792, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+4493, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -140852,7 +141673,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 22761
+			var zFormat uintptr = ts + 22822
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -140869,7 +141690,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+17500, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+17516, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -140926,7 +141747,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+22807, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22868, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -140984,7 +141805,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22807, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22868, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -141004,8 +141825,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -141018,7 +141839,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -141471,7 +142292,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -141498,7 +142319,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -141729,10 +142550,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 22826
+		return ts + 22887
 	}
 	if i == -1 {
-		return ts + 17609
+		return ts + 17625
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -141741,15 +142562,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+22833, 5)
+		Xsqlite3_str_append(tls, pStr, ts+22894, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+22839, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22900, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+14109, 1)
+			Xsqlite3_str_append(tls, pStr, ts+14119, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -141760,11 +142581,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+22839, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22900, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+14109, 1)
+			Xsqlite3_str_append(tls, pStr, ts+14119, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+6360, 1)
 	}
@@ -141786,27 +142607,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+22841, 2)
+	Xsqlite3_str_append(tls, pStr, ts+22902, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+22833, 5)
+			Xsqlite3_str_append(tls, pStr, ts+22894, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 22844
+				return ts + 22905
 			}
-			return ts + 22849
+			return ts + 22910
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+22857)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+22918)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+22859)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+22920)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+6309, 1)
 }
@@ -141849,11 +142670,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+22861, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+22922, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 22867
+				return ts + 22928
 			}
-			return ts + 22874
+			return ts + 22935
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -141863,43 +142684,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 12266
+					zFmt = ts + 12328
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 22879
+				zFmt = ts + 22940
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 22912
+				zFmt = ts + 22973
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 22937
+				zFmt = ts + 22998
 			} else {
-				zFmt = ts + 22955
+				zFmt = ts + 23016
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+22964, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+23025, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp int8
-			var zRowid uintptr = ts + 17609
-			Xsqlite3_str_appendf(tls, bp+64, ts+22972, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 17625
+			Xsqlite3_str_appendf(tls, bp+64, ts+23033, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = int8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+23003, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+23064, libc.VaList(bp+32, zRowid))
 				cRangeOp = int8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = int8('>')
 			} else {
 				cRangeOp = int8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+23013, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+23074, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+23018,
+			Xsqlite3_str_appendf(tls, bp+64, ts+23079,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+23045, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+23106, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -141931,28 +142752,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+23056, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+23117, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+22844, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+22905, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+23077, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+23138, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+22833, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+22894, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+22844, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+22905, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+6309, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -142013,52 +142835,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -143536,7 +144364,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23085, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23146, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -143564,7 +144392,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23100, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23161, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -144082,7 +144910,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23109, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23170, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -144440,10 +145268,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 17458, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 16788, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 16314, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 23123, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 17474, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 16804, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 16324, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 23184, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -144820,49 +145648,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -144870,13 +145687,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -144941,12 +145761,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+23130, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+23191, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+23130, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+23191, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -144970,7 +145790,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -144980,7 +145800,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -145025,7 +145845,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8061
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8121
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -145119,7 +145939,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 23171
+				return ts + 23232
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -145130,7 +145950,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -145138,6 +145957,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -145171,7 +145991,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -145324,6 +146144,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -145492,7 +146315,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+23178,
+			Xsqlite3ErrorMsg(tls, pParse, ts+23239,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -146226,7 +147049,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+23214, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+23275, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -146297,7 +147120,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 23240
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 23301
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -146804,7 +147627,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -146824,7 +147647,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -146835,10 +147658,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -146849,29 +147672,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -146973,8 +147796,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -146986,7 +147809,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -146996,17 +147819,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -147026,19 +147849,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -147050,19 +147873,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -147072,10 +147895,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -147089,9 +147912,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -147116,8 +147939,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -147129,7 +147952,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -147143,23 +147966,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -147170,7 +147993,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -147492,6 +148315,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -147585,8 +148409,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -147610,8 +148434,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -147763,7 +148588,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -147782,7 +148607,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -147796,7 +148621,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -147805,9 +148630,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -147826,6 +148655,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -147953,30 +148785,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -147984,20 +148835,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -148006,9 +148862,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -148049,7 +148911,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -148089,7 +148951,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -148155,19 +149018,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -148348,7 +149216,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+23251, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23312, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -148406,7 +149274,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+23251, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+23312, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -148804,7 +149672,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+23277, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+23338, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -149015,8 +149883,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -149135,14 +150003,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -149294,7 +150171,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -149402,7 +150279,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23312, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23373, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -149664,19 +150541,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -149688,9 +150567,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -149723,13 +150602,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -149881,7 +150760,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+23330, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+23391, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -149945,7 +150824,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+23358, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+23419, 0)
 	goto __5
 __4:
 	ii = 0
@@ -150646,7 +151525,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -150827,7 +151706,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+23376, -1)
+		pCtx, ts+23437, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -150960,7 +151839,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+23432, -1)
+					pCtx, ts+23493, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -151050,17 +151929,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 23477))
-var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 23488))
-var rankName = *(*[5]int8)(unsafe.Pointer(ts + 23499))
-var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 23504))
-var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 23517))
-var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 23527))
-var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 23533))
-var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 23544))
-var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 23554))
-var leadName = *(*[5]int8)(unsafe.Pointer(ts + 23566))
-var lagName = *(*[4]int8)(unsafe.Pointer(ts + 23571))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 23538))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 23549))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 23560))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 23565))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 23578))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 23588))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 23594))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 23605))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 23615))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 23627))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 23632))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -151106,7 +151985,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23575, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23636, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -151150,12 +152029,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+23594, 0)
+			ts+23655, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+23665, 0)
+				ts+23726, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -151178,7 +152057,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9230)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9290)
 					}
 					break
 				}
@@ -151384,7 +152263,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+23728, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+23789, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -151500,7 +152379,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+8822))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+8882))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -151511,6 +152390,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, int8(SQLITE_AFF_NONE))
@@ -151614,7 +152494,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+23754, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23815, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -151679,15 +152559,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 23786
+				zErr = ts + 23847
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 23803
+				zErr = ts + 23864
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 23819
+				zErr = ts + 23880
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23839, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+23900, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -151708,7 +152588,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+23872, 0)
+				ts+23933, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -151864,11 +152744,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 23919,
-	ts + 23972,
-	ts + 23376,
-	ts + 24023,
-	ts + 24075,
+	ts + 23980,
+	ts + 24033,
+	ts + 23437,
+	ts + 24084,
+	ts + 24136,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -153065,8 +153945,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -153077,13 +153956,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -153267,19 +154143,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+24125,
+				Xsqlite3ErrorMsg(tls, pParse, ts+24186,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 21119
+							return ts + 24228
 						}
-						return ts + 24167
+						return ts + 24237
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+24173, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+24243, 0)
 		}
 	}
 
@@ -153347,7 +154223,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+24207,
+		Xsqlite3ErrorMsg(tls, pParse, ts+24277,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -154444,7 +155320,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+24245, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+24315, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -155419,21 +156295,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17609, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17625, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+24267, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+24337, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17522, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17538, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+24267, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+24337, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -156176,7 +157052,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+24294)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+24364)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -156340,7 +157216,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+24303, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+24373, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -156557,9 +157433,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 8056
+							return ts + 8116
 						}
-						return ts + 8061
+						return ts + 8121
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -156571,6 +157447,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -156838,19 +157719,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+24327, 0)
+					ts+24397, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+24422, 0)
+					ts+24492, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+24506, 0)
+					ts+24576, 0)
 			}
 			break
 		case uint32(273):
@@ -157229,9 +158110,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+24303, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+24373, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+24591, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+24661, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -157999,7 +158880,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+24608, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+24678, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -158022,7 +158903,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+4493, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+24633, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+24703, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -158195,7 +159076,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+24644, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+24714, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -158208,11 +159089,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+21239, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+21300, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+24651, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+24721, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+24656, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+24726, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -158225,9 +159106,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+24666, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+24736, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+24670, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+24740, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -158461,7 +159342,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -159036,7 +159917,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -159051,7 +159932,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+24678, 0)
+			ts+24748, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -159242,23 +160123,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 24746
+	var zErr uintptr = ts + 24816
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 24760
+			zErr = ts + 24830
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 24782
+			zErr = ts + 24852
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 24804
+			zErr = ts + 24874
 			break
 
 		}
@@ -159276,35 +160157,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 24827,
-	ts + 24840,
+	ts + 24897,
+	ts + 24910,
 	uintptr(0),
-	ts + 24856,
-	ts + 24881,
-	ts + 24895,
-	ts + 24914,
+	ts + 24926,
+	ts + 24951,
+	ts + 24965,
+	ts + 24984,
 	ts + 1480,
-	ts + 24939,
-	ts + 24976,
-	ts + 24988,
-	ts + 25003,
-	ts + 25036,
-	ts + 25054,
-	ts + 25079,
-	ts + 25108,
+	ts + 25009,
+	ts + 25046,
+	ts + 25058,
+	ts + 25073,
+	ts + 25106,
+	ts + 25124,
+	ts + 25149,
+	ts + 25178,
 	uintptr(0),
-	ts + 7200,
+	ts + 7190,
 	ts + 6686,
-	ts + 25125,
-	ts + 25143,
-	ts + 25161,
-	uintptr(0),
 	ts + 25195,
+	ts + 25213,
+	ts + 25231,
 	uintptr(0),
-	ts + 25216,
-	ts + 25242,
 	ts + 25265,
+	uintptr(0),
 	ts + 25286,
+	ts + 25312,
+	ts + 25335,
+	ts + 25356,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -159405,6 +160286,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	libc.AtomicStoreNInt32(db+432, int32(1), 0)
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(libc.AtomicLoadNInt32(db+432, 0) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -159419,7 +160306,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -159464,7 +160351,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+25302, 0)
+				ts+25372, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -159581,7 +160468,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+25365, libc.VaList(bp, zName))
+		ts+25435, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -159817,7 +160704,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+25416, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+25486, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -159910,7 +160797,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -159980,7 +160867,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -159990,7 +160877,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -160022,14 +160909,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+25437, 0)
+				ts+25507, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -160159,7 +161046,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+25505, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+25575, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -160204,10 +161091,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+25511, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+25581, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25521,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25591,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -160312,7 +161199,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+25549, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+25619, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -160323,17 +161210,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+25553, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+25623, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 25553
+	zModeType = ts + 25623
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+25559, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+25629, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -160341,7 +161228,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 25564
+	zModeType = ts + 25634
 __32:
 	;
 	if !(aMode != 0) {
@@ -160371,7 +161258,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25571, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25641, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -160379,7 +161266,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25591,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25661,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -160419,7 +161306,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25615, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25685, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -160443,15 +161330,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 25631, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 25638, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 25701, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 25708, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 25646, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 25649, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 25652, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 18715, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 25716, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 25719, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 25722, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 18731, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -160597,10 +161484,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+23171, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+23232, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+25656, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+25726, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -160614,7 +161501,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -160665,9 +161552,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 7733
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 7793
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 24651
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 24721
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -160772,7 +161659,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 25662
+		zFilename = ts + 25732
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -160875,21 +161762,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+25665,
+	Xsqlite3_log(tls, iErr, ts+25735,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+25690)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+25760)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+25710)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+25780)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+25717)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+25787)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -161047,7 +161934,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+25734, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+25804, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -161703,7 +162590,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+25762, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+25832, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -161821,7 +162708,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 25770
+			return ts + 25840
 		}
 		return uintptr(0)
 	}(), 0)
@@ -161999,7 +162886,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 7533, ts + 8056, ts + 8061, ts + 7543, ts + 7538, ts + 9297, ts + 25793, ts + 25799,
+	ts + 7533, ts + 8116, ts + 8121, ts + 7543, ts + 7538, ts + 9357, ts + 25863, ts + 25869,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -162152,7 +163039,7 @@ __10:
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0' + int32(c)>>4)
-	c = uint8(*(*int8)(unsafe.Pointer(ts + 25806 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 25876 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -162207,7 +163094,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+25823, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+25893, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -162271,13 +163158,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+8056, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+8116, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+8061, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+8121, uint32(5))
 			break
 
 		}
@@ -162827,12 +163714,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+8056, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+8116, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+8061, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+8121, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(5)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -162933,7 +163820,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+25852, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+25922, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -163239,7 +164126,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*int8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+25867, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+25937, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -163254,7 +164141,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+25871, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+25941, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -163308,7 +164195,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+25897,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+25967,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -163413,11 +164300,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*int8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zPath)))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+25940, uint32(2))
+					jsonAppendRaw(tls, bp, ts+26010, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+6350, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+25943, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+26013, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -163574,14 +164461,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+25946, -1)
+			ts+26016, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, int8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+25997, -1)
+			Xsqlite3_result_error(tls, ctx, ts+26067, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -163676,7 +164563,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+16721)
+	jsonWrongNumArgs(tls, ctx, ts+16737)
 	return
 __2:
 	;
@@ -163751,9 +164638,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 26031
+			return ts + 26101
 		}
-		return ts + 26035
+		return ts + 26105
 	}())
 	return
 __2:
@@ -163886,7 +164773,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+26042, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+26112, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -163983,7 +164870,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+26045, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+26115, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -164027,7 +164914,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+26048)
+		ts+26118)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -164158,7 +165045,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+26131, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+26201, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -164177,7 +165064,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+26137, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+26207, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -164273,7 +165160,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, int8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+26137, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+26207, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -164297,7 +165184,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 26142
+				zRoot = ts + 26212
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -164362,6 +165249,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -164413,7 +165306,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+25852, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+25922, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -164508,25 +165401,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26144},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26149},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26160},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26160},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26178},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 26191},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 26194},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26198},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26210},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26222},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26233},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26244},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26256},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 26269},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26278},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26278},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26288},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 26299},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 26316}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26214},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26219},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26230},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26230},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26248},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 26261},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 26264},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26268},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26280},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26292},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26303},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26314},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26326},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 26339},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26348},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26348},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26358},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 26369},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 26386}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -164545,8 +165438,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 26334, FpModule: 0},
-	{FzName: ts + 26344, FpModule: 0},
+	{FzName: ts + 26404, FpModule: 0},
+	{FzName: ts + 26414, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -164806,11 +165699,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+26354, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+26424, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+26362, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+26432, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -165021,7 +165914,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+26367,
+		ts+26437,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -165719,7 +166612,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+26449)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+26519)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -167060,7 +167953,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+26463, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+26533, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -167072,12 +167965,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+26483, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+26553, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+26515, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+26585, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -167303,7 +168196,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+26552, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+26622, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -167326,14 +168219,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 26697
+	var zFmt uintptr = ts + 26767
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+12638, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+12700, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -167374,7 +168267,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 26753, ts + 6412, ts + 17609,
+	ts + 26823, ts + 6412, ts + 17625,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -167417,19 +168310,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+26758,
+			ts+26828,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+26820, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+26890, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+26825,
+			ts+26895,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26889,
+			ts+26959,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26959,
+			ts+27029,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -167458,7 +168351,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 27008
+			zFormat = ts + 27078
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -167470,7 +168363,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+27116,
+			ts+27186,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -167478,18 +168371,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+27161, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+27231, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+14109, 1)
+					Xsqlite3_str_append(tls, p, ts+14119, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+27188, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+27258, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+27210, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+27280, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+27218, 0)
+			Xsqlite3_str_appendf(tls, p, ts+27288, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -167504,14 +168397,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 27234,
-	ts + 27287,
-	ts + 27332,
-	ts + 27384,
-	ts + 27438,
-	ts + 27483,
-	ts + 27541,
-	ts + 27596,
+	ts + 27304,
+	ts + 27357,
+	ts + 27402,
+	ts + 27454,
+	ts + 27508,
+	ts + 27553,
+	ts + 27611,
+	ts + 27666,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -167540,7 +168433,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+27643, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+27713, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -167552,7 +168445,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+27663,
+			ts+27733,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -167560,7 +168453,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+27720,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+27790,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -167602,10 +168495,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 27755,
-		ts + 27798,
-		ts + 27833,
-		ts + 27869,
+		ts + 27825,
+		ts + 27868,
+		ts + 27903,
+		ts + 27939,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -167636,7 +168529,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27906,
+	Xsqlite3_str_appendf(tls, pSql, ts+27976,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -167648,7 +168541,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27930, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+28000, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -167671,7 +168564,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27936, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28006, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -167767,7 +168660,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 27939, ts + 27950}
+var azFormat = [2]uintptr{ts + 28009, ts + 28020}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -167805,13 +168698,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+12210, 1)
+			Xsqlite3_str_append(tls, pOut, ts+12272, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+27960, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+28030, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+27966, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+28036, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+27970, 1)
+		Xsqlite3_str_append(tls, pOut, ts+28040, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -167822,7 +168715,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+27972, -1)
+		Xsqlite3_result_error(tls, ctx, ts+28042, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -167900,7 +168793,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+28005,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+28075,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 5414
@@ -167924,7 +168817,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+28012,
+			ts+28082,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -167943,7 +168836,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+28057, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+28127, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -167957,8 +168850,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 28089,
-		ts + 28143,
+		ts + 28159,
+		ts + 28213,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -167973,23 +168866,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+28191,
+		rtreeCheckAppendMsg(tls, pCheck, ts+28261,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 28236
+					return ts + 28306
 				}
-				return ts + 28244
+				return ts + 28314
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+28253,
+				ts+28323,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 28236
+						return ts + 28306
 					}
-					return ts + 28244
+					return ts + 28314
 				}(), iKey, iVal))
 		}
 	}
@@ -168013,7 +168906,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+28311, libc.VaList(bp, i, iCell, iNode))
+				ts+28381, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -168033,7 +168926,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+28359, libc.VaList(bp+24, i, iCell, iNode))
+					ts+28429, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -168050,14 +168943,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+28426, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+28496, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+28460, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+28530, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -168065,7 +168958,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+28490,
+					ts+28560,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -168094,14 +168987,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+28545,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+28615,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+28576, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+28646, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -168123,12 +169016,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+15850, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+15860, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+28643, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+28713, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -168137,12 +169030,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+26463, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+26533, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+28671, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+28741, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -168156,8 +169049,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+28702, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+28709, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+28772, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+28779, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -168165,7 +169058,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+28717, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+28787, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -168180,7 +169073,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+28721, -1)
+			ts+28791, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -168188,7 +169081,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 7733
+			zDb = ts + 7793
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -168198,7 +169091,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 19338
+				return ts + 19381
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -168493,7 +169386,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -168551,6 +169444,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -168563,15 +169457,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+28772, 1)
+		Xsqlite3_str_append(tls, x, ts+28842, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+28774, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+28844, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+28785, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+28855, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -168591,19 +169486,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep int8 = int8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+28796, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28866, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+28814, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+28884, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = int8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+28822, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+28892, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*int8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+28830, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+28900, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+28834, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28904, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -168622,6 +169517,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -168653,6 +169549,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -168661,6 +169558,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -168719,6 +169617,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -168887,6 +169786,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -168908,6 +169808,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -168992,6 +169893,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -169020,6 +169923,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -169458,6 +170362,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -169471,6 +170376,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -169485,6 +170393,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -169509,7 +170418,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+28847, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28917, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -169518,7 +170427,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+28869, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+28939, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -169526,7 +170435,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27936, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28006, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -169605,6 +170514,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -169733,6 +170643,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -169751,7 +170662,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 17609
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 17625
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -169761,7 +170672,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28873
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28943
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -169769,7 +170680,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28879
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28949
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -169881,7 +170792,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28888, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28958, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -170011,14 +170922,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+28928) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+28998) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+28944) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+29014) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -170055,8 +170968,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -170073,7 +170986,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -170083,7 +170996,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+28959, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+29029, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -170095,25 +171008,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28967},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28980},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28993},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 29006},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28944},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 29018},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28928},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 29041},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29055},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 29068},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 29082},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29098},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29037},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29050},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29063},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 29076},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 29014},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 29088},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28998},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 29111},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29125},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 29138},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 29152},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29168},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 29110},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 29180},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -170123,26 +171036,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+29129, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+29199, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+29139, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+29209, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+29150, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+29220, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+28873, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28943, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+29161, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+29231, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -170196,7 +171109,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+26449, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+26519, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -170523,7 +171436,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+29171, -1)
+		Xsqlite3_result_error(tls, context, ts+29241, -1)
 		return
 	}
 
@@ -170534,7 +171447,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+29171, -1)
+			Xsqlite3_result_error(tls, context, ts+29241, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -170635,7 +171548,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29192, uintptr(0), uintptr(0), p+64)
+				ts+29262, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -170699,7 +171612,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+26362, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+26432, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -170720,16 +171633,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+29363, libc.VaList(bp, func() uintptr {
+			ts+29433, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 29513
+					return ts + 29583
 				}
 				return ts + 1544
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+29554)
+			ts+29624)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -170845,7 +171758,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+29679, libc.VaList(bp, zTab)))
+			ts+29749, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -170863,7 +171776,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+29798, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+29868, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -170881,7 +171794,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+29819, libc.VaList(bp+16, zIdx)))
+			ts+29889, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -170904,7 +171817,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+29870, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+29940, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -170950,7 +171863,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+29891, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29961, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -170965,7 +171878,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+29919, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -171005,7 +171918,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+20765, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+20858, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -171015,18 +171928,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+29948, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+30018, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+29967, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+30037, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+29972, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+30042, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -171038,18 +171951,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+29982, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+30052, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 30011
+							return ts + 30081
 						}
-						return ts + 30024
+						return ts + 30094
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+30033, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+30103, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -171063,7 +171976,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30055,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30125,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -171110,8 +172023,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+30082, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 15961
+		zList = rbuMPrintf(tls, p, ts+30152, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 15971
 	}
 	return zList
 }
@@ -171128,7 +172041,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+30091, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+30161, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -171150,25 +172063,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+30104, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+30174, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+30136, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+30206, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15961, ts+30159)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+30165, ts+30172, ts+6309)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15961, ts+1544)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15971, ts+30229)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+30235, ts+30242, ts+6309)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15971, ts+1544)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+30180,
+					ts+30250,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+30222, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+30292, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -171210,7 +172123,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+29919, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -171245,7 +172158,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 30242
+	zCol = ts + 30312
 __7:
 	;
 	goto __5
@@ -171253,13 +172166,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+30250,
+	zLhs = rbuMPrintf(tls, p, ts+30320,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+30271,
+	zOrder = rbuMPrintf(tls, p, ts+30341,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+30307,
+	zSelect = rbuMPrintf(tls, p, ts+30377,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 15961
+	zSep = ts + 15971
 	iCol++
 	goto __1
 __2:
@@ -171277,7 +172190,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+30334,
+		Xsqlite3_mprintf(tls, ts+30404,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -171304,8 +172217,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+30382, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 15961
+	zVector = rbuMPrintf(tls, p, ts+30452, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 15971
 	goto __15
 __15:
 	iCol++
@@ -171316,7 +172229,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+30389, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+30459, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -171349,7 +172262,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+29919, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -171361,7 +172274,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+30401, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+30471, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1544
 		} else {
@@ -171373,37 +172286,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 30242
+					zCol = ts + 30312
 				} else {
-					zCol = ts + 29972
+					zCol = ts + 30042
 				}
 				zType = ts + 1109
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+30423, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+30493, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 30159
+					return ts + 30229
 				}
 				return ts + 1544
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+30443,
+			zImpPK = Xsqlite3_mprintf(tls, ts+30513,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+30464,
+		zImpCols = Xsqlite3_mprintf(tls, ts+30534,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+30497, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+30567, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 15961
-		zAnd = ts + 22833
+		zCom = ts + 15971
+		zAnd = ts + 22894
 		nBind++
 	}
 
@@ -171442,11 +172355,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+30521, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+30591, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+30533, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+30603, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 15961
+			zS = ts + 15971
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -171454,7 +172367,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+30542, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+30612, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -171466,18 +172379,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+30557, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+30627, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1544
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+30571, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 22833
+				zList = rbuMPrintf(tls, p, ts+30641, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 22894
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+30583, libc.VaList(bp+40, zList))
+			ts+30653, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1544
@@ -171485,8 +172398,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+30633, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 22833
+				zList = rbuMPrintf(tls, p, ts+30703, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 22894
 			}
 		}
 	}
@@ -171495,7 +172408,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30646, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30716, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -171513,17 +172426,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c int8 = *(*int8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+30633,
+					zList = rbuMPrintf(tls, p, ts+30703,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15961
+					zSep = ts + 15971
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+30672,
+					zList = rbuMPrintf(tls, p, ts+30742,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15961
+					zSep = ts + 15971
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+30702,
+					zList = rbuMPrintf(tls, p, ts+30772,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15961
+					zSep = ts + 15971
 				}
 			}
 		}
@@ -171558,19 +172471,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 30739
+		var zSep uintptr = ts + 30809
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+29891, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29961, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+17497) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+17513) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+29919, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -171582,15 +172495,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 30159
+					zDesc = ts + 30229
 				} else {
 					zDesc = ts + 1544
 				}
-				z = rbuMPrintf(tls, p, ts+30752, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 15961
+				z = rbuMPrintf(tls, p, ts+30822, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 15971
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+30763, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+30833, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -171610,7 +172523,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+30767)
+			ts+30837)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -171619,7 +172532,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+29919, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -171629,25 +172542,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+30817, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+30887, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+30839, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+30909, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 30159
+						return ts + 30229
 					}
 					return ts + 1544
 				}()))
-				zComma = ts + 15961
+				zComma = ts + 15971
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+30849, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+30919, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+30864,
+			ts+30934,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 0))
 	}
 }
 
@@ -171660,7 +172573,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1544
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1544
@@ -171668,39 +172581,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 30926
+				zPk = ts + 30996
 			}
-			zSql = rbuMPrintf(tls, p, ts+30939,
+			zSql = rbuMPrintf(tls, p, ts+31009,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 30966
+							return ts + 31036
 						}
 						return ts + 1544
 					}()))
-			zComma = ts + 15961
+			zComma = ts + 15971
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+30976, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+31046, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+30983,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31053,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 31015
+						return ts + 31085
 					}
 					return ts + 1544
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 0))
 	}
 }
 
@@ -171713,7 +172626,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+31030,
+				ts+31100,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -171750,7 +172663,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+31087)
+			ts+31157)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -171855,7 +172768,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+31153, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+31223, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -171875,24 +172788,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+31173,
+				ts+31243,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+31238, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+31308, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+31274, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+31344, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -171908,7 +172821,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+31308,
+						ts+31378,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -171916,9 +172829,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 31369
+											return ts + 31439
 										}
-										return ts + 31373
+										return ts + 31443
 									}()
 								}
 								return ts + 1544
@@ -171927,20 +172840,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+31379,
+						ts+31449,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+31440,
+						ts+31510,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 31369
+									return ts + 31439
 								}
-								return ts + 31373
+								return ts + 31443
 							}(),
 							zCollist, zLimit))
 				}
@@ -171965,8 +172878,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7744)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7740)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7804)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7800)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -171977,16 +172890,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1544
 				}
-				return ts + 31599
+				return ts + 31669
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+31608,
+						ts+31678,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 31644
+								return ts + 31714
 							}
 							return ts + 1544
 						}(), zBindings)))
@@ -171995,32 +172908,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+31654, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+31724, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1544
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 31682
+					zRbuRowid = ts + 31752
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+31694, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+31764, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 31770
+							return ts + 31840
 						}
 						return ts + 1544
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+31787,
+					ts+31857,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+32086,
+						ts+32156,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -172033,9 +172946,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 32185
+						zRbuRowid = ts + 32255
 					} else {
-						zRbuRowid = ts + 32195
+						zRbuRowid = ts + 32265
 					}
 				}
 
@@ -172048,20 +172961,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+30242, 0)
+						zOrder = rbuMPrintf(tls, p, ts+30312, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15961, ts+1544)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15971, ts+1544)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+32206,
+							ts+32276,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 32254
+										return ts + 32324
 									}
 									return ts + 1544
 								}(),
@@ -172074,7 +172987,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 21119
+										return ts + 24228
 									}
 									return ts + 1544
 								}(), zOrder,
@@ -172142,9 +173055,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1544
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 31599
+				zPrefix = ts + 31669
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+32260,
+			zUpdate = Xsqlite3_mprintf(tls, ts+32330,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -172203,7 +173116,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+32290, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+32360, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -172273,28 +173186,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7733, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7733)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+32320, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+32390, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32348, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
-		libc.Xmemcpy(tls, p+48, ts+14819, uint64(4))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32418, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+14829, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+7733, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+7793, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32366, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32436, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7733, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -172327,11 +173240,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32432, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32502, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+25505, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+25575, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*int8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -172343,13 +173256,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+32464,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7733),
+			zTarget = Xsqlite3_mprintf(tls, ts+32534,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1544
 						}
-						return ts + 32496
+						return ts + 32566
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1544
@@ -172368,37 +173281,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+32498, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32568, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+32513, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32583, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+32530, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32600, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32546, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32616, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32574, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32644, 0)
 	}
 }
 
@@ -172427,15 +173340,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32546, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32616, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32592, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32662, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -172483,7 +173396,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -172543,7 +173456,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+7733, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+7793, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -172560,23 +173473,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+32627, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+32697, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7733)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+32652, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+32659, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+32722, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+32729, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -172693,7 +173606,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+25143, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+25213, 0)
 			return
 		}
 
@@ -172786,7 +173699,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+32666)
+			ts+32736)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -172794,7 +173707,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32688, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32758, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -172815,7 +173728,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+32715,
+				ts+32785,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -172845,9 +173758,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+32873, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+32943, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32888,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32958,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -172861,10 +173774,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32908, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32978, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+32933)
+			ts+33003)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -172878,12 +173791,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+33041)
+			ts+33111)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+33106)
+			ts+33176)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -172895,7 +173808,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33150, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33220, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -172915,15 +173828,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+18603)
-					rbuCopyPragma(tls, p, ts+17693)
+					rbuCopyPragma(tls, p, ts+18619)
+					rbuCopyPragma(tls, p, ts+17709)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+33175, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+33245, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -172947,10 +173860,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15865, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15875, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15865, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15875, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -173045,7 +173958,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33203, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33273, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -173058,16 +173971,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+32652, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+32722, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -173077,7 +173991,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+33228, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+33298, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -173111,7 +174025,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+33239, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+33309, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -173141,13 +174055,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+33311, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+33381, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+33325)
+				ts+33395)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -173158,7 +174072,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+33382)
+				ts+33452)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -173232,7 +174146,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33456, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33526, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -173250,12 +174164,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33488,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33558,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 33520
+							return ts + 33590
 						}
-						return ts + 33527
+						return ts + 33597
 					}()))
 			}
 		}
@@ -173263,7 +174177,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15850, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15860, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -173274,19 +174188,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+18317)
-						rbuCopyPragma(tls, p, ts+17708)
+						rbuCopyPragma(tls, p, ts+18333)
+						rbuCopyPragma(tls, p, ts+17724)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+33534, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+7733, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+7793, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+33550, uintptr(0), uintptr(0), p+64)
+								db, ts+33620, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -173340,7 +174254,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+33574, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+33644, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -173367,7 +174281,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+31599, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+31669, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -173384,7 +174298,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15865, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15875, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -173397,13 +174311,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15865, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15875, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+33582, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+33652, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -173498,7 +174412,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15865, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15875, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -173515,19 +174429,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15865, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15875, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 15850
+				zBegin = ts + 15860
 			} else {
-				zBegin = ts + 33534
+				zBegin = ts + 33604
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33534, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33604, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -173650,11 +174564,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -173793,7 +174710,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -173870,7 +174787,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33609, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33679, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -173895,7 +174812,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+33632, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+33702, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -174040,7 +174957,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+7733)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+7793)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -174055,7 +174972,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+33643, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+33713, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -174066,7 +174983,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -174096,6 +175019,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -174859,11 +175797,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+12638, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+12700, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+33654, 0)
+				ts+33724, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1544, 0)
 		} else {
@@ -174876,7 +175814,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+33775, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33845, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -174974,7 +175912,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+12638, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+12700, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -175441,6 +176379,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -175523,6 +176464,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -175552,9 +176494,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+33804,
+			zRet = Xsqlite3_mprintf(tls, ts+33874,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 22833
+			zSep = ts + 22894
 			if zRet == uintptr(0) {
 				break
 			}
@@ -175577,9 +176519,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+33838,
+				ts+33908,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 33879
+			zSep = ts + 33949
 			if zRet == uintptr(0) {
 				break
 			}
@@ -175587,18 +176529,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+8822, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+8882, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+33884,
+		ts+33954,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -175608,7 +176550,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -175641,7 +176583,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+33962,
+			ts+34032,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -175768,7 +176710,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+34015, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+34085, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -176242,9 +177184,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+12638, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+12700, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+34042, libc.VaList(bp, zDb))
+			ts+34112, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -176253,18 +177195,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1544
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+34152, bp+24)
+		sessionAppendStr(tls, bp+8, ts+34222, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1557, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+34167, bp+24)
+		sessionAppendStr(tls, bp+8, ts+34237, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+34175, bp+24)
+				sessionAppendStr(tls, bp+8, ts+34245, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 22833
+				zSep = ts + 22894
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -176373,7 +177315,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+34181, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+34251, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -176465,7 +177407,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+34201, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34271, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -176728,7 +177670,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -176751,7 +177693,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -176793,7 +177735,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -176854,7 +177796,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -176928,13 +177870,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -176996,7 +177938,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -177369,7 +178311,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -177537,7 +178479,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+12638) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+12700) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -177548,34 +178490,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+34219, bp+16)
+				sessionAppendStr(tls, bp, ts+34289, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+34232, bp+16)
+				sessionAppendStr(tls, bp, ts+34302, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+34238, bp+16)
+						sessionAppendStr(tls, bp, ts+34308, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 15961
+						zSep = ts + 15971
 					}
 				}
 
 				zSep = ts + 1544
-				sessionAppendStr(tls, bp, ts+34167, bp+16)
+				sessionAppendStr(tls, bp, ts+34237, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+34243, bp+16)
+								ts+34313, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+34175, bp+16)
+							sessionAppendStr(tls, bp, ts+34245, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 22833
+						zSep = ts + 22894
 					}
 				}
 
@@ -177627,34 +178569,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+34318, bp+16)
+	sessionAppendStr(tls, bp, ts+34388, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+34167, bp+16)
+	sessionAppendStr(tls, bp, ts+34237, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+34238, bp+16)
+			sessionAppendStr(tls, bp, ts+34308, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 22833
+			zSep = ts + 22894
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+34336, bp+16)
+		sessionAppendStr(tls, bp, ts+34406, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+33879, bp+16)
+		sessionAppendStr(tls, bp, ts+33949, bp+16)
 
 		zSep = ts + 1544
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+34175, bp+16)
+				sessionAppendStr(tls, bp, ts+34245, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 34344
+				zSep = ts + 34414
 			}
 		}
 		sessionAppendStr(tls, bp, ts+6309, bp+16)
@@ -177670,7 +178612,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+7733, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+7793, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -177681,19 +178623,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+34349, bp+16)
+	sessionAppendStr(tls, bp, ts+34419, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+22839, bp+16)
+	sessionAppendStr(tls, bp, ts+22900, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+15961, bp+16)
+			sessionAppendStr(tls, bp, ts+15971, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+34367, bp+16)
+	sessionAppendStr(tls, bp, ts+34437, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+34378, bp+16)
+		sessionAppendStr(tls, bp, ts+34448, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+6309, bp+16)
 
@@ -177709,14 +178651,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+12638, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+12700, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+34382)
+			ts+34452)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+34495)
+			ts+34565)
 	}
 	return rc
 }
@@ -177744,7 +178686,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -177753,7 +178695,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -177830,7 +178772,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -177956,7 +178898,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -177997,7 +178939,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+34639, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34709, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -178013,7 +178955,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+34660, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+34730, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -178086,10 +179028,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+34679, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+34749, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+34705, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+34775, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -178135,7 +179077,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+7733, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+7793, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -178148,19 +179090,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+34735, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34805, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+34779,
+						ts+34849,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+34850, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34920, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+12638) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+12700) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -178211,14 +179153,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+34910, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34980, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+34940, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+35010, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+34964, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+34940, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+35034, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+35010, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -179466,7 +180408,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+34992, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+35062, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -179754,7 +180696,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+35020, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+35090, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -179941,7 +180883,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+35051, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+35121, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -180009,7 +180951,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 35058
+		var zErr uintptr = ts + 35128
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -180191,7 +181133,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 35108
+		var zErr uintptr = ts + 35178
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -180515,13 +181457,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 35156, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35226, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 35164, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35234, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 35174, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35244, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -181072,7 +182014,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+35179, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35249, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -181099,14 +182041,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*int8)(unsafe.Pointer(p))) < '0' || int32(*(*int8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35186, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35256, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+35217, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+35287, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -181117,7 +182059,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35250, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35320, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -181130,7 +182072,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35287, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35357, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -181139,7 +182081,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35296, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35366, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -181158,7 +182100,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35329, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35399, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -181173,14 +182115,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35363, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35433, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35371, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35441, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*int8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+35403, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+35473, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -181188,9 +182130,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35409, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35479, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35423, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35493, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -181198,9 +182140,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35461, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35531, zCmd, nCmd) == 0 {
 		if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || int32(*(*int8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35472, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35542, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -181210,19 +182152,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+6427, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 9310, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 18698},
-			{FzName: ts + 35507, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 9378, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 18714},
+			{FzName: ts + 35577, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35515, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35585, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35546, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35616, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -181269,15 +182211,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+23499) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+17609) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35574, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+23560) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+17625) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35644, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+35604) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+35674) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35614, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35684, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -181294,13 +182236,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35645, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35715, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35650, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35720, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35657, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35727, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -181338,8 +182280,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+23499) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35665, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+23560) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35735, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -181371,7 +182313,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35694, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35764, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -181408,19 +182350,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 35363
+			zTail = ts + 35433
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 35714
+			zTail = ts + 35784
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+35722, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+35792, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+17609, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+17625, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -181464,18 +182406,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35733, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35803, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1544
 			}
-			return ts + 15961
+			return ts + 15971
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35749, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35819, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35756,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+23499))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35826,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+23560))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -181585,7 +182527,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35782) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35852) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -181595,7 +182537,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35787) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35857) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -181605,7 +182547,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35796) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35866) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -181618,7 +182560,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35806) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35876) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -181628,7 +182570,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35816) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35886) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -181644,7 +182586,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+23499) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+23560) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -181667,7 +182609,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 35828
+	var zSelect uintptr = ts + 35898
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -181689,7 +182631,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+35860) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35930) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -181703,7 +182645,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+35868,
+				ts+35938,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -181801,7 +182743,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+35933, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+36003, 0)
 					return FTS5_EOF
 				}
 			}
@@ -181814,20 +182756,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+35953, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+36023, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35984, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+36054, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35987, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+36057, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+31369, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+31439, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -181913,6 +182855,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*int8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -181941,7 +182894,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 1))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*int8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = int8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -183594,9 +184547,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35991, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+36061, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+35020, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+35090, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -183612,7 +184565,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c int8 = *(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+35996, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+36066, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -183699,7 +184652,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+21836, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+21897, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -183780,7 +184733,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+36025, 0)
+			ts+36095, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -183950,12 +184903,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+36078,
+								ts+36148,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 36128
+										return ts + 36198
 									}
-									return ts + 35991
+									return ts + 36061
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -184898,7 +185851,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+36135, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+36205, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -184977,7 +185930,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+36141,
+			ts+36211,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -185002,7 +185955,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+36192,
+			ts+36262,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -185025,7 +185978,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+36241,
+			ts+36311,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -185264,7 +186217,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+36281, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+36351, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -186463,7 +187416,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+36304,
+			ts+36374,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -187929,7 +188882,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+36388,
+			ts+36458,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -188420,10 +189373,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -189006,13 +189964,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+36445, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+36515, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+26362, ts+36453, 0, pzErr)
+				pConfig, ts+26432, ts+36523, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+12778,
-					ts+36488,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+12840,
+					ts+36558,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -189265,7 +190223,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+36135, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+36205, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -189379,7 +190337,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+36532,
+		ts+36602,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -189549,7 +190507,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+36618)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+36688)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -189820,7 +190778,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+36623, 0)
+			ts+36693, 0)
 		return SQLITE_ERROR
 	}
 
@@ -190244,11 +191202,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+36662,
+		ts+36732,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 15961
+					return ts + 15971
 				}
 				return ts + 1544
 			}(),
@@ -190260,9 +191218,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 36717
+					return ts + 36787
 				}
-				return ts + 36722
+				return ts + 36792
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -190308,12 +191266,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+36726, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+36796, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+6409, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36732, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36802, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -190344,7 +191302,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36760, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36830, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -190375,7 +191333,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36770, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36840, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -190407,14 +191365,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+36791, libc.VaList(bp, z))
+				ts+36861, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 35174
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 35244
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -190470,7 +191428,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+36623, 0)
+		ts+36693, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -190687,7 +191645,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+36824, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36894, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -190832,28 +191790,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+36860, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36930, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+36871, 0)
+				ts+36941, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36951, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37021, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+36959, 0)
+				ts+37029, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+18297, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+18313, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+37015, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37085, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+37021, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37091, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -190911,7 +191869,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+18832, z) {
+			0 == Xsqlite3_stricmp(tls, ts+18848, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -190924,12 +191882,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+37037,
+				ts+37107,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 21737
+						return ts + 21798
 					}
-					return ts + 37074
+					return ts + 37144
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -191559,7 +192517,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+37086, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+37156, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -191803,7 +192761,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37107, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37177, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -191822,7 +192780,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37129, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37199, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -191869,7 +192827,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+37160)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+37230)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -191878,7 +192836,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+37173, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+37243, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -191892,7 +192850,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 37264, ts + 35363, ts + 26362, ts + 35714, ts + 12778,
+	ts + 37334, ts + 35433, ts + 26432, ts + 35784, ts + 12840,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -191916,7 +192874,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+37271, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+37341, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -191934,13 +192892,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+37271, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+37341, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+37276, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+37346, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -191995,17 +192955,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 37291,
-			ts + 37359,
-			ts + 37428,
-			ts + 37461,
-			ts + 37500,
-			ts + 37540,
-			ts + 37579,
-			ts + 37620,
-			ts + 37659,
-			ts + 37701,
-			ts + 37741,
+			ts + 37361,
+			ts + 37429,
+			ts + 37498,
+			ts + 37531,
+			ts + 37570,
+			ts + 37610,
+			ts + 37649,
+			ts + 37690,
+			ts + 37729,
+			ts + 37771,
+			ts + 37811,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -192107,18 +193067,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+37764,
+		ts+37834,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+37868,
+			ts+37938,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+37906,
+			ts+37976,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -192130,7 +193090,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+37944,
+			ts+38014,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -192142,14 +193102,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+26362, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+12778, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+37264, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+26432, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+12840, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+37334, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+35714, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+35784, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+35363, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+35433, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -192161,17 +193121,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37986,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+38056,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 31015
+					return ts + 31085
 				}
 				return ts + 1544
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+38016,
+			ts+38086,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -192208,27 +193168,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+38060, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+38130, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+38083, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+38153, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+35363, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+35433, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35714, ts+38089, 0, pzErr)
+				pConfig, ts+35784, ts+38159, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+37264, ts+38121, 1, pzErr)
+				pConfig, ts+37334, ts+38191, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35860, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35930, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -192434,12 +193394,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+38138,
+		ts+38208,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+38188,
+			ts+38258,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -192447,7 +193407,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35860, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35930, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -192623,7 +193583,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+38217,
+	zSql = Xsqlite3_mprintf(tls, ts+38287,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -192805,14 +193765,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+35363, bp+48)
+			rc = fts5StorageCount(tls, p, ts+35433, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+35714, bp+56)
+			rc = fts5StorageCount(tls, p, ts+35784, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -193007,9 +193967,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38249) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38319) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38260) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38330) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -193224,7 +194184,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 38271
+			var zCat uintptr = ts + 38341
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -193236,7 +194196,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38280) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38350) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -193247,18 +194207,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38291) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38361) {
 					if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' && int32(*(*int8)(unsafe.Pointer(zArg))) != '2' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*int8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38249) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38319) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38260) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38330) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38280) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38350) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -193534,7 +194494,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 38309
+	var zBase uintptr = ts + 38379
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -193676,7 +194636,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38319, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38389, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -193684,11 +194644,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38322, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38392, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38327, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38397, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -193696,7 +194656,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38332, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38402, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -193704,7 +194664,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38335, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38405, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -193712,11 +194672,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38338, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38408, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38343, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38413, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -193724,19 +194684,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38348, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38418, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38352, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38422, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38358, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38428, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38363, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38433, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193744,11 +194704,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38367, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38437, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38371, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38441, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -193756,7 +194716,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38374, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38444, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193764,11 +194724,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38378, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38448, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38382, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38452, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193776,7 +194736,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38386, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38456, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193784,7 +194744,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38390, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38460, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193792,7 +194752,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38394, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38464, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193808,24 +194768,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38398, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38378, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38468, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38448, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38401, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38404, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38471, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38474, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38408, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38394, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38478, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38464, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -193840,137 +194800,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38411, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38481, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38378, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38448, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38419, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38489, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38426, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38496, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38431, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38501, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38327, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38397, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38436, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38506, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38322, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38392, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38441, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38511, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38394, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38464, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38446, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38516, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+16821, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+16837, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38451, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38521, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38404, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38474, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38455, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38525, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38319, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38389, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38460, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38530, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38363, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38433, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38466, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38536, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38470, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38540, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38472, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38542, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38386, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38456, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38478, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38548, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38394, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38464, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38486, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38556, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38378, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38448, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38492, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38562, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38378, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38448, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38497, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38567, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38319, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38503, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38573, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38390, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38460, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38511, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38581, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38519, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38589, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38523, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38593, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38386, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38456, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38531, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38601, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38319, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38537, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38607, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38390, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38460, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38543, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38613, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38404, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38474, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -193985,16 +194945,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38550, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38620, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38335, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38405, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38555, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38625, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -194002,21 +194962,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38560, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38630, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38335, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38405, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38566, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38636, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38335, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38405, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38519, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38589, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194024,7 +194984,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38572, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38642, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -194032,9 +194992,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38578, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38648, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38319, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -194049,12 +195009,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38584, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38654, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38588, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38658, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38591, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38661, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -194063,7 +195023,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38594, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38664, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -194219,7 +195179,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38598) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38668) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -194399,22 +195359,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 38309, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38379, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 38613, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38683, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 38619, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38689, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 38626, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38696, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -195557,14 +196517,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+38634) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+38704) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+38638) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+38708) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+38642) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+38712) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38651, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38721, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -195590,19 +196550,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 38685,
-		ts + 38725,
-		ts + 38760,
+		ts + 38755,
+		ts + 38795,
+		ts + 38830,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+24651, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+24721, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38803, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38873, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -195735,11 +196695,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+38836, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38906, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+38867,
+		ts+38937,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -195763,7 +196723,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+38918, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38988, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -196158,7 +197118,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+38944, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+39014, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -196180,7 +197140,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 38954
+	return ts + 39024
 }
 
 func init() {
@@ -196235,114 +197195,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -196787,6 +197749,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -197105,6 +198079,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -197232,5 +198207,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&winVfs)) + 160)) = winNextSystemCall
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=1\x00COMPILER=msvc-1900\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00AreFileApisANSI\x00CharLowerW\x00CharUpperW\x00CloseHandle\x00CreateFileA\x00CreateFileW\x00CreateFileMappingA\x00CreateFileMappingW\x00CreateMutexW\x00DeleteFileA\x00DeleteFileW\x00FileTimeToLocalFileTime\x00FileTimeToSystemTime\x00FlushFileBuffers\x00FormatMessageA\x00FormatMessageW\x00FreeLibrary\x00GetCurrentProcessId\x00GetDiskFreeSpaceA\x00GetDiskFreeSpaceW\x00GetFileAttributesA\x00GetFileAttributesW\x00GetFileAttributesExW\x00GetFileSize\x00GetFullPathNameA\x00GetFullPathNameW\x00GetLastError\x00GetProcAddressA\x00GetSystemInfo\x00GetSystemTime\x00GetSystemTimeAsFileTime\x00GetTempPathA\x00GetTempPathW\x00GetTickCount\x00GetVersionExA\x00GetVersionExW\x00HeapAlloc\x00HeapCreate\x00HeapDestroy\x00HeapFree\x00HeapReAlloc\x00HeapSize\x00HeapValidate\x00HeapCompact\x00LoadLibraryA\x00LoadLibraryW\x00LocalFree\x00LockFile\x00LockFileEx\x00MapViewOfFile\x00MultiByteToWideChar\x00QueryPerformanceCounter\x00ReadFile\x00SetEndOfFile\x00SetFilePointer\x00Sleep\x00SystemTimeToFileTime\x00UnlockFile\x00UnlockFileEx\x00UnmapViewOfFile\x00WideCharToMultiByte\x00WriteFile\x00CreateEventExW\x00WaitForSingleObject\x00WaitForSingleObjectEx\x00SetFilePointerEx\x00GetFileInformationByHandleEx\x00MapViewOfFileFromApp\x00CreateFile2\x00LoadPackagedLibrary\x00GetTickCount64\x00GetNativeSystemInfo\x00OutputDebugStringA\x00OutputDebugStringW\x00GetProcessHeap\x00CreateFileMappingFromApp\x00InterlockedCompareExchange\x00UuidCreate\x00UuidCreateSequential\x00FlushViewOfFile\x00%s\x00OsError 0x%lx (%lu)\x00os_win.c:%d: (%lu) %s(%s) - %s\x00delayed %dms for lock/sharing conflict at line %d\x00winSeekFile\x00winClose\x00winRead\x00winWrite1\x00winWrite2\x00winTruncate1\x00winTruncate2\x00winSync1\x00winSync2\x00winFileSize\x00winUnlockReadLock\x00winUnlock\x00winLockSharedMemory\x00%s-shm\x00readonly_shm\x00winOpenShm\x00winShmMap1\x00winShmMap2\x00winShmMap3\x00winUnmapfile1\x00winUnmapfile2\x00winMapfile1\x00winMapfile2\x00etilqs_\x00winGetTempname1\x00winGetTempname2\x00winGetTempname3\x00winGetTempname4\x00winGetTempname5\x00abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x00exclusive\x00winOpen\x00psow\x00winDelete\x00winAccess\x00%s%c%s\x00winFullPathname1\x00winFullPathname2\x00winFullPathname3\x00winFullPathname4\x00win32\x00win32-longpath\x00win32-none\x00win32-longpath-none\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00stat\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00dll\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_store_directory\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00access\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=1\x00COMPILER=msvc-1900\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00AreFileApisANSI\x00CharLowerW\x00CharUpperW\x00CloseHandle\x00CreateFileA\x00CreateFileW\x00CreateFileMappingA\x00CreateFileMappingW\x00CreateMutexW\x00DeleteFileA\x00DeleteFileW\x00FileTimeToLocalFileTime\x00FileTimeToSystemTime\x00FlushFileBuffers\x00FormatMessageA\x00FormatMessageW\x00FreeLibrary\x00GetCurrentProcessId\x00GetDiskFreeSpaceA\x00GetDiskFreeSpaceW\x00GetFileAttributesA\x00GetFileAttributesW\x00GetFileAttributesExW\x00GetFileSize\x00GetFullPathNameA\x00GetFullPathNameW\x00GetLastError\x00GetProcAddressA\x00GetSystemInfo\x00GetSystemTime\x00GetSystemTimeAsFileTime\x00GetTempPathA\x00GetTempPathW\x00GetTickCount\x00GetVersionExA\x00GetVersionExW\x00HeapAlloc\x00HeapCreate\x00HeapDestroy\x00HeapFree\x00HeapReAlloc\x00HeapSize\x00HeapValidate\x00HeapCompact\x00LoadLibraryA\x00LoadLibraryW\x00LocalFree\x00LockFile\x00LockFileEx\x00MapViewOfFile\x00MultiByteToWideChar\x00QueryPerformanceCounter\x00ReadFile\x00SetEndOfFile\x00SetFilePointer\x00Sleep\x00SystemTimeToFileTime\x00UnlockFile\x00UnlockFileEx\x00UnmapViewOfFile\x00WideCharToMultiByte\x00WriteFile\x00CreateEventExW\x00WaitForSingleObject\x00WaitForSingleObjectEx\x00SetFilePointerEx\x00GetFileInformationByHandleEx\x00MapViewOfFileFromApp\x00CreateFile2\x00LoadPackagedLibrary\x00GetTickCount64\x00GetNativeSystemInfo\x00OutputDebugStringA\x00OutputDebugStringW\x00GetProcessHeap\x00CreateFileMappingFromApp\x00InterlockedCompareExchange\x00UuidCreate\x00UuidCreateSequential\x00FlushViewOfFile\x00%s\x00OsError 0x%lx (%lu)\x00os_win.c:%d: (%lu) %s(%s) - %s\x00delayed %dms for lock/sharing conflict at line %d\x00winSeekFile\x00winClose\x00winRead\x00winWrite1\x00winWrite2\x00winTruncate1\x00winTruncate2\x00winSync1\x00winSync2\x00winFileSize\x00winUnlockReadLock\x00winUnlock\x00winLockSharedMemory\x00%s-shm\x00readonly_shm\x00winOpenShm\x00winShmMap1\x00winShmMap2\x00winShmMap3\x00winUnmapfile1\x00winUnmapfile2\x00winMapfile1\x00winMapfile2\x00etilqs_\x00winGetTempname1\x00winGetTempname2\x00winGetTempname3\x00winGetTempname4\x00winGetTempname5\x00abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x00exclusive\x00winOpen\x00psow\x00winDelete\x00winAccess\x00%s%c%s\x00winFullPathname1\x00winFullPathname2\x00winFullPathname3\x00winFullPathname4\x00win32\x00win32-longpath\x00win32-none\x00win32-longpath-none\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00stat\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00dll\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_store_directory\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00access\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/lib/sqlite_windows_arm64.go b/vendor/modernc.org/sqlite/lib/sqlite_windows_arm64.go
index 740fae3a..57c8fcdb 100644
--- a/vendor/modernc.org/sqlite/lib/sqlite_windows_arm64.go
+++ b/vendor/modernc.org/sqlite/lib/sqlite_windows_arm64.go
@@ -1,4 +1,4 @@
-// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_windows_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3400100/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_WIN=1 -D_MSC_VER=1900', DO NOT EDIT.
+// Code generated by 'ccgo -DSQLITE_PRIVATE= -export-defines "" -export-enums "" -export-externs X -export-fields F -export-typedefs "" -ignore-unsupported-alignment -pkgname sqlite3 -volatile=sqlite3_io_error_pending,sqlite3_open_file_count,sqlite3_pager_readdb_count,sqlite3_pager_writedb_count,sqlite3_pager_writej_count,sqlite3_search_count,sqlite3_sort_count,saved_cnt,randomnessPid -o lib/sqlite_windows_amd64.go -trace-translation-units testdata/sqlite-amalgamation-3410000/sqlite3.c -full-path-comments -DNDEBUG -DHAVE_USLEEP -DLONGDOUBLE_TYPE=double -DSQLITE_CORE -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_ENABLE_PREUPDATE_HOOK -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MUTEX_APPDEF=1 -DSQLITE_MUTEX_NOOP -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE=1 -DSQLITE_OS_WIN=1 -D_MSC_VER=1900', DO NOT EDIT.
 
 package sqlite3
 
@@ -6800,6 +6800,7 @@ const (
 	FTS5_LCP                                                                       = 7
 	FTS5_LP                                                                        = 10
 	FTS5_MAIN_PREFIX                                                               = 48
+	FTS5_MAX_LEVEL                                                                 = 64
 	FTS5_MAX_PAGE_SIZE                                                             = 65536
 	FTS5_MAX_PREFIX_INDEXES                                                        = 31
 	FTS5_MAX_SEGMENT                                                               = 2000
@@ -10899,6 +10900,7 @@ const (
 	OPFLG_IN2                                                                      = 0x04
 	OPFLG_IN3                                                                      = 0x08
 	OPFLG_JUMP                                                                     = 0x01
+	OPFLG_NCYCLE                                                                   = 0x40
 	OPFLG_OUT2                                                                     = 0x10
 	OPFLG_OUT3                                                                     = 0x20
 	OPTIONAL                                                                       = 0
@@ -13881,6 +13883,7 @@ const (
 	SF_Recursive                                                                   = 0x0002000
 	SF_Resolved                                                                    = 0x0000004
 	SF_UFSrcCheck                                                                  = 0x0800000
+	SF_UpdateFrom                                                                  = 0x10000000
 	SF_UsesEphemeral                                                               = 0x0000020
 	SF_Values                                                                      = 0x0000200
 	SF_View                                                                        = 0x0200000
@@ -14478,6 +14481,7 @@ const (
 	SQLITE_ACCESS_READ                                                             = 2
 	SQLITE_ACCESS_READWRITE                                                        = 1
 	SQLITE_AFF_BLOB                                                                = 0x41
+	SQLITE_AFF_FLEXNUM                                                             = 0x46
 	SQLITE_AFF_INTEGER                                                             = 0x44
 	SQLITE_AFF_MASK                                                                = 0x47
 	SQLITE_AFF_NONE                                                                = 0x40
@@ -14596,6 +14600,7 @@ const (
 	SQLITE_CacheSpill                                                              = 0x00000020
 	SQLITE_CellSizeCk                                                              = 0x00200000
 	SQLITE_CkptFullFSync                                                           = 0x00000010
+	SQLITE_Coroutines                                                              = 0x02000000
 	SQLITE_CountOfView                                                             = 0x00000200
 	SQLITE_CoverIdxScan                                                            = 0x00000020
 	SQLITE_CursorHints                                                             = 0x00000400
@@ -14959,6 +14964,7 @@ const (
 	SQLITE_NOTADB                                                                  = 26
 	SQLITE_NOTFOUND                                                                = 12
 	SQLITE_NOTICE                                                                  = 27
+	SQLITE_NOTICE_RBU                                                              = 795
 	SQLITE_NOTICE_RECOVER_ROLLBACK                                                 = 539
 	SQLITE_NOTICE_RECOVER_WAL                                                      = 283
 	SQLITE_NOTNULL                                                                 = 0x90
@@ -15061,11 +15067,14 @@ const (
 	SQLITE_ResetDatabase                                                           = 0x02000000
 	SQLITE_ReverseOrder                                                            = 0x00001000
 	SQLITE_SAVEPOINT                                                               = 32
+	SQLITE_SCANSTAT_COMPLEX                                                        = 0x0001
 	SQLITE_SCANSTAT_EST                                                            = 2
 	SQLITE_SCANSTAT_EXPLAIN                                                        = 4
 	SQLITE_SCANSTAT_NAME                                                           = 3
+	SQLITE_SCANSTAT_NCYCLE                                                         = 7
 	SQLITE_SCANSTAT_NLOOP                                                          = 0
 	SQLITE_SCANSTAT_NVISIT                                                         = 1
+	SQLITE_SCANSTAT_PARENTID                                                       = 6
 	SQLITE_SCANSTAT_SELECTID                                                       = 5
 	SQLITE_SCHEMA                                                                  = 17
 	SQLITE_SELECT                                                                  = 21
@@ -15080,7 +15089,7 @@ const (
 	SQLITE_SHM_UNLOCK                                                              = 1
 	SQLITE_SORTER_PMASZ                                                            = 250
 	SQLITE_SOUNDEX                                                                 = 1
-	SQLITE_SOURCE_ID                                                               = "2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24"
+	SQLITE_SOURCE_ID                                                               = "2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d"
 	SQLITE_SO_ASC                                                                  = 0
 	SQLITE_SO_DESC                                                                 = 1
 	SQLITE_SO_UNDEFINED                                                            = -1
@@ -15191,8 +15200,8 @@ const (
 	SQLITE_UTF8                                                                    = 1
 	SQLITE_VDBEINT_H                                                               = 0
 	SQLITE_VDBE_H                                                                  = 0
-	SQLITE_VERSION                                                                 = "3.40.1"
-	SQLITE_VERSION_NUMBER                                                          = 3040001
+	SQLITE_VERSION                                                                 = "3.41.0"
+	SQLITE_VERSION_NUMBER                                                          = 3041000
 	SQLITE_VTABRISK_High                                                           = 2
 	SQLITE_VTABRISK_Low                                                            = 0
 	SQLITE_VTABRISK_Normal                                                         = 1
@@ -17082,6 +17091,7 @@ const (
 	WHERE_DISTINCT_UNIQUE                                                          = 1
 	WHERE_DISTINCT_UNORDERED                                                       = 3
 	WHERE_DUPLICATES_OK                                                            = 0x0010
+	WHERE_EXPRIDX                                                                  = 0x04000000
 	WHERE_GROUPBY                                                                  = 0x0040
 	WHERE_IDX_ONLY                                                                 = 0x00000040
 	WHERE_INDEXED                                                                  = 0x00000200
@@ -22543,6 +22553,7 @@ type sqlite3_api_routines = struct {
 	Fserialize              uintptr
 	Fdb_name                uintptr
 	Fvalue_encoding         uintptr
+	Fis_interrupted         uintptr
 }
 
 // CAPI3REF: Loadable Extension Thunk
@@ -24004,10 +24015,8 @@ type U8 = uint8
 type I8 = int8
 
 // The datatype used to store estimates of the number of rows in a
-// table or index.  This is an unsigned integer type.  For 99.9% of
-// the world, a 32-bit integer is sufficient.  But a 64-bit integer
-// can be used at compile-time if desired.
-type TRowcnt = U32
+// table or index.
+type TRowcnt = U64
 
 // Estimated quantities used for query planning are stored as 16-bit
 // logarithms.  For quantity X, the value stored is 10*log2(X).  This
@@ -24063,12 +24072,10 @@ type BusyHandler = BusyHandler1
 type AggInfo1 = struct {
 	FdirectMode     U8
 	FuseSortingIdx  U8
-	F__ccgo_pad1    [2]byte
+	FnSortingColumn U16
 	FsortingIdx     int32
 	FsortingIdxPTab int32
-	FnSortingColumn int32
-	FmnReg          int32
-	FmxReg          int32
+	FiFirstReg      int32
 	FpGroupBy       uintptr
 	FaCol           uintptr
 	FnColumn        int32
@@ -24320,7 +24327,6 @@ type Index1 = struct {
 	FaSample       uintptr
 	FaiRowEst      uintptr
 	FnRowEst0      TRowcnt
-	F__ccgo_pad3   [4]byte
 	FcolNotIdxed   Bitmask
 }
 
@@ -24441,7 +24447,7 @@ type Parse1 = struct {
 	F__ccgo_pad2      [4]byte
 	FaLabel           uintptr
 	FpConstExpr       uintptr
-	FpIdxExpr         uintptr
+	FpIdxEpr          uintptr
 	FconstraintName   Token
 	FwriteMask        YDbMask
 	FcookieMask       YDbMask
@@ -24465,11 +24471,13 @@ type Parse1 = struct {
 	FnQueryLoop      U32
 	Foldmask         U32
 	Fnewmask         U32
+	FnProgressSteps  U32
 	FeTriggerOp      U8
 	FbReturning      U8
 	FeOrconf         U8
 	FdisableTriggers U8
 	FaTempReg        [8]int32
+	F__ccgo_pad4     [4]byte
 	FpOuterParse     uintptr
 	FsNameToken      Token
 	FsLastToken      Token
@@ -24477,11 +24485,11 @@ type Parse1 = struct {
 	FiPkSortOrder    U8
 	Fexplain         U8
 	FeParseMode      U8
-	F__ccgo_pad4     [3]byte
+	F__ccgo_pad5     [3]byte
 	FnVtabLock       int32
 	FnHeight         int32
 	FaddrExplain     int32
-	F__ccgo_pad5     [4]byte
+	F__ccgo_pad6     [4]byte
 	FpVList          uintptr
 	FpReprepare      uintptr
 	FzTail           uintptr
@@ -25116,7 +25124,7 @@ type Vdbe1 = struct {
 	FnOp                int32
 	FnOpAlloc           int32
 	FaColName           uintptr
-	FpResultSet         uintptr
+	FpResultRow         uintptr
 	FzErrMsg            uintptr
 	FpVList             uintptr
 	FstartTime          I64
@@ -25254,10 +25262,8 @@ type AggInfo_col = struct {
 	FpTab          uintptr
 	FpCExpr        uintptr
 	FiTable        int32
-	FiMem          int32
 	FiColumn       I16
 	FiSorterColumn I16
-	F__ccgo_pad1   [4]byte
 }
 
 // An instance of this structure contains information needed to generate
@@ -25272,12 +25278,10 @@ type AggInfo_col = struct {
 // original Select structure that describes the SELECT statement.  These
 // fields do not need to be freed when deallocating the AggInfo structure.
 type AggInfo_func = struct {
-	FpFExpr      uintptr
-	FpFunc       uintptr
-	FiMem        int32
-	FiDistinct   int32
-	FiDistAddr   int32
-	F__ccgo_pad1 [4]byte
+	FpFExpr    uintptr
+	FpFunc     uintptr
+	FiDistinct int32
+	FiDistAddr int32
 }
 
 // The datatype ynVar is a signed integer, either 16-bit or 32-bit.
@@ -25467,10 +25471,12 @@ type RenameCtx1 = struct {
 }
 
 // Context pointer passed down through the tree-walk.
-type CoveringIndexCheck = struct {
+type CoveringIndexCheck1 = struct {
 	FpIdx        uintptr
 	FiTabCur     int32
-	F__ccgo_pad1 [4]byte
+	FbExpr       U8
+	FbUnidx      U8
+	F__ccgo_pad1 [2]byte
 }
 
 var sqlite3azCompileOpt = [52]uintptr{
@@ -25674,7 +25680,7 @@ var Xsqlite3WhereTrace U32 = U32(0)
 // created by mkopcodeh.awk during compilation.  Data is obtained
 // from the comments following the "case OP_xxxx:" statements in
 // the vdbe.c file.
-var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x01), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x09), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x26), uint8(0x26), uint8(0x01), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
+var Xsqlite3OpcodeProperty = [187]uint8{uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x41), uint8(0x00), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x12), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x01), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x49), uint8(0x41), uint8(0x01), uint8(0x01), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x41), uint8(0x26), uint8(0x26), uint8(0x41), uint8(0x23), uint8(0x0b), uint8(0x01), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x0b), uint8(0x01), uint8(0x03), uint8(0x03), uint8(0x03), uint8(0x01), uint8(0x41), uint8(0x01), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x08), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x02), uint8(0x02), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x12), uint8(0x1e), uint8(0x20), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x40), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x26), uint8(0x40), uint8(0x00), uint8(0x12), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x40), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x00), uint8(0x40), uint8(0x40), uint8(0x10), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x50), uint8(0x00), uint8(0x40), uint8(0x04), uint8(0x04), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x10), uint8(0x00), uint8(0x00), uint8(0x06), uint8(0x10), uint8(0x00), uint8(0x04), uint8(0x1a), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x40), uint8(0x50), uint8(0x40), uint8(0x00), uint8(0x10), uint8(0x10), uint8(0x02), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00), uint8(0x00)}
 
 // Name of the default collating sequence
 var Xsqlite3StrBINARY = *(*[7]int8)(unsafe.Pointer(ts + 1089))
@@ -25826,7 +25832,6 @@ type VdbeFrame1 = struct {
 	Fv         uintptr
 	FpParent   uintptr
 	FaOp       uintptr
-	FanExec    uintptr
 	FaMem      uintptr
 	FapCsr     uintptr
 	FaOnce     uintptr
@@ -25875,8 +25880,18 @@ type Bft = uint32
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus1 = struct {
 	FaddrExplain int32
+	FaAddrRange  [6]int32
 	FaddrLoop    int32
 	FaddrVisit   int32
 	FiSelectID   int32
@@ -25887,6 +25902,15 @@ type ScanStatus1 = struct {
 
 // The ScanStatus object holds a single value for the
 // sqlite3_stmt_scanstatus() interface.
+//
+// aAddrRange[]:
+//
+//	This array is used by ScanStatus elements associated with EQP
+//	notes that make an SQLITE_SCANSTAT_NCYCLE value available. It is
+//	an array of up to 3 ranges of VM addresses for which the Vdbe.anCycle[]
+//	values should be summed to calculate the NCYCLE value. Each pair of
+//	integer addresses is a start and end address (both inclusive) for a range
+//	instructions. A start value of 0 indicates an empty range.
 type ScanStatus = ScanStatus1
 
 // The DblquoteStr object holds the text of a double-quoted
@@ -26003,7 +26027,7 @@ func Xsqlite3_status64(tls *libc.TLS, op int32, pCurrent uintptr, pHighwater uin
 	_ = pMutex
 
 	if op < 0 || op >= int32(uint64(unsafe.Sizeof([10]Sqlite3StatValueType{}))/uint64(unsafe.Sizeof(Sqlite3StatValueType(0)))) {
-		return Xsqlite3MisuseError(tls, 23140)
+		return Xsqlite3MisuseError(tls, 23229)
 	}
 	if statMutex[op] != 0 {
 		pMutex = Xsqlite3Pcache1Mutex(tls)
@@ -26865,14 +26889,14 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 					var iOrigJD I64
 					var iGuess I64
 					var cnt int32 = 0
-					var iErr int32
+					var iErr I64
 
 					computeJD(tls, p)
 					iGuess = libc.AssignInt64(&iOrigJD, (*DateTime)(unsafe.Pointer(p)).FiJD)
-					iErr = 0
+					iErr = int64(0)
 					for __ccgo := true; __ccgo; __ccgo = iErr != 0 && libc.PostIncInt32(&cnt, 1) < 3 {
 						libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(DateTime{})))
-						iGuess = iGuess - I64(iErr)
+						iGuess = iGuess - iErr
 						(*DateTime)(unsafe.Pointer(bp)).FiJD = iGuess
 						(*DateTime)(unsafe.Pointer(bp)).FvalidJD = int8(1)
 						rc = toLocaltime(tls, bp, pCtx)
@@ -26880,7 +26904,7 @@ func parseModifier(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, p uintptr, i
 							return rc
 						}
 						computeJD(tls, bp)
-						iErr = int32((*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD)
+						iErr = (*DateTime)(unsafe.Pointer(bp)).FiJD - iOrigJD
 					}
 					libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(DateTime{})))
 					(*DateTime)(unsafe.Pointer(p)).FiJD = iGuess
@@ -55288,7 +55312,7 @@ func Xsqlite3DbSpanDup(tls *libc.TLS, db uintptr, zStart uintptr, zEnd uintptr)
 		zStart++
 	}
 	n = int32((int64(zEnd) - int64(zStart)) / 1)
-	for n > 0 && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
+	for int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zStart + uintptr(n-1))))])&0x01 != 0 {
 		n--
 	}
 	return Xsqlite3DbStrNDup(tls, db, zStart, uint64(n))
@@ -55544,6 +55568,8 @@ func Xsqlite3_str_vappendf(tls *libc.TLS, pAccum uintptr, fmt uintptr, ap Va_lis
 	var i int32
 	var nPad int32
 	var ch uint32
+	var nCopyBytes I64
+	var nPrior I64
 
 	var z uintptr
 
@@ -56530,6 +56556,7 @@ __180:
 	if !(precision > 1) {
 		goto __192
 	}
+	nPrior = int64(1)
 	width = width - (precision - 1)
 	if !(width > 1 && !(flag_leftjustify != 0)) {
 		goto __193
@@ -56538,11 +56565,35 @@ __180:
 	width = 0
 __193:
 	;
+	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	precision--
 __194:
-	if !(libc.PostDecInt32(&precision, 1) > 1) {
+	if !(precision > 1) {
 		goto __195
 	}
-	Xsqlite3_str_append(tls, pAccum, bp+16, length)
+	if !(nPrior > I64(precision-1)) {
+		goto __196
+	}
+	nPrior = I64(precision - 1)
+__196:
+	;
+	nCopyBytes = I64(length) * nPrior
+	if !(nCopyBytes+I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar) >= I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnAlloc)) {
+		goto __197
+	}
+	Xsqlite3StrAccumEnlarge(tls, pAccum, nCopyBytes)
+__197:
+	;
+	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError != 0) {
+		goto __198
+	}
+	goto __195
+__198:
+	;
+	Xsqlite3_str_append(tls, pAccum,
+		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText+uintptr(I64((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar)-nCopyBytes), int32(nCopyBytes))
+	precision = int32(I64(precision) - nPrior)
+	nPrior = nPrior * int64(2)
 	goto __194
 __195:
 	;
@@ -56554,30 +56605,30 @@ __192:
 __69:
 __70:
 	if !(bArgList != 0) {
-		goto __196
+		goto __199
 	}
 	bufpt = getTextArg(tls, pArgList)
 	xtype = EtByte(EtSTRING)
-	goto __197
-__196:
+	goto __200
+__199:
 	bufpt = libc.VaUintptr(&ap)
-__197:
+__200:
 	;
 	if !(bufpt == uintptr(0)) {
-		goto __198
+		goto __201
 	}
 	bufpt = ts + 1544
-	goto __199
-__198:
+	goto __202
+__201:
 	if !(int32(xtype) == EtDYNSTRING) {
-		goto __200
+		goto __203
 	}
 	if !((*Sqlite3_str)(unsafe.Pointer(pAccum)).FnChar == U32(0) &&
 		(*Sqlite3_str)(unsafe.Pointer(pAccum)).FmxAlloc != 0 &&
 		width == 0 &&
 		precision < 0 &&
 		int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FaccError) == 0) {
-		goto __201
+		goto __204
 	}
 
 	(*Sqlite3_str)(unsafe.Pointer(pAccum)).FzText = bufpt
@@ -56586,83 +56637,83 @@ __198:
 	*(*U8)(unsafe.Pointer(pAccum + 29)) |= U8(SQLITE_PRINTF_MALLOCED)
 	length = 0
 	goto __58
-__201:
+__204:
 	;
 	zExtra = bufpt
-__200:
+__203:
 	;
-__199:
+__202:
 	;
 	if !(precision >= 0) {
-		goto __202
+		goto __205
 	}
 	if !(flag_altform2 != 0) {
-		goto __204
+		goto __207
 	}
 
 	z = bufpt
-__206:
-	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
-		goto __207
-	}
-	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
-		goto __208
-	}
 __209:
-	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+	if !(libc.PostDecInt32(&precision, 1) > 0 && *(*uint8)(unsafe.Pointer(z)) != 0) {
 		goto __210
 	}
+	if !(int32(*(*uint8)(unsafe.Pointer(libc.PostIncUintptr(&z, 1)))) >= 0xc0) {
+		goto __211
+	}
+__212:
+	if !(int32(*(*uint8)(unsafe.Pointer(z)))&0xc0 == 0x80) {
+		goto __213
+	}
 	z++
+	goto __212
+__213:
+	;
+__211:
+	;
 	goto __209
 __210:
 	;
+	length = int32((int64(z) - int64(bufpt)) / 1)
+	goto __208
+__207:
+	length = 0
+__214:
+	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
+		goto __216
+	}
+	goto __215
+__215:
+	length++
+	goto __214
+	goto __216
+__216:
+	;
 __208:
 	;
 	goto __206
-__207:
-	;
-	length = int32((int64(z) - int64(bufpt)) / 1)
-	goto __205
-__204:
-	length = 0
-__211:
-	if !(length < precision && *(*int8)(unsafe.Pointer(bufpt + uintptr(length))) != 0) {
-		goto __213
-	}
-	goto __212
-__212:
-	length++
-	goto __211
-	goto __213
-__213:
-	;
 __205:
-	;
-	goto __203
-__202:
 	length = 0x7fffffff & int32(libc.Xstrlen(tls, bufpt))
-__203:
+__206:
 	;
 adjust_width_for_utf8:
 	if !(flag_altform2 != 0 && width > 0) {
-		goto __214
+		goto __217
 	}
 
 	ii = length - 1
-__215:
+__218:
 	if !(ii >= 0) {
-		goto __216
+		goto __219
 	}
 	if !(int32(*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostDecInt32(&ii, 1)))))&0xc0 == 0x80) {
-		goto __217
+		goto __220
 	}
 	width++
+__220:
+	;
+	goto __218
+__219:
+	;
 __217:
-	;
-	goto __215
-__216:
-	;
-__214:
 	;
 	goto __58
 __71:
@@ -56676,17 +56727,17 @@ __73:
 	}()
 
 	if !(bArgList != 0) {
-		goto __218
+		goto __221
 	}
 	escarg = getTextArg(tls, pArgList)
-	goto __219
-__218:
+	goto __222
+__221:
 	escarg = libc.VaUintptr(&ap)
-__219:
+__222:
 	;
 	isnull = libc.Bool32(escarg == uintptr(0))
 	if !(isnull != 0) {
-		goto __220
+		goto __223
 	}
 	escarg = func() uintptr {
 		if int32(xtype) == EtSQLESCAPE2 {
@@ -56694,90 +56745,90 @@ __219:
 		}
 		return ts + 1550
 	}()
-__220:
+__223:
 	;
 	k = I64(precision)
 	i1 = libc.AssignInt64(&n1, int64(0))
-__221:
+__224:
 	if !(k != int64(0) && int32(libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))) != 0) {
-		goto __223
+		goto __226
 	}
 	if !(int32(ch1) == int32(q)) {
-		goto __224
-	}
-	n1++
-__224:
-	;
-	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
-		goto __225
-	}
-__226:
-	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
 		goto __227
 	}
-	i1++
-	goto __226
+	n1++
 __227:
 	;
-__225:
+	if !(flag_altform2 != 0 && int32(ch1)&0xc0 == 0xc0) {
+		goto __228
+	}
+__229:
+	if !(int32(*(*int8)(unsafe.Pointer(escarg + uintptr(i1+int64(1)))))&0xc0 == 0x80) {
+		goto __230
+	}
+	i1++
+	goto __229
+__230:
 	;
-	goto __222
-__222:
+__228:
+	;
+	goto __225
+__225:
 	i1++
 	k--
-	goto __221
-	goto __223
-__223:
+	goto __224
+	goto __226
+__226:
 	;
 	needQuote = libc.Bool32(!(isnull != 0) && int32(xtype) == EtSQLESCAPE2)
 	n1 = n1 + (i1 + int64(3))
 	if !(n1 > int64(SQLITE_PRINT_BUF_SIZE)) {
-		goto __228
+		goto __231
 	}
 	bufpt = libc.AssignUintptr(&zExtra, printfTempBuf(tls, pAccum, n1))
 	if !(bufpt == uintptr(0)) {
-		goto __230
+		goto __233
 	}
 	return
-__230:
+__233:
 	;
-	goto __229
-__228:
+	goto __232
+__231:
 	bufpt = bp + 16
-__229:
+__232:
 	;
 	j = int64(0)
 	if !(needQuote != 0) {
-		goto __231
+		goto __234
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__231:
+__234:
 	;
 	k = i1
 	i1 = int64(0)
-__232:
+__235:
 	if !(i1 < k) {
-		goto __234
+		goto __237
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = libc.AssignInt8(&ch1, *(*int8)(unsafe.Pointer(escarg + uintptr(i1))))
 	if !(int32(ch1) == int32(q)) {
-		goto __235
+		goto __238
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = ch1
-__235:
+__238:
 	;
-	goto __233
-__233:
+	goto __236
+__236:
 	i1++
-	goto __232
-	goto __234
-__234:
+	goto __235
+	goto __237
+__237:
 	;
 	if !(needQuote != 0) {
-		goto __236
+		goto __239
 	}
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(libc.PostIncInt64(&j, 1)))) = q
-__236:
+__239:
 	;
 	*(*int8)(unsafe.Pointer(bufpt + uintptr(j))) = int8(0)
 	length = int32(j)
@@ -56785,89 +56836,89 @@ __236:
 
 __74:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __237
+		goto __240
 	}
 	return
-__237:
+__240:
 	;
 	if !(flag_alternateform != 0) {
-		goto __238
+		goto __241
 	}
 
 	pExpr = libc.VaUintptr(&ap)
 	if !(pExpr != 0 && !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_IntValue) != U32(0))) {
-		goto __240
+		goto __243
 	}
 	Xsqlite3_str_appendall(tls, pAccum, *(*uintptr)(unsafe.Pointer(pExpr + 8)))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, pExpr)
-__240:
+__243:
 	;
-	goto __239
-__238:
+	goto __242
+__241:
 	pToken = libc.VaUintptr(&ap)
 
 	if !(pToken != 0 && (*Token)(unsafe.Pointer(pToken)).Fn != 0) {
-		goto __241
+		goto __244
 	}
 	Xsqlite3_str_append(tls, pAccum, (*Token)(unsafe.Pointer(pToken)).Fz, int32((*Token)(unsafe.Pointer(pToken)).Fn))
 	Xsqlite3RecordErrorByteOffset(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, (*Token)(unsafe.Pointer(pToken)).Fz)
-__241:
+__244:
 	;
-__239:
+__242:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
 
 __75:
 	if !(int32((*Sqlite3_str)(unsafe.Pointer(pAccum)).FprintfFlags)&SQLITE_PRINTF_INTERNAL == 0) {
-		goto __242
+		goto __245
 	}
 	return
-__242:
+__245:
 	;
 	pItem = libc.VaUintptr(&ap)
 
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 && !(flag_altform2 != 0)) {
-		goto __243
+		goto __246
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
-	goto __244
-__243:
+	goto __247
+__246:
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzName != 0) {
-		goto __245
+		goto __248
 	}
 	if !((*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0) {
-		goto __247
+		goto __250
 	}
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase)
 	Xsqlite3_str_append(tls, pAccum, ts+1557, 1)
-__247:
+__250:
 	;
 	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzName)
-	goto __246
-__245:
-	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __248
-	}
-	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
 	goto __249
 __248:
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
+		goto __251
+	}
+	Xsqlite3_str_appendall(tls, pAccum, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias)
+	goto __252
+__251:
 	pSel = (*SrcItem)(unsafe.Pointer(pItem)).FpSelect
 
 	if !((*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_NestedFrom) != 0) {
-		goto __250
+		goto __253
 	}
 	Xsqlite3_str_appendf(tls, pAccum, ts+1559, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
-	goto __251
-__250:
+	goto __254
+__253:
 	Xsqlite3_str_appendf(tls, pAccum, ts+1569, libc.VaList(bp+8, (*Select)(unsafe.Pointer(pSel)).FselId))
-__251:
+__254:
+	;
+__252:
 	;
 __249:
 	;
-__246:
-	;
-__244:
+__247:
 	;
 	length = libc.AssignInt32(&width, 0)
 	goto __58
@@ -56880,32 +56931,32 @@ __58:
 	;
 	width = width - length
 	if !(width > 0) {
-		goto __252
+		goto __255
 	}
 	if !!(flag_leftjustify != 0) {
-		goto __254
+		goto __257
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__254:
+__257:
 	;
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
 	if !(flag_leftjustify != 0) {
-		goto __255
+		goto __258
 	}
 	Xsqlite3_str_appendchar(tls, pAccum, width, int8(' '))
-__255:
+__258:
 	;
-	goto __253
-__252:
+	goto __256
+__255:
 	Xsqlite3_str_append(tls, pAccum, bufpt, length)
-__253:
+__256:
 	;
 	if !(zExtra != 0) {
-		goto __256
+		goto __259
 	}
 	Xsqlite3DbFree(tls, (*Sqlite3_str)(unsafe.Pointer(pAccum)).Fdb, zExtra)
 	zExtra = uintptr(0)
-__256:
+__259:
 	;
 	goto __4
 __4:
@@ -56964,7 +57015,7 @@ func Xsqlite3RecordErrorOffsetOfExpr(tls *libc.TLS, db uintptr, pExpr uintptr) {
 //
 // Return the number of bytes of text that StrAccum is able to accept
 // after the attempted enlargement.  The value returned might be zero.
-func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
+func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N I64) int32 {
 	var zNew uintptr
 
 	if (*StrAccum)(unsafe.Pointer(p)).FaccError != 0 {
@@ -56980,8 +57031,7 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 		} else {
 			zOld = uintptr(0)
 		}
-		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
-		szNew = szNew + (Sqlite3_int64(N) + int64(1))
+		var szNew I64 = I64((*StrAccum)(unsafe.Pointer(p)).FnChar) + N + int64(1)
 		if szNew+I64((*StrAccum)(unsafe.Pointer(p)).FnChar) <= I64((*StrAccum)(unsafe.Pointer(p)).FmxAlloc) {
 			szNew = szNew + I64((*StrAccum)(unsafe.Pointer(p)).FnChar)
 		}
@@ -57010,12 +57060,13 @@ func Xsqlite3StrAccumEnlarge(tls *libc.TLS, p uintptr, N int32) int32 {
 			return 0
 		}
 	}
-	return N
+
+	return int32(N)
 }
 
 // Append N copies of character c to the given string buffer.
 func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
-	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, N)) <= 0 {
+	if I64((*Sqlite3_str)(unsafe.Pointer(p)).FnChar)+I64(N) >= I64((*Sqlite3_str)(unsafe.Pointer(p)).FnAlloc) && libc.AssignInt32(&N, Xsqlite3StrAccumEnlarge(tls, p, int64(N))) <= 0 {
 		return
 	}
 	for libc.PostDecInt32(&N, 1) > 0 {
@@ -57024,7 +57075,7 @@ func Xsqlite3_str_appendchar(tls *libc.TLS, p uintptr, N int32, c int8) {
 }
 
 func enlargeAndAppend(tls *libc.TLS, p uintptr, z uintptr, N int32) {
-	N = Xsqlite3StrAccumEnlarge(tls, p, N)
+	N = Xsqlite3StrAccumEnlarge(tls, p, int64(N))
 	if N > 0 {
 		libc.Xmemcpy(tls, (*StrAccum)(unsafe.Pointer(p)).FzText+uintptr((*StrAccum)(unsafe.Pointer(p)).FnChar), z, uint64(N))
 		*(*U32)(unsafe.Pointer(p + 24)) += U32(N)
@@ -58237,6 +58288,24 @@ func Xsqlite3ErrorWithMsg(tls *libc.TLS, db uintptr, err_code int32, zFormat uin
 	}
 }
 
+// Check for interrupts and invoke progress callback.
+func Xsqlite3ProgressCheck(tls *libc.TLS, p uintptr) {
+	var db uintptr = (*Parse)(unsafe.Pointer(p)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*Parse)(unsafe.Pointer(p)).FnErr++
+		(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 && libc.PreIncUint32(&(*Parse)(unsafe.Pointer(p)).FnProgressSteps, 1) >= (*Sqlite3)(unsafe.Pointer(db)).FnProgressOps {
+		if (*struct {
+			f func(*libc.TLS, uintptr) int32
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*Parse)(unsafe.Pointer(p)).FnErr++
+			(*Parse)(unsafe.Pointer(p)).Frc = SQLITE_INTERRUPT
+		}
+		(*Parse)(unsafe.Pointer(p)).FnProgressSteps = U32(0)
+	}
+}
+
 // Add an error message to pParse->zErrMsg and increment pParse->nErr.
 //
 // This function should be used to report any error that occurs while
@@ -58864,10 +58933,13 @@ __57:
 	return int32(0)
 }
 
-// Render an signed 64-bit integer as text.  Store the result in zOut[].
+// Render an signed 64-bit integer as text.  Store the result in zOut[] and
+// return the length of the string that was stored, in bytes.  The value
+// returned does not include the zero terminator at the end of the output
+// string.
 //
 // The caller must ensure that zOut[] is at least 21 bytes in size.
-func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
+func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) int32 {
 	bp := tls.Alloc(22)
 	defer tls.Free(22)
 
@@ -58893,6 +58965,7 @@ func Xsqlite3Int64ToText(tls *libc.TLS, v I64, zOut uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(libc.PostDecInt32(&i, 1)))) = int8('-')
 	}
 	libc.Xmemcpy(tls, zOut, bp+uintptr(i+1), uint64(unsafe.Sizeof([22]int8{}))-uint64(1)-uint64(i))
+	return int32(uint64(unsafe.Sizeof([22]int8{})) - uint64(2) - uint64(i))
 }
 
 func compare2pow63(tls *libc.TLS, zNum uintptr, incr int32) int32 {
@@ -59854,11 +59927,12 @@ func findElementWithHash(tls *libc.TLS, pH uintptr, pKey uintptr, pHash uintptr)
 	if pHash != 0 {
 		*(*uint32)(unsafe.Pointer(pHash)) = h
 	}
-	for libc.PostDecUint32(&count, 1) != 0 {
+	for count != 0 {
 		if Xsqlite3StrICmp(tls, (*HashElem)(unsafe.Pointer(elem)).FpKey, pKey) == 0 {
 			return elem
 		}
 		elem = (*HashElem)(unsafe.Pointer(elem)).Fnext
+		count--
 	}
 	return uintptr(unsafe.Pointer(&nullElement))
 }
@@ -60837,7 +60911,7 @@ func winSeekFile(tls *libc.TLS, pFile uintptr, iOffset Sqlite3_int64) int32 {
 	if dwRet == libc.Uint32(libc.Uint32FromInt32(-1)) &&
 		libc.AssignUint32(&lastErrno, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)) != DWORD(0) {
 		(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = lastErrno
-		winLogErrorAtLine(tls, SQLITE_IOERR|int32(22)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4597, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47395)
+		winLogErrorAtLine(tls, SQLITE_IOERR|int32(22)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4597, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47684)
 
 		return 1
 	}
@@ -60863,7 +60937,7 @@ func winClose(tls *libc.TLS, id uintptr) int32 {
 	if rc != 0 {
 		return SQLITE_OK
 	}
-	return winLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4609, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47491)
+	return winLogErrorAtLine(tls, SQLITE_IOERR|int32(16)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4609, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47780)
 }
 
 func winRead(tls *libc.TLS, id uintptr, pBuf uintptr, amt int32, offset Sqlite3_int64) int32 {
@@ -60897,9 +60971,9 @@ func winRead(tls *libc.TLS, id uintptr, pBuf uintptr, amt int32, offset Sqlite3_
 		}
 		(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = *(*DWORD)(unsafe.Pointer(bp + 40))
 
-		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(1)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4618, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47559)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(1)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4618, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47848)
 	}
-	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47562)
+	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47851)
 	if *(*DWORD)(unsafe.Pointer(bp + 32)) < DWORD(amt) {
 		libc.Xmemset(tls, pBuf+uintptr(*(*DWORD)(unsafe.Pointer(bp + 32))), 0, uint64(DWORD(amt)-*(*DWORD)(unsafe.Pointer(bp + 32))))
 
@@ -60955,12 +61029,12 @@ func winWrite(tls *libc.TLS, id uintptr, pBuf uintptr, amt int32, offset Sqlite3
 	if rc != 0 {
 		if (*WinFile)(unsafe.Pointer(pFile)).FlastErrno == DWORD(39) ||
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno == DWORD(112) {
-			return winLogErrorAtLine(tls, SQLITE_FULL, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4626, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47671)
+			return winLogErrorAtLine(tls, SQLITE_FULL, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4626, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47960)
 		}
 
-		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(3)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4636, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47676)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(3)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4636, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47965)
 	} else {
-		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47679)
+		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 47968)
 	}
 
 	return SQLITE_OK
@@ -60987,10 +61061,10 @@ func winTruncate(tls *libc.TLS, id uintptr, nByte Sqlite3_int64) int32 {
 	winUnmapfile(tls, pFile)
 
 	if winSeekFile(tls, pFile, nByte) != 0 {
-		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4646, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47742)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4646, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48031)
 	} else if 0 == (*(*func(*libc.TLS, HANDLE) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 53*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFile)).Fh) && libc.AssignUint32(&lastErrno, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)) != DWORD(1224) {
 		(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = lastErrno
-		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4659, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47747)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(6)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4659, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48036)
 	}
 
 	if rc == SQLITE_OK && oldMmapSize > int64(0) {
@@ -61016,7 +61090,7 @@ func winSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 		} else {
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
 
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4672, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47839)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4672, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48128)
 		}
 	}
 	rc = (*(*func(*libc.TLS, HANDLE) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 13*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFile)).Fh)
@@ -61026,7 +61100,7 @@ func winSync(tls *libc.TLS, id uintptr, flags int32) int32 {
 	} else {
 		(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
 
-		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4681, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47854)
+		return winLogErrorAtLine(tls, SQLITE_IOERR|int32(4)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4681, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48143)
 	}
 	return int32(0)
 }
@@ -61047,7 +61121,7 @@ func winFileSize(tls *libc.TLS, id uintptr, pSize uintptr) int32 {
 		if lowerBits == 0xffffffff &&
 			libc.AssignUint32(&lastErrno, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)) != DWORD(0) {
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = lastErrno
-			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(7)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4690, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47895)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(7)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4690, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48184)
 		}
 
 	}
@@ -61089,7 +61163,7 @@ func winUnlockReadLock(tls *libc.TLS, pFile uintptr) int32 {
 	}
 	if res == 0 && libc.AssignUint32(&lastErrno, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)) != DWORD(158) {
 		(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = lastErrno
-		winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4702, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 47990)
+		winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4702, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48279)
 	}
 
 	return res
@@ -61215,7 +61289,7 @@ func winUnlock(tls *libc.TLS, id uintptr, locktype int32) int32 {
 	if type1 >= EXCLUSIVE_LOCK {
 		winUnlockFile(tls, pFile+16, uint32(Xsqlite3PendingByte+2), uint32(0), uint32(SHARED_SIZE), uint32(0))
 		if locktype == SHARED_LOCK && !(winGetReadLock(tls, pFile) != 0) {
-			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4720, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48216)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(8)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4720, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 48505)
 		}
 	}
 	if type1 >= RESERVED_LOCK {
@@ -61518,7 +61592,7 @@ func winLockSharedMemory(tls *libc.TLS, pShmNode uintptr) int32 {
 			return SQLITE_READONLY | int32(5)<<8
 		} else if winTruncate(tls, pShmNode+16, int64(0)) != 0 {
 			winShmSystemLock(tls, pShmNode, WINSHM_UNLCK, (22+SQLITE_SHM_NLOCK)*4+SQLITE_SHM_NLOCK, 1)
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4730, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 48682)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(18)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4730, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 48971)
 		}
 	}
 
@@ -61625,7 +61699,7 @@ __12:
 	if !(rc != SQLITE_OK) {
 		goto __13
 	}
-	rc = winLogErrorAtLine(tls, rc, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4770, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 48764)
+	rc = winLogErrorAtLine(tls, rc, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4770, (*WinShmNode)(unsafe.Pointer(pShmNode)).FzFilename, 49053)
 	goto shm_open_err
 __13:
 	;
@@ -61853,7 +61927,7 @@ __3:
 	if !(rc != SQLITE_OK) {
 		goto __6
 	}
-	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4781, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49035)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4781, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49324)
 	goto shmpage_out
 __6:
 	;
@@ -61871,7 +61945,7 @@ __8:
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
-	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4792, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49050)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(19)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4792, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49339)
 	goto shmpage_out
 __9:
 	;
@@ -61919,7 +61993,7 @@ __14:
 		goto __15
 	}
 	(*WinShmNode)(unsafe.Pointer(pShmNode)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
-	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, (*WinShmNode)(unsafe.Pointer(pShmNode)).FlastErrno, ts+4803, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49109)
+	rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(21)<<8, (*WinShmNode)(unsafe.Pointer(pShmNode)).FlastErrno, ts+4803, (*WinFile)(unsafe.Pointer(pDbFd)).FzPath, 49398)
 	if !(hMap != 0) {
 		goto __16
 	}
@@ -61965,7 +62039,7 @@ func winUnmapfile(tls *libc.TLS, pFile uintptr) int32 {
 		if !((*(*func(*libc.TLS, LPCVOID) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 59*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFile)).FpMapRegion) != 0) {
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
 
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4814, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49158)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4814, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49447)
 		}
 		(*WinFile)(unsafe.Pointer(pFile)).FpMapRegion = uintptr(0)
 		(*WinFile)(unsafe.Pointer(pFile)).FmmapSize = int64(0)
@@ -61974,7 +62048,7 @@ func winUnmapfile(tls *libc.TLS, pFile uintptr) int32 {
 		if !((*(*func(*libc.TLS, HANDLE) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFile)).FhMap) != 0) {
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
 
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4828, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49169)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+4828, (*WinFile)(unsafe.Pointer(pFile)).FzPath, 49458)
 		}
 		(*WinFile)(unsafe.Pointer(pFile)).FhMap = uintptr(0)
 	}
@@ -62018,7 +62092,7 @@ func winMapfile(tls *libc.TLS, pFd uintptr, nByte Sqlite3_int64) int32 {
 			DWORD(*(*Sqlite3_int64)(unsafe.Pointer(bp))&int64(0xffffffff)), uintptr(0))
 		if (*WinFile)(unsafe.Pointer(pFd)).FhMap == uintptr(0) {
 			(*WinFile)(unsafe.Pointer(pFd)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
-			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4842, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49246)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4842, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49535)
 
 			return SQLITE_OK
 		}
@@ -62028,7 +62102,7 @@ func winMapfile(tls *libc.TLS, pFd uintptr, nByte Sqlite3_int64) int32 {
 			(*(*func(*libc.TLS, HANDLE) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 3*24 + 8)))(tls, (*WinFile)(unsafe.Pointer(pFd)).FhMap)
 			(*WinFile)(unsafe.Pointer(pFd)).FhMap = uintptr(0)
 			(*WinFile)(unsafe.Pointer(pFd)).FlastErrno = (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls)
-			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4854, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49264)
+			rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(24)<<8, (*WinFile)(unsafe.Pointer(pFd)).FlastErrno, ts+4854, (*WinFile)(unsafe.Pointer(pFd)).FzPath, 49553)
 
 			return SQLITE_OK
 		}
@@ -62192,7 +62266,7 @@ func winGetTempname(tls *libc.TLS, pVfs uintptr, pzBuf uintptr) int32 {
 				Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 				Xsqlite3_free(tls, zBuf)
 
-				return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4874, uintptr(0), 49566)
+				return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4874, uintptr(0), 49855)
 			}
 			Xsqlite3_snprintf(tls, nMax, zBuf, ts+4493, libc.VaList(bp, Xsqlite3_temp_directory))
 		}
@@ -62209,7 +62283,7 @@ func winGetTempname(tls *libc.TLS, pVfs uintptr, pzBuf uintptr) int32 {
 			Xsqlite3_free(tls, zWidePath)
 			Xsqlite3_free(tls, zBuf)
 
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4890, uintptr(0), 49666)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4890, uintptr(0), 49955)
 		}
 		zMulti = winUnicodeToUtf8(tls, zWidePath)
 		if zMulti != 0 {
@@ -62233,7 +62307,7 @@ func winGetTempname(tls *libc.TLS, pVfs uintptr, pzBuf uintptr) int32 {
 		if (*(*func(*libc.TLS, DWORD, LPSTR) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 31*24 + 8)))(tls, uint32(nMax), zMbcsPath) == DWORD(0) {
 			Xsqlite3_free(tls, zBuf)
 
-			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4906, uintptr(0), 49693)
+			return winLogErrorAtLine(tls, SQLITE_IOERR|int32(25)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+4906, uintptr(0), 49982)
 		}
 		zUtf8 = winMbcsToUtf8(tls, zMbcsPath, (*(*func(*libc.TLS) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls))
 		if zUtf8 != 0 {
@@ -62249,14 +62323,14 @@ func winGetTempname(tls *libc.TLS, pVfs uintptr, pzBuf uintptr) int32 {
 	if !(winMakeEndInDirSep(tls, nDir+1, zBuf) != 0) {
 		Xsqlite3_free(tls, zBuf)
 
-		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4922, uintptr(0), 49717)
+		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4922, uintptr(0), 50006)
 	}
 
 	nLen = Xsqlite3Strlen30(tls, zBuf)
 	if nLen+nPre+17 > nBuf {
 		Xsqlite3_free(tls, zBuf)
 
-		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4938, uintptr(0), 49735)
+		return winLogErrorAtLine(tls, SQLITE_ERROR, uint32(0), ts+4938, uintptr(0), 50024)
 	}
 
 	Xsqlite3_snprintf(tls, nBuf-16-nLen, zBuf+uintptr(nLen), ts+4866, 0)
@@ -62438,7 +62512,7 @@ func winOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, id uintptr, flags int32
 			}
 		}
 	}
-	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 8)), 50024)
+	winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 8)), 50313)
 
 	if h == libc.UintptrFromInt64(int64(-1)) {
 		Xsqlite3_free(tls, zConverted)
@@ -62449,8 +62523,8 @@ func winOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, id uintptr, flags int32
 				pOutFlags)
 		} else {
 			(*WinFile)(unsafe.Pointer(pFile)).FlastErrno = *(*DWORD)(unsafe.Pointer(bp + 12))
-			winLogErrorAtLine(tls, SQLITE_CANTOPEN, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+5027, zUtf8Name, 50039)
-			return Xsqlite3CantopenError(tls, 50040)
+			winLogErrorAtLine(tls, SQLITE_CANTOPEN, (*WinFile)(unsafe.Pointer(pFile)).FlastErrno, ts+5027, zUtf8Name, 50328)
+			return Xsqlite3CantopenError(tls, 50329)
 		}
 	}
 
@@ -62565,9 +62639,9 @@ func winDelete(tls *libc.TLS, pVfs uintptr, zFilename uintptr, syncDir int32) in
 		}
 	}
 	if rc != 0 && rc != SQLITE_IOERR|int32(23)<<8 {
-		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, *(*DWORD)(unsafe.Pointer(bp + 4)), ts+5040, zFilename, 50212)
+		rc = winLogErrorAtLine(tls, SQLITE_IOERR|int32(10)<<8, *(*DWORD)(unsafe.Pointer(bp + 4)), ts+5040, zFilename, 50501)
 	} else {
-		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp)), 50214)
+		winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp)), 50503)
 	}
 	Xsqlite3_free(tls, zConverted)
 
@@ -62605,10 +62679,10 @@ func winAccess(tls *libc.TLS, pVfs uintptr, zFilename uintptr, flags int32, pRes
 				attr = (*WIN32_FILE_ATTRIBUTE_DATA)(unsafe.Pointer(bp)).FdwFileAttributes
 			}
 		} else {
-			winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 50264)
+			winLogIoerr(tls, *(*int32)(unsafe.Pointer(bp + 36)), 50553)
 			if *(*DWORD)(unsafe.Pointer(bp + 40)) != DWORD(2) && *(*DWORD)(unsafe.Pointer(bp + 40)) != DWORD(3) {
 				Xsqlite3_free(tls, zConverted)
-				return winLogErrorAtLine(tls, SQLITE_IOERR|int32(13)<<8, *(*DWORD)(unsafe.Pointer(bp + 40)), ts+5050, zFilename, 50267)
+				return winLogErrorAtLine(tls, SQLITE_IOERR|int32(13)<<8, *(*DWORD)(unsafe.Pointer(bp + 40)), ts+5050, zFilename, 50556)
 			} else {
 				attr = libc.Uint32(libc.Uint32FromInt32(-1))
 			}
@@ -62686,7 +62760,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 		nByte = (*(*func(*libc.TLS, LPCWSTR, DWORD, LPWSTR, uintptr) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 25*24 + 8)))(tls, zConverted, uint32(0), uintptr(0), uintptr(0))
 		if nByte == DWORD(0) {
 			Xsqlite3_free(tls, zConverted)
-			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5067, zRelative, 50484)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5067, zRelative, 50773)
 		}
 		nByte = nByte + DWORD(3)
 		zTemp = Xsqlite3MallocZero(tls, uint64(nByte)*uint64(unsafe.Sizeof(WCHAR(0))))
@@ -62698,7 +62772,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 		if nByte == DWORD(0) {
 			Xsqlite3_free(tls, zConverted)
 			Xsqlite3_free(tls, zTemp)
-			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5084, zRelative, 50497)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5084, zRelative, 50786)
 		}
 		Xsqlite3_free(tls, zConverted)
 		zOut = winUnicodeToUtf8(tls, zTemp)
@@ -62708,7 +62782,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 		nByte = (*(*func(*libc.TLS, LPCSTR, DWORD, LPSTR, uintptr) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 24*24 + 8)))(tls, zConverted, uint32(0), uintptr(0), uintptr(0))
 		if nByte == DWORD(0) {
 			Xsqlite3_free(tls, zConverted)
-			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5101, zRelative, 50510)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5101, zRelative, 50799)
 		}
 		nByte = nByte + DWORD(3)
 		zTemp = Xsqlite3MallocZero(tls, uint64(nByte)*uint64(unsafe.Sizeof(int8(0))))
@@ -62720,7 +62794,7 @@ func winFullPathnameNoMutex(tls *libc.TLS, pVfs uintptr, zRelative uintptr, nFul
 		if nByte == DWORD(0) {
 			Xsqlite3_free(tls, zConverted)
 			Xsqlite3_free(tls, zTemp)
-			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5118, zRelative, 50523)
+			return winLogErrorAtLine(tls, SQLITE_CANTOPEN|int32(3)<<8, (*(*func(*libc.TLS) DWORD)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 26*24 + 8)))(tls), ts+5118, zRelative, 50812)
 		}
 		Xsqlite3_free(tls, zConverted)
 		zOut = winMbcsToUtf8(tls, zTemp, (*(*func(*libc.TLS) WINBOOL)(unsafe.Pointer(uintptr(unsafe.Pointer(&aSyscall)) + 8)))(tls))
@@ -66841,7 +66915,7 @@ __26:
 		goto __27
 	}
 
-	libc.Xmemset(tls, zSuper+libc.UintptrFromInt32(-4), 0, uint64(4))
+	libc.Xmemset(tls, (*Pager)(unsafe.Pointer(pPager)).FpTmpSpace, 0, uint64(4))
 	rc = pager_delsuper(tls, pPager, zSuper)
 
 __27:
@@ -67893,7 +67967,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 
 	var zUri uintptr
 	var nUriByte int32
-	var nUri int32
 	var z uintptr
 	var iDc int32
 
@@ -67910,7 +67983,6 @@ func Xsqlite3PagerOpen(tls *libc.TLS, pVfs uintptr, ppPager uintptr, zFilename u
 	*(*U32)(unsafe.Pointer(bp + 12)) = U32(SQLITE_DEFAULT_PAGE_SIZE)
 	zUri = uintptr(0)
 	nUriByte = 1
-	nUri = 0
 
 	journalFileSize = (Xsqlite3JournalSize(tls, pVfs) + 7) & libc.CplInt32(7)
 
@@ -67976,7 +68048,6 @@ __10:
 	}
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
 	z += uintptr(libc.Xstrlen(tls, z) + uint64(1))
-	nUri++
 	goto __10
 __11:
 	;
@@ -67986,7 +68057,7 @@ __11:
 		goto __12
 	}
 
-	rc = Xsqlite3CantopenError(tls, 59950)
+	rc = Xsqlite3CantopenError(tls, 60235)
 __12:
 	;
 	if !(rc != SQLITE_OK) {
@@ -68177,36 +68248,25 @@ __33:
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FmemDb = U8(memDb)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FreadOnly = U8(readOnly)
 
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync = (*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FtempFile
-	if !((*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnoSync != 0) {
-		goto __34
-	}
+	Xsqlite3PagerSetFlags(tls, *(*uintptr)(unsafe.Pointer(bp)), uint32(SQLITE_DEFAULT_SYNCHRONOUS+1|PAGER_CACHESPILL))
 
-	goto __35
-__34:
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FfullSync = U8(1)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FextraSync = U8(0)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FsyncFlags = U8(SQLITE_SYNC_NORMAL)
-	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FwalSyncFlags = U8(SQLITE_SYNC_NORMAL | int32(SQLITE_SYNC_NORMAL)<<2)
-__35:
-	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FnExtra = U16(nExtra)
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalSizeLimit = int64(-1)
 
 	setSectorSize(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if !!(useJournal != 0) {
-		goto __36
+		goto __34
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_OFF)
-	goto __37
-__36:
+	goto __35
+__34:
 	if !(memDb != 0 || memJM != 0) {
-		goto __38
+		goto __36
 	}
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FjournalMode = U8(PAGER_JOURNALMODE_MEMORY)
-__38:
+__36:
 	;
-__37:
+__35:
 	;
 	(*Pager)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FxReiniter = xReinit
 	setGetterMethod(tls, *(*uintptr)(unsafe.Pointer(bp)))
@@ -68378,7 +68438,7 @@ __7:
 	if !(rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 8))&SQLITE_OPEN_READONLY != 0) {
 		goto __10
 	}
-	rc = Xsqlite3CantopenError(tls, 60480)
+	rc = Xsqlite3CantopenError(tls, 60754)
 	Xsqlite3OsClose(tls, (*Pager)(unsafe.Pointer(pPager)).Fjfd)
 __10:
 	;
@@ -68502,7 +68562,7 @@ func getPageNormal(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, fla
 	if !(pgno == Pgno(0)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 60693)
+	return Xsqlite3CorruptError(tls, 60967)
 __1:
 	;
 	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3PcacheFetch(tls, (*Pager)(unsafe.Pointer(pPager)).FpPCache, pgno, 3)
@@ -68541,7 +68601,7 @@ __5:
 	if !(pgno == (*Pager)(unsafe.Pointer(pPager)).FlckPgno) {
 		goto __7
 	}
-	rc = Xsqlite3CorruptError(tls, 60725)
+	rc = Xsqlite3CorruptError(tls, 60999)
 	goto pager_acquire_err
 __7:
 	;
@@ -68618,7 +68678,7 @@ func getPageMMap(tls *libc.TLS, pPager uintptr, pgno Pgno, ppPage uintptr, flags
 		(int32((*Pager)(unsafe.Pointer(pPager)).FeState) == PAGER_READER || flags&PAGER_GET_READONLY != 0))
 
 	if pgno <= Pgno(1) && pgno == Pgno(0) {
-		return Xsqlite3CorruptError(tls, 60804)
+		return Xsqlite3CorruptError(tls, 61078)
 	}
 
 	if bMmapOk != 0 && (*Pager)(unsafe.Pointer(pPager)).FpWal != uintptr(0) {
@@ -69530,10 +69590,12 @@ func Xsqlite3PagerSavepoint(tls *libc.TLS, pPager uintptr, op int32, iSavepoint
 // The return value to this routine is always safe to use with
 // sqlite3_uri_parameter() and sqlite3_filename_database() and friends.
 func Xsqlite3PagerFilename(tls *libc.TLS, pPager uintptr, nullIfMemDb int32) uintptr {
-	if nullIfMemDb != 0 && (*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 {
+	if nullIfMemDb != 0 && ((*Pager)(unsafe.Pointer(pPager)).FmemDb != 0 || Xsqlite3IsMemdb(tls, (*Pager)(unsafe.Pointer(pPager)).FpVfs) != 0) {
 		return uintptr(unsafe.Pointer(&zFake)) + 4
+	} else {
+		return (*Pager)(unsafe.Pointer(pPager)).FzFilename
 	}
-	return (*Pager)(unsafe.Pointer(pPager)).FzFilename
+	return uintptr(0)
 }
 
 var zFake = [8]int8{int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0), int8(0)}
@@ -69619,7 +69681,7 @@ func Xsqlite3PagerMovepage(tls *libc.TLS, pPager uintptr, pPg uintptr, pgno Pgno
 	if pPgOld != 0 {
 		if int32((*PgHdr)(unsafe.Pointer(pPgOld)).FnRef) > 1 {
 			Xsqlite3PagerUnrefNotNull(tls, pPgOld)
-			return Xsqlite3CorruptError(tls, 62345)
+			return Xsqlite3CorruptError(tls, 62623)
 		}
 		*(*U16)(unsafe.Pointer(pPg + 52)) |= U16(int32((*PgHdr)(unsafe.Pointer(pPgOld)).Fflags) & PGHDR_NEED_SYNC)
 		if (*Pager)(unsafe.Pointer(pPager)).FtempFile != 0 {
@@ -70376,7 +70438,7 @@ func walIndexAppend(tls *libc.TLS, pWal uintptr, iFrame U32, iPage U32) int32 {
 		nCollide = idx
 		for iKey = walHash(tls, iPage); *(*Ht_slot)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaHash + uintptr(iKey)*2)) != 0; iKey = walNextHash(tls, iKey) {
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 64109)
+				return Xsqlite3CorruptError(tls, 64387)
 			}
 		}
 		*(*U32)(unsafe.Pointer((*WalHashLoc)(unsafe.Pointer(bp)).FaPgno + uintptr(idx-1)*4)) = iPage
@@ -70475,7 +70537,7 @@ __6:
 	if !(version != U32(WAL_MAX_VERSION)) {
 		goto __7
 	}
-	rc = Xsqlite3CantopenError(tls, 64241)
+	rc = Xsqlite3CantopenError(tls, 64519)
 	goto finished
 __7:
 	;
@@ -71061,7 +71123,7 @@ __10:
 		goto __14
 	}
 
-	rc = Xsqlite3CorruptError(tls, 65055)
+	rc = Xsqlite3CorruptError(tls, 65333)
 	goto __15
 __14:
 	Xsqlite3OsFileControlHint(tls, (*Wal)(unsafe.Pointer(pWal)).FpDbFd, SQLITE_FCNTL_SIZE_HINT, bp+16)
@@ -71336,7 +71398,7 @@ func walIndexReadHdr(tls *libc.TLS, pWal uintptr, pChanged uintptr) int32 {
 	}
 
 	if badHdr == 0 && (*Wal)(unsafe.Pointer(pWal)).Fhdr.FiVersion != U32(WALINDEX_MAX_VERSION) {
-		rc = Xsqlite3CantopenError(tls, 65404)
+		rc = Xsqlite3CantopenError(tls, 65682)
 	}
 	if (*Wal)(unsafe.Pointer(pWal)).FbShmUnreliable != 0 {
 		if rc != SQLITE_OK {
@@ -71809,7 +71871,7 @@ func Xsqlite3WalFindFrame(tls *libc.TLS, pWal uintptr, pgno Pgno, piRead uintptr
 				iRead = iFrame
 			}
 			if libc.PostDecInt32(&nCollide, 1) == 0 {
-				return Xsqlite3CorruptError(tls, 66141)
+				return Xsqlite3CorruptError(tls, 66419)
 			}
 			iKey = walNextHash(tls, iKey)
 		}
@@ -72314,7 +72376,7 @@ func Xsqlite3WalCheckpoint(tls *libc.TLS, pWal uintptr, db uintptr, eMode int32,
 
 	if rc == SQLITE_OK {
 		if (*Wal)(unsafe.Pointer(pWal)).Fhdr.FmxFrame != 0 && walPagesize(tls, pWal) != nBuf {
-			rc = Xsqlite3CorruptError(tls, 66860)
+			rc = Xsqlite3CorruptError(tls, 67138)
 		} else {
 			rc = walCheckpoint(tls, pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf)
 		}
@@ -72549,8 +72611,8 @@ type CellInfo1 = struct {
 
 type CellInfo = CellInfo1
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -72558,23 +72620,25 @@ type CellInfo = CellInfo1
 // detect pages that are used twice and orphaned pages (both of which
 // indicate corruption).
 type IntegrityCk1 = struct {
-	FpBt       uintptr
-	FpPager    uintptr
-	FaPgRef    uintptr
-	FnPage     Pgno
-	FmxErr     int32
-	FnErr      int32
-	FbOomFault int32
-	FzPfx      uintptr
-	Fv1        Pgno
-	Fv2        int32
-	FerrMsg    StrAccum
-	Fheap      uintptr
-	Fdb        uintptr
+	FpBt         uintptr
+	FpPager      uintptr
+	FaPgRef      uintptr
+	FnPage       Pgno
+	FmxErr       int32
+	FnErr        int32
+	Frc          int32
+	FnStep       U32
+	F__ccgo_pad1 [4]byte
+	FzPfx        uintptr
+	Fv1          Pgno
+	Fv2          int32
+	FerrMsg      StrAccum
+	Fheap        uintptr
+	Fdb          uintptr
 }
 
-// This structure is passed around through all the sanity checking routines
-// in order to keep track of some global state information.
+// This structure is passed around through all the PRAGMA integrity_check
+// checking routines in order to keep track of some global state information.
 //
 // The aRef[] array is allocated so that there is 1 bit for each page in
 // the database. As the integrity-check proceeds, for each page used in
@@ -72970,7 +73034,7 @@ func btreeMoveto(tls *libc.TLS, pCur uintptr, pKey uintptr, nKey I64, bias int32
 		}
 		Xsqlite3VdbeRecordUnpack(tls, pKeyInfo, int32(nKey), pKey, pIdxKey)
 		if int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) == 0 || int32((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FnField) > int32((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FnAllField) {
-			rc = Xsqlite3CorruptError(tls, 68970)
+			rc = Xsqlite3CorruptError(tls, 69249)
 		} else {
 			rc = Xsqlite3BtreeIndexMoveto(tls, pCur, pIdxKey, pRes)
 		}
@@ -73107,7 +73171,7 @@ __1:
 	if !(key == Pgno(0)) {
 		goto __2
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69151)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69430)
 	return
 __2:
 	;
@@ -73124,7 +73188,7 @@ __3:
 		goto __4
 	}
 
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69164)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69443)
 	goto ptrmap_exit
 __4:
 	;
@@ -73132,7 +73196,7 @@ __4:
 	if !(offset < 0) {
 		goto __5
 	}
-	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69169)
+	*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69448)
 	goto ptrmap_exit
 __5:
 	;
@@ -73175,7 +73239,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 	offset = int32(Pgno(5) * (key - Pgno(iPtrmap) - Pgno(1)))
 	if offset < 0 {
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
-		return Xsqlite3CorruptError(tls, 69214)
+		return Xsqlite3CorruptError(tls, 69493)
 	}
 
 	*(*U8)(unsafe.Pointer(pEType)) = *(*U8)(unsafe.Pointer(pPtrmap + uintptr(offset)))
@@ -73185,7 +73249,7 @@ func ptrmapGet(tls *libc.TLS, pBt uintptr, key Pgno, pEType uintptr, pPgno uintp
 
 	Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
 	if int32(*(*U8)(unsafe.Pointer(pEType))) < 1 || int32(*(*U8)(unsafe.Pointer(pEType))) > 5 {
-		return Xsqlite3CorruptError(tls, 69222)
+		return Xsqlite3CorruptError(tls, 69501)
 	}
 	return SQLITE_OK
 }
@@ -73435,7 +73499,7 @@ func ptrmapPutOvflPtr(tls *libc.TLS, pPage uintptr, pSrc uintptr, pCell uintptr,
 	if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 		var ovfl Pgno
 		if Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) >= Uptr(pCell) && Uptr((*MemPage)(unsafe.Pointer(pSrc)).FaDataEnd) < Uptr(pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnLocal)) {
-			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69614)
+			*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 69893)
 			return
 		}
 		ovfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp)).FnSize)-4))
@@ -73482,7 +73546,7 @@ func defragmentPage(tls *libc.TLS, pPage uintptr, nMaxFrag int32) int32 {
 	if !(iFree > usableSize-4) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 69672)
+	return Xsqlite3CorruptError(tls, 69951)
 __2:
 	;
 	if !(iFree != 0) {
@@ -73492,7 +73556,7 @@ __2:
 	if !(iFree2 > usableSize-4) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 69675)
+	return Xsqlite3CorruptError(tls, 69954)
 __4:
 	;
 	if !(0 == iFree2 || int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2)))) == 0 && int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+1)))) == 0) {
@@ -73505,7 +73569,7 @@ __4:
 	if !(top >= iFree) {
 		goto __6
 	}
-	return Xsqlite3CorruptError(tls, 69683)
+	return Xsqlite3CorruptError(tls, 69962)
 __6:
 	;
 	if !(iFree2 != 0) {
@@ -73514,14 +73578,14 @@ __6:
 	if !(iFree+sz > iFree2) {
 		goto __9
 	}
-	return Xsqlite3CorruptError(tls, 69686)
+	return Xsqlite3CorruptError(tls, 69965)
 __9:
 	;
 	sz2 = int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFree2+2) + 1)))
 	if !(iFree2+sz2 > usableSize) {
 		goto __10
 	}
-	return Xsqlite3CorruptError(tls, 69688)
+	return Xsqlite3CorruptError(tls, 69967)
 __10:
 	;
 	libc.Xmemmove(tls, data+uintptr(iFree+sz+sz2), data+uintptr(iFree+sz), uint64(iFree2-(iFree+sz)))
@@ -73531,7 +73595,7 @@ __7:
 	if !(iFree+sz > usableSize) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 69692)
+	return Xsqlite3CorruptError(tls, 69971)
 __11:
 	;
 __8:
@@ -73595,7 +73659,7 @@ __19:
 	if !(pc < iCellStart || pc > iCellLast) {
 		goto __22
 	}
-	return Xsqlite3CorruptError(tls, 69725)
+	return Xsqlite3CorruptError(tls, 70004)
 __22:
 	;
 	size = int32((*struct {
@@ -73605,7 +73669,7 @@ __22:
 	if !(cbrk < iCellStart || pc+size > usableSize) {
 		goto __23
 	}
-	return Xsqlite3CorruptError(tls, 69731)
+	return Xsqlite3CorruptError(tls, 70010)
 __23:
 	;
 	*(*U8)(unsafe.Pointer(pAddr1)) = U8(cbrk >> 8)
@@ -73627,7 +73691,7 @@ defragment_out:
 	if !(int32(*(*uint8)(unsafe.Pointer(data + uintptr(hdr+7))))+cbrk-iCellFirst != (*MemPage)(unsafe.Pointer(pPage)).FnFree) {
 		goto __24
 	}
-	return Xsqlite3CorruptError(tls, 69745)
+	return Xsqlite3CorruptError(tls, 70024)
 __24:
 	;
 	*(*uint8)(unsafe.Pointer(data + uintptr(hdr+5))) = U8(cbrk >> 8)
@@ -73662,7 +73726,7 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 				*(*U8)(unsafe.Pointer(aData + uintptr(hdr+7))) += U8(int32(U8(x)))
 				return aData + uintptr(pc)
 			} else if x+pc > maxPC {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69802)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70081)
 				return uintptr(0)
 			} else {
 				*(*U8)(unsafe.Pointer(aData + uintptr(pc+2))) = U8(x >> 8)
@@ -73675,13 +73739,13 @@ func pageFindSlot(tls *libc.TLS, pPg uintptr, nByte int32, pRc uintptr) uintptr
 		pc = int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1)))
 		if pc <= iAddr {
 			if pc != 0 {
-				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69817)
+				*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70096)
 			}
 			return uintptr(0)
 		}
 	}
 	if pc > maxPC+nByte-4 {
-		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 69824)
+		*(*int32)(unsafe.Pointer(pRc)) = Xsqlite3CorruptError(tls, 70103)
 	}
 	return uintptr(0)
 }
@@ -73706,7 +73770,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 		if top == 0 && (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize == U32(65536) {
 			top = 65536
 		} else {
-			return Xsqlite3CorruptError(tls, 69873)
+			return Xsqlite3CorruptError(tls, 70152)
 		}
 	}
 
@@ -73717,7 +73781,7 @@ func allocateSpace(tls *libc.TLS, pPage uintptr, nByte int32, pIdx uintptr) int3
 
 			*(*int32)(unsafe.Pointer(pIdx)) = libc.AssignInt32(&g2, int32((int64(pSpace)-int64(data))/1))
 			if g2 <= gap {
-				return Xsqlite3CorruptError(tls, 69891)
+				return Xsqlite3CorruptError(tls, 70170)
 			} else {
 				return SQLITE_OK
 			}
@@ -73769,22 +73833,22 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 				if int32(iFreeBlk) == 0 {
 					break
 				}
-				return Xsqlite3CorruptError(tls, 69970)
+				return Xsqlite3CorruptError(tls, 70249)
 			}
 			iPtr = iFreeBlk
 		}
 		if U32(iFreeBlk) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize-U32(4) {
-			return Xsqlite3CorruptError(tls, 69975)
+			return Xsqlite3CorruptError(tls, 70254)
 		}
 
 		if iFreeBlk != 0 && iEnd+U32(3) >= U32(iFreeBlk) {
 			nFrag = U8(U32(iFreeBlk) - iEnd)
 			if iEnd > U32(iFreeBlk) {
-				return Xsqlite3CorruptError(tls, 69987)
+				return Xsqlite3CorruptError(tls, 70266)
 			}
 			iEnd = U32(int32(iFreeBlk) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iFreeBlk)+2) + 1)))))
 			if iEnd > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-				return Xsqlite3CorruptError(tls, 69990)
+				return Xsqlite3CorruptError(tls, 70269)
 			}
 			iSize = U16(iEnd - U32(iStart))
 			iFreeBlk = U16(int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(iFreeBlk) + 1))))
@@ -73794,7 +73858,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			var iPtrEnd int32 = int32(iPtr) + (int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2))))<<8 | int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(iPtr)+2) + 1))))
 			if iPtrEnd+3 >= int32(iStart) {
 				if iPtrEnd > int32(iStart) {
-					return Xsqlite3CorruptError(tls, 70003)
+					return Xsqlite3CorruptError(tls, 70282)
 				}
 				nFrag = U8(int32(nFrag) + (int32(iStart) - iPtrEnd))
 				iSize = U16(iEnd - U32(iPtr))
@@ -73802,7 +73866,7 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 			}
 		}
 		if int32(nFrag) > int32(*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7)))) {
-			return Xsqlite3CorruptError(tls, 70009)
+			return Xsqlite3CorruptError(tls, 70288)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+7))) -= uint8(int32(nFrag))
 	}
@@ -73810,10 +73874,10 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 	x = U16(int32(*(*U8)(unsafe.Pointer(pTmp)))<<8 | int32(*(*U8)(unsafe.Pointer(pTmp + 1))))
 	if int32(iStart) <= int32(x) {
 		if int32(iStart) < int32(x) {
-			return Xsqlite3CorruptError(tls, 70018)
+			return Xsqlite3CorruptError(tls, 70297)
 		}
 		if int32(iPtr) != int32(hdr)+1 {
-			return Xsqlite3CorruptError(tls, 70019)
+			return Xsqlite3CorruptError(tls, 70298)
 		}
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1))) = U8(int32(iFreeBlk) >> 8)
 		*(*uint8)(unsafe.Pointer(data + uintptr(int32(hdr)+1) + 1)) = U8(iFreeBlk)
@@ -73837,13 +73901,12 @@ func freeSpace(tls *libc.TLS, pPage uintptr, iStart U16, iSize U16) int32 {
 func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 	var pBt uintptr
 
-	(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(flagByte >> 3)
-	flagByte = flagByte & libc.CplInt32(PTF_LEAF)
-	(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4 - 4*int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
-	if flagByte == PTF_LEAFDATA|PTF_INTKEY {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
-		if (*MemPage)(unsafe.Pointer(pPage)).Fleaf != 0 {
+	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
+	if flagByte >= PTF_ZERODATA|PTF_LEAF {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(0)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(1)
+		if flagByte == PTF_LEAFDATA|PTF_INTKEY|PTF_LEAF {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(1)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -73851,7 +73914,46 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else if flagByte == PTF_ZERODATA|PTF_LEAF {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
 		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70357)
+		}
+	} else {
+		(*MemPage)(unsafe.Pointer(pPage)).FchildPtrSize = U8(4)
+		(*MemPage)(unsafe.Pointer(pPage)).Fleaf = U8(0)
+		if flagByte == PTF_ZERODATA {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
+		} else if flagByte == PTF_LEAFDATA|PTF_INTKEY {
 			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
 			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
@@ -73859,32 +73961,21 @@ func decodeFlags(tls *libc.TLS, pPage uintptr, flagByte int32) int32 {
 			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr, uintptr)
 			}{btreeParseCellPtrNoPayload}))
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(1)
+			(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
+			(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
+		} else {
+			(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
+			(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr) U16
+			}{cellSizePtr}))
+			(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
+				f func(*libc.TLS, uintptr, uintptr, uintptr)
+			}{btreeParseCellPtrIndex}))
+			return Xsqlite3CorruptError(tls, 70381)
 		}
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLeaf
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLeaf
-	} else if flagByte == PTF_ZERODATA {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		(*MemPage)(unsafe.Pointer(pPage)).FmaxLocal = (*BtShared)(unsafe.Pointer(pBt)).FmaxLocal
-		(*MemPage)(unsafe.Pointer(pPage)).FminLocal = (*BtShared)(unsafe.Pointer(pBt)).FminLocal
-	} else {
-		(*MemPage)(unsafe.Pointer(pPage)).FintKey = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FintKeyLeaf = U8(0)
-		(*MemPage)(unsafe.Pointer(pPage)).FxCellSize = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr) U16
-		}{cellSizePtr}))
-		(*MemPage)(unsafe.Pointer(pPage)).FxParseCell = *(*uintptr)(unsafe.Pointer(&struct {
-			f func(*libc.TLS, uintptr, uintptr, uintptr)
-		}{btreeParseCellPtrIndex}))
-		return Xsqlite3CorruptError(tls, 70097)
 	}
-	(*MemPage)(unsafe.Pointer(pPage)).Fmax1bytePayload = (*BtShared)(unsafe.Pointer(pBt)).Fmax1bytePayload
 	return SQLITE_OK
 }
 
@@ -73912,11 +74003,11 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 		var next U32
 		var size U32
 		if pc < top {
-			return Xsqlite3CorruptError(tls, 70148)
+			return Xsqlite3CorruptError(tls, 70432)
 		}
 		for 1 != 0 {
 			if pc > iCellLast {
-				return Xsqlite3CorruptError(tls, 70153)
+				return Xsqlite3CorruptError(tls, 70437)
 			}
 			next = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc) + 1))))
 			size = U32(int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(pc+2) + 1))))
@@ -73927,15 +74018,15 @@ func btreeComputeFreeSpace(tls *libc.TLS, pPage uintptr) int32 {
 			pc = int32(next)
 		}
 		if next > U32(0) {
-			return Xsqlite3CorruptError(tls, 70163)
+			return Xsqlite3CorruptError(tls, 70447)
 		}
 		if U32(pc)+size > uint32(usableSize) {
-			return Xsqlite3CorruptError(tls, 70167)
+			return Xsqlite3CorruptError(tls, 70451)
 		}
 	}
 
 	if nFree > usableSize || nFree < iCellFirst {
-		return Xsqlite3CorruptError(tls, 70179)
+		return Xsqlite3CorruptError(tls, 70463)
 	}
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = int32(U16(nFree - iCellFirst))
 	return SQLITE_OK
@@ -73963,14 +74054,14 @@ func btreeCellSizeCheck(tls *libc.TLS, pPage uintptr) int32 {
 		pc = int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellOffset+i*2)))))
 
 		if pc < iCellFirst || pc > iCellLast {
-			return Xsqlite3CorruptError(tls, 70210)
+			return Xsqlite3CorruptError(tls, 70494)
 		}
 		sz = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
 		})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxCellSize})).f(tls, pPage, data+uintptr(pc)))
 
 		if pc+sz > usableSize {
-			return Xsqlite3CorruptError(tls, 70215)
+			return Xsqlite3CorruptError(tls, 70499)
 		}
 	}
 	return SQLITE_OK
@@ -73984,7 +74075,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 	data = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if decodeFlags(tls, pPage, int32(*(*U8)(unsafe.Pointer(data)))) != 0 {
-		return Xsqlite3CorruptError(tls, 70247)
+		return Xsqlite3CorruptError(tls, 70531)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FmaskPage = U16((*BtShared)(unsafe.Pointer(pBt)).FpageSize - U32(1))
@@ -73996,7 +74087,7 @@ func btreeInitPage(tls *libc.TLS, pPage uintptr) int32 {
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnCell = U16(int32(*(*U8)(unsafe.Pointer(data + 3)))<<8 | int32(*(*U8)(unsafe.Pointer(data + 3 + 1))))
 	if U32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > ((*BtShared)(unsafe.Pointer(pBt)).FpageSize-U32(8))/U32(6) {
-		return Xsqlite3CorruptError(tls, 70261)
+		return Xsqlite3CorruptError(tls, 70545)
 	}
 
 	(*MemPage)(unsafe.Pointer(pPage)).FnFree = -1
@@ -74099,7 +74190,7 @@ func getAndInitPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, pCur
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	rc = Xsqlite3CorruptError(tls, 70416)
+	rc = Xsqlite3CorruptError(tls, 70700)
 	goto getAndInitPage_error1
 __1:
 	;
@@ -74127,7 +74218,7 @@ __3:
 	if !(pCur != 0 && (int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FnCell) < 1 || int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FintKey) != int32((*BtCursor)(unsafe.Pointer(pCur)).FcurIntKey))) {
 		goto __5
 	}
-	rc = Xsqlite3CorruptError(tls, 70437)
+	rc = Xsqlite3CorruptError(tls, 70721)
 	goto getAndInitPage_error2
 __5:
 	;
@@ -74166,7 +74257,7 @@ func btreeGetUnusedPage(tls *libc.TLS, pBt uintptr, pgno Pgno, ppPage uintptr, f
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FpDbPage) > 1 {
 			releasePage(tls, *(*uintptr)(unsafe.Pointer(ppPage)))
 			*(*uintptr)(unsafe.Pointer(ppPage)) = uintptr(0)
-			return Xsqlite3CorruptError(tls, 70503)
+			return Xsqlite3CorruptError(tls, 70787)
 		}
 		(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(ppPage)))).FisInit = U8(0)
 	} else {
@@ -75049,7 +75140,7 @@ __16:
 	if !(Xsqlite3WritableSchema(tls, (*BtShared)(unsafe.Pointer(pBt)).Fdb) == 0) {
 		goto __18
 	}
-	rc = Xsqlite3CorruptError(tls, 71438)
+	rc = Xsqlite3CorruptError(tls, 71722)
 	goto page1_init_failed
 	goto __19
 __18:
@@ -75464,7 +75555,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 	if int32(eType) == PTRMAP_OVERFLOW2 {
 		if Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData) != iFrom {
-			return Xsqlite3CorruptError(tls, 71859)
+			return Xsqlite3CorruptError(tls, 72143)
 		}
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData, iTo)
 	} else {
@@ -75490,7 +75581,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, pCell, bp)
 				if U32((*CellInfo)(unsafe.Pointer(bp)).FnLocal) < (*CellInfo)(unsafe.Pointer(bp)).FnPayload {
 					if pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-						return Xsqlite3CorruptError(tls, 71878)
+						return Xsqlite3CorruptError(tls, 72162)
 					}
 					if iFrom == Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4)) {
 						Xsqlite3Put4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(bp)).FnSize)-uintptr(4), iTo)
@@ -75499,7 +75590,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 				}
 			} else {
 				if pCell+uintptr(4) > (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize) {
-					return Xsqlite3CorruptError(tls, 71887)
+					return Xsqlite3CorruptError(tls, 72171)
 				}
 				if Xsqlite3Get4byte(tls, pCell) == iFrom {
 					Xsqlite3Put4byte(tls, pCell, iTo)
@@ -75510,7 +75601,7 @@ func modifyPagePointer(tls *libc.TLS, pPage uintptr, iFrom Pgno, iTo Pgno, eType
 
 		if i == nCell {
 			if int32(eType) != PTRMAP_BTREE || Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8)) != iFrom {
-				return Xsqlite3CorruptError(tls, 71899)
+				return Xsqlite3CorruptError(tls, 72183)
 			}
 			Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+8), iTo)
 		}
@@ -75526,7 +75617,7 @@ func relocatePage(tls *libc.TLS, pBt uintptr, pDbPage uintptr, eType U8, iPtrPag
 	var pPager uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 
 	if iDbPage < Pgno(3) {
-		return Xsqlite3CorruptError(tls, 71934)
+		return Xsqlite3CorruptError(tls, 72218)
 	}
 
 	*(*int32)(unsafe.Pointer(bp)) = Xsqlite3PagerMovepage(tls, pPager, (*MemPage)(unsafe.Pointer(pDbPage)).FpDbPage, iFreePage, isCommit)
@@ -75587,7 +75678,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 			return rc
 		}
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_ROOTPAGE {
-			return Xsqlite3CorruptError(tls, 72032)
+			return Xsqlite3CorruptError(tls, 72316)
 		}
 
 		if int32(*(*U8)(unsafe.Pointer(bp))) == PTRMAP_FREEPAGE {
@@ -75622,7 +75713,7 @@ func incrVacuumStep(tls *libc.TLS, pBt uintptr, nFin Pgno, iLastPg Pgno, bCommit
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 32)))
 				if *(*Pgno)(unsafe.Pointer(bp + 40)) > dbSize {
 					releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
-					return Xsqlite3CorruptError(tls, 72084)
+					return Xsqlite3CorruptError(tls, 72368)
 				}
 			}
 
@@ -75682,7 +75773,7 @@ func Xsqlite3BtreeIncrVacuum(tls *libc.TLS, p uintptr) int32 {
 		var nFin Pgno = finalDbSize(tls, pBt, nOrig, nFree)
 
 		if nOrig < nFin || nFree >= nOrig {
-			rc = Xsqlite3CorruptError(tls, 72152)
+			rc = Xsqlite3CorruptError(tls, 72436)
 		} else if nFree > Pgno(0) {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
 			if rc == SQLITE_OK {
@@ -75721,7 +75812,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 
 		nOrig = btreePagecount(tls, pBt)
 		if ptrmapPageno(tls, pBt, nOrig) == nOrig || nOrig == U32(Xsqlite3PendingByte)/(*BtShared)(unsafe.Pointer(pBt)).FpageSize+U32(1) {
-			return Xsqlite3CorruptError(tls, 72203)
+			return Xsqlite3CorruptError(tls, 72487)
 		}
 
 		nFree = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer((*BtShared)(unsafe.Pointer(pBt)).FpPage1)).FaData+36)
@@ -75752,7 +75843,7 @@ func autoVacuumCommit(tls *libc.TLS, p uintptr) int32 {
 		}
 		nFin = finalDbSize(tls, pBt, nOrig, nVac)
 		if nFin > nOrig {
-			return Xsqlite3CorruptError(tls, 72230)
+			return Xsqlite3CorruptError(tls, 72514)
 		}
 		if nFin < nOrig {
 			rc = saveAllCursors(tls, pBt, uint32(0), uintptr(0))
@@ -76093,7 +76184,7 @@ func btreeCursor(tls *libc.TLS, p uintptr, iTable Pgno, wrFlag int32, pKeyInfo u
 
 	if iTable <= Pgno(1) {
 		if iTable < Pgno(1) {
-			return Xsqlite3CorruptError(tls, 72694)
+			return Xsqlite3CorruptError(tls, 72978)
 		} else if btreePagecount(tls, pBt) == Pgno(0) {
 			iTable = Pgno(0)
 		}
@@ -76337,14 +76428,14 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpBt
 
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).Fix) >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
-		return Xsqlite3CorruptError(tls, 73101)
+		return Xsqlite3CorruptError(tls, 73385)
 	}
 
 	getCellInfo(tls, pCur)
 	aPayload = (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload
 
 	if Uptr((int64(aPayload)-int64((*MemPage)(unsafe.Pointer(pPage)).FaData))/1) > Uptr((*BtShared)(unsafe.Pointer(pBt)).FusableSize-U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)) {
-		return Xsqlite3CorruptError(tls, 73116)
+		return Xsqlite3CorruptError(tls, 73400)
 	}
 
 	if offset < U32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) {
@@ -76389,7 +76480,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 
 		for *(*Pgno)(unsafe.Pointer(bp)) != 0 {
 			if *(*Pgno)(unsafe.Pointer(bp)) > (*BtShared)(unsafe.Pointer(pBt)).FnPage {
-				return Xsqlite3CorruptError(tls, 73178)
+				return Xsqlite3CorruptError(tls, 73462)
 			}
 
 			*(*Pgno)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FaOverflow + uintptr(iIdx)*4)) = *(*Pgno)(unsafe.Pointer(bp))
@@ -76438,7 +76529,7 @@ func accessPayload(tls *libc.TLS, pCur uintptr, offset U32, amt U32, pBuf uintpt
 	}
 
 	if rc == SQLITE_OK && amt > U32(0) {
-		return Xsqlite3CorruptError(tls, 73263)
+		return Xsqlite3CorruptError(tls, 73547)
 	}
 	return rc
 }
@@ -76518,7 +76609,7 @@ func Xsqlite3BtreePayloadFetch(tls *libc.TLS, pCur uintptr, pAmt uintptr) uintpt
 
 func moveToChild(tls *libc.TLS, pCur uintptr, newPgno U32) int32 {
 	if int32((*BtCursor)(unsafe.Pointer(pCur)).FiPage) >= BTCURSOR_MAX_DEPTH-1 {
-		return Xsqlite3CorruptError(tls, 73400)
+		return Xsqlite3CorruptError(tls, 73684)
 	}
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey | BTCF_ValidOvfl))
@@ -76609,7 +76700,7 @@ __2:
 	if !(int32((*MemPage)(unsafe.Pointer(pRoot)).FisInit) == 0 || libc.Bool32((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo == uintptr(0)) != int32((*MemPage)(unsafe.Pointer(pRoot)).FintKey)) {
 		goto __11
 	}
-	return Xsqlite3CorruptError(tls, 73539)
+	return Xsqlite3CorruptError(tls, 73823)
 __11:
 	;
 skip_init:
@@ -76629,7 +76720,7 @@ __12:
 	if !((*MemPage)(unsafe.Pointer(pRoot)).Fpgno != Pgno(1)) {
 		goto __16
 	}
-	return Xsqlite3CorruptError(tls, 73551)
+	return Xsqlite3CorruptError(tls, 73835)
 __16:
 	;
 	subpage = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(pRoot)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pRoot)).FhdrOffset)+8))
@@ -76693,18 +76784,8 @@ func Xsqlite3BtreeFirst(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
-// Move the cursor to the last entry in the table.  Return SQLITE_OK
-// on success.  Set *pRes to 0 if the cursor actually points to something
-// or set *pRes to 1 if the table is empty.
-func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
-	var rc int32
-
-	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
-		*(*int32)(unsafe.Pointer(pRes)) = 0
-		return SQLITE_OK
-	}
-
-	rc = moveToRoot(tls, pCur)
+func btreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	var rc int32 = moveToRoot(tls, pCur)
 	if rc == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRes)) = 0
 		rc = moveToRightmost(tls, pCur)
@@ -76720,6 +76801,14 @@ func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
 	return rc
 }
 
+func Xsqlite3BtreeLast(tls *libc.TLS, pCur uintptr, pRes uintptr) int32 {
+	if CURSOR_VALID == int32((*BtCursor)(unsafe.Pointer(pCur)).FeState) && int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_AtLast != 0 {
+		*(*int32)(unsafe.Pointer(pRes)) = 0
+		return SQLITE_OK
+	}
+	return btreeLast(tls, pCur, pRes)
+}
+
 // Move the cursor so that it points to an entry in a table (a.k.a INTKEY)
 // table near the key intKey.   Return a success code.
 //
@@ -76841,7 +76930,7 @@ __19:
 	if !(pCell >= (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __21
 	}
-	return Xsqlite3CorruptError(tls, 73793)
+	return Xsqlite3CorruptError(tls, 74077)
 __21:
 	;
 	goto __19
@@ -77045,7 +77134,7 @@ __2:
 	if !!(int32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FisInit) != 0) {
 		goto __4
 	}
-	return Xsqlite3CorruptError(tls, 73989)
+	return Xsqlite3CorruptError(tls, 74273)
 __4:
 	;
 	goto bypass_moveto_root
@@ -77110,7 +77199,7 @@ __15:
 	if !(nCell < 2 || U32(nCell)/(*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FusableSize > (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpBt)).FnPage) {
 		goto __17
 	}
-	rc = Xsqlite3CorruptError(tls, 74076)
+	rc = Xsqlite3CorruptError(tls, 74360)
 	goto moveto_index_finish
 __17:
 	;
@@ -77158,7 +77247,7 @@ __22:
 	if !((*UnpackedRecord)(unsafe.Pointer(pIdxKey)).FerrCode != 0) {
 		goto __24
 	}
-	rc = Xsqlite3CorruptError(tls, 74108)
+	rc = Xsqlite3CorruptError(tls, 74392)
 __24:
 	;
 	goto moveto_index_finish
@@ -77277,7 +77366,7 @@ func btreeNext(tls *libc.TLS, pCur uintptr) int32 {
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	if !(int32((*MemPage)(unsafe.Pointer(pPage)).FisInit) != 0) || Xsqlite3FaultSim(tls, 412) != 0 {
-		return Xsqlite3CorruptError(tls, 74224)
+		return Xsqlite3CorruptError(tls, 74508)
 	}
 
 	if idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) {
@@ -77437,7 +77526,7 @@ func allocateBtreePage(tls *libc.TLS, pBt uintptr, ppPage uintptr, pPgno uintptr
 	if !(n >= mxPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74404)
+	return Xsqlite3CorruptError(tls, 74688)
 __1:
 	;
 	if !(n > U32(0)) {
@@ -77502,7 +77591,7 @@ __15:
 	if !(iTrunk > mxPage || libc.PostIncUint32(&nSearch, 1) > n) {
 		goto __16
 	}
-	rc = Xsqlite3CorruptError(tls, 74460)
+	rc = Xsqlite3CorruptError(tls, 74744)
 	goto __17
 __16:
 	rc = btreeGetUnusedPage(tls, pBt, iTrunk, bp+8, 0)
@@ -77538,7 +77627,7 @@ __19:
 		goto __22
 	}
 
-	rc = Xsqlite3CorruptError(tls, 74489)
+	rc = Xsqlite3CorruptError(tls, 74773)
 	goto end_allocate_page
 	goto __23
 __22:
@@ -77582,7 +77671,7 @@ __27:
 	if !(iNewTrunk > mxPage) {
 		goto __32
 	}
-	rc = Xsqlite3CorruptError(tls, 74523)
+	rc = Xsqlite3CorruptError(tls, 74807)
 	goto end_allocate_page
 __32:
 	;
@@ -77694,7 +77783,7 @@ __40:
 	if !(iPage > mxPage || iPage < Pgno(2)) {
 		goto __51
 	}
-	rc = Xsqlite3CorruptError(tls, 74588)
+	rc = Xsqlite3CorruptError(tls, 74872)
 	goto end_allocate_page
 __51:
 	;
@@ -77852,7 +77941,7 @@ func freePage2(tls *libc.TLS, pBt uintptr, pMemPage uintptr, iPage Pgno) int32 {
 	if !(iPage < Pgno(2) || iPage > (*BtShared)(unsafe.Pointer(pBt)).FnPage) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 74715)
+	return Xsqlite3CorruptError(tls, 74999)
 __1:
 	;
 	if !(pMemPage != 0) {
@@ -77909,7 +77998,7 @@ __7:
 	if !(iTrunk > btreePagecount(tls, pBt)) {
 		goto __10
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74762)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75046)
 	goto freepage_out
 __10:
 	;
@@ -77925,7 +78014,7 @@ __11:
 	if !(nLeaf > (*BtShared)(unsafe.Pointer(pBt)).FusableSize/U32(4)-U32(2)) {
 		goto __12
 	}
-	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 74773)
+	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3CorruptError(tls, 75057)
 	goto freepage_out
 __12:
 	;
@@ -77999,7 +78088,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 	var ovflPageSize U32
 
 	if pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 74862)
+		return Xsqlite3CorruptError(tls, 75146)
 	}
 	ovflPgno = Xsqlite3Get4byte(tls, pCell+uintptr((*CellInfo)(unsafe.Pointer(pInfo)).FnSize)-uintptr(4))
 	pBt = (*MemPage)(unsafe.Pointer(pPage)).FpBt
@@ -78011,7 +78100,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 		*(*Pgno)(unsafe.Pointer(bp + 8)) = Pgno(0)
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 		if ovflPgno < Pgno(2) || ovflPgno > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 74879)
+			return Xsqlite3CorruptError(tls, 75163)
 		}
 		if nOvfl != 0 {
 			rc = getOverflowPage(tls, pBt, ovflPgno, bp, bp+8)
@@ -78022,7 +78111,7 @@ func clearCellOverflow(tls *libc.TLS, pPage uintptr, pCell uintptr, pInfo uintpt
 
 		if (*(*uintptr)(unsafe.Pointer(bp)) != 0 || libc.AssignPtrUintptr(bp, btreePageLookup(tls, pBt, ovflPgno)) != uintptr(0)) &&
 			Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 {
-			rc = Xsqlite3CorruptError(tls, 74899)
+			rc = Xsqlite3CorruptError(tls, 75183)
 		} else {
 			rc = freePage2(tls, pBt, *(*uintptr)(unsafe.Pointer(bp)), ovflPgno)
 		}
@@ -78187,7 +78276,7 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	hdr = int32((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)
 
 	if pc+U32(sz) > (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FusableSize {
-		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75152)
+		*(*int32)(unsafe.Pointer(pRC)) = Xsqlite3CorruptError(tls, 75436)
 		return
 	}
 	rc = freeSpace(tls, pPage, uint16(pc), uint16(sz))
@@ -78211,9 +78300,9 @@ func dropCell(tls *libc.TLS, pPage uintptr, idx int32, sz int32, pRC uintptr) {
 	}
 }
 
-func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno, pRC uintptr) {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32, pTemp uintptr, iChild Pgno) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	*(*int32)(unsafe.Pointer(bp)) = 0
 	var j int32
@@ -78236,16 +78325,14 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 	} else {
 		var rc int32 = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 		if rc != SQLITE_OK {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		data = (*MemPage)(unsafe.Pointer(pPage)).FaData
 
 		rc = allocateSpace(tls, pPage, sz, bp)
 		if rc != 0 {
-			*(*int32)(unsafe.Pointer(pRC)) = rc
-			return
+			return rc
 		}
 
 		*(*int32)(unsafe.Pointer(pPage + 20)) -= int32(U16(2 + sz))
@@ -78266,9 +78353,15 @@ func insertCell(tls *libc.TLS, pPage uintptr, i int32, pCell uintptr, sz int32,
 		}
 
 		if (*BtShared)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FpBt)).FautoVacuum != 0 {
-			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, pRC)
+			*(*int32)(unsafe.Pointer(bp + 4)) = SQLITE_OK
+
+			ptrmapPutOvflPtr(tls, pPage, pPage, pCell, bp+4)
+			if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
+				return *(*int32)(unsafe.Pointer(bp + 4))
+			}
 		}
 	}
+	return SQLITE_OK
 }
 
 // A CellArray object contains a cache of pointers and sizes for a
@@ -78402,11 +78495,14 @@ type CellArray1 = struct {
 type CellArray = CellArray1
 
 func populateCellCache(tls *libc.TLS, p uintptr, idx int32, N int32) {
+	var pRef uintptr = (*CellArray)(unsafe.Pointer(p)).FpRef
+	var szCell uintptr = (*CellArray)(unsafe.Pointer(p)).FszCell
+
 	for N > 0 {
-		if int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2))) == 0 {
-			*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FszCell + uintptr(idx)*2)) = (*struct {
+		if int32(*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2))) == 0 {
+			*(*U16)(unsafe.Pointer(szCell + uintptr(idx)*2)) = (*struct {
 				f func(*libc.TLS, uintptr, uintptr) U16
-			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FpRef)).FxCellSize})).f(tls, (*CellArray)(unsafe.Pointer(p)).FpRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
+			})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pRef)).FxCellSize})).f(tls, pRef, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(p)).FapCell + uintptr(idx)*8)))
 		} else {
 		}
 		idx++
@@ -78459,12 +78555,12 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 
 		if Uptr(pCell) >= Uptr(aData+uintptr(j)) && Uptr(pCell) < Uptr(pEnd) {
 			if Uptr(pCell+uintptr(sz)) > Uptr(pEnd) {
-				return Xsqlite3CorruptError(tls, 75453)
+				return Xsqlite3CorruptError(tls, 75737)
 			}
 			pCell = pTmp + uintptr((int64(pCell)-int64(aData))/1)
 		} else if Uptr(pCell+uintptr(sz)) > Uptr(pSrcEnd) &&
 			Uptr(pCell) < Uptr(pSrcEnd) {
-			return Xsqlite3CorruptError(tls, 75458)
+			return Xsqlite3CorruptError(tls, 75742)
 		}
 
 		pData -= uintptr(sz)
@@ -78472,7 +78568,7 @@ func rebuildPage(tls *libc.TLS, pCArray uintptr, iFirst int32, nCell int32, pPg
 		*(*U8)(unsafe.Pointer(pCellptr + 1)) = U8((int64(pData) - int64(aData)) / 1)
 		pCellptr += uintptr(2)
 		if pData < pCellptr {
-			return Xsqlite3CorruptError(tls, 75464)
+			return Xsqlite3CorruptError(tls, 75748)
 		}
 		libc.Xmemmove(tls, pData, pCell, uint64(sz))
 
@@ -78532,7 +78628,7 @@ func pageInsertArray(tls *libc.TLS, pPg uintptr, pBegin uintptr, ppData uintptr,
 
 		if Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))+uintptr(sz)) > Uptr(pEnd) &&
 			Uptr(*(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8))) < Uptr(pEnd) {
-			Xsqlite3CorruptError(tls, 75549)
+			Xsqlite3CorruptError(tls, 75833)
 			return 1
 		}
 		libc.Xmemmove(tls, pSlot, *(*uintptr)(unsafe.Pointer((*CellArray)(unsafe.Pointer(pCArray)).FapCell + uintptr(i)*8)), uint64(sz))
@@ -78621,7 +78717,7 @@ func editPage(tls *libc.TLS, pPg uintptr, iOld int32, iNew int32, nNew int32, pC
 	if !(nShift > nCell) {
 		goto __2
 	}
-	return Xsqlite3CorruptError(tls, 75660)
+	return Xsqlite3CorruptError(tls, 75947)
 __2:
 	;
 	libc.Xmemmove(tls, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx, (*MemPage)(unsafe.Pointer(pPg)).FaCellIdx+uintptr(nShift*2), uint64(nCell*2))
@@ -78737,7 +78833,7 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 	var pBt uintptr = (*MemPage)(unsafe.Pointer(pPage)).FpBt
 
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) == 0 {
-		return Xsqlite3CorruptError(tls, 75773)
+		return Xsqlite3CorruptError(tls, 76060)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 136)) = allocateBtreePage(tls, pBt, bp, bp+8, uint32(0), uint8(0))
@@ -78780,8 +78876,8 @@ func balance_quick(tls *libc.TLS, pParent uintptr, pPage uintptr, pSpace uintptr
 		}
 
 		if *(*int32)(unsafe.Pointer(bp + 136)) == SQLITE_OK {
-			insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
-				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+136)
+			*(*int32)(unsafe.Pointer(bp + 136)) = insertCell(tls, pParent, int32((*MemPage)(unsafe.Pointer(pParent)).FnCell), pSpace, int32((int64(pOut)-int64(pSpace))/1),
+				uintptr(0), (*MemPage)(unsafe.Pointer(pPage)).Fpgno)
 		}
 
 		Xsqlite3Put4byte(tls, (*MemPage)(unsafe.Pointer(pParent)).FaData+uintptr(int32((*MemPage)(unsafe.Pointer(pParent)).FhdrOffset)+8), *(*Pgno)(unsafe.Pointer(bp + 8)))
@@ -78863,6 +78959,8 @@ func balance_nonroot(tls *libc.TLS, pParent uintptr, iParentIdx int32, aOvflSpac
 	var piEnd uintptr
 	var p uintptr
 	var sz1 int32
+	var szR int32
+	var szD int32
 	var szRight int32
 	var szLeft int32
 	var r int32
@@ -79055,7 +79153,7 @@ __22:
 	if !(int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pOld)).FaData))) != int32(*(*U8)(unsafe.Pointer((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 112)))).FaData)))) {
 		goto __25
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76194)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76481)
 	goto balance_cleanup
 __25:
 	;
@@ -79066,7 +79164,7 @@ __25:
 	if !(limit < int32(*(*U16)(unsafe.Pointer(pOld + 28)))) {
 		goto __27
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76218)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76505)
 	goto balance_cleanup
 __27:
 	;
@@ -79224,7 +79322,7 @@ __52:
 	if !(k > NB+2) {
 		goto __55
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76319)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76606)
 	goto balance_cleanup
 __55:
 	;
@@ -79298,7 +79396,7 @@ __65:
 	}()) {
 		goto __67
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76352)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76639)
 	goto balance_cleanup
 __67:
 	;
@@ -79324,9 +79422,10 @@ __68:
 	cachedCellSize(tls, bp+8, d)
 __71:
 	;
-	cachedCellSize(tls, bp+8, r)
+	szR = int32(cachedCellSize(tls, bp+8, r))
+	szD = int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))
 	if !(szRight != 0 &&
-		(bBulk != 0 || szRight+int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2)))+2 > szLeft-(int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2)))+func() int32 {
+		(bBulk != 0 || szRight+szD+2 > szLeft-(szR+func() int32 {
 			if i == k-1 {
 				return 0
 			}
@@ -79337,8 +79436,8 @@ __71:
 	goto __73
 __74:
 	;
-	szRight = szRight + (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(d)*2))) + 2)
-	szLeft = szLeft - (int32(*(*U16)(unsafe.Pointer((*CellArray)(unsafe.Pointer(bp+8)).FszCell + uintptr(r)*2))) + 2)
+	szRight = szRight + (szD + 2)
+	szLeft = szLeft - (szR + 2)
 	*(*int32)(unsafe.Pointer(bp + 196 + uintptr(i-1)*4)) = r
 	r--
 	d--
@@ -79360,7 +79459,7 @@ __73:
 	}()) {
 		goto __75
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76394)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76683)
 	goto balance_cleanup
 __75:
 	;
@@ -79388,7 +79487,7 @@ __76:
 		*(*int32)(unsafe.Pointer(bp + 172)) == SQLITE_OK) {
 		goto __81
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76427)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76716)
 __81:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != 0) {
@@ -79649,11 +79748,11 @@ __120:
 	if !(Uptr(pSrcEnd) >= Uptr(pCell1) && Uptr(pSrcEnd) < Uptr(pCell1+uintptr(sz2))) {
 		goto __121
 	}
-	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76627)
+	*(*int32)(unsafe.Pointer(bp + 172)) = Xsqlite3CorruptError(tls, 76916)
 	goto balance_cleanup
 __121:
 	;
-	insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno, bp+172)
+	*(*int32)(unsafe.Pointer(bp + 172)) = insertCell(tls, pParent, nxDiv+i, pCell1, sz2, pTemp1, (*MemPage)(unsafe.Pointer(pNew2)).Fpgno)
 	if !(*(*int32)(unsafe.Pointer(bp + 172)) != SQLITE_OK) {
 		goto __122
 	}
@@ -79841,7 +79940,7 @@ func anotherValidCursor(tls *libc.TLS, pCur uintptr) int32 {
 		if pOther != pCur &&
 			int32((*BtCursor)(unsafe.Pointer(pOther)).FeState) == CURSOR_VALID &&
 			(*BtCursor)(unsafe.Pointer(pOther)).FpPage == (*BtCursor)(unsafe.Pointer(pCur)).FpPage {
-			return Xsqlite3CorruptError(tls, 76857)
+			return Xsqlite3CorruptError(tls, 77146)
 		}
 	}
 	return SQLITE_OK
@@ -79879,7 +79978,7 @@ func balance(tls *libc.TLS, pCur uintptr) int32 {
 				break
 			}
 		} else if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage) > 1 {
-			rc = Xsqlite3CorruptError(tls, 76917)
+			rc = Xsqlite3CorruptError(tls, 77206)
 		} else {
 			var pParent uintptr = *(*uintptr)(unsafe.Pointer(pCur + 144 + uintptr(iPage-1)*8))
 			var iIdx int32 = int32(*(*U16)(unsafe.Pointer(pCur + 88 + uintptr(iPage-1)*2)))
@@ -79956,7 +80055,7 @@ func btreeOverwriteContent(tls *libc.TLS, pPage uintptr, pDest uintptr, pX uintp
 	return SQLITE_OK
 }
 
-func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+func btreeOverwriteOverflowCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
@@ -79968,19 +80067,11 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	var ovflPgno Pgno
 	var ovflPageSize U32
 
-	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaDataEnd ||
-		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData+uintptr((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FcellOffset) {
-		return Xsqlite3CorruptError(tls, 77062)
-	}
-
 	rc = btreeOverwriteContent(tls, *(*uintptr)(unsafe.Pointer(bp)), (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
 		0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
 	if rc != 0 {
 		return rc
 	}
-	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
-		return SQLITE_OK
-	}
 
 	iOffset = int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal)
 
@@ -79993,7 +80084,7 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 			return rc
 		}
 		if Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1 || (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FisInit != 0 {
-			rc = Xsqlite3CorruptError(tls, 77081)
+			rc = Xsqlite3CorruptError(tls, 77370)
 		} else {
 			if U32(iOffset)+ovflPageSize < U32(nTotal) {
 				ovflPgno = Xsqlite3Get4byte(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaData)
@@ -80012,6 +80103,23 @@ func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
 	return SQLITE_OK
 }
 
+func btreeOverwriteCell(tls *libc.TLS, pCur uintptr, pX uintptr) int32 {
+	var nTotal int32 = (*BtreePayload)(unsafe.Pointer(pX)).FnData + (*BtreePayload)(unsafe.Pointer(pX)).FnZero
+	var pPage uintptr = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
+
+	if (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload+uintptr((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd ||
+		(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FcellOffset) {
+		return Xsqlite3CorruptError(tls, 77398)
+	}
+	if int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal) == nTotal {
+		return btreeOverwriteContent(tls, pPage, (*BtCursor)(unsafe.Pointer(pCur)).Finfo.FpPayload, pX,
+			0, int32((*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnLocal))
+	} else {
+		return btreeOverwriteOverflowCell(tls, pCur, pX)
+	}
+	return int32(0)
+}
+
 // Insert a new record into the BTree.  The content of the new record
 // is described by the pX object.  The pCur cursor is used only to
 // define what table the record should be inserted into, and is left
@@ -80047,7 +80155,6 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	var idx int32
 	var pPage uintptr
 	var p uintptr
-	var pBt uintptr
 	var oldCell uintptr
 	var newCell uintptr
 
@@ -80056,13 +80163,12 @@ func Xsqlite3BtreeInsert(tls *libc.TLS, pCur uintptr, pX uintptr, flags int32, s
 	*(*int32)(unsafe.Pointer(bp)) = seekResult
 	*(*int32)(unsafe.Pointer(bp + 124)) = 0
 	p = (*BtCursor)(unsafe.Pointer(pCur)).FpBtree
-	pBt = (*Btree)(unsafe.Pointer(p)).FpBt
 	newCell = uintptr(0)
 
 	if !(int32((*BtCursor)(unsafe.Pointer(pCur)).FcurFlags)&BTCF_Multiple != 0) {
 		goto __1
 	}
-	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, pBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
+	*(*int32)(unsafe.Pointer(bp + 120)) = saveAllCursors(tls, (*Btree)(unsafe.Pointer(p)).FpBt, (*BtCursor)(unsafe.Pointer(pCur)).FpgnoRoot, pCur)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
 		goto __2
 	}
@@ -80073,7 +80179,7 @@ __2:
 		goto __3
 	}
 
-	return Xsqlite3CorruptError(tls, 77168)
+	return Xsqlite3CorruptError(tls, 77479)
 __3:
 	;
 __1:
@@ -80186,7 +80292,7 @@ __7:
 		goto __21
 	}
 
-	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77291)
+	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3CorruptError(tls, 77602)
 	goto __22
 __21:
 	*(*int32)(unsafe.Pointer(bp + 120)) = btreeComputeFreeSpace(tls, pPage)
@@ -80200,20 +80306,20 @@ __23:
 	;
 __20:
 	;
-	newCell = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
+	newCell = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpTmpSpace
 
 	if !(flags&BTREE_PREFORMAT != 0) {
 		goto __24
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize
+	*(*int32)(unsafe.Pointer(bp + 124)) = (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FnPreformatSize
 	if !(*(*int32)(unsafe.Pointer(bp + 124)) < 4) {
 		goto __26
 	}
 	*(*int32)(unsafe.Pointer(bp + 124)) = 4
 __26:
 	;
-	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
+	if !((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum != 0 && *(*int32)(unsafe.Pointer(bp + 124)) > int32((*MemPage)(unsafe.Pointer(pPage)).FmaxLocal)) {
 		goto __27
 	}
 	(*struct {
@@ -80223,7 +80329,13 @@ __26:
 		goto __28
 	}
 	ovfl = Xsqlite3Get4byte(tls, newCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))-4))
-	ptrmapPut(tls, pBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	ptrmapPut(tls, (*Btree)(unsafe.Pointer(p)).FpBt, ovfl, uint8(PTRMAP_OVERFLOW1), (*MemPage)(unsafe.Pointer(pPage)).Fpgno, bp+120)
+	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
+		goto __29
+	}
+	goto end_insert
+__29:
+	;
 __28:
 	;
 __27:
@@ -80231,100 +80343,100 @@ __27:
 	goto __25
 __24:
 	*(*int32)(unsafe.Pointer(bp + 120)) = fillInCell(tls, pPage, newCell, pX, bp+124)
-__25:
-	;
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __29
+		goto __30
 	}
 	goto end_insert
-__29:
+__30:
+	;
+__25:
 	;
 	idx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	if !(*(*int32)(unsafe.Pointer(bp)) == 0) {
-		goto __30
+		goto __31
 	}
 
 	if !(idx >= int32((*MemPage)(unsafe.Pointer(pPage)).FnCell)) {
-		goto __32
+		goto __33
 	}
-	return Xsqlite3CorruptError(tls, 77327)
-__32:
+	return Xsqlite3CorruptError(tls, 77640)
+__33:
 	;
 	*(*int32)(unsafe.Pointer(bp + 120)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pPage)).FpDbPage)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __33
+		goto __34
 	}
 	goto end_insert
-__33:
+__34:
 	;
 	oldCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*idx))))))
 	if !!(int32((*MemPage)(unsafe.Pointer(pPage)).Fleaf) != 0) {
-		goto __34
+		goto __35
 	}
 	libc.Xmemcpy(tls, newCell, oldCell, uint64(4))
-__34:
+__35:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(pPage)).FxParseCell})).f(tls, pPage, oldCell, bp+128)
 	if !(U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) != (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload) {
-		goto __35
+		goto __36
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = clearCellOverflow(tls, pPage, oldCell, bp+128)
-	goto __36
-__35:
-	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+	goto __37
 __36:
+	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_OK
+__37:
 	;
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidOvfl))
 	if !(int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize) == *(*int32)(unsafe.Pointer(bp + 124)) && U32((*CellInfo)(unsafe.Pointer(bp+128)).FnLocal) == (*CellInfo)(unsafe.Pointer(bp+128)).FnPayload &&
-		(!(int32((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
-		goto __37
+		(!(int32((*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FautoVacuum) != 0) || *(*int32)(unsafe.Pointer(bp + 124)) < int32((*MemPage)(unsafe.Pointer(pPage)).FminLocal))) {
+		goto __38
 	}
 
 	if !(oldCell < (*MemPage)(unsafe.Pointer(pPage)).FaData+uintptr((*MemPage)(unsafe.Pointer(pPage)).FhdrOffset)+uintptr(10)) {
-		goto __38
-	}
-	return Xsqlite3CorruptError(tls, 77354)
-__38:
-	;
-	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
 		goto __39
 	}
-	return Xsqlite3CorruptError(tls, 77357)
+	return Xsqlite3CorruptError(tls, 77667)
 __39:
+	;
+	if !(oldCell+uintptr(*(*int32)(unsafe.Pointer(bp + 124))) > (*MemPage)(unsafe.Pointer(pPage)).FaDataEnd) {
+		goto __40
+	}
+	return Xsqlite3CorruptError(tls, 77670)
+__40:
 	;
 	libc.Xmemcpy(tls, oldCell, newCell, uint64(*(*int32)(unsafe.Pointer(bp + 124))))
 	return SQLITE_OK
-__37:
+__38:
 	;
 	dropCell(tls, pPage, idx, int32((*CellInfo)(unsafe.Pointer(bp+128)).FnSize), bp+120)
 	if !(*(*int32)(unsafe.Pointer(bp + 120)) != 0) {
-		goto __40
+		goto __41
 	}
 	goto end_insert
-__40:
+__41:
 	;
-	goto __31
-__30:
+	goto __32
+__31:
 	if !(*(*int32)(unsafe.Pointer(bp)) < 0 && int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) > 0) {
-		goto __41
+		goto __42
 	}
 
 	idx = int32(libc.PreIncUint16(&(*BtCursor)(unsafe.Pointer(pCur)).Fix, 1))
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
-	goto __42
-__41:
-	;
+	goto __43
 __42:
 	;
-__31:
+__43:
 	;
-	insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0), bp+120)
+__32:
+	;
+	*(*int32)(unsafe.Pointer(bp + 120)) = insertCell(tls, pPage, idx, newCell, *(*int32)(unsafe.Pointer(bp + 124)), uintptr(0), uint32(0))
 
 	(*BtCursor)(unsafe.Pointer(pCur)).Finfo.FnSize = U16(0)
 	if !((*MemPage)(unsafe.Pointer(pPage)).FnOverflow != 0) {
-		goto __43
+		goto __44
 	}
 
 	*(*U8)(unsafe.Pointer(pCur + 1)) &= libc.Uint8FromInt32(libc.CplInt32(BTCF_ValidNKey))
@@ -80333,30 +80445,30 @@ __31:
 	(*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pCur)).FpPage)).FnOverflow = U8(0)
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_INVALID)
 	if !(flags&BTREE_SAVEPOSITION != 0 && *(*int32)(unsafe.Pointer(bp + 120)) == SQLITE_OK) {
-		goto __44
+		goto __45
 	}
 	btreeReleaseAllCursorPages(tls, pCur)
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKeyInfo != 0) {
-		goto __45
+		goto __46
 	}
 
 	(*BtCursor)(unsafe.Pointer(pCur)).FpKey = Xsqlite3Malloc(tls, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
 	if !((*BtCursor)(unsafe.Pointer(pCur)).FpKey == uintptr(0)) {
-		goto __46
+		goto __47
 	}
 	*(*int32)(unsafe.Pointer(bp + 120)) = SQLITE_NOMEM
-	goto __47
-__46:
-	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+	goto __48
 __47:
+	libc.Xmemcpy(tls, (*BtCursor)(unsafe.Pointer(pCur)).FpKey, (*BtreePayload)(unsafe.Pointer(pX)).FpKey, uint64((*BtreePayload)(unsafe.Pointer(pX)).FnKey))
+__48:
 	;
-__45:
+__46:
 	;
 	(*BtCursor)(unsafe.Pointer(pCur)).FeState = U8(CURSOR_REQUIRESEEK)
 	(*BtCursor)(unsafe.Pointer(pCur)).FnKey = (*BtreePayload)(unsafe.Pointer(pX)).FnKey
-__44:
+__45:
 	;
-__43:
+__44:
 	;
 end_insert:
 	return *(*int32)(unsafe.Pointer(bp + 120))
@@ -80379,7 +80491,6 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 	var pBt uintptr = (*BtCursor)(unsafe.Pointer(pDest)).FpBt
 	var aOut uintptr = (*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace
 	var aIn uintptr
@@ -80398,13 +80509,15 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 	nIn = U32((*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnLocal)
 	aIn = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload
 	if aIn+uintptr(nIn) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-		return Xsqlite3CorruptError(tls, 77461)
+		return Xsqlite3CorruptError(tls, 77773)
 	}
 	nRem = (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FnPayload
 	if nIn == nRem && nIn < U32((*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pDest)).FpPage)).FmaxLocal) {
 		libc.Xmemcpy(tls, aOut, aIn, uint64(nIn))
 		(*BtShared)(unsafe.Pointer(pBt)).FnPreformatSize = int32(int64(nIn) + (int64(aOut)-int64((*BtShared)(unsafe.Pointer(pBt)).FpTmpSpace))/1)
+		return SQLITE_OK
 	} else {
+		*(*int32)(unsafe.Pointer(bp + 20)) = SQLITE_OK
 		var pSrcPager uintptr = (*BtShared)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpBt)).FpPager
 		var pPgnoOut uintptr = uintptr(0)
 		var ovflIn Pgno = Pgno(0)
@@ -80421,7 +80534,7 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		if nRem > nIn {
 			if aIn+uintptr(nIn)+uintptr(4) > (*MemPage)(unsafe.Pointer((*BtCursor)(unsafe.Pointer(pSrc)).FpPage)).FaDataEnd {
-				return Xsqlite3CorruptError(tls, 77484)
+				return Xsqlite3CorruptError(tls, 77798)
 			}
 			ovflIn = Xsqlite3Get4byte(tls, (*BtCursor)(unsafe.Pointer(pSrc)).Finfo.FpPayload+uintptr(nIn))
 		}
@@ -80480,9 +80593,9 @@ func Xsqlite3BtreeTransferRow(tls *libc.TLS, pDest uintptr, pSrc uintptr, iKey I
 
 		releasePage(tls, pPageOut)
 		Xsqlite3PagerUnref(tls, *(*uintptr)(unsafe.Pointer(bp)))
+		return *(*int32)(unsafe.Pointer(bp + 20))
 	}
-
-	return *(*int32)(unsafe.Pointer(bp + 20))
+	return int32(0)
 }
 
 // Delete the entry that the cursor is pointing to.
@@ -80522,7 +80635,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 				return *(*int32)(unsafe.Pointer(bp + 24))
 			}
 		} else {
-			return Xsqlite3CorruptError(tls, 77581)
+			return Xsqlite3CorruptError(tls, 77894)
 		}
 	}
 
@@ -80530,11 +80643,11 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 	iCellIdx = int32((*BtCursor)(unsafe.Pointer(pCur)).Fix)
 	pPage = (*BtCursor)(unsafe.Pointer(pCur)).FpPage
 	if int32((*MemPage)(unsafe.Pointer(pPage)).FnCell) <= iCellIdx {
-		return Xsqlite3CorruptError(tls, 77590)
+		return Xsqlite3CorruptError(tls, 77903)
 	}
 	pCell = (*MemPage)(unsafe.Pointer(pPage)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pPage)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pPage)).FaCellIdx + uintptr(2*iCellIdx))))))
 	if (*MemPage)(unsafe.Pointer(pPage)).FnFree < 0 && btreeComputeFreeSpace(tls, pPage) != 0 {
-		return Xsqlite3CorruptError(tls, 77594)
+		return Xsqlite3CorruptError(tls, 77907)
 	}
 
 	bPreserve = U8(libc.Bool32(int32(flags)&BTREE_SAVEPOSITION != 0))
@@ -80609,7 +80722,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 		}
 		pCell = (*MemPage)(unsafe.Pointer(pLeaf)).FaData + uintptr(int32((*MemPage)(unsafe.Pointer(pLeaf)).FmaskPage)&int32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer((*MemPage)(unsafe.Pointer(pLeaf)).FaCellIdx + uintptr(2*(int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1)))))))
 		if pCell < (*MemPage)(unsafe.Pointer(pLeaf)).FaData+4 {
-			return Xsqlite3CorruptError(tls, 77685)
+			return Xsqlite3CorruptError(tls, 77998)
 		}
 		nCell = int32((*struct {
 			f func(*libc.TLS, uintptr, uintptr) U16
@@ -80619,7 +80732,7 @@ func Xsqlite3BtreeDelete(tls *libc.TLS, pCur uintptr, flags U8) int32 {
 
 		*(*int32)(unsafe.Pointer(bp + 24)) = Xsqlite3PagerWrite(tls, (*MemPage)(unsafe.Pointer(pLeaf)).FpDbPage)
 		if *(*int32)(unsafe.Pointer(bp + 24)) == SQLITE_OK {
-			insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n, bp+24)
+			*(*int32)(unsafe.Pointer(bp + 24)) = insertCell(tls, pPage, iCellIdx, pCell-uintptr(4), nCell+4, pTmp, n)
 		}
 		dropCell(tls, pLeaf, int32((*MemPage)(unsafe.Pointer(pLeaf)).FnCell)-1, nCell, bp+24)
 		if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
@@ -80678,7 +80791,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 
 		Xsqlite3BtreeGetMeta(tls, p, BTREE_LARGEST_ROOT_PAGE, bp)
 		if *(*Pgno)(unsafe.Pointer(bp)) > btreePagecount(tls, pBt) {
-			return Xsqlite3CorruptError(tls, 77801)
+			return Xsqlite3CorruptError(tls, 78114)
 		}
 		*(*Pgno)(unsafe.Pointer(bp))++
 
@@ -80707,7 +80820,7 @@ func btreeCreateTable(tls *libc.TLS, p uintptr, piTable uintptr, createTabFlags
 			}
 			*(*int32)(unsafe.Pointer(bp + 40)) = ptrmapGet(tls, pBt, *(*Pgno)(unsafe.Pointer(bp)), bp+32, bp+36)
 			if int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_ROOTPAGE || int32(*(*U8)(unsafe.Pointer(bp + 32))) == PTRMAP_FREEPAGE {
-				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 77849)
+				*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 78162)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 				releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -80783,7 +80896,7 @@ func clearDatabasePage(tls *libc.TLS, pBt uintptr, pgno Pgno, freePageFlag int32
 	if !(pgno > btreePagecount(tls, pBt)) {
 		goto __1
 	}
-	return Xsqlite3CorruptError(tls, 77939)
+	return Xsqlite3CorruptError(tls, 78252)
 __1:
 	;
 	*(*int32)(unsafe.Pointer(bp + 32)) = getAndInitPage(tls, pBt, pgno, bp, uintptr(0), 0)
@@ -80797,7 +80910,7 @@ __2:
 		Xsqlite3PagerPageRefcount(tls, (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpDbPage) != 1+libc.Bool32(pgno == Pgno(1))) {
 		goto __3
 	}
-	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 77946)
+	*(*int32)(unsafe.Pointer(bp + 32)) = Xsqlite3CorruptError(tls, 78259)
 	goto cleardatabasepage_out
 __3:
 	;
@@ -80931,7 +81044,7 @@ func btreeDropTable(tls *libc.TLS, p uintptr, iTable Pgno, piMoved uintptr) int3
 	var pBt uintptr = (*Btree)(unsafe.Pointer(p)).FpBt
 
 	if iTable > btreePagecount(tls, pBt) {
-		return Xsqlite3CorruptError(tls, 78050)
+		return Xsqlite3CorruptError(tls, 78363)
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 12)) = Xsqlite3BtreeClearTable(tls, p, int32(iTable), uintptr(0))
@@ -81106,12 +81219,41 @@ func Xsqlite3BtreePager(tls *libc.TLS, p uintptr) uintptr {
 	return (*BtShared)(unsafe.Pointer((*Btree)(unsafe.Pointer(p)).FpBt)).FpPager
 }
 
+func checkOom(tls *libc.TLS, pCheck uintptr) {
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
+	(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr == 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+	}
+}
+
+func checkProgress(tls *libc.TLS, pCheck uintptr) {
+	var db uintptr = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb
+	if libc.AtomicLoadNInt32(db+432, 0) != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+	}
+	if (*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0 {
+		(*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep++
+		if (*IntegrityCk)(unsafe.Pointer(pCheck)).FnStep%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps == U32(0) &&
+			(*struct {
+				f func(*libc.TLS, uintptr) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0 {
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).Frc = SQLITE_INTERRUPT
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
+			(*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr = 0
+		}
+	}
+}
+
 func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
 	var ap Va_list
 	_ = ap
+	checkProgress(tls, pCheck)
 	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
 		return
 	}
@@ -81119,15 +81261,15 @@ func checkAppendMsg(tls *libc.TLS, pCheck uintptr, zFormat uintptr, va uintptr)
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FnErr++
 	ap = va
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FnChar != 0 {
-		Xsqlite3_str_append(tls, pCheck+56, ts+5414, 1)
+		Xsqlite3_str_append(tls, pCheck+64, ts+5414, 1)
 	}
 	if (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx != 0 {
-		Xsqlite3_str_appendf(tls, pCheck+56, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
+		Xsqlite3_str_appendf(tls, pCheck+64, (*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx, libc.VaList(bp, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1, (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2))
 	}
-	Xsqlite3_str_vappendf(tls, pCheck+56, zFormat, ap)
+	Xsqlite3_str_vappendf(tls, pCheck+64, zFormat, ap)
 	_ = ap
 	if int32((*IntegrityCk)(unsafe.Pointer(pCheck)).FerrMsg.FaccError) == SQLITE_NOMEM {
-		(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+		checkOom(tls, pCheck)
 	}
 }
 
@@ -81151,9 +81293,6 @@ func checkRef(tls *libc.TLS, pCheck uintptr, iPage Pgno) int32 {
 		checkAppendMsg(tls, pCheck, ts+5439, libc.VaList(bp+8, iPage))
 		return 1
 	}
-	if libc.AtomicLoadNInt32((*IntegrityCk)(unsafe.Pointer(pCheck)).Fdb+432, 0) != 0 {
-		return 1
-	}
 	setPageReferenced(tls, pCheck, iPage)
 	return 0
 }
@@ -81167,7 +81306,7 @@ func checkPtrmap(tls *libc.TLS, pCheck uintptr, iChild Pgno, eType U8, iParent P
 	rc = ptrmapGet(tls, (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt, iChild, bp+48, bp+52)
 	if rc != SQLITE_OK {
 		if rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8 {
-			(*IntegrityCk)(unsafe.Pointer(pCheck)).FbOomFault = 1
+			checkOom(tls, pCheck)
 		}
 		checkAppendMsg(tls, pCheck, ts+5464, libc.VaList(bp, iChild))
 		return
@@ -81241,7 +81380,9 @@ func checkList(tls *libc.TLS, pCheck uintptr, isFreeList int32, iPage Pgno, N U3
 
 func btreeHeapInsert(tls *libc.TLS, aHeap uintptr, x U32) {
 	var j U32
-	var i U32 = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
+	var i U32
+
+	i = libc.PreIncUint32(&*(*U32)(unsafe.Pointer(aHeap)), 1)
 	*(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) = x
 	for libc.AssignUint32(&j, i/U32(2)) > U32(0) && *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4)) > *(*U32)(unsafe.Pointer(aHeap + uintptr(i)*4)) {
 		x = *(*U32)(unsafe.Pointer(aHeap + uintptr(j)*4))
@@ -81326,48 +81467,55 @@ func checkTreePage(tls *libc.TLS, pCheck uintptr, iPage Pgno, piMinKey uintptr,
 	saved_v2 = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2
 	savedIsInit = U8(0)
 
+	checkProgress(tls, pCheck)
+	if !((*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr == 0) {
+		goto __1
+	}
+	goto end_of_check
+__1:
+	;
 	pBt = (*IntegrityCk)(unsafe.Pointer(pCheck)).FpBt
 	usableSize = (*BtShared)(unsafe.Pointer(pBt)).FusableSize
 	if !(iPage == Pgno(0)) {
-		goto __1
-	}
-	return 0
-__1:
-	;
-	if !(checkRef(tls, pCheck, iPage) != 0) {
 		goto __2
 	}
 	return 0
 __2:
+	;
+	if !(checkRef(tls, pCheck, iPage) != 0) {
+		goto __3
+	}
+	return 0
+__3:
 	;
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5660
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv1 = iPage
 	if !(libc.AssignInt32(&rc, btreeGetPage(tls, pBt, iPage, bp+96, 0)) != 0) {
-		goto __3
+		goto __4
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+5670, libc.VaList(bp, rc))
 	goto end_of_check
-__3:
+__4:
 	;
 	savedIsInit = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = U8(0)
 	if !(libc.AssignInt32(&rc, btreeInitPage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __4
+		goto __5
 	}
 
 	checkAppendMsg(tls, pCheck,
 		ts+5708, libc.VaList(bp+8, rc))
 	goto end_of_check
-__4:
+__5:
 	;
 	if !(libc.AssignInt32(&rc, btreeComputeFreeSpace(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))) != 0) {
-		goto __5
+		goto __6
 	}
 
 	checkAppendMsg(tls, pCheck, ts+5746, libc.VaList(bp+16, rc))
 	goto end_of_check
-__5:
+__6:
 	;
 	data = (*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FaData
 	hdr = int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FhdrOffset)
@@ -81382,29 +81530,29 @@ __5:
 	pCellIdx = data + uintptr(cellStart+2*(nCell-1))
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __6
+		goto __7
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, data+uintptr(hdr+8)))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __8
+		goto __9
 	}
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = ts + 5794
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__8:
+__9:
 	;
 	depth = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
-	goto __7
-__6:
+	goto __8
+__7:
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
-__7:
+__8:
 	;
 	i = nCell - 1
-__9:
+__10:
 	if !(i >= 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr != 0) {
-		goto __11
+		goto __12
 	}
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).Fv2 = i
@@ -81412,28 +81560,28 @@ __9:
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(pCellIdx))))
 	pCellIdx -= uintptr(2)
 	if !(pc < contentOffset || pc > usableSize-U32(4)) {
-		goto __12
+		goto __13
 	}
 	checkAppendMsg(tls, pCheck, ts+5822,
 		libc.VaList(bp+24, pc, contentOffset, usableSize-U32(4)))
 	doCoverageCheck = 0
-	goto __10
-__12:
+	goto __11
+__13:
 	;
 	pCell = data + uintptr(pc)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxParseCell})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), pCell, bp+112)
 	if !(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize) > usableSize) {
-		goto __13
+		goto __14
 	}
 	checkAppendMsg(tls, pCheck, ts+5852, 0)
 	doCoverageCheck = 0
-	goto __10
-__13:
+	goto __11
+__14:
 	;
 	if !((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FintKey != 0) {
-		goto __14
+		goto __15
 	}
 	if !(func() int32 {
 		if keyCanBeEqual != 0 {
@@ -81441,97 +81589,97 @@ __13:
 		}
 		return libc.Bool32((*CellInfo)(unsafe.Pointer(bp+112)).FnKey >= *(*I64)(unsafe.Pointer(bp + 104)))
 	}() != 0) {
-		goto __15
+		goto __16
 	}
 	checkAppendMsg(tls, pCheck, ts+5876, libc.VaList(bp+48, (*CellInfo)(unsafe.Pointer(bp+112)).FnKey))
-__15:
+__16:
 	;
 	*(*I64)(unsafe.Pointer(bp + 104)) = (*CellInfo)(unsafe.Pointer(bp + 112)).FnKey
 	keyCanBeEqual = 0
-__14:
+__15:
 	;
 	if !((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload > U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal)) {
-		goto __16
+		goto __17
 	}
 
 	nPage = ((*CellInfo)(unsafe.Pointer(bp+112)).FnPayload - U32((*CellInfo)(unsafe.Pointer(bp+112)).FnLocal) + usableSize - U32(5)) / (usableSize - U32(4))
 	pgnoOvfl = Xsqlite3Get4byte(tls, pCell+uintptr(int32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-4))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __17
+		goto __18
 	}
 	checkPtrmap(tls, pCheck, pgnoOvfl, uint8(PTRMAP_OVERFLOW1), iPage)
-__17:
+__18:
 	;
 	checkList(tls, pCheck, 0, pgnoOvfl, nPage)
-__16:
+__17:
 	;
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __18
+		goto __19
 	}
 
 	pgno = int32(Xsqlite3Get4byte(tls, pCell))
 	if !((*BtShared)(unsafe.Pointer(pBt)).FautoVacuum != 0) {
-		goto __20
+		goto __21
 	}
 	checkPtrmap(tls, pCheck, uint32(pgno), uint8(PTRMAP_BTREE), iPage)
-__20:
+__21:
 	;
 	d2 = checkTreePage(tls, pCheck, uint32(pgno), bp+104, *(*I64)(unsafe.Pointer(bp + 104)))
 	keyCanBeEqual = 0
 	if !(d2 != depth) {
-		goto __21
+		goto __22
 	}
 	checkAppendMsg(tls, pCheck, ts+5900, 0)
 	depth = d2
-__21:
+__22:
 	;
-	goto __19
-__18:
-	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+	goto __20
 __19:
+	btreeHeapInsert(tls, heap, pc<<16|(pc+U32((*CellInfo)(unsafe.Pointer(bp+112)).FnSize)-U32(1)))
+__20:
 	;
-	goto __10
-__10:
-	i--
-	goto __9
 	goto __11
 __11:
+	i--
+	goto __10
+	goto __12
+__12:
 	;
 	*(*I64)(unsafe.Pointer(piMinKey)) = *(*I64)(unsafe.Pointer(bp + 104))
 
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = uintptr(0)
 	if !(doCoverageCheck != 0 && (*IntegrityCk)(unsafe.Pointer(pCheck)).FmxErr > 0) {
-		goto __22
+		goto __23
 	}
 
 	if !!(int32((*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).Fleaf) != 0) {
-		goto __23
+		goto __24
 	}
 	heap = (*IntegrityCk)(unsafe.Pointer(pCheck)).Fheap
 	*(*U32)(unsafe.Pointer(heap)) = U32(0)
 	i = nCell - 1
-__24:
+__25:
 	if !(i >= 0) {
-		goto __26
+		goto __27
 	}
 	pc = U32(libc.X__builtin_bswap16(tls, *(*U16)(unsafe.Pointer(data + uintptr(cellStart+i*2)))))
 	size = U32((*struct {
 		f func(*libc.TLS, uintptr, uintptr) U16
 	})(unsafe.Pointer(&struct{ uintptr }{(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FxCellSize})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 96)), data+uintptr(pc)))
 	btreeHeapInsert(tls, heap, pc<<16|(pc+size-U32(1)))
-	goto __25
-__25:
-	i--
-	goto __24
 	goto __26
 __26:
+	i--
+	goto __25
+	goto __27
+__27:
 	;
-__23:
+__24:
 	;
 	i = int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+1) + 1)))
-__27:
+__28:
 	if !(i > 0) {
-		goto __28
+		goto __29
 	}
 
 	size1 = int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i+2) + 1)))
@@ -81541,48 +81689,48 @@ __27:
 	j = int32(*(*U8)(unsafe.Pointer(data + uintptr(i))))<<8 | int32(*(*U8)(unsafe.Pointer(data + uintptr(i) + 1)))
 
 	i = j
-	goto __27
-__28:
+	goto __28
+__29:
 	;
 	nFrag = 0
 	prev = contentOffset - U32(1)
-__29:
+__30:
 	if !(btreeHeapPull(tls, heap, bp+136) != 0) {
-		goto __30
+		goto __31
 	}
 	if !(prev&U32(0xffff) >= *(*U32)(unsafe.Pointer(bp + 136))>>16) {
-		goto __31
+		goto __32
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+5925, libc.VaList(bp+56, *(*U32)(unsafe.Pointer(bp + 136))>>16, iPage))
-	goto __30
-	goto __32
-__31:
+	goto __31
+	goto __33
+__32:
 	nFrag = int32(U32(nFrag) + (*(*U32)(unsafe.Pointer(bp + 136))>>16 - prev&U32(0xffff) - U32(1)))
 	prev = *(*U32)(unsafe.Pointer(bp + 136))
-__32:
+__33:
 	;
-	goto __29
-__30:
+	goto __30
+__31:
 	;
 	nFrag = int32(U32(nFrag) + (usableSize - prev&U32(0xffff) - U32(1)))
 
 	if !(*(*U32)(unsafe.Pointer(heap)) == U32(0) && nFrag != int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7))))) {
-		goto __33
+		goto __34
 	}
 	checkAppendMsg(tls, pCheck,
 		ts+5962,
 		libc.VaList(bp+72, nFrag, int32(*(*U8)(unsafe.Pointer(data + uintptr(hdr+7)))), iPage))
-__33:
+__34:
 	;
-__22:
+__23:
 	;
 end_of_check:
 	if !!(doCoverageCheck != 0) {
-		goto __34
+		goto __35
 	}
 	(*MemPage)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FisInit = savedIsInit
-__34:
+__35:
 	;
 	releasePage(tls, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	(*IntegrityCk)(unsafe.Pointer(pCheck)).FzPfx = saved_zPfx
@@ -81611,9 +81759,9 @@ __34:
 // since obviously it is not possible to know which pages are covered by
 // the unverified btrees.  Except, if aRoot[1] is 1, then the freelist
 // checks are still performed.
-func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr) uintptr {
-	bp := tls.Alloc(248)
-	defer tls.Free(248)
+func Xsqlite3BtreeIntegrityCheck(tls *libc.TLS, db uintptr, p uintptr, aRoot uintptr, nRoot int32, mxErr int32, pnErr uintptr, pzOut uintptr) int32 {
+	bp := tls.Alloc(256)
+	defer tls.Free(256)
 
 	var i Pgno
 
@@ -81645,19 +81793,13 @@ __1:
 	;
 	Xsqlite3BtreeEnter(tls, p)
 
+	libc.Xmemset(tls, bp+32, 0, uint64(unsafe.Sizeof(IntegrityCk{})))
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fdb = db
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpBt = pBt
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FpPager = (*BtShared)(unsafe.Pointer(pBt)).FpPager
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnPage = btreePagecount(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FpBt)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FmxErr = mxErr
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FzPfx = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv1 = Pgno(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fv2 = 0
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FaPgRef = uintptr(0)
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).Fheap = uintptr(0)
-	Xsqlite3StrAccumInit(tls, bp+32+56, uintptr(0), bp+136, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
+	Xsqlite3StrAccumInit(tls, bp+32+64, uintptr(0), bp+144, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FerrMsg.FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnPage == Pgno(0)) {
 		goto __3
@@ -81669,7 +81811,7 @@ __3:
 	if !!(int32((*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef) != 0) {
 		goto __4
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __4:
 	;
@@ -81677,7 +81819,7 @@ __4:
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap == uintptr(0)) {
 		goto __5
 	}
-	(*IntegrityCk)(unsafe.Pointer(bp + 32)).FbOomFault = 1
+	checkOom(tls, bp+32)
 	goto integrity_ck_cleanup
 __5:
 	;
@@ -81762,7 +81904,7 @@ __20:
 	checkPtrmap(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), uint8(PTRMAP_ROOTPAGE), uint32(0))
 __21:
 	;
-	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+240, int64(0xffffffff)|int64(0x7fffffff)<<32)
+	checkTreePage(tls, bp+32, *(*Pgno)(unsafe.Pointer(aRoot + uintptr(i)*4)), bp+248, int64(0xffffffff)|int64(0x7fffffff)<<32)
 	goto __18
 __18:
 	i++
@@ -81805,22 +81947,19 @@ __22:
 integrity_ck_cleanup:
 	Xsqlite3PageFree(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).Fheap)
 	Xsqlite3_free(tls, (*IntegrityCk)(unsafe.Pointer(bp+32)).FaPgRef)
-	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FbOomFault != 0) {
-		goto __28
-	}
-	Xsqlite3_str_reset(tls, bp+32+56)
-	(*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr++
-__28:
-	;
 	*(*int32)(unsafe.Pointer(pnErr)) = (*IntegrityCk)(unsafe.Pointer(bp + 32)).FnErr
 	if !((*IntegrityCk)(unsafe.Pointer(bp+32)).FnErr == 0) {
-		goto __29
+		goto __28
 	}
-	Xsqlite3_str_reset(tls, bp+32+56)
+	Xsqlite3_str_reset(tls, bp+32+64)
+	*(*uintptr)(unsafe.Pointer(pzOut)) = uintptr(0)
+	goto __29
+__28:
+	*(*uintptr)(unsafe.Pointer(pzOut)) = Xsqlite3StrAccumFinish(tls, bp+32+64)
 __29:
 	;
 	Xsqlite3BtreeLeave(tls, p)
-	return Xsqlite3StrAccumFinish(tls, bp+32+56)
+	return (*IntegrityCk)(unsafe.Pointer(bp + 32)).Frc
 }
 
 // Return the full pathname of the underlying database file.  Return
@@ -82047,8 +82186,8 @@ func Xsqlite3BtreeConnectionCount(tls *libc.TLS, p uintptr) int32 {
 }
 
 func findBtree(tls *libc.TLS, pErrorDb uintptr, pDb uintptr, zDb uintptr) uintptr {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var i int32 = Xsqlite3FindDbName(tls, pDb, zDb)
 
@@ -82548,7 +82687,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 
 	if int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int != 0 {
 		libc.Xmemcpy(tls, bp+8, p, uint64(int32((*Mem)(unsafe.Pointer(p)).Fflags)&MEM_Int*2))
-		Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
+		(*Mem)(unsafe.Pointer(p)).Fn = Xsqlite3Int64ToText(tls, *(*I64)(unsafe.Pointer(bp + 8)), zBuf)
 	} else {
 		Xsqlite3StrAccumInit(tls, bp+16, uintptr(0), zBuf, sz, 0)
 		Xsqlite3_str_appendf(tls, bp+16, ts+6277,
@@ -82560,6 +82699,7 @@ func vdbeMemRenderNum(tls *libc.TLS, sz int32, zBuf uintptr, p uintptr) {
 			}()))
 
 		*(*int8)(unsafe.Pointer(zBuf + uintptr((*StrAccum)(unsafe.Pointer(bp+16)).FnChar))) = int8(0)
+		(*Mem)(unsafe.Pointer(p)).Fn = int32((*StrAccum)(unsafe.Pointer(bp + 16)).FnChar)
 	}
 }
 
@@ -82747,7 +82887,6 @@ func Xsqlite3VdbeMemStringify(tls *libc.TLS, pMem uintptr, enc U8, bForce U8) in
 
 	vdbeMemRenderNum(tls, nByte, (*Mem)(unsafe.Pointer(pMem)).Fz, pMem)
 
-	(*Mem)(unsafe.Pointer(pMem)).Fn = int32(libc.Xstrlen(tls, (*Mem)(unsafe.Pointer(pMem)).Fz) & uint64(0x3fffffff))
 	(*Mem)(unsafe.Pointer(pMem)).Fenc = U8(SQLITE_UTF8)
 	*(*U16)(unsafe.Pointer(pMem + 20)) |= U16(MEM_Str | MEM_Term)
 	if bForce != 0 {
@@ -82921,16 +83060,18 @@ func Xsqlite3VdbeBooleanValue(tls *libc.TLS, pMem uintptr, ifNull int32) int32 {
 	return libc.Bool32(Xsqlite3VdbeRealValue(tls, pMem) != 0.0)
 }
 
-// The MEM structure is already a MEM_Real.  Try to also make it a
-// MEM_Int if we can.
+// The MEM structure is already a MEM_Real or MEM_IntReal. Try to
+// make it a MEM_Int if we can.
 func Xsqlite3VdbeIntegerAffinity(tls *libc.TLS, pMem uintptr) {
-	var ix I64
-
-	ix = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
-
-	if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
-		*(*I64)(unsafe.Pointer(pMem)) = ix
+	if int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&MEM_IntReal != 0 {
 		(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	} else {
+		var ix I64 = doubleToInt64(tls, *(*float64)(unsafe.Pointer(pMem)))
+
+		if *(*float64)(unsafe.Pointer(pMem)) == float64(ix) && ix > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) && ix < int64(0xffffffff)|int64(0x7fffffff)<<32 {
+			*(*I64)(unsafe.Pointer(pMem)) = ix
+			(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pMem)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+		}
 	}
 }
 
@@ -83373,7 +83514,7 @@ func Xsqlite3VdbeMemFromBtree(tls *libc.TLS, pCur uintptr, offset U32, amt U32,
 	var rc int32
 	(*Mem)(unsafe.Pointer(pMem)).Fflags = U16(MEM_Null)
 	if Xsqlite3BtreeMaxRecordSize(tls, pCur) < Sqlite3_int64(offset+amt) {
-		return Xsqlite3CorruptError(tls, 81276)
+		return Xsqlite3CorruptError(tls, 81630)
 	}
 	if SQLITE_OK == libc.AssignInt32(&rc, Xsqlite3VdbeMemClearAndResize(tls, pMem, int32(amt+U32(1)))) {
 		rc = Xsqlite3BtreePayload(tls, pCur, offset, amt, (*Mem)(unsafe.Pointer(pMem)).Fz)
@@ -83610,43 +83751,34 @@ __9:
 __10:
 	Xsqlite3ValueApplyAffinity(tls, pVal, aff, uint8(SQLITE_UTF8))
 
-	rc = Xsqlite3VdbeChangeEncoding(tls, pVal, int32(enc))
-	if !(rc == SQLITE_OK && Xsqlite3VdbeMemTooBig(tls, pVal) != 0) {
-		goto __12
-	}
-	rc = SQLITE_TOOBIG
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).FnErr++
-__12:
-	;
 __11:
 	;
-	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
-
 value_from_function_out:
 	if !(rc != SQLITE_OK) {
-		goto __13
+		goto __12
 	}
 	pVal = uintptr(0)
-__13:
+	(*Parse)(unsafe.Pointer((*ValueNewStat4Ctx)(unsafe.Pointer(pCtx)).FpParse)).Frc = rc
+__12:
 	;
 	if !(apVal != 0) {
-		goto __14
+		goto __13
 	}
 	i = 0
-__15:
+__14:
 	if !(i < nVal) {
-		goto __17
+		goto __16
 	}
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(i)*8)))
+	goto __15
+__15:
+	i++
+	goto __14
 	goto __16
 __16:
-	i++
-	goto __15
-	goto __17
-__17:
 	;
 	Xsqlite3DbFreeNN(tls, db, apVal)
-__14:
+__13:
 	;
 	*(*uintptr)(unsafe.Pointer(ppVal)) = pVal
 	return rc
@@ -84031,7 +84163,7 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		return Xsqlite3GetVarint32(tls, a, bp)
 	}())
 	if *(*int32)(unsafe.Pointer(bp)) > nRec || iHdr >= *(*int32)(unsafe.Pointer(bp)) {
-		return Xsqlite3CorruptError(tls, 81913)
+		return Xsqlite3CorruptError(tls, 82270)
 	}
 	iField = *(*int32)(unsafe.Pointer(bp))
 	for i = 0; i <= iCol; i++ {
@@ -84046,14 +84178,14 @@ func Xsqlite3Stat4Column(tls *libc.TLS, db uintptr, pRec uintptr, nRec int32, iC
 		}())
 
 		if iHdr > *(*int32)(unsafe.Pointer(bp)) {
-			return Xsqlite3CorruptError(tls, 81919)
+			return Xsqlite3CorruptError(tls, 82276)
 		}
 		szField = int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 4))))
 		iField = iField + szField
 	}
 
 	if iField > nRec {
-		return Xsqlite3CorruptError(tls, 81925)
+		return Xsqlite3CorruptError(tls, 82282)
 	}
 	if pMem == uintptr(0) {
 		pMem = libc.AssignPtrUintptr(ppVal, Xsqlite3ValueNew(tls, db))
@@ -84423,7 +84555,9 @@ func Xsqlite3VdbeExplainParent(tls *libc.TLS, pParse uintptr) int32 {
 //
 // If the bPush flag is true, then make this opcode the parent for
 // subsequent Explains until sqlite3VdbeExplainPop() is called.
-func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) {
+func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr, va uintptr) int32 {
+	var addr int32 = 0
+
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var zMsg uintptr
 		var v uintptr
@@ -84435,13 +84569,15 @@ func Xsqlite3VdbeExplain(tls *libc.TLS, pParse uintptr, bPush U8, zFmt uintptr,
 		_ = ap
 		v = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 		iThis = (*Vdbe)(unsafe.Pointer(v)).FnOp
-		Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
+		addr = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, iThis, (*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0,
 			zMsg, -6)
 
 		if bPush != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FaddrExplain = iThis
 		}
+
 	}
+	return addr
 }
 
 // Pop the EXPLAIN QUERY PLAN stack one level.
@@ -84518,6 +84654,9 @@ func resizeResolveLabel(tls *libc.TLS, p uintptr, v uintptr, j int32) {
 	if (*Parse)(unsafe.Pointer(p)).FaLabel == uintptr(0) {
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = 0
 	} else {
+		if nNewSize >= 100 && nNewSize/100 > (*Parse)(unsafe.Pointer(p)).FnLabelAlloc/100 {
+			Xsqlite3ProgressCheck(tls, p)
+		}
 		(*Parse)(unsafe.Pointer(p)).FnLabelAlloc = nNewSize
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(p)).FaLabel + uintptr(j)*4)) = (*Vdbe)(unsafe.Pointer(v)).FnOp
 	}
@@ -85406,7 +85545,7 @@ func Xsqlite3VdbeNextOpcode(tls *libc.TLS, p uintptr, pSub uintptr, eMode int32,
 // allocated by the OP_Program opcode in sqlite3VdbeExec().
 func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 	var i int32
-	var aMem uintptr = p + 120
+	var aMem uintptr = p + 112
 	var apCsr uintptr = aMem + uintptr((*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)*56
 
 	for i = 0; i < (*VdbeFrame)(unsafe.Pointer(p)).FnChildCsr; i++ {
@@ -85415,7 +85554,7 @@ func Xsqlite3VdbeFrameDelete(tls *libc.TLS, p uintptr) {
 		}
 	}
 	releaseMemArray(tls, aMem, (*VdbeFrame)(unsafe.Pointer(p)).FnChildMem)
-	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+72, -1, 0)
+	Xsqlite3VdbeDeleteAuxData(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p+64, -1, 0)
 	Xsqlite3DbFree(tls, (*Vdbe)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(p)).Fv)).Fdb, p)
 }
 
@@ -85449,7 +85588,6 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 	var pOp uintptr
 
 	releaseMemArray(tls, pMem, 8)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 
 	if (*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -85491,7 +85629,7 @@ func Xsqlite3VdbeList(tls *libc.TLS, p uintptr) int32 {
 				Xsqlite3VdbeMemSetStr(tls, pMem+uintptr(5)*56, zP4, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 				(*Vdbe)(unsafe.Pointer(p)).FnResColumn = U16(8)
 			}
-			(*Vdbe)(unsafe.Pointer(p)).FpResultSet = pMem
+			(*Vdbe)(unsafe.Pointer(p)).FpResultRow = pMem
 			if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				rc = SQLITE_ERROR
@@ -86243,7 +86381,7 @@ func Xsqlite3VdbeReset(tls *libc.TLS, p uintptr) int32 {
 		Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
 		(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = uintptr(0)
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 
 	return (*Vdbe)(unsafe.Pointer(p)).Frc & (*Sqlite3)(unsafe.Pointer(db)).FerrMask
 }
@@ -86351,7 +86489,7 @@ func Xsqlite3VdbeFinishMoveto(tls *libc.TLS, p uintptr) int32 {
 		return rc
 	}
 	if *(*int32)(unsafe.Pointer(bp)) != 0 {
-		return Xsqlite3CorruptError(tls, 85647)
+		return Xsqlite3CorruptError(tls, 86058)
 	}
 	(*VdbeCursor)(unsafe.Pointer(p)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(p)).FcacheStatus = U32(CACHE_STALE)
@@ -86902,7 +87040,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		i = 0
 	}
 	if d1 > uint32(nKey1) {
-		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86574))
+		(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86985))
 		return 0
 	}
 
@@ -86967,7 +87105,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 
 				if d1+U32((*Mem)(unsafe.Pointer(bp+8)).Fn) > uint32(nKey1) ||
 					int32((*KeyInfo)(unsafe.Pointer(libc.AssignUintptr(&pKeyInfo, (*UnpackedRecord)(unsafe.Pointer(pPKey2)).FpKeyInfo))).FnAllField) <= i {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86651))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87062))
 					return 0
 				} else if *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8)) != 0 {
 					(*Mem)(unsafe.Pointer(bp + 8)).Fenc = (*KeyInfo)(unsafe.Pointer(pKeyInfo)).Fenc
@@ -87001,7 +87139,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 				var nStr int32 = int32((*(*U32)(unsafe.Pointer(bp + 64)) - U32(12)) / U32(2))
 
 				if d1+U32(nStr) > uint32(nKey1) {
-					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86681))
+					(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87092))
 					return 0
 				} else if int32((*Mem)(unsafe.Pointer(pRhs)).Fflags)&MEM_Zero != 0 {
 					if !(isAllZero(tls, aKey1+uintptr(d1), nStr) != 0) {
@@ -87051,7 +87189,7 @@ func Xsqlite3VdbeRecordCompareWithSkip(tls *libc.TLS, nKey1 int32, pKey1 uintptr
 		}
 		idx1 = idx1 + U32(Xsqlite3VarintLen(tls, uint64(*(*U32)(unsafe.Pointer(bp + 64)))))
 		if idx1 >= *(*U32)(unsafe.Pointer(bp + 4)) {
-			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86725))
+			(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87136))
 			return 0
 		}
 	}
@@ -87197,7 +87335,7 @@ __5:
 	if !(szHdr+nStr > nKey1) {
 		goto __7
 	}
-	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 86888))
+	(*UnpackedRecord)(unsafe.Pointer(pPKey2)).FerrCode = U8(Xsqlite3CorruptError(tls, 87299))
 	return 0
 __7:
 	;
@@ -87368,7 +87506,7 @@ __6:
 idx_rowid_corruption:
 	;
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp)
-	return Xsqlite3CorruptError(tls, 87046)
+	return Xsqlite3CorruptError(tls, 87457)
 }
 
 // Compare the key of the index entry that cursor pC is pointing to against
@@ -87394,7 +87532,7 @@ func Xsqlite3VdbeIdxKeyCompare(tls *libc.TLS, db uintptr, pC uintptr, pUnpacked
 
 	if nCellKey <= int64(0) || nCellKey > int64(0x7fffffff) {
 		*(*int32)(unsafe.Pointer(res)) = 0
-		return Xsqlite3CorruptError(tls, 87079)
+		return Xsqlite3CorruptError(tls, 87490)
 	}
 	Xsqlite3VdbeMemInit(tls, bp, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur, U32(nCellKey), bp)
@@ -87668,7 +87806,7 @@ func Xsqlite3_finalize(tls *libc.TLS, pStmt uintptr) int32 {
 		var v uintptr = pStmt
 		var db uintptr = (*Vdbe)(unsafe.Pointer(v)).Fdb
 		if vdbeSafety(tls, v) != 0 {
-			return Xsqlite3MisuseError(tls, 87442)
+			return Xsqlite3MisuseError(tls, 87854)
 		}
 		Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		if (*Vdbe)(unsafe.Pointer(v)).FstartTime > int64(0) {
@@ -88020,8 +88158,11 @@ func Xsqlite3_result_text(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel
 }
 
 func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_uint64, xDel uintptr, enc uint8) {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		n = n & libc.CplUint64(uint64(1))
 	}
 	if n > uint64(0x7fffffff) {
 		invokeValueDestructor(tls, z, xDel, pCtx)
@@ -88031,15 +88172,15 @@ func Xsqlite3_result_text64(tls *libc.TLS, pCtx uintptr, z uintptr, n Sqlite3_ui
 }
 
 func Xsqlite3_result_text16(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_text16be(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16BE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16BE), xDel)
 }
 
 func Xsqlite3_result_text16le(tls *libc.TLS, pCtx uintptr, z uintptr, n int32, xDel uintptr) {
-	setResultStrOrError(tls, pCtx, z, n, uint8(SQLITE_UTF16LE), xDel)
+	setResultStrOrError(tls, pCtx, z, int32(U64(n)&libc.CplUint64(uint64(1))), uint8(SQLITE_UTF16LE), xDel)
 }
 
 func Xsqlite3_result_value(tls *libc.TLS, pCtx uintptr, pValue uintptr) {
@@ -88227,6 +88368,7 @@ __14:
 	invokeProfileCallback(tls, db, p)
 __16:
 	;
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = uintptr(0)
 	if !(rc == SQLITE_DONE && (*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
 		goto __17
 	}
@@ -88279,7 +88421,7 @@ func Xsqlite3_step(tls *libc.TLS, pStmt uintptr) int32 {
 	var db uintptr
 
 	if vdbeSafetyNotNull(tls, v) != 0 {
-		return Xsqlite3MisuseError(tls, 88129)
+		return Xsqlite3MisuseError(tls, 88544)
 	}
 	db = (*Vdbe)(unsafe.Pointer(v)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -88343,6 +88485,15 @@ func Xsqlite3_vtab_nochange(tls *libc.TLS, p uintptr) int32 {
 	return Xsqlite3_value_nochange(tls, (*Sqlite3_context)(unsafe.Pointer(p)).FpOut)
 }
 
+// The destructor function for a ValueList object.  This needs to be
+// a separate function, unknowable to the application, to ensure that
+// calls to sqlite3_vtab_in_first()/sqlite3_vtab_in_next() that are not
+// preceeded by activation of IN processing via sqlite3_vtab_int() do not
+// try to access a fake ValueList object inserted by a hostile extension.
+func Xsqlite3VdbeValueListFree(tls *libc.TLS, pToDelete uintptr) {
+	Xsqlite3_free(tls, pToDelete)
+}
+
 func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32) int32 {
 	bp := tls.Alloc(68)
 	defer tls.Free(68)
@@ -88354,9 +88505,10 @@ func valueFromValueList(tls *libc.TLS, pVal uintptr, ppOut uintptr, bNext int32)
 	if pVal == uintptr(0) {
 		return SQLITE_MISUSE
 	}
-	pRhs = Xsqlite3_value_pointer(tls, pVal, ts+6709)
-	if pRhs == uintptr(0) {
-		return SQLITE_MISUSE
+	if int32((*Sqlite3_value)(unsafe.Pointer(pVal)).Fflags)&MEM_Dyn == 0 || (*Sqlite3_value)(unsafe.Pointer(pVal)).FxDel != *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})) {
+		return SQLITE_ERROR
+	} else {
+		pRhs = (*Sqlite3_value)(unsafe.Pointer(pVal)).Fz
 	}
 	if bNext != 0 {
 		rc = Xsqlite3BtreeNext(tls, (*ValueList)(unsafe.Pointer(pRhs)).FpCsr, 0)
@@ -88590,7 +88742,7 @@ func Xsqlite3_column_count(tls *libc.TLS, pStmt uintptr) int32 {
 // currently executing statement pStmt.
 func Xsqlite3_data_count(tls *libc.TLS, pStmt uintptr) int32 {
 	var pVm uintptr = pStmt
-	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet == uintptr(0) {
+	if pVm == uintptr(0) || (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow == uintptr(0) {
 		return 0
 	}
 	return int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn)
@@ -88614,8 +88766,8 @@ func columnMem(tls *libc.TLS, pStmt uintptr, i int32) uintptr {
 	}
 
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(pVm)).Fdb)).Fmutex)
-	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
-		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultSet + uintptr(i)*56
+	if (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow != uintptr(0) && i < int32((*Vdbe)(unsafe.Pointer(pVm)).FnResColumn) && i >= 0 {
+		pOut = (*Vdbe)(unsafe.Pointer(pVm)).FpResultRow + uintptr(i)*56
 	} else {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(pVm)).Fdb, SQLITE_RANGE)
 		pOut = columnNullValue(tls)
@@ -88789,15 +88941,15 @@ func vdbeUnbind(tls *libc.TLS, p uintptr, i uint32) int32 {
 
 	var pVar uintptr
 	if vdbeSafetyNotNull(tls, p) != 0 {
-		return Xsqlite3MisuseError(tls, 88775)
+		return Xsqlite3MisuseError(tls, 89208)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 	if int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) != VDBE_READY_STATE {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).Fdb)).Fmutex)
 		Xsqlite3_log(tls, SQLITE_MISUSE,
-			ts+6719, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
-		return Xsqlite3MisuseError(tls, 88783)
+			ts+6709, libc.VaList(bp, (*Vdbe)(unsafe.Pointer(p)).FzSql))
+		return Xsqlite3MisuseError(tls, 89216)
 	}
 	if i >= uint32((*Vdbe)(unsafe.Pointer(p)).FnVar) {
 		Xsqlite3Error(tls, (*Vdbe)(unsafe.Pointer(p)).Fdb, SQLITE_RANGE)
@@ -88908,14 +89060,17 @@ func Xsqlite3_bind_text(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nD
 }
 
 func Xsqlite3_bind_text64(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData Sqlite3_uint64, xDel uintptr, enc uint8) int32 {
-	if int32(enc) == SQLITE_UTF16 {
-		enc = uint8(SQLITE_UTF16LE)
+	if int32(enc) != SQLITE_UTF8 {
+		if int32(enc) == SQLITE_UTF16 {
+			enc = uint8(SQLITE_UTF16LE)
+		}
+		nData = nData & libc.Uint64FromInt32(libc.CplInt32(int32(U16(1))))
 	}
 	return bindText(tls, pStmt, i, zData, int64(nData), xDel, enc)
 }
 
-func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, nData int32, xDel uintptr) int32 {
-	return bindText(tls, pStmt, i, zData, int64(nData), xDel, uint8(SQLITE_UTF16LE))
+func Xsqlite3_bind_text16(tls *libc.TLS, pStmt uintptr, i int32, zData uintptr, n int32, xDel uintptr) int32 {
+	return bindText(tls, pStmt, i, zData, int64(U64(n)&libc.CplUint64(uint64(1))), xDel, uint8(SQLITE_UTF16LE))
 }
 
 func Xsqlite3_bind_value(tls *libc.TLS, pStmt uintptr, i int32, pValue uintptr) int32 {
@@ -89199,7 +89354,7 @@ func Xsqlite3_preupdate_old(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_INSERT) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89271)
+	rc = Xsqlite3MisuseError(tls, 89707)
 	goto preupdate_old_out
 __1:
 	;
@@ -89343,7 +89498,7 @@ func Xsqlite3_preupdate_new(tls *libc.TLS, db uintptr, iIdx int32, ppValue uintp
 	if !(!(p != 0) || (*PreUpdate)(unsafe.Pointer(p)).Fop == SQLITE_DELETE) {
 		goto __1
 	}
-	rc = Xsqlite3MisuseError(tls, 89373)
+	rc = Xsqlite3MisuseError(tls, 89809)
 	goto preupdate_new_out
 __1:
 	;
@@ -89515,7 +89670,7 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 			var zStart uintptr = zRawSql
 			for int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zRawSql, 1)))) != '\n' && *(*int8)(unsafe.Pointer(zRawSql)) != 0 {
 			}
-			Xsqlite3_str_append(tls, bp+48, ts+6759, 3)
+			Xsqlite3_str_append(tls, bp+48, ts+6749, 3)
 
 			Xsqlite3_str_append(tls, bp+48, zStart, int32((int64(zRawSql)-int64(zStart))/1))
 		}
@@ -89570,21 +89725,21 @@ func Xsqlite3VdbeExpandSql(tls *libc.TLS, p uintptr, zRawSql uintptr) uintptr {
 					pVar = bp + 88
 				}
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
-				Xsqlite3_str_appendf(tls, bp+48, ts+6763, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
+				Xsqlite3_str_appendf(tls, bp+48, ts+6753, libc.VaList(bp+16, nOut, (*Mem)(unsafe.Pointer(pVar)).Fz))
 				if int32(enc) != SQLITE_UTF8 {
 					Xsqlite3VdbeMemRelease(tls, bp+88)
 				}
 			} else if int32((*Mem)(unsafe.Pointer(pVar)).Fflags)&MEM_Zero != 0 {
-				Xsqlite3_str_appendf(tls, bp+48, ts+6770, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
+				Xsqlite3_str_appendf(tls, bp+48, ts+6760, libc.VaList(bp+32, *(*int32)(unsafe.Pointer(pVar))))
 			} else {
 				var nOut int32
 
-				Xsqlite3_str_append(tls, bp+48, ts+6783, 2)
+				Xsqlite3_str_append(tls, bp+48, ts+6773, 2)
 				nOut = (*Mem)(unsafe.Pointer(pVar)).Fn
 				for i = 0; i < nOut; i++ {
-					Xsqlite3_str_appendf(tls, bp+48, ts+6786, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
+					Xsqlite3_str_appendf(tls, bp+48, ts+6776, libc.VaList(bp+40, int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pVar)).Fz + uintptr(i))))&0xff))
 				}
-				Xsqlite3_str_append(tls, bp+48, ts+6791, 1)
+				Xsqlite3_str_append(tls, bp+48, ts+6781, 1)
 			}
 		}
 	}
@@ -89676,11 +89831,11 @@ func applyNumericAffinity(tls *libc.TLS, pRec uintptr, bTryForInt int32) {
 func applyAffinity(tls *libc.TLS, pRec uintptr, affinity int8, enc U8) {
 	if int32(affinity) >= SQLITE_AFF_NUMERIC {
 		if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int == 0 {
-			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real == 0 {
+			if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Real|MEM_IntReal) == 0 {
 				if int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0 {
 					applyNumericAffinity(tls, pRec, 1)
 				}
-			} else {
+			} else if int32(affinity) <= SQLITE_AFF_REAL {
 				Xsqlite3VdbeIntegerAffinity(tls, pRec)
 			}
 		}
@@ -89811,8 +89966,8 @@ var azTypes = [5]uintptr{
 // Execute as much of a VDBE program as we can.
 // This is the core of sqlite3_step().
 func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
-	bp := tls.Alloc(1040)
-	defer tls.Free(1040)
+	bp := tls.Alloc(1048)
+	defer tls.Free(1048)
 
 	var aOp uintptr
 	var pOp uintptr
@@ -90047,7 +90202,6 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	var nRoot int32
 	var aRoot uintptr
 
-	var z uintptr
 	var pnErr uintptr
 
 	var iSet int32
@@ -90148,593 +90302,597 @@ func Xsqlite3VdbeExec(tls *libc.TLS, p uintptr) int32 {
 	pIn3 = uintptr(0)
 	pOut = uintptr(0)
 
-	Xsqlite3VdbeEnter(tls, p)
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
 		goto __1
 	}
+	Xsqlite3VdbeEnter(tls, p)
+__1:
+	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxProgress != 0) {
+		goto __2
+	}
 	iPrior = *(*U32)(unsafe.Pointer(p + 212 + 4*4))
 
 	nProgressLimit = U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps - iPrior%(*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
-	goto __2
-__1:
-	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+	goto __3
 __2:
+	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
+__3:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_NOMEM) {
-		goto __3
+		goto __4
 	}
 
 	goto no_mem
-__3:
+__4:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_OK
 
 	(*Vdbe)(unsafe.Pointer(p)).FiCurrentTime = int64(0)
 
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = uintptr(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __4
+		goto __5
 	}
 	goto abort_due_to_interrupt
-__4:
+__5:
 	;
 	pOp = aOp + uintptr((*Vdbe)(unsafe.Pointer(p)).Fpc)*24
-__5:
+__6:
 	if !(1 != 0) {
-		goto __7
+		goto __8
 	}
 
 	nVmStep++
 
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Goto:
-		goto __9
-
-	case OP_Gosub:
 		goto __10
 
-	case OP_Return:
+	case OP_Gosub:
 		goto __11
 
-	case OP_InitCoroutine:
+	case OP_Return:
 		goto __12
 
-	case OP_EndCoroutine:
+	case OP_InitCoroutine:
 		goto __13
 
-	case OP_Yield:
+	case OP_EndCoroutine:
 		goto __14
 
-	case OP_HaltIfNull:
+	case OP_Yield:
 		goto __15
 
-	case OP_Halt:
+	case OP_HaltIfNull:
 		goto __16
 
-	case OP_Integer:
+	case OP_Halt:
 		goto __17
 
-	case OP_Int64:
+	case OP_Integer:
 		goto __18
 
-	case OP_Real:
+	case OP_Int64:
 		goto __19
 
-	case OP_String8:
+	case OP_Real:
 		goto __20
 
-	case OP_String:
+	case OP_String8:
 		goto __21
 
-	case OP_BeginSubrtn:
+	case OP_String:
 		goto __22
-	case OP_Null:
-		goto __23
 
-	case OP_SoftNull:
+	case OP_BeginSubrtn:
+		goto __23
+	case OP_Null:
 		goto __24
 
-	case OP_Blob:
+	case OP_SoftNull:
 		goto __25
 
-	case OP_Variable:
+	case OP_Blob:
 		goto __26
 
-	case OP_Move:
+	case OP_Variable:
 		goto __27
 
-	case OP_Copy:
+	case OP_Move:
 		goto __28
 
-	case OP_SCopy:
+	case OP_Copy:
 		goto __29
 
-	case OP_IntCopy:
+	case OP_SCopy:
 		goto __30
 
-	case OP_FkCheck:
+	case OP_IntCopy:
 		goto __31
 
-	case OP_ResultRow:
+	case OP_FkCheck:
 		goto __32
 
-	case OP_Concat:
+	case OP_ResultRow:
 		goto __33
 
-	case OP_Add:
+	case OP_Concat:
 		goto __34
-	case OP_Subtract:
-		goto __35
-	case OP_Multiply:
-		goto __36
-	case OP_Divide:
-		goto __37
-	case OP_Remainder:
-		goto __38
 
-	case OP_CollSeq:
+	case OP_Add:
+		goto __35
+	case OP_Subtract:
+		goto __36
+	case OP_Multiply:
+		goto __37
+	case OP_Divide:
+		goto __38
+	case OP_Remainder:
 		goto __39
 
-	case OP_BitAnd:
+	case OP_CollSeq:
 		goto __40
-	case OP_BitOr:
-		goto __41
-	case OP_ShiftLeft:
-		goto __42
-	case OP_ShiftRight:
-		goto __43
 
-	case OP_AddImm:
+	case OP_BitAnd:
+		goto __41
+	case OP_BitOr:
+		goto __42
+	case OP_ShiftLeft:
+		goto __43
+	case OP_ShiftRight:
 		goto __44
 
-	case OP_MustBeInt:
+	case OP_AddImm:
 		goto __45
 
-	case OP_RealAffinity:
+	case OP_MustBeInt:
 		goto __46
 
-	case OP_Cast:
+	case OP_RealAffinity:
 		goto __47
 
-	case OP_Eq:
+	case OP_Cast:
 		goto __48
-	case OP_Ne:
-		goto __49
-	case OP_Lt:
-		goto __50
-	case OP_Le:
-		goto __51
-	case OP_Gt:
-		goto __52
-	case OP_Ge:
-		goto __53
 
-	case OP_ElseEq:
+	case OP_Eq:
+		goto __49
+	case OP_Ne:
+		goto __50
+	case OP_Lt:
+		goto __51
+	case OP_Le:
+		goto __52
+	case OP_Gt:
+		goto __53
+	case OP_Ge:
 		goto __54
 
-	case OP_Permutation:
+	case OP_ElseEq:
 		goto __55
 
-	case OP_Compare:
+	case OP_Permutation:
 		goto __56
 
-	case OP_Jump:
+	case OP_Compare:
 		goto __57
 
-	case OP_And:
+	case OP_Jump:
 		goto __58
-	case OP_Or:
-		goto __59
 
-	case OP_IsTrue:
+	case OP_And:
+		goto __59
+	case OP_Or:
 		goto __60
 
-	case OP_Not:
+	case OP_IsTrue:
 		goto __61
 
-	case OP_BitNot:
+	case OP_Not:
 		goto __62
 
-	case OP_Once:
+	case OP_BitNot:
 		goto __63
 
-	case OP_If:
+	case OP_Once:
 		goto __64
 
-	case OP_IfNot:
+	case OP_If:
 		goto __65
 
-	case OP_IsNull:
+	case OP_IfNot:
 		goto __66
 
-	case OP_IsType:
+	case OP_IsNull:
 		goto __67
 
-	case OP_ZeroOrNull:
+	case OP_IsType:
 		goto __68
 
-	case OP_NotNull:
+	case OP_ZeroOrNull:
 		goto __69
 
-	case OP_IfNullRow:
+	case OP_NotNull:
 		goto __70
 
-	case OP_Offset:
+	case OP_IfNullRow:
 		goto __71
 
-	case OP_Column:
+	case OP_Offset:
 		goto __72
 
-	case OP_TypeCheck:
+	case OP_Column:
 		goto __73
 
-	case OP_Affinity:
+	case OP_TypeCheck:
 		goto __74
 
-	case OP_MakeRecord:
+	case OP_Affinity:
 		goto __75
 
-	case OP_Count:
+	case OP_MakeRecord:
 		goto __76
 
-	case OP_Savepoint:
+	case OP_Count:
 		goto __77
 
-	case OP_AutoCommit:
+	case OP_Savepoint:
 		goto __78
 
-	case OP_Transaction:
+	case OP_AutoCommit:
 		goto __79
 
-	case OP_ReadCookie:
+	case OP_Transaction:
 		goto __80
 
-	case OP_SetCookie:
+	case OP_ReadCookie:
 		goto __81
 
-	case OP_ReopenIdx:
+	case OP_SetCookie:
 		goto __82
 
-	case OP_OpenRead:
+	case OP_ReopenIdx:
 		goto __83
-	case OP_OpenWrite:
-		goto __84
 
-	case OP_OpenDup:
+	case OP_OpenRead:
+		goto __84
+	case OP_OpenWrite:
 		goto __85
 
-	case OP_OpenAutoindex:
+	case OP_OpenDup:
 		goto __86
-	case OP_OpenEphemeral:
-		goto __87
 
-	case OP_SorterOpen:
+	case OP_OpenAutoindex:
+		goto __87
+	case OP_OpenEphemeral:
 		goto __88
 
-	case OP_SequenceTest:
+	case OP_SorterOpen:
 		goto __89
 
-	case OP_OpenPseudo:
+	case OP_SequenceTest:
 		goto __90
 
-	case OP_Close:
+	case OP_OpenPseudo:
 		goto __91
 
-	case OP_SeekLT:
+	case OP_Close:
 		goto __92
-	case OP_SeekLE:
-		goto __93
-	case OP_SeekGE:
-		goto __94
-	case OP_SeekGT:
-		goto __95
 
-	case OP_SeekScan:
+	case OP_SeekLT:
+		goto __93
+	case OP_SeekLE:
+		goto __94
+	case OP_SeekGE:
+		goto __95
+	case OP_SeekGT:
 		goto __96
 
-	case OP_SeekHit:
+	case OP_SeekScan:
 		goto __97
 
-	case OP_IfNotOpen:
+	case OP_SeekHit:
 		goto __98
 
-	case OP_IfNoHope:
+	case OP_IfNotOpen:
 		goto __99
-	case OP_NoConflict:
+
+	case OP_IfNoHope:
 		goto __100
-	case OP_NotFound:
+	case OP_NoConflict:
 		goto __101
-	case OP_Found:
+	case OP_NotFound:
 		goto __102
+	case OP_Found:
+		goto __103
 
 	case OP_SeekRowid:
-		goto __103
-	case OP_NotExists:
 		goto __104
-
-	case OP_Sequence:
+	case OP_NotExists:
 		goto __105
 
-	case OP_NewRowid:
+	case OP_Sequence:
 		goto __106
 
-	case OP_Insert:
+	case OP_NewRowid:
 		goto __107
 
-	case OP_RowCell:
+	case OP_Insert:
 		goto __108
 
-	case OP_Delete:
+	case OP_RowCell:
 		goto __109
 
-	case OP_ResetCount:
+	case OP_Delete:
 		goto __110
 
-	case OP_SorterCompare:
+	case OP_ResetCount:
 		goto __111
 
-	case OP_SorterData:
+	case OP_SorterCompare:
 		goto __112
 
-	case OP_RowData:
+	case OP_SorterData:
 		goto __113
 
-	case OP_Rowid:
+	case OP_RowData:
 		goto __114
 
-	case OP_NullRow:
+	case OP_Rowid:
 		goto __115
 
-	case OP_SeekEnd:
+	case OP_NullRow:
 		goto __116
-	case OP_Last:
-		goto __117
 
-	case OP_IfSmaller:
+	case OP_SeekEnd:
+		goto __117
+	case OP_Last:
 		goto __118
 
-	case OP_SorterSort:
+	case OP_IfSmaller:
 		goto __119
-	case OP_Sort:
-		goto __120
 
-	case OP_Rewind:
+	case OP_SorterSort:
+		goto __120
+	case OP_Sort:
 		goto __121
 
-	case OP_SorterNext:
+	case OP_Rewind:
 		goto __122
 
-	case OP_Prev:
+	case OP_SorterNext:
 		goto __123
 
-	case OP_Next:
+	case OP_Prev:
 		goto __124
 
-	case OP_IdxInsert:
+	case OP_Next:
 		goto __125
 
-	case OP_SorterInsert:
+	case OP_IdxInsert:
 		goto __126
 
-	case OP_IdxDelete:
+	case OP_SorterInsert:
 		goto __127
 
-	case OP_DeferredSeek:
+	case OP_IdxDelete:
 		goto __128
-	case OP_IdxRowid:
-		goto __129
 
-	case OP_FinishSeek:
+	case OP_DeferredSeek:
+		goto __129
+	case OP_IdxRowid:
 		goto __130
 
-	case OP_IdxLE:
+	case OP_FinishSeek:
 		goto __131
-	case OP_IdxGT:
-		goto __132
-	case OP_IdxLT:
-		goto __133
-	case OP_IdxGE:
-		goto __134
 
-	case OP_Destroy:
+	case OP_IdxLE:
+		goto __132
+	case OP_IdxGT:
+		goto __133
+	case OP_IdxLT:
+		goto __134
+	case OP_IdxGE:
 		goto __135
 
-	case OP_Clear:
+	case OP_Destroy:
 		goto __136
 
-	case OP_ResetSorter:
+	case OP_Clear:
 		goto __137
 
-	case OP_CreateBtree:
+	case OP_ResetSorter:
 		goto __138
 
-	case OP_SqlExec:
+	case OP_CreateBtree:
 		goto __139
 
-	case OP_ParseSchema:
+	case OP_SqlExec:
 		goto __140
 
-	case OP_LoadAnalysis:
+	case OP_ParseSchema:
 		goto __141
 
-	case OP_DropTable:
+	case OP_LoadAnalysis:
 		goto __142
 
-	case OP_DropIndex:
+	case OP_DropTable:
 		goto __143
 
-	case OP_DropTrigger:
+	case OP_DropIndex:
 		goto __144
 
-	case OP_IntegrityCk:
+	case OP_DropTrigger:
 		goto __145
 
-	case OP_RowSetAdd:
+	case OP_IntegrityCk:
 		goto __146
 
-	case OP_RowSetRead:
+	case OP_RowSetAdd:
 		goto __147
 
-	case OP_RowSetTest:
+	case OP_RowSetRead:
 		goto __148
 
-	case OP_Program:
+	case OP_RowSetTest:
 		goto __149
 
-	case OP_Param:
+	case OP_Program:
 		goto __150
 
-	case OP_FkCounter:
+	case OP_Param:
 		goto __151
 
-	case OP_FkIfZero:
+	case OP_FkCounter:
 		goto __152
 
-	case OP_MemMax:
+	case OP_FkIfZero:
 		goto __153
 
-	case OP_IfPos:
+	case OP_MemMax:
 		goto __154
 
-	case OP_OffsetLimit:
+	case OP_IfPos:
 		goto __155
 
-	case OP_IfNotZero:
+	case OP_OffsetLimit:
 		goto __156
 
-	case OP_DecrJumpZero:
+	case OP_IfNotZero:
 		goto __157
 
-	case OP_AggInverse:
+	case OP_DecrJumpZero:
 		goto __158
-	case OP_AggStep:
+
+	case OP_AggInverse:
 		goto __159
-	case OP_AggStep1:
+	case OP_AggStep:
 		goto __160
+	case OP_AggStep1:
+		goto __161
 
 	case OP_AggValue:
-		goto __161
-	case OP_AggFinal:
 		goto __162
-
-	case OP_Checkpoint:
+	case OP_AggFinal:
 		goto __163
 
-	case OP_JournalMode:
+	case OP_Checkpoint:
 		goto __164
 
-	case OP_Vacuum:
+	case OP_JournalMode:
 		goto __165
 
-	case OP_IncrVacuum:
+	case OP_Vacuum:
 		goto __166
 
-	case OP_Expire:
+	case OP_IncrVacuum:
 		goto __167
 
-	case OP_CursorLock:
+	case OP_Expire:
 		goto __168
 
-	case OP_CursorUnlock:
+	case OP_CursorLock:
 		goto __169
 
-	case OP_TableLock:
+	case OP_CursorUnlock:
 		goto __170
 
-	case OP_VBegin:
+	case OP_TableLock:
 		goto __171
 
-	case OP_VCreate:
+	case OP_VBegin:
 		goto __172
 
-	case OP_VDestroy:
+	case OP_VCreate:
 		goto __173
 
-	case OP_VOpen:
+	case OP_VDestroy:
 		goto __174
 
-	case OP_VInitIn:
+	case OP_VOpen:
 		goto __175
 
-	case OP_VFilter:
+	case OP_VInitIn:
 		goto __176
 
-	case OP_VColumn:
+	case OP_VFilter:
 		goto __177
 
-	case OP_VNext:
+	case OP_VColumn:
 		goto __178
 
-	case OP_VRename:
+	case OP_VNext:
 		goto __179
 
-	case OP_VUpdate:
+	case OP_VRename:
 		goto __180
 
-	case OP_Pagecount:
+	case OP_VUpdate:
 		goto __181
 
-	case OP_MaxPgcnt:
+	case OP_Pagecount:
 		goto __182
 
-	case OP_PureFunc:
+	case OP_MaxPgcnt:
 		goto __183
-	case OP_Function:
-		goto __184
 
-	case OP_ClrSubtype:
+	case OP_PureFunc:
+		goto __184
+	case OP_Function:
 		goto __185
 
-	case OP_FilterAdd:
+	case OP_ClrSubtype:
 		goto __186
 
-	case OP_Filter:
+	case OP_FilterAdd:
 		goto __187
 
-	case OP_Trace:
+	case OP_Filter:
 		goto __188
-	case OP_Init:
+
+	case OP_Trace:
 		goto __189
+	case OP_Init:
+		goto __190
 
 	default:
-		goto __190
+		goto __191
 	}
-	goto __8
+	goto __9
 
-__9:
+__10:
 jump_to_p2_and_check_for_interrupt:
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
 
 check_for_interrupt:
 	if !(libc.AtomicLoadNInt32(db+432, 0) != 0) {
-		goto __191
+		goto __192
 	}
 	goto abort_due_to_interrupt
-__191:
-	;
 __192:
+	;
+__193:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __193
+		goto __194
 	}
 
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __194
+		goto __195
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
+__195:
+	;
+	goto __193
 __194:
 	;
-	goto __192
-__193:
-	;
-	goto __8
+	goto __9
 
-__10:
+__11:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -90743,56 +90901,56 @@ __10:
 
 	goto jump_to_p2_and_check_for_interrupt
 
-__11:
+__12:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __195
+		goto __196
 	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __197
-	}
-__197:
-	;
-	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
-	goto __196
-__195:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __198
 	}
-
 __198:
 	;
+	pOp = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
+	goto __197
 __196:
-	;
-	goto __8
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __199
+	}
 
-__12:
+__199:
+	;
+__197:
+	;
+	goto __9
+
+__13:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp3 - 1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __199
+		goto __200
 	}
-	goto __8
-__199:
+	goto __9
+__200:
 	;
 jump_to_p2:
 	;
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __8
+	goto __9
 
-__13:
+__14:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pCaller = aOp + uintptr(*(*I64)(unsafe.Pointer(pIn1)))*24
 
 	pOp = aOp + uintptr((*VdbeOp)(unsafe.Pointer(pCaller)).Fp2-1)*24
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Undefined)
-	goto __8
+	goto __9
 
-__14:
+__15:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(MEM_Int)
@@ -90800,20 +90958,21 @@ __14:
 	*(*I64)(unsafe.Pointer(pIn1)) = I64(int32((int64(pOp) - int64(aOp)) / 24))
 
 	pOp = aOp + uintptr(pcDest)*24
-	goto __8
+	goto __9
 
-__15:
+__16:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&MEM_Null == 0) {
-		goto __200
-	}
-	goto __8
-__200:
-	;
-__16:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
 		goto __201
 	}
+	goto __9
+__201:
+	;
+__17:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0 && (*Op)(unsafe.Pointer(pOp)).Fp1 == SQLITE_OK) {
+		goto __202
+	}
 
 	pFrame = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = (*VdbeFrame)(unsafe.Pointer(pFrame)).FpParent
@@ -90821,124 +90980,124 @@ __16:
 	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
 	pcx = Xsqlite3VdbeFrameRestore(tls, pFrame)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == OE_Ignore) {
-		goto __202
+		goto __203
 	}
 
 	pcx = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(pcx)*24)).Fp2 - 1
-__202:
+__203:
 	;
 	aOp = (*Vdbe)(unsafe.Pointer(p)).FaOp
 	aMem = (*Vdbe)(unsafe.Pointer(p)).FaMem
 	pOp = aOp + uintptr(pcx)*24
-	goto __8
-__201:
+	goto __9
+__202:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8((*Op)(unsafe.Pointer(pOp)).Fp2)
 
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc != 0) {
-		goto __203
-	}
-	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
 		goto __204
 	}
-
-	Xsqlite3VdbeError(tls, p, ts+6793, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
-		goto __206
+	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
+		goto __205
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+6814, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+
+	Xsqlite3VdbeError(tls, p, ts+6783, libc.VaList(bp, azType[int32((*Op)(unsafe.Pointer(pOp)).Fp5)-1]))
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) != 0) {
+		goto __207
+	}
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+6804, libc.VaList(bp+8, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg, *(*uintptr)(unsafe.Pointer(pOp + 16))))
+__207:
+	;
+	goto __206
+__205:
+	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 __206:
-	;
-	goto __205
-__204:
-	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+24, *(*uintptr)(unsafe.Pointer(pOp + 16))))
-__205:
 	;
 	pcx = int32((int64(pOp) - int64(aOp)) / 24)
-	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+6821, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
-__203:
+	Xsqlite3_log(tls, (*Op)(unsafe.Pointer(pOp)).Fp1, ts+6811, libc.VaList(bp+32, pcx, (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
+__204:
 	;
 	rc = Xsqlite3VdbeHalt(tls, p)
 
 	if !(rc == SQLITE_BUSY) {
-		goto __207
+		goto __208
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-	goto __208
-__207:
+	goto __209
+__208:
 	;
 	if (*Vdbe)(unsafe.Pointer(p)).Frc != 0 {
 		rc = SQLITE_ERROR
 	} else {
 		rc = SQLITE_DONE
 	}
-__208:
+__209:
 	;
 	goto vdbe_return
 
-__17:
+__18:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64((*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __8
+	goto __9
 
-__18:
+__19:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__19:
+__20:
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Real)
 
 	*(*float64)(unsafe.Pointer(pOut)) = *(*float64)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16))))
-	goto __8
+	goto __9
 
-__20:
+__21:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = Xsqlite3Strlen30(tls, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 
 	if !(int32(encoding) != SQLITE_UTF8) {
-		goto __209
+		goto __210
 	}
 	rc = Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64(-1), uint8(SQLITE_UTF8), uintptr(0))
 
 	if !(rc != 0) {
-		goto __210
-	}
-	goto too_big
-__210:
-	;
-	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
 		goto __211
 	}
-	goto no_mem
+	goto too_big
 __211:
+	;
+	if !(SQLITE_OK != Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))) {
+		goto __212
+	}
+	goto no_mem
+__212:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).FszMalloc = 0
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -6) {
-		goto __212
+		goto __213
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__212:
+__213:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp4type = int8(-6)
 	*(*uintptr)(unsafe.Pointer(pOp + 16)) = (*Mem)(unsafe.Pointer(pOut)).Fz
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Mem)(unsafe.Pointer(pOut)).Fn
-__209:
+__210:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __213
+		goto __214
 	}
 	goto too_big
-__213:
+__214:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_String)
 
-__21:
+__22:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Str | MEM_Static | MEM_Term)
@@ -90946,10 +91105,10 @@ __21:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = (*Op)(unsafe.Pointer(pOp)).Fp1
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__22:
 __23:
+__24:
 	pOut = out2Prerelease(tls, p, pOp)
 	cnt = (*Op)(unsafe.Pointer(pOp)).Fp3 - (*Op)(unsafe.Pointer(pOp)).Fp2
 
@@ -90960,9 +91119,9 @@ __23:
 		return uint16(MEM_Null)
 	}())
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
-__214:
+__215:
 	if !(cnt > 0) {
-		goto __215
+		goto __216
 	}
 	pOut += 56
 
@@ -90970,171 +91129,171 @@ __214:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = nullFlag
 	(*Mem)(unsafe.Pointer(pOut)).Fn = 0
 	cnt--
-	goto __214
-__215:
+	goto __215
+__216:
 	;
-	goto __8
-
-__24:
-	;
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
-	goto __8
+	goto __9
 
 __25:
 	;
-	pOut = out2Prerelease(tls, p, pOp)
-	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __216
-	}
-	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
-		goto __218
-	}
-	goto no_mem
-__218:
-	;
-	goto __217
-__216:
-	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
-__217:
-	;
-	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
-
-	goto __8
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_Undefined|MEM_AffMask) | MEM_Null)
+	goto __9
 
 __26:
 	;
-	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
-	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+	pOut = out2Prerelease(tls, p, pOp)
+	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
+		goto __217
+	}
+	Xsqlite3VdbeMemSetZeroBlob(tls, pOut, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pOut) != 0) {
 		goto __219
 	}
-	goto too_big
+	goto no_mem
 __219:
+	;
+	goto __218
+__217:
+	Xsqlite3VdbeMemSetStr(tls, pOut, *(*uintptr)(unsafe.Pointer(pOp + 16)), int64((*Op)(unsafe.Pointer(pOp)).Fp1), uint8(0), uintptr(0))
+__218:
+	;
+	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
+
+	goto __9
+
+__27:
+	;
+	pVar = (*Vdbe)(unsafe.Pointer(p)).FaVar + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*56
+	if !(Xsqlite3VdbeMemTooBig(tls, pVar) != 0) {
+		goto __220
+	}
+	goto too_big
+__220:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __220
+		goto __221
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-__220:
+__221:
 	;
 	libc.Xmemcpy(tls, pOut, pVar, uint64(uintptr(0)+24))
 	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Dyn | MEM_Ephem))
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Static | MEM_FromBind)
 
-	goto __8
+	goto __9
 
-__27:
+__28:
 	n = (*Op)(unsafe.Pointer(pOp)).Fp3
 	p1 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p2 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pIn1 = aMem + uintptr(p1)*56
 	pOut = aMem + uintptr(p2)*56
-__221:
+__222:
 	;
 	Xsqlite3VdbeMemMove(tls, pOut, pIn1)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __224
+		goto __225
 	}
 	goto no_mem
-__224:
+__225:
 	;
 	pIn1 += 56
 	pOut += 56
-	goto __222
-__222:
-	if libc.PreDecInt32(&n, 1) != 0 {
-		goto __221
-	}
 	goto __223
 __223:
+	if libc.PreDecInt32(&n, 1) != 0 {
+		goto __222
+	}
+	goto __224
+__224:
 	;
-	goto __8
+	goto __9
 
-__28:
+__29:
 	n1 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
-__225:
+__226:
 	if !(1 != 0) {
-		goto __226
+		goto __227
 	}
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
 	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __227
-	}
-	goto no_mem
-__227:
-	;
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __228
 	}
-	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto no_mem
 __228:
 	;
-	if !(libc.PostDecInt32(&n1, 1) == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Subtype != 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5)&0x0002 != 0) {
 		goto __229
 	}
-	goto __226
+	*(*U16)(unsafe.Pointer(pOut + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
 __229:
+	;
+	if !(libc.PostDecInt32(&n1, 1) == 0) {
+		goto __230
+	}
+	goto __227
+__230:
 	;
 	pOut += 56
 	pIn1 += 56
-	goto __225
-__226:
+	goto __226
+__227:
 	;
-	goto __8
+	goto __9
 
-__29:
+__30:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn1, MEM_Ephem)
-	goto __8
+	goto __9
 
-__30:
+__31:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetInt64(tls, pOut, *(*I64)(unsafe.Pointer(pIn1)))
-	goto __8
-
-__31:
-	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
-		goto __230
-	}
-	goto abort_due_to_error
-__230:
-	;
-	goto __8
+	goto __9
 
 __32:
-	;
-	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
-	(*Vdbe)(unsafe.Pointer(p)).FpResultSet = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 0)) != SQLITE_OK) {
 		goto __231
 	}
-	goto no_mem
+	goto abort_due_to_error
 __231:
 	;
-	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+	goto __9
+
+__33:
+	;
+	(*Vdbe)(unsafe.Pointer(p)).FcacheCtr = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr + U32(2) | U32(1)
+	(*Vdbe)(unsafe.Pointer(p)).FpResultRow = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
 		goto __232
 	}
+	goto no_mem
+__232:
+	;
+	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_ROW != 0) {
+		goto __233
+	}
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_ROW), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, uintptr(0))
-__232:
+__233:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp)-int64(aOp))/24) + 1
 	rc = SQLITE_ROW
 	goto vdbe_return
 
-__33:
+__34:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -91142,95 +91301,95 @@ __33:
 	flags1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 
 	if !((int32(flags1)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __233
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__233:
-	;
-	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
 		goto __234
 	}
-	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
-		goto __236
-	}
-	goto no_mem
-__236:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __235
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __9
 __234:
-	if !(int32(flags1)&MEM_Zero != 0) {
+	;
+	if !(int32(flags1)&(MEM_Str|MEM_Blob) == 0) {
+		goto __235
+	}
+	if !(Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(0)) != 0) {
 		goto __237
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
-		goto __238
-	}
 	goto no_mem
-__238:
-	;
-	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
 __237:
 	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __236
 __235:
+	if !(int32(flags1)&MEM_Zero != 0) {
+		goto __238
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn1) != 0) {
+		goto __239
+	}
+	goto no_mem
+__239:
+	;
+	flags1 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags) & libc.CplInt32(MEM_Str))
+__238:
+	;
+__236:
 	;
 	flags2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	if !(int32(flags2)&(MEM_Str|MEM_Blob) == 0) {
-		goto __239
+		goto __240
 	}
 	if !(Xsqlite3VdbeMemStringify(tls, pIn2, encoding, uint8(0)) != 0) {
-		goto __241
-	}
-	goto no_mem
-__241:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
-	goto __240
-__239:
-	if !(int32(flags2)&MEM_Zero != 0) {
 		goto __242
 	}
-	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
-		goto __243
-	}
 	goto no_mem
-__243:
-	;
-	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
 __242:
 	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+	goto __241
 __240:
+	if !(int32(flags2)&MEM_Zero != 0) {
+		goto __243
+	}
+	if !(Xsqlite3VdbeMemExpandBlob(tls, pIn2) != 0) {
+		goto __244
+	}
+	goto no_mem
+__244:
+	;
+	flags2 = U16(int32((*Mem)(unsafe.Pointer(pIn2)).Fflags) & libc.CplInt32(MEM_Str))
+__243:
+	;
+__241:
 	;
 	nByte = I64((*Mem)(unsafe.Pointer(pIn1)).Fn + (*Mem)(unsafe.Pointer(pIn2)).Fn)
 	if !(nByte > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __244
-	}
-	goto too_big
-__244:
-	;
-	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
 		goto __245
 	}
-	goto no_mem
+	goto too_big
 __245:
+	;
+	if !(Xsqlite3VdbeMemGrow(tls, pOut, int32(nByte)+2, libc.Bool32(pOut == pIn2)) != 0) {
+		goto __246
+	}
+	goto no_mem
+__246:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Str)
 	if !(pOut != pIn2) {
-		goto __246
+		goto __247
 	}
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz, (*Mem)(unsafe.Pointer(pIn2)).Fz, uint64((*Mem)(unsafe.Pointer(pIn2)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn2)).Fflags = flags2
-__246:
+__247:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pOut)).Fz+uintptr((*Mem)(unsafe.Pointer(pIn2)).Fn), (*Mem)(unsafe.Pointer(pIn1)).Fz, uint64((*Mem)(unsafe.Pointer(pIn1)).Fn))
 
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags1
 	if !(int32(encoding) > SQLITE_UTF8) {
-		goto __247
+		goto __248
 	}
 	nByte = nByte & int64(libc.CplInt32(1))
-__247:
+__248:
 	;
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pOut)).Fz + uintptr(nByte+int64(1)))) = int8(0)
@@ -91238,231 +91397,231 @@ __247:
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte)
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = encoding
 
-	goto __8
+	goto __9
 
-__34:
 __35:
 __36:
 __37:
 __38:
+__39:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	type1 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	type2 = (*Mem)(unsafe.Pointer(pIn2)).Fflags
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __248
+		goto __249
 	}
 int_math:
 	iA = *(*I64)(unsafe.Pointer(pIn1))
 	*(*I64)(unsafe.Pointer(bp + 208)) = *(*I64)(unsafe.Pointer(pIn2))
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __251
-	case OP_Subtract:
 		goto __252
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __253
-	case OP_Divide:
+	case OP_Multiply:
 		goto __254
-	default:
+	case OP_Divide:
 		goto __255
-	}
-	goto __250
-__251:
-	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
+	default:
 		goto __256
 	}
-	goto fp_math
-__256:
-	;
-	goto __250
+	goto __251
 __252:
-	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3AddInt64(tls, bp+208, iA) != 0) {
 		goto __257
 	}
 	goto fp_math
 __257:
 	;
-	goto __250
+	goto __251
 __253:
-	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
+	if !(Xsqlite3SubInt64(tls, bp+208, iA) != 0) {
 		goto __258
 	}
 	goto fp_math
 __258:
 	;
-	goto __250
+	goto __251
 __254:
-	if !(iA == int64(0)) {
+	if !(Xsqlite3MulInt64(tls, bp+208, iA) != 0) {
 		goto __259
 	}
-	goto arithmetic_result_is_null
+	goto fp_math
 __259:
 	;
-	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
-		goto __260
-	}
-	goto fp_math
-__260:
-	;
-	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
-	goto __250
-
+	goto __251
 __255:
 	if !(iA == int64(0)) {
-		goto __261
+		goto __260
 	}
 	goto arithmetic_result_is_null
+__260:
+	;
+	if !(iA == int64(-1) && *(*I64)(unsafe.Pointer(bp + 208)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __261
+	}
+	goto fp_math
 __261:
 	;
-	if !(iA == int64(-1)) {
+	*(*I64)(unsafe.Pointer(bp + 208)) /= iA
+	goto __251
+
+__256:
+	if !(iA == int64(0)) {
 		goto __262
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __262:
+	;
+	if !(iA == int64(-1)) {
+		goto __263
+	}
+	iA = int64(1)
+__263:
 	;
 	*(*I64)(unsafe.Pointer(bp + 208)) %= iA
-	goto __250
+	goto __251
 
-__250:
+__251:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 208))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __249
-__248:
+	goto __250
+__249:
 	if !((int32(type1)|int32(type2))&MEM_Null != 0) {
-		goto __263
+		goto __264
 	}
 	goto arithmetic_result_is_null
-	goto __264
-__263:
+	goto __265
+__264:
 	type1 = numericType(tls, pIn1)
 	type2 = numericType(tls, pIn2)
 	if !(int32(type1)&int32(type2)&MEM_Int != 0) {
-		goto __265
+		goto __266
 	}
 	goto int_math
-__265:
+__266:
 	;
 fp_math:
 	rA = Xsqlite3VdbeRealValue(tls, pIn1)
 	rB = Xsqlite3VdbeRealValue(tls, pIn2)
 	switch int32((*Op)(unsafe.Pointer(pOp)).Fopcode) {
 	case OP_Add:
-		goto __267
-	case OP_Subtract:
 		goto __268
-	case OP_Multiply:
+	case OP_Subtract:
 		goto __269
-	case OP_Divide:
+	case OP_Multiply:
 		goto __270
-	default:
+	case OP_Divide:
 		goto __271
-	}
-	goto __266
-__267:
-	rB = rB + rA
-	goto __266
-__268:
-	rB = rB - rA
-	goto __266
-__269:
-	rB = rB * rA
-	goto __266
-__270:
-	if !(rA == float64(0)) {
+	default:
 		goto __272
 	}
-	goto arithmetic_result_is_null
-__272:
-	;
-	rB = rB / rA
-	goto __266
-
+	goto __267
+__268:
+	rB = rB + rA
+	goto __267
+__269:
+	rB = rB - rA
+	goto __267
+__270:
+	rB = rB * rA
+	goto __267
 __271:
-	iA = Xsqlite3VdbeIntValue(tls, pIn1)
-	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
-	if !(iA == int64(0)) {
+	if !(rA == float64(0)) {
 		goto __273
 	}
 	goto arithmetic_result_is_null
 __273:
 	;
-	if !(iA == int64(-1)) {
+	rB = rB / rA
+	goto __267
+
+__272:
+	iA = Xsqlite3VdbeIntValue(tls, pIn1)
+	*(*I64)(unsafe.Pointer(bp + 208)) = Xsqlite3VdbeIntValue(tls, pIn2)
+	if !(iA == int64(0)) {
 		goto __274
 	}
-	iA = int64(1)
+	goto arithmetic_result_is_null
 __274:
 	;
-	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
-	goto __266
-
-__266:
-	;
-	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+	if !(iA == int64(-1)) {
 		goto __275
 	}
-	goto arithmetic_result_is_null
+	iA = int64(1)
 __275:
+	;
+	rB = float64(*(*I64)(unsafe.Pointer(bp + 208)) % iA)
+	goto __267
+
+__267:
+	;
+	if !(Xsqlite3IsNaN(tls, rB) != 0) {
+		goto __276
+	}
+	goto arithmetic_result_is_null
+__276:
 	;
 	*(*float64)(unsafe.Pointer(pOut)) = rB
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Real)
-__264:
+__265:
 	;
-__249:
+__250:
 	;
-	goto __8
+	goto __9
 
 arithmetic_result_is_null:
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-
-__39:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __276
-	}
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
-__276:
-	;
-	goto __8
+	goto __9
 
 __40:
+	;
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __277
+	}
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, int64(0))
+__277:
+	;
+	goto __9
+
 __41:
 __42:
 __43:
+__44:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)|int32((*Mem)(unsafe.Pointer(pIn2)).Fflags))&MEM_Null != 0) {
-		goto __277
+		goto __278
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __8
-__277:
+	goto __9
+__278:
 	;
 	*(*I64)(unsafe.Pointer(bp + 224)) = Xsqlite3VdbeIntValue(tls, pIn2)
 	iB1 = Xsqlite3VdbeIntValue(tls, pIn1)
 	op = (*Op)(unsafe.Pointer(pOp)).Fopcode
 	if !(int32(op) == OP_BitAnd) {
-		goto __278
+		goto __279
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) &= iB1
-	goto __279
-__278:
+	goto __280
+__279:
 	if !(int32(op) == OP_BitOr) {
-		goto __280
+		goto __281
 	}
 	*(*I64)(unsafe.Pointer(bp + 224)) |= iB1
-	goto __281
-__280:
+	goto __282
+__281:
 	if !(iB1 != int64(0)) {
-		goto __282
+		goto __283
 	}
 
 	if !(iB1 < int64(0)) {
-		goto __283
+		goto __284
 	}
 
 	op = U8(2*OP_ShiftLeft + 1 - int32(op))
@@ -91471,95 +91630,95 @@ __280:
 	} else {
 		iB1 = int64(64)
 	}
-__283:
+__284:
 	;
 	if !(iB1 >= int64(64)) {
-		goto __284
+		goto __285
 	}
 	if *(*I64)(unsafe.Pointer(bp + 224)) >= int64(0) || int32(op) == OP_ShiftLeft {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(0)
 	} else {
 		*(*I64)(unsafe.Pointer(bp + 224)) = int64(-1)
 	}
-	goto __285
-__284:
+	goto __286
+__285:
 	libc.Xmemcpy(tls, bp+216, bp+224, uint64(unsafe.Sizeof(U64(0))))
 	if !(int32(op) == OP_ShiftLeft) {
-		goto __286
+		goto __287
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) <<= iB1
-	goto __287
-__286:
+	goto __288
+__287:
 	*(*U64)(unsafe.Pointer(bp + 216)) >>= iB1
 
 	if !(*(*I64)(unsafe.Pointer(bp + 224)) < int64(0)) {
-		goto __288
+		goto __289
 	}
 	*(*U64)(unsafe.Pointer(bp + 216)) |= (uint64(0xffffffff)<<32 | uint64(0xffffffff)) << (int64(64) - iB1)
+__289:
+	;
 __288:
 	;
-__287:
-	;
 	libc.Xmemcpy(tls, bp+224, bp+216, uint64(unsafe.Sizeof(I64(0))))
-__285:
+__286:
+	;
+__283:
 	;
 __282:
 	;
-__281:
-	;
-__279:
+__280:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 224))
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
-__44:
+__45:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	*(*I64)(unsafe.Pointer(pIn1)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __8
-
-__45:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __289
-	}
-	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
-		goto __290
-	}
-
-	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __291
-	}
-	rc = SQLITE_MISMATCH
-	goto abort_due_to_error
-	goto __292
-__291:
-	goto jump_to_p2
-__292:
-	;
-__290:
-	;
-__289:
-	;
-	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-	goto __8
+	goto __9
 
 __46:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __290
+	}
+	applyAffinity(tls, pIn1, int8(SQLITE_AFF_NUMERIC), encoding)
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+		goto __291
+	}
+
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
+		goto __292
+	}
+	rc = SQLITE_MISMATCH
+	goto abort_due_to_error
+	goto __293
+__292:
+	goto jump_to_p2
+__293:
+	;
+__291:
+	;
+__290:
+	;
+	(*Mem)(unsafe.Pointer(pIn1)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
+	goto __9
+
+__47:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __293
+		goto __294
 	}
 
 	Xsqlite3VdbeMemRealify(tls, pIn1)
 
-__293:
+__294:
 	;
-	goto __8
+	goto __9
 
-__47:
+__48:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
@@ -91569,189 +91728,193 @@ __47:
 		}
 		return 0
 	}()
-	if !(rc != 0) {
-		goto __294
-	}
-	goto abort_due_to_error
-__294:
-	;
-	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
 	if !(rc != 0) {
 		goto __295
 	}
 	goto abort_due_to_error
 __295:
 	;
-	goto __8
+	rc = Xsqlite3VdbeMemCast(tls, pIn1, uint8((*Op)(unsafe.Pointer(pOp)).Fp2), encoding)
+	if !(rc != 0) {
+		goto __296
+	}
+	goto abort_due_to_error
+__296:
+	;
+	goto __9
 
-__48:
 __49:
 __50:
 __51:
 __52:
 __53:
+__54:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags11 = (*Mem)(unsafe.Pointer(pIn1)).Fflags
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags11)&int32(flags3)&MEM_Int != 0) {
-		goto __296
+		goto __297
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn3)) > *(*I64)(unsafe.Pointer(pIn1))) {
-		goto __297
+		goto __298
 	}
 	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __299
-	}
-
-	goto jump_to_p2
-__299:
-	;
-	iCompare = +1
-	goto __298
-__297:
-	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
 		goto __300
 	}
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
-		goto __302
-	}
 
 	goto jump_to_p2
-__302:
-	;
-	iCompare = -1
-	goto __301
 __300:
-	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
+	;
+	iCompare = +1
+
+	goto __299
+__298:
+	if !(*(*I64)(unsafe.Pointer(pIn3)) < *(*I64)(unsafe.Pointer(pIn1))) {
+		goto __301
+	}
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __303
 	}
 
 	goto jump_to_p2
 __303:
 	;
-	iCompare = 0
+	iCompare = -1
+
+	goto __302
 __301:
-	;
-__298:
-	;
-	goto __8
-__296:
-	;
-	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+	if !(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))) != 0) {
 		goto __304
 	}
 
+	goto jump_to_p2
+__304:
+	;
+	iCompare = 0
+
+__302:
+	;
+__299:
+	;
+	goto __9
+__297:
+	;
+	if !((int32(flags11)|int32(flags3))&MEM_Null != 0) {
+		goto __305
+	}
+
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_NULLEQ != 0) {
-		goto __306
+		goto __307
 	}
 
 	if !(int32(flags11)&int32(flags3)&MEM_Null != 0 &&
 		int32(flags3)&MEM_Cleared == 0) {
-		goto __308
+		goto __309
 	}
 	res = 0
-	goto __309
-__308:
+	goto __310
+__309:
 	res = func() int32 {
 		if int32(flags3)&MEM_Null != 0 {
 			return -1
 		}
 		return +1
 	}()
-__309:
-	;
-	goto __307
-__306:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
-		goto __310
-	}
-	goto jump_to_p2
 __310:
 	;
-	iCompare = 1
-	goto __8
+	goto __308
 __307:
 	;
-	goto __305
-__304:
-	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
-	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&SQLITE_JUMPIFNULL != 0) {
 		goto __311
 	}
+	goto jump_to_p2
+__311:
+	;
+	iCompare = 1
+
+	goto __9
+__308:
+	;
+	goto __306
+__305:
+	affinity = int8(int32((*Op)(unsafe.Pointer(pOp)).Fp5) & SQLITE_AFF_MASK)
+	if !(int32(affinity) >= SQLITE_AFF_NUMERIC) {
+		goto __312
+	}
 	if !((int32(flags11)|int32(flags3))&MEM_Str != 0) {
-		goto __313
+		goto __314
 	}
 	if !(int32(flags11)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __314
+		goto __315
 	}
 	applyNumericAffinity(tls, pIn1, 0)
 
 	flags3 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
-__314:
-	;
-	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
-		goto __315
-	}
-	applyNumericAffinity(tls, pIn3, 0)
 __315:
 	;
-__313:
-	;
-	goto __312
-__311:
-	if !(int32(affinity) == SQLITE_AFF_TEXT) {
+	if !(int32(flags3)&(MEM_Int|MEM_IntReal|MEM_Real|MEM_Str) == MEM_Str) {
 		goto __316
 	}
-	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+	applyNumericAffinity(tls, pIn3, 0)
+__316:
+	;
+__314:
+	;
+	goto __313
+__312:
+	if !(int32(affinity) == SQLITE_AFF_TEXT && (int32(flags11)|int32(flags3))&MEM_Str != 0) {
 		goto __317
 	}
+	if !(int32(flags11)&MEM_Str == 0 && int32(flags11)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
+		goto __318
+	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn1, encoding, uint8(1))
 
 	flags11 = U16(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags11)&MEM_TypeMask)
 	if !(pIn1 == pIn3) {
-		goto __318
+		goto __319
 	}
 	flags3 = U16(int32(flags11) | MEM_Str)
+__319:
+	;
 __318:
 	;
-__317:
-	;
 	if !(int32(flags3)&MEM_Str == 0 && int32(flags3)&(MEM_Int|MEM_Real|MEM_IntReal) != 0) {
-		goto __319
+		goto __320
 	}
 
 	Xsqlite3VdbeMemStringify(tls, pIn3, encoding, uint8(1))
 
 	flags3 = U16(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&libc.CplInt32(MEM_TypeMask) | int32(flags3)&MEM_TypeMask)
-__319:
+__320:
 	;
-__316:
+__317:
 	;
-__312:
+__313:
 	;
 	res = Xsqlite3MemCompare(tls, pIn3, pIn1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__305:
+__306:
 	;
 	if !(res < 0) {
-		goto __320
+		goto __321
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aLTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __321
-__320:
+	goto __322
+__321:
 	if !(res == 0) {
-		goto __322
+		goto __323
 	}
 	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aEQb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
-	goto __323
-__322:
-	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+	goto __324
 __323:
+	res2 = int32(*(*uint8)(unsafe.Pointer(Xsqlite3aGTb + uintptr((*Op)(unsafe.Pointer(pOp)).Fopcode))))
+__324:
 	;
-__321:
+__322:
 	;
 	iCompare = res
 
@@ -91760,38 +91923,38 @@ __321:
 	(*Mem)(unsafe.Pointer(pIn1)).Fflags = flags11
 
 	if !(res2 != 0) {
-		goto __324
-	}
-	goto jump_to_p2
-__324:
-	;
-	goto __8
-
-__54:
-	;
-	if !(iCompare == 0) {
 		goto __325
 	}
 	goto jump_to_p2
 __325:
 	;
-	goto __8
+	goto __9
 
 __55:
 	;
-	goto __8
-
-__56:
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+	if !(iCompare == 0) {
 		goto __326
 	}
-	aPermute = uintptr(0)
-	goto __327
+	goto jump_to_p2
 __326:
+	;
+	goto __9
+
+__56:
+	;
+	goto __9
+
+__57:
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_PERMUTE == 0) {
+		goto __327
+	}
+	aPermute = uintptr(0)
+	goto __328
+__327:
 	;
 	aPermute = *(*uintptr)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24 + 16)) + uintptr(1)*4
 
-__327:
+__328:
 	;
 	n2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 	pKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -91799,9 +91962,9 @@ __327:
 	p11 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	p21 = (*Op)(unsafe.Pointer(pOp)).Fp2
 	i = 0
-__328:
+__329:
 	if !(i < n2) {
-		goto __330
+		goto __331
 	}
 	if aPermute != 0 {
 		idx = *(*U32)(unsafe.Pointer(aPermute + uintptr(i)*4))
@@ -91812,298 +91975,299 @@ __328:
 	pColl = *(*uintptr)(unsafe.Pointer(pKeyInfo + 32 + uintptr(i)*8))
 	bRev = int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i)))) & KEYINFO_ORDER_DESC
 	iCompare = Xsqlite3MemCompare(tls, aMem+uintptr(U32(p11)+idx)*56, aMem+uintptr(U32(p21)+idx)*56, pColl)
+
 	if !(iCompare != 0) {
-		goto __331
+		goto __332
 	}
 	if !(int32(*(*U8)(unsafe.Pointer((*KeyInfo)(unsafe.Pointer(pKeyInfo)).FaSortFlags + uintptr(i))))&KEYINFO_ORDER_BIGNULL != 0 &&
 		(int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p11)+idx)*56)).Fflags)&MEM_Null != 0 || int32((*Mem)(unsafe.Pointer(aMem+uintptr(U32(p21)+idx)*56)).Fflags)&MEM_Null != 0)) {
-		goto __332
-	}
-	iCompare = -iCompare
-__332:
-	;
-	if !(bRev != 0) {
 		goto __333
 	}
 	iCompare = -iCompare
 __333:
 	;
-	goto __330
-__331:
-	;
-	goto __329
-__329:
-	i++
-	goto __328
-	goto __330
-__330:
-	;
-	goto __8
-
-__57:
-	;
-	if !(iCompare < 0) {
+	if !(bRev != 0) {
 		goto __334
 	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
-	goto __335
+	iCompare = -iCompare
 __334:
-	if !(iCompare == 0) {
-		goto __336
-	}
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
-	goto __337
-__336:
 	;
-	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
-__337:
+	goto __331
+__332:
 	;
-__335:
+	goto __330
+__330:
+	i++
+	goto __329
+	goto __331
+__331:
 	;
-	goto __8
+	goto __9
 
 __58:
+	;
+	if !(iCompare < 0) {
+		goto __335
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1-1)*24
+	goto __336
+__335:
+	if !(iCompare == 0) {
+		goto __337
+	}
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2-1)*24
+	goto __338
+__337:
+	;
+	pOp = aOp + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3-1)*24
+__338:
+	;
+__336:
+	;
+	goto __9
+
 __59:
+__60:
 	v1 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, 2)
 	v2 = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, 2)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_And) {
-		goto __338
+		goto __339
 	}
 	v1 = int32(and_logic[v1*3+v2])
-	goto __339
-__338:
-	v1 = int32(or_logic[v1*3+v2])
+	goto __340
 __339:
+	v1 = int32(or_logic[v1*3+v2])
+__340:
 	;
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(v1 == 2) {
-		goto __340
+		goto __341
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-	goto __341
-__340:
+	goto __342
+__341:
 	*(*I64)(unsafe.Pointer(pOut)) = I64(v1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Int)
-__341:
+__342:
 	;
-	goto __8
+	goto __9
 
-__60:
+__61:
 	;
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56,
 		int64(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)^*(*int32)(unsafe.Pointer(pOp + 16))))
-	goto __8
-
-__61:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __342
-	}
-	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
-	goto __343
-__342:
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-__343:
-	;
-	goto __8
+	goto __9
 
 __62:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
+		goto __343
+	}
+	Xsqlite3VdbeMemSetInt64(tls, pOut, libc.BoolInt64(!(Xsqlite3VdbeBooleanValue(tls, pIn1, 0) != 0)))
+	goto __344
+__343:
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+__344:
+	;
+	goto __9
+
+__63:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemSetNull(tls, pOut)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __344
+		goto __345
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = ^Xsqlite3VdbeIntValue(tls, pIn1)
-__344:
+__345:
 	;
-	goto __8
+	goto __9
 
-__63:
+__64:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __345
+		goto __346
 	}
 	iAddr = U32(int32((int64(pOp) - int64((*Vdbe)(unsafe.Pointer(p)).FaOp)) / 24))
 	if !(int32(*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))))&(int32(1)<<(iAddr&U32(7))) != 0) {
-		goto __347
-	}
-
-	goto jump_to_p2
-__347:
-	;
-	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
-	goto __346
-__345:
-	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __348
 	}
 
 	goto jump_to_p2
 __348:
 	;
+	*(*U8)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FpFrame)).FaOnce + uintptr(iAddr/U32(8)))) |= U8(int32(1) << (iAddr & U32(7)))
+	goto __347
 __346:
-	;
-	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
-	goto __8
-
-__64:
-	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
-
-	if !(c != 0) {
+	if !((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1 == (*Op)(unsafe.Pointer(pOp)).Fp1) {
 		goto __349
 	}
+
 	goto jump_to_p2
 __349:
 	;
-	goto __8
+__347:
+	;
+	(*Op)(unsafe.Pointer(pOp)).Fp1 = (*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp)).Fp1
+	goto __9
 
 __65:
-	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
+	c = Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, (*Op)(unsafe.Pointer(pOp)).Fp3)
 
-	if !(c1 != 0) {
+	if !(c != 0) {
 		goto __350
 	}
 	goto jump_to_p2
 __350:
 	;
-	goto __8
+	goto __9
 
 __66:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	c1 = libc.BoolInt32(!(Xsqlite3VdbeBooleanValue(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56, libc.BoolInt32(!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0))) != 0))
 
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+	if !(c1 != 0) {
 		goto __351
 	}
 	goto jump_to_p2
 __351:
 	;
-	goto __8
+	goto __9
 
 __67:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null != 0) {
+		goto __352
+	}
+	goto jump_to_p2
+__352:
+	;
+	goto __9
+
+__68:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= 0) {
-		goto __352
+		goto __353
 	}
 	pC = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 < int32((*VdbeCursor)(unsafe.Pointer(pC)).FnHdrParsed)) {
-		goto __354
+		goto __355
 	}
 	serialType = *(*U32)(unsafe.Pointer(pC + 112 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*4))
 	if !(serialType >= U32(12)) {
-		goto __356
+		goto __357
 	}
 	if !(serialType&U32(1) != 0) {
-		goto __358
+		goto __359
 	}
 	typeMask = U16(0x04)
-	goto __359
-__358:
-	typeMask = U16(0x08)
+	goto __360
 __359:
+	typeMask = U16(0x08)
+__360:
 	;
-	goto __357
-__356:
-	;
-	typeMask = U16(aMask[serialType])
+	goto __358
 __357:
 	;
-	goto __355
-__354:
+	typeMask = U16(aMask[serialType])
+__358:
+	;
+	goto __356
+__355:
 	typeMask = U16(int32(1) << (*(*int32)(unsafe.Pointer(pOp + 16)) - 1))
 
-__355:
+__356:
 	;
-	goto __353
-__352:
+	goto __354
+__353:
 	;
 	typeMask = U16(int32(1) << (Xsqlite3_value_type(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56) - 1))
 
-__353:
+__354:
 	;
 	if !(int32(typeMask)&int32((*Op)(unsafe.Pointer(pOp)).Fp5) != 0) {
-		goto __360
-	}
-	goto jump_to_p2
-__360:
-	;
-	goto __8
-
-__68:
-	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
-		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
 		goto __361
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-	goto __362
+	goto jump_to_p2
 __361:
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
-__362:
 	;
-	goto __8
+	goto __9
 
 __69:
+	if !(int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56)).Fflags)&MEM_Null != 0 ||
+		int32((*Mem)(unsafe.Pointer(aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fflags)&MEM_Null != 0) {
+		goto __362
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+	goto __363
+__362:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56, int64(0))
+__363:
+	;
+	goto __9
+
+__70:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __363
-	}
-	goto jump_to_p2
-__363:
-	;
-	goto __8
-
-__70:
-	;
-	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
-	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
 		goto __364
 	}
-	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
 	goto jump_to_p2
 __364:
 	;
-	goto __8
+	goto __9
 
 __71:
+	;
+	pC1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
+	if !(pC1 != 0 && (*VdbeCursor)(unsafe.Pointer(pC1)).FnullRow != 0) {
+		goto __365
+	}
+	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)
+	goto jump_to_p2
+__365:
+	;
+	goto __9
+
+__72:
 	;
 	pC2 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pOut = (*Vdbe)(unsafe.Pointer(p)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !(pC2 == uintptr(0) || int32((*VdbeCursor)(unsafe.Pointer(pC2)).FeCurType) != CURTYPE_BTREE) {
-		goto __365
+		goto __366
 	}
 	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __366
-__365:
+	goto __367
+__366:
 	if !((*VdbeCursor)(unsafe.Pointer(pC2)).FdeferredMoveto != 0) {
-		goto __367
+		goto __368
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC2)
 	if !(rc != 0) {
-		goto __368
+		goto __369
 	}
 	goto abort_due_to_error
+__369:
+	;
 __368:
 	;
+	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
+		goto __370
+	}
+	Xsqlite3VdbeMemSetNull(tls, pOut)
+	goto __371
+__370:
+	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
+__371:
+	;
 __367:
 	;
-	if !(Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))) != 0) {
-		goto __369
-	}
-	Xsqlite3VdbeMemSetNull(tls, pOut)
-	goto __370
-__369:
-	Xsqlite3VdbeMemSetInt64(tls, pOut, Xsqlite3BtreeOffset(tls, *(*uintptr)(unsafe.Pointer(pC2 + 48))))
-__370:
-	;
-__366:
-	;
-	goto __8
+	goto __9
 
-__72:
+__73:
 	;
 	pC3 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	p22 = U32((*Op)(unsafe.Pointer(pOp)).Fp2)
@@ -92113,144 +92277,144 @@ op_column_restart:
 	aOffset = (*VdbeCursor)(unsafe.Pointer(pC3)).FaOffset
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus != (*Vdbe)(unsafe.Pointer(p)).FcacheCtr) {
-		goto __371
+		goto __372
 	}
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FnullRow != 0) {
-		goto __373
+		goto __374
 	}
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC3)).FeCurType) == CURTYPE_PSEUDO && (*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult > 0) {
-		goto __375
+		goto __376
 	}
 
 	pReg = aMem + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FseekResult)*56
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = libc.AssignPtrUint32(pC3+108, U32((*Mem)(unsafe.Pointer(pReg)).Fn))
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = (*Mem)(unsafe.Pointer(pReg)).Fz
-	goto __376
-__375:
+	goto __377
+__376:
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	Xsqlite3VdbeMemSetNull(tls, pDest)
 	goto op_column_out
-__376:
+__377:
 	;
-	goto __374
-__373:
+	goto __375
+__374:
 	pCrsr = *(*uintptr)(unsafe.Pointer(pC3 + 48))
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FdeferredMoveto != 0) {
-		goto __377
+		goto __378
 	}
 
 	if !(*(*uintptr)(unsafe.Pointer(pC3 + 16)) != 0 && libc.AssignUint32(&iMap, *(*U32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC3 + 16)) + uintptr(U32(1)+p22)*4))) > U32(0)) {
-		goto __379
+		goto __380
 	}
 	pC3 = (*VdbeCursor)(unsafe.Pointer(pC3)).FpAltCursor
 	p22 = iMap - U32(1)
 	goto op_column_restart
-__379:
+__380:
 	;
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC3)
 	if !(rc != 0) {
-		goto __380
+		goto __381
 	}
 	goto abort_due_to_error
-__380:
+__381:
 	;
-	goto __378
-__377:
+	goto __379
+__378:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, pCrsr) != 0) {
-		goto __381
+		goto __382
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __382
+		goto __383
 	}
 	goto abort_due_to_error
-__382:
+__383:
 	;
 	goto op_column_restart
-__381:
+__382:
 	;
-__378:
+__379:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize = Xsqlite3BtreePayloadSize(tls, pCrsr)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = Xsqlite3BtreePayloadFetch(tls, pCrsr, pC3+108)
 
-__374:
+__375:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FcacheStatus = (*Vdbe)(unsafe.Pointer(p)).FcacheCtr
 	if !(libc.AssignPtrUint32(aOffset, U32(*(*U8)(unsafe.Pointer((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow)))) < U32(0x80)) {
-		goto __383
+		goto __384
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(1)
-	goto __384
-__383:
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+	goto __385
 __384:
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32(Xsqlite3GetVarint32(tls, (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow, aOffset))
+__385:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(0)
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __385
+		goto __386
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FaRow = uintptr(0)
 	(*VdbeCursor)(unsafe.Pointer(pC3)).FszRow = U32(0)
 
 	if !(*(*U32)(unsafe.Pointer(aOffset)) > U32(98307) || *(*U32)(unsafe.Pointer(aOffset)) > (*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize) {
-		goto __387
+		goto __388
 	}
 	goto op_column_corrupt
-__387:
+__388:
 	;
-	goto __386
-__385:
+	goto __387
+__386:
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
 
 	goto op_column_read_header
-__386:
+__387:
 	;
-	goto __372
-__371:
+	goto __373
+__372:
 	if !(Xsqlite3BtreeCursorHasMoved(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48))) != 0) {
-		goto __388
+		goto __389
 	}
 	rc = Xsqlite3VdbeHandleMovedCursor(tls, pC3)
 	if !(rc != 0) {
-		goto __389
+		goto __390
 	}
 	goto abort_due_to_error
-__389:
+__390:
 	;
 	goto op_column_restart
-__388:
+__389:
 	;
-__372:
+__373:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __390
+		goto __391
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset < *(*U32)(unsafe.Pointer(aOffset))) {
-		goto __392
+		goto __393
 	}
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __394
+		goto __395
 	}
 	libc.Xmemset(tls, bp+232, 0, uint64(unsafe.Sizeof(Mem{})))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset)), bp+232)
 	if !(rc != SQLITE_OK) {
-		goto __396
+		goto __397
 	}
 	goto abort_due_to_error
-__396:
+__397:
 	;
 	zData = (*Mem)(unsafe.Pointer(bp + 232)).Fz
-	goto __395
-__394:
-	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+	goto __396
 __395:
+	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow
+__396:
 	;
 op_column_read_header:
 	i1 = int32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed)
@@ -92258,353 +92422,353 @@ op_column_read_header:
 	zHdr = zData + uintptr((*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset)
 	zEndHdr = zData + uintptr(*(*U32)(unsafe.Pointer(aOffset)))
 
-__397:
+__398:
 	if !(libc.AssignPtrUint32(pC3+112+uintptr(i1)*4, libc.AssignPtrUint32(bp+288, U32(*(*U8)(unsafe.Pointer(zHdr))))) < U32(0x80)) {
-		goto __400
+		goto __401
 	}
 	zHdr++
 	offset64 = offset64 + U64(Xsqlite3VdbeOneByteSerialTypeLen(tls, uint8(*(*U32)(unsafe.Pointer(bp + 288)))))
-	goto __401
-__400:
+	goto __402
+__401:
 	zHdr += uintptr(Xsqlite3GetVarint32(tls, zHdr, bp+288))
 	*(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(i1)*4)) = *(*U32)(unsafe.Pointer(bp + 288))
 	offset64 = offset64 + U64(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))
-__401:
+__402:
 	;
 	*(*U32)(unsafe.Pointer(aOffset + uintptr(libc.PreIncInt32(&i1, 1))*4)) = U32(offset64 & uint64(0xffffffff))
-	goto __398
-__398:
-	if U32(i1) <= p22 && zHdr < zEndHdr {
-		goto __397
-	}
 	goto __399
 __399:
+	if U32(i1) <= p22 && zHdr < zEndHdr {
+		goto __398
+	}
+	goto __400
+__400:
 	;
 	if !(zHdr >= zEndHdr && (zHdr > zEndHdr || offset64 != U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) ||
 		offset64 > U64((*VdbeCursor)(unsafe.Pointer(pC3)).FpayloadSize)) {
-		goto __402
+		goto __403
 	}
 	if !(*(*U32)(unsafe.Pointer(aOffset)) == U32(0)) {
-		goto __403
+		goto __404
 	}
 	i1 = 0
 	zHdr = zEndHdr
-	goto __404
-__403:
-	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
-		goto __405
-	}
-	Xsqlite3VdbeMemRelease(tls, bp+232)
-__405:
-	;
-	goto op_column_corrupt
+	goto __405
 __404:
-	;
-__402:
-	;
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
-	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
 		goto __406
 	}
 	Xsqlite3VdbeMemRelease(tls, bp+232)
 __406:
 	;
-	goto __393
-__392:
-	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+	goto op_column_corrupt
+__405:
+	;
+__403:
+	;
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed = U16(i1)
+	(*VdbeCursor)(unsafe.Pointer(pC3)).FiHdrOffset = U32((int64(zHdr) - int64(zData)) / 1)
+	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FaRow == uintptr(0)) {
+		goto __407
+	}
+	Xsqlite3VdbeMemRelease(tls, bp+232)
+__407:
+	;
+	goto __394
 __393:
+	*(*U32)(unsafe.Pointer(bp + 288)) = U32(0)
+__394:
 	;
 	if !(U32((*VdbeCursor)(unsafe.Pointer(pC3)).FnHdrParsed) <= p22) {
-		goto __407
+		goto __408
 	}
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -10) {
-		goto __408
+		goto __409
 	}
 	Xsqlite3VdbeMemShallowCopy(tls, pDest, *(*uintptr)(unsafe.Pointer(pOp + 16)), MEM_Static)
-	goto __409
-__408:
-	Xsqlite3VdbeMemSetNull(tls, pDest)
+	goto __410
 __409:
+	Xsqlite3VdbeMemSetNull(tls, pDest)
+__410:
 	;
 	goto op_column_out
-__407:
+__408:
 	;
-	goto __391
-__390:
-	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+	goto __392
 __391:
+	*(*U32)(unsafe.Pointer(bp + 288)) = *(*U32)(unsafe.Pointer(pC3 + 112 + uintptr(p22)*4))
+__392:
 	;
 	pDest = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pDest)).Fflags)&(MEM_Agg|MEM_Dyn) != 0) {
-		goto __410
+		goto __411
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest)
-__410:
+__411:
 	;
 	if !((*VdbeCursor)(unsafe.Pointer(pC3)).FszRow >= *(*U32)(unsafe.Pointer(aOffset + uintptr(p22+U32(1))*4))) {
-		goto __411
+		goto __412
 	}
 
 	zData = (*VdbeCursor)(unsafe.Pointer(pC3)).FaRow + uintptr(*(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)))
 	if !(*(*U32)(unsafe.Pointer(bp + 288)) < U32(12)) {
-		goto __413
+		goto __414
 	}
 	Xsqlite3VdbeSerialGet(tls, zData, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __414
-__413:
+	goto __415
+__414:
 	(*Mem)(unsafe.Pointer(pDest)).Fn = libc.AssignInt32(&len, int32((*(*U32)(unsafe.Pointer(bp + 288))-U32(12))/U32(2)))
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 	if !((*Mem)(unsafe.Pointer(pDest)).FszMalloc < len+2) {
-		goto __415
+		goto __416
 	}
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __417
+		goto __418
 	}
 	goto too_big
-__417:
+__418:
 	;
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = U16(MEM_Null)
 	if !(Xsqlite3VdbeMemGrow(tls, pDest, len+2, 0) != 0) {
-		goto __418
+		goto __419
 	}
 	goto no_mem
-__418:
+__419:
 	;
-	goto __416
-__415:
-	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+	goto __417
 __416:
+	(*Mem)(unsafe.Pointer(pDest)).Fz = (*Mem)(unsafe.Pointer(pDest)).FzMalloc
+__417:
 	;
 	libc.Xmemcpy(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, zData, uint64(len))
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len))) = int8(0)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pDest)).Fz + uintptr(len+1))) = int8(0)
 	(*Mem)(unsafe.Pointer(pDest)).Fflags = aFlag1[*(*U32)(unsafe.Pointer(bp + 288))&U32(1)]
-__414:
+__415:
 	;
-	goto __412
-__411:
+	goto __413
+__412:
 	(*Mem)(unsafe.Pointer(pDest)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG) != 0 &&
 		(*(*U32)(unsafe.Pointer(bp + 288)) >= U32(12) && *(*U32)(unsafe.Pointer(bp + 288))&U32(1) == U32(0) || int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_TYPEOFARG != 0) ||
 		libc.AssignInt32(&len, int32(Xsqlite3VdbeSerialTypeLen(tls, *(*U32)(unsafe.Pointer(bp + 288))))) == 0) {
-		goto __419
+		goto __420
 	}
 
 	Xsqlite3VdbeSerialGet(tls, uintptr(unsafe.Pointer(&Xsqlite3CtypeMap)), *(*U32)(unsafe.Pointer(bp + 288)), pDest)
-	goto __420
-__419:
+	goto __421
+__420:
 	if !(len > *(*int32)(unsafe.Pointer(db + 136))) {
-		goto __421
+		goto __422
 	}
 	goto too_big
-__421:
+__422:
 	;
 	rc = Xsqlite3VdbeMemFromBtree(tls, *(*uintptr)(unsafe.Pointer(pC3 + 48)), *(*U32)(unsafe.Pointer(aOffset + uintptr(p22)*4)), uint32(len), pDest)
 	if !(rc != SQLITE_OK) {
-		goto __422
+		goto __423
 	}
 	goto abort_due_to_error
-__422:
+__423:
 	;
 	Xsqlite3VdbeSerialGet(tls, (*Mem)(unsafe.Pointer(pDest)).Fz, *(*U32)(unsafe.Pointer(bp + 288)), pDest)
 	*(*U16)(unsafe.Pointer(pDest + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Ephem))
-__420:
+__421:
 	;
-__412:
+__413:
 	;
 op_column_out:
 	;
-	goto __8
+	goto __9
 
 op_column_corrupt:
 	if !((*Op)(unsafe.Pointer(aOp)).Fp3 > 0) {
-		goto __423
+		goto __424
 	}
 	pOp = aOp + uintptr((*Op)(unsafe.Pointer(aOp)).Fp3-1)*24
-	goto __8
-	goto __424
-__423:
-	rc = Xsqlite3CorruptError(tls, 92777)
-	goto abort_due_to_error
+	goto __9
+	goto __425
 __424:
+	rc = Xsqlite3CorruptError(tls, 93317)
+	goto abort_due_to_error
+__425:
 	;
-__73:
+__74:
 	;
 	pTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	aCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	i2 = 0
-__425:
+__426:
 	if !(i2 < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __427
-	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __428
 	}
-	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_GENERATED != 0) {
 		goto __429
 	}
-	goto __426
-__429:
-	;
-	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+	if !(int32((*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
 		goto __430
 	}
-	pIn1 += 56
-	goto __426
+	goto __427
 __430:
 	;
-__428:
+	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __431
+	}
+	pIn1 += 56
+	goto __427
+__431:
+	;
+__429:
 	;
 	applyAffinity(tls, pIn1, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).Faffinity, encoding)
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Null == 0) {
-		goto __431
+		goto __432
 	}
 	switch int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8)) & 0xf0 >> 4) {
 	case COLTYPE_BLOB:
-		goto __433
-	case COLTYPE_INTEGER:
 		goto __434
-	case COLTYPE_INT:
+	case COLTYPE_INTEGER:
 		goto __435
-	case COLTYPE_TEXT:
+	case COLTYPE_INT:
 		goto __436
-	case COLTYPE_REAL:
+	case COLTYPE_TEXT:
 		goto __437
-	default:
+	case COLTYPE_REAL:
 		goto __438
-	}
-	goto __432
-__433:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
+	default:
 		goto __439
 	}
-	goto vdbe_type_error
-__439:
-	;
-	goto __432
-
+	goto __433
 __434:
-__435:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
 		goto __440
 	}
 	goto vdbe_type_error
 __440:
 	;
-	goto __432
+	goto __433
 
+__435:
 __436:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int == 0) {
 		goto __441
 	}
 	goto vdbe_type_error
 __441:
 	;
-	goto __432
+	goto __433
 
 __437:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Str == 0) {
+		goto __442
+	}
+	goto vdbe_type_error
+__442:
+	;
+	goto __433
+
+__438:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __442
+		goto __443
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __444
+		goto __445
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __445
-__444:
+	goto __446
+__445:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__445:
-	;
-	goto __443
-__442:
-	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
-		goto __446
-	}
-	goto vdbe_type_error
 __446:
 	;
+	goto __444
 __443:
+	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&(MEM_Real|MEM_IntReal) == 0) {
+		goto __447
+	}
+	goto vdbe_type_error
+__447:
 	;
-	goto __432
+__444:
+	;
+	goto __433
 
-__438:
-	goto __432
+__439:
+	goto __433
 
+__433:
+	;
 __432:
 	;
-__431:
-	;
 	pIn1 += 56
-	goto __426
-__426:
-	i2++
-	goto __425
 	goto __427
 __427:
+	i2++
+	goto __426
+	goto __428
+__428:
 	;
-	goto __8
+	goto __9
 
 vdbe_type_error:
-	Xsqlite3VdbeError(tls, p, ts+6845,
+	Xsqlite3VdbeError(tls, p, ts+6835,
 		libc.VaList(bp+56, vdbeMemTypeName(tls, pIn1), Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(aCol + uintptr(i2)*24 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab)).FzName, (*Column)(unsafe.Pointer(aCol+uintptr(i2)*24)).FzCnName))
 	rc = SQLITE_CONSTRAINT | int32(12)<<8
 	goto abort_due_to_error
 
-__74:
+__75:
 	zAffinity = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__447:
+__448:
 	if !(1 != 0) {
-		goto __448
+		goto __449
 	}
 
 	applyAffinity(tls, pIn1, *(*int8)(unsafe.Pointer(zAffinity)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Int != 0) {
-		goto __449
+		goto __450
 	}
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) <= 140737488355327 && *(*I64)(unsafe.Pointer(pIn1)) >= -140737488355328) {
-		goto __450
+		goto __451
 	}
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-	goto __451
-__450:
+	goto __452
+__451:
 	*(*float64)(unsafe.Pointer(pIn1)) = float64(*(*I64)(unsafe.Pointer(pIn1)))
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) |= U16(MEM_Real)
 	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__451:
+__452:
 	;
-__449:
+__450:
 	;
 	zAffinity++
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity))) == 0) {
-		goto __452
+		goto __453
 	}
-	goto __448
-__452:
+	goto __449
+__453:
 	;
 	pIn1 += 56
-	goto __447
-__448:
+	goto __448
+__449:
 	;
-	goto __8
+	goto __9
 
-__75:
+__76:
 	nData = uint64(0)
 	nHdr = 0
 	nZero = int64(0)
@@ -92618,319 +92782,308 @@ __75:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(zAffinity1 != 0) {
-		goto __453
+		goto __454
 	}
 	pRec = pData0
-__454:
+__455:
 	applyAffinity(tls, pRec, *(*int8)(unsafe.Pointer(zAffinity1)), encoding)
 	if !(int32(*(*int8)(unsafe.Pointer(zAffinity1))) == SQLITE_AFF_REAL && int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Int != 0) {
-		goto __457
+		goto __458
 	}
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_IntReal)
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Int))
-__457:
+__458:
 	;
 	zAffinity1++
 	pRec += 56
 
-	goto __455
-__455:
-	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
-		goto __454
-	}
 	goto __456
 __456:
+	if *(*int8)(unsafe.Pointer(zAffinity1)) != 0 {
+		goto __455
+	}
+	goto __457
+__457:
 	;
-__453:
+__454:
 	;
 	pRec = pLast
-__458:
+__459:
 	;
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Null != 0) {
-		goto __461
+		goto __462
 	}
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __463
+		goto __464
 	}
 
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(10)
-	goto __464
-__463:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+	goto __465
 __464:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(0)
+__465:
 	;
 	nHdr++
-	goto __462
-__461:
+	goto __463
+__462:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&(MEM_Int|MEM_IntReal) != 0) {
-		goto __465
+		goto __466
 	}
 
 	i3 = *(*I64)(unsafe.Pointer(pRec))
 
 	if !(i3 < int64(0)) {
-		goto __467
+		goto __468
 	}
 	uu = U64(^i3)
-	goto __468
-__467:
-	uu = U64(i3)
+	goto __469
 __468:
+	uu = U64(i3)
+__469:
 	;
 	nHdr++
 
 	if !(uu <= uint64(127)) {
-		goto __469
+		goto __470
 	}
 	if !(i3&int64(1) == i3 && int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) >= 4) {
-		goto __471
+		goto __472
 	}
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(8) + U32(uu)
-	goto __472
-__471:
+	goto __473
+__472:
 	nData++
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(1)
-__472:
+__473:
 	;
-	goto __470
-__469:
+	goto __471
+__470:
 	if !(uu <= uint64(32767)) {
-		goto __473
+		goto __474
 	}
 	nData = nData + uint64(2)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(2)
-	goto __474
-__473:
+	goto __475
+__474:
 	if !(uu <= uint64(8388607)) {
-		goto __475
+		goto __476
 	}
 	nData = nData + uint64(3)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(3)
-	goto __476
-__475:
+	goto __477
+__476:
 	if !(uu <= uint64(2147483647)) {
-		goto __477
+		goto __478
 	}
 	nData = nData + uint64(4)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(4)
-	goto __478
-__477:
+	goto __479
+__478:
 	if !(uu <= uint64(140737488355327)) {
-		goto __479
+		goto __480
 	}
 	nData = nData + uint64(6)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(5)
-	goto __480
-__479:
+	goto __481
+__480:
 	nData = nData + uint64(8)
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_IntReal != 0) {
-		goto __481
+		goto __482
 	}
 
 	*(*float64)(unsafe.Pointer(pRec)) = float64(*(*I64)(unsafe.Pointer(pRec)))
 	*(*U16)(unsafe.Pointer(pRec + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_IntReal))
 	*(*U16)(unsafe.Pointer(pRec + 20)) |= U16(MEM_Real)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __482
-__481:
-	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+	goto __483
 __482:
+	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(6)
+__483:
 	;
-__480:
+__481:
 	;
-__478:
+__479:
 	;
-__476:
+__477:
 	;
-__474:
+__475:
 	;
-__470:
+__471:
 	;
-	goto __466
-__465:
+	goto __467
+__466:
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Real != 0) {
-		goto __483
+		goto __484
 	}
 	nHdr++
 	nData = nData + uint64(8)
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = U32(7)
-	goto __484
-__483:
+	goto __485
+__484:
 	;
 	len1 = U32((*Mem)(unsafe.Pointer(pRec)).Fn)
 	serial_type = len1*U32(2) + U32(12) + U32(libc.Bool32(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Str != 0))
 	if !(int32((*Mem)(unsafe.Pointer(pRec)).Fflags)&MEM_Zero != 0) {
-		goto __485
+		goto __486
 	}
 	serial_type = serial_type + U32(*(*int32)(unsafe.Pointer(pRec))*2)
 	if !(nData != 0) {
-		goto __486
+		goto __487
 	}
 	if !(Xsqlite3VdbeMemExpandBlob(tls, pRec) != 0) {
-		goto __488
+		goto __489
 	}
 	goto no_mem
-__488:
+__489:
 	;
 	len1 = len1 + U32(*(*int32)(unsafe.Pointer(pRec)))
-	goto __487
-__486:
-	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+	goto __488
 __487:
+	nZero = nZero + I64(*(*int32)(unsafe.Pointer(pRec)))
+__488:
 	;
-__485:
+__486:
 	;
 	nData = nData + U64(len1)
 	nHdr = nHdr + Xsqlite3VarintLen(tls, uint64(serial_type))
 	(*Mem)(unsafe.Pointer(pRec)).FuTemp = serial_type
-__484:
+__485:
 	;
-__466:
+__467:
 	;
-__462:
+__463:
 	;
 	if !(pRec == pData0) {
-		goto __489
+		goto __490
 	}
-	goto __460
-__489:
+	goto __461
+__490:
 	;
 	pRec -= 56
-	goto __459
-__459:
-	if 1 != 0 {
-		goto __458
-	}
 	goto __460
 __460:
+	if 1 != 0 {
+		goto __459
+	}
+	goto __461
+__461:
 	;
 	if !(nHdr <= 126) {
-		goto __490
+		goto __491
 	}
 
 	nHdr = nHdr + 1
-	goto __491
-__490:
+	goto __492
+__491:
 	nVarint = Xsqlite3VarintLen(tls, uint64(nHdr))
 	nHdr = nHdr + nVarint
 	if !(nVarint < Xsqlite3VarintLen(tls, uint64(nHdr))) {
-		goto __492
+		goto __493
 	}
 	nHdr++
-__492:
+__493:
 	;
-__491:
+__492:
 	;
 	nByte1 = I64(U64(nHdr) + nData)
 
 	if !(nByte1+nZero <= I64((*Mem)(unsafe.Pointer(pOut)).FszMalloc)) {
-		goto __493
+		goto __494
 	}
 
 	(*Mem)(unsafe.Pointer(pOut)).Fz = (*Mem)(unsafe.Pointer(pOut)).FzMalloc
-	goto __494
-__493:
+	goto __495
+__494:
 	if !(nByte1+nZero > I64(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __495
-	}
-	goto too_big
-__495:
-	;
-	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
 		goto __496
 	}
-	goto no_mem
+	goto too_big
 __496:
 	;
-__494:
+	if !(Xsqlite3VdbeMemClearAndResize(tls, pOut, int32(nByte1)) != 0) {
+		goto __497
+	}
+	goto no_mem
+__497:
+	;
+__495:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fn = int32(nByte1)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Blob)
 	if !(nZero != 0) {
-		goto __497
+		goto __498
 	}
 	*(*int32)(unsafe.Pointer(pOut)) = int32(nZero)
 	*(*U16)(unsafe.Pointer(pOut + 20)) |= U16(MEM_Zero)
-__497:
+__498:
 	;
 	zHdr1 = (*Mem)(unsafe.Pointer(pOut)).Fz
 	zPayload = zHdr1 + uintptr(nHdr)
 
 	if !(nHdr < 0x80) {
-		goto __498
+		goto __499
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(nHdr)
-	goto __499
-__498:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+	goto __500
 __499:
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(nHdr)))
+__500:
 	;
 	pRec = pData0
-__500:
+__501:
 	if !(1 != 0) {
-		goto __501
+		goto __502
 	}
 	serial_type = (*Mem)(unsafe.Pointer(pRec)).FuTemp
 
 	if !(serial_type <= U32(7)) {
-		goto __502
+		goto __503
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type == U32(0)) {
-		goto __504
+		goto __505
 	}
 
-	goto __505
-__504:
+	goto __506
+__505:
 	if !(serial_type == U32(7)) {
-		goto __506
+		goto __507
 	}
 
 	libc.Xmemcpy(tls, bp+296, pRec, uint64(unsafe.Sizeof(U64(0))))
 
-	goto __507
-__506:
-	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+	goto __508
 __507:
+	*(*U64)(unsafe.Pointer(bp + 296)) = U64(*(*I64)(unsafe.Pointer(pRec)))
+__508:
 	;
 	len1 = libc.AssignUint32(&i4, U32(Xsqlite3SmallTypeSizes[serial_type]))
 
-__508:
+__509:
 	if !(1 != 0) {
-		goto __509
+		goto __510
 	}
 	*(*U8)(unsafe.Pointer(zPayload + uintptr(libc.PreDecUint32(&i4, 1)))) = U8(*(*U64)(unsafe.Pointer(bp + 296)) & uint64(0xFF))
 	if !(i4 == U32(0)) {
-		goto __510
+		goto __511
 	}
+	goto __510
+__511:
+	;
+	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
 	goto __509
 __510:
-	;
-	*(*U64)(unsafe.Pointer(bp + 296)) >>= 8
-	goto __508
-__509:
 	;
 	zPayload += uintptr(len1)
-__505:
+__506:
 	;
-	goto __503
-__502:
+	goto __504
+__503:
 	if !(serial_type < U32(0x80)) {
-		goto __511
+		goto __512
 	}
 	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&zHdr1, 1))) = U8(serial_type)
 	if !(serial_type >= U32(14) && (*Mem)(unsafe.Pointer(pRec)).Fn > 0) {
-		goto __513
-	}
-
-	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
-	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
-__513:
-	;
-	goto __512
-__511:
-	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
-	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __514
 	}
 
@@ -92938,467 +93091,478 @@ __511:
 	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __514:
 	;
+	goto __513
 __512:
-	;
-__503:
-	;
-	if !(pRec == pLast) {
+	zHdr1 += uintptr(Xsqlite3PutVarint(tls, zHdr1, uint64(serial_type)))
+	if !((*Mem)(unsafe.Pointer(pRec)).Fn != 0) {
 		goto __515
 	}
-	goto __501
+
+	libc.Xmemcpy(tls, zPayload, (*Mem)(unsafe.Pointer(pRec)).Fz, uint64((*Mem)(unsafe.Pointer(pRec)).Fn))
+	zPayload += uintptr((*Mem)(unsafe.Pointer(pRec)).Fn)
 __515:
 	;
-	pRec += 56
-	goto __500
-__501:
+__513:
 	;
-	goto __8
+__504:
+	;
+	if !(pRec == pLast) {
+		goto __516
+	}
+	goto __502
+__516:
+	;
+	pRec += 56
+	goto __501
+__502:
+	;
+	goto __9
 
-__76:
+__77:
 	;
 	pCrsr1 = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) + 48))
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __516
+		goto __517
 	}
 	*(*I64)(unsafe.Pointer(bp + 304)) = Xsqlite3BtreeRowCountEst(tls, pCrsr1)
-	goto __517
-__516:
+	goto __518
+__517:
 	*(*I64)(unsafe.Pointer(bp + 304)) = int64(0)
 	rc = Xsqlite3BtreeCount(tls, db, pCrsr1, bp+304)
 	if !(rc != 0) {
-		goto __518
+		goto __519
 	}
 	goto abort_due_to_error
-__518:
+__519:
 	;
-__517:
+__518:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 304))
 	goto check_for_interrupt
 
-__77:
+__78:
 	p12 = (*Op)(unsafe.Pointer(pOp)).Fp1
 	zName = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	if !(p12 == SAVEPOINT_BEGIN) {
-		goto __519
+		goto __520
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __521
+		goto __522
 	}
 
-	Xsqlite3VdbeError(tls, p, ts+6886, 0)
+	Xsqlite3VdbeError(tls, p, ts+6876, 0)
 	rc = SQLITE_BUSY
-	goto __522
-__521:
+	goto __523
+__522:
 	nName = Xsqlite3Strlen30(tls, zName)
 
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN,
 		(*Sqlite3)(unsafe.Pointer(db)).FnStatement+(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __523
+		goto __524
 	}
 	goto abort_due_to_error
-__523:
+__524:
 	;
 	pNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Savepoint{}))+uint64(nName)+uint64(1))
 	if !(pNew != 0) {
-		goto __524
+		goto __525
 	}
 	(*Savepoint)(unsafe.Pointer(pNew)).FzName = pNew + 1*32
 	libc.Xmemcpy(tls, (*Savepoint)(unsafe.Pointer(pNew)).FzName, zName, uint64(nName+1))
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FautoCommit != 0) {
-		goto __525
+		goto __526
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(1)
-	goto __526
-__525:
-	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+	goto __527
 __526:
+	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint++
+__527:
 	;
 	(*Savepoint)(unsafe.Pointer(pNew)).FpNext = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = pNew
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Savepoint)(unsafe.Pointer(pNew)).FnDeferredImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__524:
+__525:
 	;
-__522:
+__523:
 	;
-	goto __520
-__519:
+	goto __521
+__520:
 	;
 	iSavepoint = 0
 
 	pSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
-__527:
-	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
-		goto __529
-	}
-	iSavepoint++
-	goto __528
 __528:
-	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
-	goto __527
-	goto __529
-__529:
-	;
-	if !!(pSavepoint != 0) {
+	if !(pSavepoint != 0 && Xsqlite3StrICmp(tls, (*Savepoint)(unsafe.Pointer(pSavepoint)).FzName, zName) != 0) {
 		goto __530
 	}
-	Xsqlite3VdbeError(tls, p, ts+6937, libc.VaList(bp+88, zName))
-	rc = SQLITE_ERROR
-	goto __531
+	iSavepoint++
+	goto __529
+__529:
+	pSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
+	goto __528
+	goto __530
 __530:
+	;
+	if !!(pSavepoint != 0) {
+		goto __531
+	}
+	Xsqlite3VdbeError(tls, p, ts+6927, libc.VaList(bp+88, zName))
+	rc = SQLITE_ERROR
+	goto __532
+__531:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __532
+		goto __533
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+6959, 0)
+		ts+6949, 0)
 	rc = SQLITE_BUSY
-	goto __533
-__532:
+	goto __534
+__533:
 	isTransaction = libc.Bool32((*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext == uintptr(0) && (*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint != 0)
 	if !(isTransaction != 0 && p12 == SAVEPOINT_RELEASE) {
-		goto __534
+		goto __535
 	}
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __536
+		goto __537
 	}
 	goto vdbe_return
-__536:
+__537:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __537
+		goto __538
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__537:
+__538:
 	;
 	rc = (*Vdbe)(unsafe.Pointer(p)).Frc
 	if !(rc != 0) {
-		goto __538
+		goto __539
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(0)
-	goto __539
-__538:
-	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+	goto __540
 __539:
+	(*Sqlite3)(unsafe.Pointer(db)).FisTransactionSavepoint = U8(0)
+__540:
 	;
-	goto __535
-__534:
+	goto __536
+__535:
 	iSavepoint = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint - iSavepoint - 1
 	if !(p12 == SAVEPOINT_ROLLBACK) {
-		goto __540
+		goto __541
 	}
 	isSchemaChange = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_SchemaChange) != U32(0))
 	ii = 0
-__542:
+__543:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __544
+		goto __545
 	}
 	rc = Xsqlite3BtreeTripAllCursors(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt,
 		SQLITE_ABORT|int32(2)<<8,
 		libc.Bool32(isSchemaChange == 0))
 	if !(rc != SQLITE_OK) {
-		goto __545
+		goto __546
 	}
 	goto abort_due_to_error
-__545:
+__546:
 	;
-	goto __543
-__543:
-	ii++
-	goto __542
 	goto __544
 __544:
+	ii++
+	goto __543
+	goto __545
+__545:
 	;
-	goto __541
-__540:
-	;
-	isSchemaChange = 0
+	goto __542
 __541:
+	;
+	isSchemaChange = 0
+__542:
 	;
 	ii = 0
-__546:
+__547:
 	if !(ii < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __548
+		goto __549
 	}
 	rc = Xsqlite3BtreeSavepoint(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii)*32)).FpBt, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __549
+		goto __550
 	}
 	goto abort_due_to_error
-__549:
+__550:
 	;
-	goto __547
-__547:
-	ii++
-	goto __546
 	goto __548
 __548:
+	ii++
+	goto __547
+	goto __549
+__549:
 	;
 	if !(isSchemaChange != 0) {
-		goto __550
+		goto __551
 	}
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
-__550:
-	;
-__535:
-	;
-	if !(rc != 0) {
-		goto __551
-	}
-	goto abort_due_to_error
 __551:
 	;
+__536:
+	;
+	if !(rc != 0) {
+		goto __552
+	}
+	goto abort_due_to_error
 __552:
+	;
+__553:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FpSavepoint != pSavepoint) {
-		goto __553
+		goto __554
 	}
 	pTmp = (*Sqlite3)(unsafe.Pointer(db)).FpSavepoint
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pTmp)).FpNext
 	Xsqlite3DbFree(tls, db, pTmp)
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-	goto __552
-__553:
+	goto __553
+__554:
 	;
 	if !(p12 == SAVEPOINT_RELEASE) {
-		goto __554
+		goto __555
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FpSavepoint = (*Savepoint)(unsafe.Pointer(pSavepoint)).FpNext
 	Xsqlite3DbFree(tls, db, pSavepoint)
 	if !!(isTransaction != 0) {
-		goto __556
+		goto __557
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnSavepoint--
-__556:
+__557:
 	;
-	goto __555
-__554:
+	goto __556
+__555:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredCons
 	(*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons = (*Savepoint)(unsafe.Pointer(pSavepoint)).FnDeferredImmCons
-__555:
+__556:
 	;
 	if !(!(isTransaction != 0) || p12 == SAVEPOINT_ROLLBACK) {
-		goto __557
+		goto __558
 	}
 	rc = Xsqlite3VtabSavepoint(tls, db, p12, iSavepoint)
 	if !(rc != SQLITE_OK) {
-		goto __558
-	}
-	goto abort_due_to_error
-__558:
-	;
-__557:
-	;
-__533:
-	;
-__531:
-	;
-__520:
-	;
-	if !(rc != 0) {
 		goto __559
 	}
 	goto abort_due_to_error
 __559:
 	;
-	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+__558:
+	;
+__534:
+	;
+__532:
+	;
+__521:
+	;
+	if !(rc != 0) {
 		goto __560
 	}
+	goto abort_due_to_error
+__560:
+	;
+	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_HALT_STATE) {
+		goto __561
+	}
 	rc = SQLITE_DONE
 	goto vdbe_return
-__560:
+__561:
 	;
-	goto __8
+	goto __9
 
-__78:
+__79:
 	desiredAutoCommit = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iRollback = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !(desiredAutoCommit != int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit)) {
-		goto __561
+		goto __562
 	}
 	if !(iRollback != 0) {
-		goto __563
+		goto __564
 	}
 
 	Xsqlite3RollbackAll(tls, db, SQLITE_ABORT|int32(2)<<8)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1)
-	goto __564
-__563:
+	goto __565
+__564:
 	if !(desiredAutoCommit != 0 && (*Sqlite3)(unsafe.Pointer(db)).FnVdbeWrite > 0) {
-		goto __565
+		goto __566
 	}
 
 	Xsqlite3VdbeError(tls, p,
-		ts+7013, 0)
+		ts+7003, 0)
 	rc = SQLITE_BUSY
 	goto abort_due_to_error
-	goto __566
-__565:
+	goto __567
+__566:
 	if !(libc.AssignInt32(&rc, Xsqlite3VdbeCheckFk(tls, p, 1)) != SQLITE_OK) {
-		goto __567
+		goto __568
 	}
 	goto vdbe_return
-	goto __568
-__567:
-	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+	goto __569
 __568:
+	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(desiredAutoCommit)
+__569:
 	;
-__566:
+__567:
 	;
-__564:
+__565:
 	;
 	if !(Xsqlite3VdbeHalt(tls, p) == SQLITE_BUSY) {
-		goto __569
+		goto __570
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Sqlite3)(unsafe.Pointer(db)).FautoCommit = U8(1 - desiredAutoCommit)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = libc.AssignInt32(&rc, SQLITE_BUSY)
 	goto vdbe_return
-__569:
+__570:
 	;
 	Xsqlite3CloseSavepoints(tls, db)
 	if !((*Vdbe)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
-		goto __570
+		goto __571
 	}
 	rc = SQLITE_DONE
-	goto __571
-__570:
-	rc = SQLITE_ERROR
+	goto __572
 __571:
+	rc = SQLITE_ERROR
+__572:
 	;
 	goto vdbe_return
-	goto __562
-__561:
+	goto __563
+__562:
 	Xsqlite3VdbeError(tls, p,
 		func() uintptr {
 			if !(desiredAutoCommit != 0) {
-				return ts + 7068
+				return ts + 7058
 			}
 			return func() uintptr {
 				if iRollback != 0 {
-					return ts + 7116
+					return ts + 7106
 				}
-				return ts + 7159
+				return ts + 7149
 			}()
 		}(), 0)
 
 	rc = SQLITE_ERROR
 	goto abort_due_to_error
-__562:
+__563:
 	;
-__79:
+__80:
 	*(*int32)(unsafe.Pointer(bp + 312)) = 0
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&(uint64(SQLITE_QueryOnly)|uint64(0x00002)<<32) != uint64(0)) {
-		goto __572
+		goto __573
 	}
 	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_QueryOnly) != 0) {
-		goto __573
+		goto __574
 	}
 
 	rc = SQLITE_READONLY
-	goto __574
-__573:
-	rc = SQLITE_CORRUPT
+	goto __575
 __574:
+	rc = SQLITE_CORRUPT
+__575:
 	;
 	goto abort_due_to_error
-__572:
+__573:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 	pBt = (*Db)(unsafe.Pointer(pDb)).FpBt
 
 	if !(pBt != 0) {
-		goto __575
+		goto __576
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, pBt, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+312)
 
 	if !(rc != SQLITE_OK) {
-		goto __576
+		goto __577
 	}
 	if !(rc&0xff == SQLITE_BUSY) {
-		goto __577
+		goto __578
 	}
 	(*Vdbe)(unsafe.Pointer(p)).Fpc = int32((int64(pOp) - int64(aOp)) / 24)
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	goto vdbe_return
-__577:
+__578:
 	;
 	goto abort_due_to_error
-__576:
+__577:
 	;
 	if !(Bft(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x20>>5)) != 0 &&
 		(*Op)(unsafe.Pointer(pOp)).Fp2 != 0 &&
 		(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0 || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1)) {
-		goto __578
+		goto __579
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FiStatement == 0) {
-		goto __579
+		goto __580
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).FnStatement++
 	(*Vdbe)(unsafe.Pointer(p)).FiStatement = (*Sqlite3)(unsafe.Pointer(db)).FnSavepoint + (*Sqlite3)(unsafe.Pointer(db)).FnStatement
-__579:
+__580:
 	;
 	rc = Xsqlite3VtabSavepoint(tls, db, SAVEPOINT_BEGIN, (*Vdbe)(unsafe.Pointer(p)).FiStatement-1)
 	if !(rc == SQLITE_OK) {
-		goto __580
+		goto __581
 	}
 	rc = Xsqlite3BtreeBeginStmt(tls, pBt, (*Vdbe)(unsafe.Pointer(p)).FiStatement)
-__580:
+__581:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons
 	(*Vdbe)(unsafe.Pointer(p)).FnStmtDefImmCons = (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons
-__578:
+__579:
 	;
-__575:
+__576:
 	;
 	if !(rc == SQLITE_OK &&
 		(*Op)(unsafe.Pointer(pOp)).Fp5 != 0 &&
 		(*(*int32)(unsafe.Pointer(bp + 312)) != (*Op)(unsafe.Pointer(pOp)).Fp3 || (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FiGeneration != *(*int32)(unsafe.Pointer(pOp + 16)))) {
-		goto __581
+		goto __582
 	}
 
 	Xsqlite3DbFree(tls, db, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg)
-	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+7200)
+	(*Vdbe)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3DbStrDup(tls, db, ts+7190)
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpSchema)).Fschema_cookie != *(*int32)(unsafe.Pointer(bp + 312))) {
-		goto __582
+		goto __583
 	}
 	Xsqlite3ResetOneSchema(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-__582:
+__583:
 	;
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(1), 0, 0x3)
 	rc = SQLITE_SCHEMA
 
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 4, 0x10)
-__581:
+__582:
 	;
 	if !(rc != 0) {
-		goto __583
+		goto __584
 	}
 	goto abort_due_to_error
-__583:
+__584:
 	;
-	goto __8
+	goto __9
 
-__80:
+__81:
 	;
 	iDb = (*Op)(unsafe.Pointer(pOp)).Fp1
 	iCookie = (*Op)(unsafe.Pointer(pOp)).Fp3
@@ -93406,67 +93570,67 @@ __80:
 	Xsqlite3BtreeGetMeta(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt, iCookie, bp+316)
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 316)))
-	goto __8
+	goto __9
 
-__81:
+__82:
 	;
 	pDb1 = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32
 
 	rc = Xsqlite3BtreeUpdateMeta(tls, (*Db)(unsafe.Pointer(pDb1)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, uint32((*Op)(unsafe.Pointer(pOp)).Fp3))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_SCHEMA_VERSION) {
-		goto __584
+		goto __585
 	}
 
 	*(*U32)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)) = *(*U32)(unsafe.Pointer(pOp + 12)) - U32((*Op)(unsafe.Pointer(pOp)).Fp5)
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	Xsqlite3FkClearTriggerCache(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
-	goto __585
-__584:
+	goto __586
+__585:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == BTREE_FILE_FORMAT) {
-		goto __586
+		goto __587
 	}
 
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb1)).FpSchema)).Ffile_format = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
+__587:
+	;
 __586:
 	;
-__585:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 == 1) {
-		goto __587
+		goto __588
 	}
 
 	Xsqlite3ExpirePreparedStatements(tls, db, 0)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-__587:
-	;
-	if !(rc != 0) {
-		goto __588
-	}
-	goto abort_due_to_error
 __588:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __589
+	}
+	goto abort_due_to_error
+__589:
+	;
+	goto __9
 
-__82:
+__83:
 	;
 	pCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCur != 0 && (*VdbeCursor)(unsafe.Pointer(pCur)).FpgnoRoot == U32((*Op)(unsafe.Pointer(pOp)).Fp2)) {
-		goto __589
+		goto __590
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)))
 	goto open_cursor_set_hints
-__589:
+__590:
 	;
-__83:
 __84:
+__85:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(p + 200))&0x3>>0) == 1) {
-		goto __590
+		goto __591
 	}
 	rc = SQLITE_ABORT | int32(2)<<8
 	goto abort_due_to_error
-__590:
+__591:
 	;
 	nField1 = 0
 	pKeyInfo1 = uintptr(0)
@@ -93477,24 +93641,24 @@ __590:
 	pX = (*Db)(unsafe.Pointer(pDb2)).FpBt
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_OpenWrite) {
-		goto __591
+		goto __592
 	}
 
 	wrFlag = BTREE_WRCSR | int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_FORDELETE
 
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format) < int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat)) {
-		goto __593
+		goto __594
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat = (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb2)).FpSchema)).Ffile_format
+__594:
+	;
+	goto __593
+__592:
+	wrFlag = 0
 __593:
-	;
-	goto __592
-__591:
-	wrFlag = 0
-__592:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_P2ISREG != 0) {
-		goto __594
+		goto __595
 	}
 
 	pIn2 = aMem + uintptr(p23)*56
@@ -93502,30 +93666,30 @@ __592:
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	p23 = U32(int32(*(*I64)(unsafe.Pointer(pIn2))))
 
-__594:
+__595:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -8) {
-		goto __595
+		goto __596
 	}
 	pKeyInfo1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	nField1 = int32((*KeyInfo)(unsafe.Pointer(pKeyInfo1)).FnAllField)
-	goto __596
-__595:
+	goto __597
+__596:
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -3) {
-		goto __597
+		goto __598
 	}
 	nField1 = *(*int32)(unsafe.Pointer(pOp + 16))
-__597:
+__598:
 	;
-__596:
+__597:
 	;
 	pCur = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, nField1, uint8(CURTYPE_BTREE))
 	if !(pCur == uintptr(0)) {
-		goto __598
+		goto __599
 	}
 	goto no_mem
-__598:
+__599:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FiDb = I8(iDb1)
 	(*VdbeCursor)(unsafe.Pointer(pCur)).FnullRow = U8(1)
@@ -93541,22 +93705,22 @@ open_cursor_set_hints:
 	Xsqlite3BtreeCursorHintFlags(tls, *(*uintptr)(unsafe.Pointer(pCur + 48)),
 		uint32(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_BULKCSR|OPFLAG_SEEKEQ)))
 	if !(rc != 0) {
-		goto __599
+		goto __600
 	}
 	goto abort_due_to_error
-__599:
+__600:
 	;
-	goto __8
+	goto __9
 
-__85:
+__86:
 	pOrig = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
 
 	pCx = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, int32((*VdbeCursor)(unsafe.Pointer(pOrig)).FnField), uint8(CURTYPE_BTREE))
 	if !(pCx == uintptr(0)) {
-		goto __600
+		goto __601
 	}
 	goto no_mem
-__600:
+__601:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx)).FnullRow = U8(1)
 	libc.SetBitFieldPtr8Uint32(pCx+8, Bool(1), 0, 0x1)
@@ -93570,133 +93734,133 @@ __600:
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx + 16)), (*VdbeCursor)(unsafe.Pointer(pCx)).FpgnoRoot, BTREE_WRCSR,
 		(*VdbeCursor)(unsafe.Pointer(pCx)).FpKeyInfo, *(*uintptr)(unsafe.Pointer(pCx + 48)))
 
-	goto __8
+	goto __9
 
-__86:
 __87:
+__88:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __601
+		goto __602
 	}
 
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fn = 0
 	(*Mem)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)).Fz = ts + 1544
-__601:
+__602:
 	;
 	pCx1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pCx1 != 0 && !(int32(*(*uint8)(unsafe.Pointer(pCx1 + 8))&0x8>>3) != 0) && (*Op)(unsafe.Pointer(pOp)).Fp2 <= int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FnField)) {
-		goto __602
+		goto __603
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FseqCount = int64(0)
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FcacheStatus = U32(CACHE_STALE)
 	rc = Xsqlite3BtreeClearTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), int32((*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot), uintptr(0))
-	goto __603
-__602:
+	goto __604
+__603:
 	pCx1 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_BTREE))
 	if !(pCx1 == uintptr(0)) {
-		goto __604
+		goto __605
 	}
 	goto no_mem
-__604:
+__605:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(1), 0, 0x1)
 	rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, pCx1+16,
 		BTREE_OMIT_JOURNAL|BTREE_SINGLE|int32((*Op)(unsafe.Pointer(pOp)).Fp5),
 		vfsFlags)
 	if !(rc == SQLITE_OK) {
-		goto __605
+		goto __606
 	}
 	rc = Xsqlite3BtreeBeginTrans(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), 1, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __606
+		goto __607
 	}
 
 	if !(libc.AssignPtrUintptr(pCx1+56, libc.AssignUintptr(&pKeyInfo2, *(*uintptr)(unsafe.Pointer(pOp + 16)))) != uintptr(0)) {
-		goto __607
+		goto __608
 	}
 
 	rc = Xsqlite3BtreeCreateTable(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), pCx1+68,
 		BTREE_BLOBKEY|int32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	if !(rc == SQLITE_OK) {
-		goto __609
+		goto __610
 	}
 
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), (*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot, BTREE_WRCSR,
 		pKeyInfo2, *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
-__609:
+__610:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(0)
-	goto __608
-__607:
+	goto __609
+__608:
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FpgnoRoot = Pgno(SCHEMA_ROOT)
 	rc = Xsqlite3BtreeCursor(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)), uint32(SCHEMA_ROOT), BTREE_WRCSR,
 		uintptr(0), *(*uintptr)(unsafe.Pointer(pCx1 + 48)))
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FisTable = U8(1)
-__608:
+__609:
 	;
-__606:
+__607:
 	;
 	libc.SetBitFieldPtr8Uint32(pCx1+8, Bool(libc.Bool32(int32((*Op)(unsafe.Pointer(pOp)).Fp5) != BTREE_UNORDERED)), 2, 0x4)
-	if !(rc != 0) {
-		goto __610
-	}
-	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
-__610:
-	;
-__605:
-	;
-__603:
-	;
 	if !(rc != 0) {
 		goto __611
 	}
-	goto abort_due_to_error
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(pCx1 + 16)))
 __611:
 	;
+__606:
+	;
+__604:
+	;
+	if !(rc != 0) {
+		goto __612
+	}
+	goto abort_due_to_error
+__612:
+	;
 	(*VdbeCursor)(unsafe.Pointer(pCx1)).FnullRow = U8(1)
-	goto __8
+	goto __9
 
-__88:
+__89:
 	;
 	pCx2 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, uint8(CURTYPE_SORTER))
 	if !(pCx2 == uintptr(0)) {
-		goto __612
+		goto __613
 	}
 	goto no_mem
-__612:
+__613:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx2)).FpKeyInfo = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	rc = Xsqlite3VdbeSorterInit(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp3, pCx2)
 	if !(rc != 0) {
-		goto __613
+		goto __614
 	}
 	goto abort_due_to_error
-__613:
+__614:
 	;
-	goto __8
+	goto __9
 
-__89:
+__90:
 	;
 	pC4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(pC4)).FseqCount, 1) == int64(0)) {
-		goto __614
+		goto __615
 	}
 	goto jump_to_p2
-__614:
+__615:
 	;
-	goto __8
+	goto __9
 
-__90:
+__91:
 	;
 	pCx3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp3, uint8(CURTYPE_PSEUDO))
 	if !(pCx3 == uintptr(0)) {
-		goto __615
+		goto __616
 	}
 	goto no_mem
-__615:
+__616:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pCx3)).FseekResult = (*Op)(unsafe.Pointer(pOp)).Fp2
@@ -93704,18 +93868,18 @@ __615:
 
 	*(*uintptr)(unsafe.Pointer(pCx3 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
 
-	goto __8
+	goto __9
 
-__91:
+__92:
 	;
 	Xsqlite3VdbeFreeCursor(tls, p, *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))
 	*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)) = uintptr(0)
-	goto __8
+	goto __9
 
-__92:
 __93:
 __94:
 __95:
+__96:
 	;
 	pC5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -93726,92 +93890,92 @@ __95:
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FcacheStatus = U32(CACHE_STALE)
 	if !((*VdbeCursor)(unsafe.Pointer(pC5)).FisTable != 0) {
-		goto __616
+		goto __617
 	}
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	flags31 = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	if !(int32(flags31)&(MEM_Int|MEM_Real|MEM_IntReal|MEM_Str) == MEM_Str) {
-		goto __618
+		goto __619
 	}
 	applyNumericAffinity(tls, pIn3, 0)
-__618:
+__619:
 	;
 	iKey = Xsqlite3VdbeIntValue(tls, pIn3)
 	newType = (*Mem)(unsafe.Pointer(pIn3)).Fflags
 	(*Mem)(unsafe.Pointer(pIn3)).Fflags = flags31
 
 	if !(int32(newType)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __619
-	}
-	if !(int32(newType)&MEM_Real == 0) {
 		goto __620
 	}
-	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+	if !(int32(newType)&MEM_Real == 0) {
 		goto __621
 	}
+	if !(int32(newType)&MEM_Null != 0 || oc >= OP_SeekGE) {
+		goto __622
+	}
 
 	goto jump_to_p2
-	goto __622
-__621:
+	goto __623
+__622:
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __623
+		goto __624
 	}
 	goto abort_due_to_error
-__623:
+__624:
 	;
 	goto seek_not_found
-__622:
+__623:
 	;
-__620:
+__621:
 	;
 	c2 = Xsqlite3IntFloatCompare(tls, iKey, *(*float64)(unsafe.Pointer(pIn3)))
 
 	if !(c2 > 0) {
-		goto __624
+		goto __625
 	}
 
 	if !(oc&0x0001 == OP_SeekGT&0x0001) {
-		goto __626
+		goto __627
 	}
 	oc--
-__626:
+__627:
 	;
-	goto __625
-__624:
+	goto __626
+__625:
 	if !(c2 < 0) {
-		goto __627
+		goto __628
 	}
 
 	if !(oc&0x0001 == OP_SeekLT&0x0001) {
-		goto __628
+		goto __629
 	}
 	oc++
+__629:
+	;
 __628:
 	;
-__627:
+__626:
 	;
-__625:
-	;
-__619:
+__620:
 	;
 	rc = Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), int64(U64(iKey)), 0, bp+320)
 	(*VdbeCursor)(unsafe.Pointer(pC5)).FmovetoTarget = iKey
 	if !(rc != SQLITE_OK) {
-		goto __629
+		goto __630
 	}
 	goto abort_due_to_error
-__629:
+__630:
 	;
-	goto __617
-__616:
+	goto __618
+__617:
 	if !(Xsqlite3BtreeCursorHasHint(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), uint32(BTREE_SEEK_EQ)) != 0) {
-		goto __630
+		goto __631
 	}
 	eqOnly = 1
 
-__630:
+__631:
 	;
 	nField2 = *(*int32)(unsafe.Pointer(pOp + 16))
 
@@ -93829,106 +93993,106 @@ __630:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 328)).FeqSeen = U8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), bp+328, bp+320)
 	if !(rc != SQLITE_OK) {
-		goto __631
+		goto __632
 	}
 	goto abort_due_to_error
-__631:
+__632:
 	;
 	if !(eqOnly != 0 && int32((*UnpackedRecord)(unsafe.Pointer(bp+328)).FeqSeen) == 0) {
-		goto __632
+		goto __633
 	}
 
 	goto seek_not_found
-__632:
+__633:
 	;
-__617:
+__618:
 	;
 	if !(oc >= OP_SeekGE) {
-		goto __633
+		goto __634
 	}
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) < 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekGT) {
-		goto __635
+		goto __636
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __637
+		goto __638
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __638
+		goto __639
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __639
-__638:
-	goto abort_due_to_error
+	goto __640
 __639:
+	goto abort_due_to_error
+__640:
 	;
+__638:
+	;
+	goto __637
+__636:
+	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 __637:
 	;
-	goto __636
-__635:
-	*(*int32)(unsafe.Pointer(bp + 320)) = 0
-__636:
-	;
-	goto __634
-__633:
+	goto __635
+__634:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) > 0 || *(*int32)(unsafe.Pointer(bp + 320)) == 0 && oc == OP_SeekLT) {
-		goto __640
+		goto __641
 	}
 	*(*int32)(unsafe.Pointer(bp + 320)) = 0
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)), 0)
 	if !(rc != SQLITE_OK) {
-		goto __642
+		goto __643
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __643
+		goto __644
 	}
 	rc = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 320)) = 1
-	goto __644
-__643:
-	goto abort_due_to_error
+	goto __645
 __644:
+	goto abort_due_to_error
+__645:
 	;
+__643:
+	;
+	goto __642
+__641:
+	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
 __642:
 	;
-	goto __641
-__640:
-	*(*int32)(unsafe.Pointer(bp + 320)) = Xsqlite3BtreeEof(tls, *(*uintptr)(unsafe.Pointer(pC5 + 48)))
-__641:
-	;
-__634:
+__635:
 	;
 seek_not_found:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 320)) != 0) {
-		goto __645
+		goto __646
 	}
 	goto jump_to_p2
-	goto __646
-__645:
+	goto __647
+__646:
 	if !(eqOnly != 0) {
-		goto __647
+		goto __648
 	}
 
 	pOp += 24
+__648:
+	;
 __647:
 	;
-__646:
-	;
-	goto __8
+	goto __9
 
-__96:
+__97:
 	;
 	pC6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp1)*8))
 
 	if !!(Xsqlite3BtreeCursorIsValidNN(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48))) != 0) {
-		goto __648
+		goto __649
 	}
-	goto __8
-__648:
+	goto __9
+__649:
 	;
 	nStep = (*Op)(unsafe.Pointer(pOp)).Fp1
 
@@ -93937,108 +94101,108 @@ __648:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).Fdefault_rc = int8(0)
 	(*UnpackedRecord)(unsafe.Pointer(bp + 368)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp+1*24)).Fp3)*56
 	*(*int32)(unsafe.Pointer(bp + 408)) = 0
-__649:
+__650:
 	if !(1 != 0) {
-		goto __650
+		goto __651
 	}
 	rc = Xsqlite3VdbeIdxKeyCompare(tls, db, pC6, bp+368, bp+408)
 	if !(rc != 0) {
-		goto __651
+		goto __652
 	}
 	goto abort_due_to_error
-__651:
+__652:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 408)) > 0 && int32((*Op)(unsafe.Pointer(pOp)).Fp5) == 0) {
-		goto __652
+		goto __653
 	}
 seekscan_search_fail:
 	;
 	pOp += 24
 	goto jump_to_p2
-__652:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
-		goto __653
-	}
-
-	goto jump_to_p2
-	goto __650
 __653:
 	;
-	if !(nStep <= 0) {
+	if !(*(*int32)(unsafe.Pointer(bp + 408)) >= 0) {
 		goto __654
 	}
 
-	goto __650
+	goto jump_to_p2
+	goto __651
 __654:
+	;
+	if !(nStep <= 0) {
+		goto __655
+	}
+
+	goto __651
+__655:
 	;
 	nStep--
 	rc = Xsqlite3BtreeNext(tls, *(*uintptr)(unsafe.Pointer(pC6 + 48)), 0)
 	if !(rc != 0) {
-		goto __655
+		goto __656
 	}
 	if !(rc == SQLITE_DONE) {
-		goto __656
+		goto __657
 	}
 	rc = SQLITE_OK
 	goto seekscan_search_fail
-	goto __657
-__656:
-	goto abort_due_to_error
+	goto __658
 __657:
+	goto abort_due_to_error
+__658:
 	;
-__655:
+__656:
 	;
-	goto __649
-__650:
+	goto __650
+__651:
 	;
-	goto __8
+	goto __9
 
-__97:
+__98:
 	;
 	pC7 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) < (*Op)(unsafe.Pointer(pOp)).Fp2) {
-		goto __658
+		goto __659
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __659
-__658:
+	goto __660
+__659:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit) > (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __660
+		goto __661
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC7)).FseekHit = U16((*Op)(unsafe.Pointer(pOp)).Fp3)
+__661:
+	;
 __660:
 	;
-__659:
-	;
-	goto __8
+	goto __9
 
-__98:
+__99:
 	;
 	pCur1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(pCur1 == uintptr(0) || (*VdbeCursor)(unsafe.Pointer(pCur1)).FnullRow != 0) {
-		goto __661
+		goto __662
 	}
 	goto jump_to_p2_and_check_for_interrupt
-__661:
+__662:
 	;
-	goto __8
+	goto __9
 
-__99:
+__100:
 	;
 	pC8 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC8)).FseekHit) >= *(*int32)(unsafe.Pointer(pOp + 16))) {
-		goto __662
+		goto __663
 	}
-	goto __8
-__662:
+	goto __9
+__663:
 	;
-__100:
 __101:
 __102:
+__103:
 	;
 	pC9 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94046,14 +94210,14 @@ __102:
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField) > 0) {
-		goto __663
+		goto __664
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 416)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), bp+416, pC9+36)
-	goto __664
-__663:
+	goto __665
+__664:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fflags)&MEM_Zero != 0 {
@@ -94063,108 +94227,108 @@ __663:
 	}()
 
 	if !(rc != 0) {
-		goto __665
-	}
-	goto no_mem
-__665:
-	;
-	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
-	if !(pIdxKey == uintptr(0)) {
 		goto __666
 	}
 	goto no_mem
 __666:
+	;
+	pIdxKey = Xsqlite3VdbeAllocUnpackedRecord(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo)
+	if !(pIdxKey == uintptr(0)) {
+		goto __667
+	}
+	goto no_mem
+__667:
 	;
 	Xsqlite3VdbeRecordUnpack(tls, (*VdbeCursor)(unsafe.Pointer(pC9)).FpKeyInfo, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fn, (*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem)).Fz, pIdxKey)
 	(*UnpackedRecord)(unsafe.Pointer(pIdxKey)).Fdefault_rc = int8(0)
 	rc = Xsqlite3BtreeIndexMoveto(tls, *(*uintptr)(unsafe.Pointer(pC9 + 48)), pIdxKey, pC9+36)
 	Xsqlite3DbFreeNN(tls, db, pIdxKey)
-__664:
+__665:
 	;
 	if !(rc != SQLITE_OK) {
-		goto __667
+		goto __668
 	}
 	goto abort_due_to_error
-__667:
+__668:
 	;
 	alreadyExists = libc.Bool32((*VdbeCursor)(unsafe.Pointer(pC9)).FseekResult == 0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FnullRow = U8(1 - alreadyExists)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC9)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Found) {
-		goto __668
+		goto __669
 	}
 
 	if !(alreadyExists != 0) {
-		goto __670
-	}
-	goto jump_to_p2
-__670:
-	;
-	goto __669
-__668:
-	if !!(alreadyExists != 0) {
 		goto __671
 	}
-
 	goto jump_to_p2
 __671:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+	goto __670
+__669:
+	if !!(alreadyExists != 0) {
 		goto __672
 	}
 
+	goto jump_to_p2
+__672:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_NoConflict) {
+		goto __673
+	}
+
 	ii1 = 0
-__673:
+__674:
 	if !(ii1 < int32((*UnpackedRecord)(unsafe.Pointer(bp+416)).FnField)) {
-		goto __675
+		goto __676
 	}
 	if !(int32((*Mem)(unsafe.Pointer((*UnpackedRecord)(unsafe.Pointer(bp+416)).FaMem+uintptr(ii1)*56)).Fflags)&MEM_Null != 0) {
-		goto __676
+		goto __677
 	}
 
 	goto jump_to_p2
-__676:
-	;
-	goto __674
-__674:
-	ii1++
-	goto __673
-	goto __675
-__675:
-	;
-__672:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
-		goto __677
-	}
-	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 __677:
 	;
-__669:
+	goto __675
+__675:
+	ii1++
+	goto __674
+	goto __676
+__676:
 	;
-	goto __8
+__673:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_IfNoHope) {
+		goto __678
+	}
+	(*VdbeCursor)(unsafe.Pointer(pC9)).FseekHit = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
+__678:
+	;
+__670:
+	;
+	goto __9
 
-__103:
+__104:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn3)).Fflags)&(MEM_Int|MEM_IntReal) == 0) {
-		goto __678
+		goto __679
 	}
 
 	*(*Mem)(unsafe.Pointer(bp + 456)) = *(*Mem)(unsafe.Pointer(pIn3))
 	applyAffinity(tls, bp+456, int8(SQLITE_AFF_NUMERIC), encoding)
 	if !(int32((*Mem)(unsafe.Pointer(bp+456)).Fflags)&MEM_Int == 0) {
-		goto __679
+		goto __680
 	}
 	goto jump_to_p2
-__679:
+__680:
 	;
 	iKey1 = U64(*(*I64)(unsafe.Pointer(bp + 456)))
 	goto notExistsWithKey
-__678:
+__679:
 	;
-__104:
+__105:
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	iKey1 = U64(*(*I64)(unsafe.Pointer(pIn3)))
@@ -94183,35 +94347,35 @@ notExistsWithKey:
 
 	(*VdbeCursor)(unsafe.Pointer(pC10)).FseekResult = *(*int32)(unsafe.Pointer(bp + 512))
 	if !(*(*int32)(unsafe.Pointer(bp + 512)) != 0) {
-		goto __680
+		goto __681
 	}
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 == 0) {
-		goto __681
+		goto __682
 	}
-	rc = Xsqlite3CorruptError(tls, 95020)
-	goto __682
-__681:
-	goto jump_to_p2
+	rc = Xsqlite3CorruptError(tls, 95560)
+	goto __683
 __682:
-	;
-__680:
-	;
-	if !(rc != 0) {
-		goto __683
-	}
-	goto abort_due_to_error
+	goto jump_to_p2
 __683:
 	;
-	goto __8
+__681:
+	;
+	if !(rc != 0) {
+		goto __684
+	}
+	goto abort_due_to_error
+__684:
+	;
+	goto __9
 
-__105:
+__106:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = libc.PostIncInt64(&(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8)))).FseqCount, 1)
-	goto __8
+	goto __9
 
-__106:
+__107:
 	*(*I64)(unsafe.Pointer(bp + 520)) = int64(0)
 	*(*int32)(unsafe.Pointer(bp + 516)) = 0
 	pOut = out2Prerelease(tls, p, pOp)
@@ -94219,123 +94383,123 @@ __106:
 	pC11 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !!(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1) != 0) {
-		goto __684
+		goto __685
 	}
 	rc = Xsqlite3BtreeLast(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), bp+516)
 	if !(rc != SQLITE_OK) {
-		goto __685
-	}
-	goto abort_due_to_error
-__685:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
 		goto __686
 	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
-	goto __687
+	goto abort_due_to_error
 __686:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) != 0) {
+		goto __687
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = int64(1)
+	goto __688
+__687:
 	;
 	*(*I64)(unsafe.Pointer(bp + 520)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)))
 	if !(*(*I64)(unsafe.Pointer(bp + 520)) >= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff))) {
-		goto __688
+		goto __689
 	}
 	libc.SetBitFieldPtr8Uint32(pC11+8, Bool(1), 1, 0x2)
-	goto __689
-__688:
-	*(*I64)(unsafe.Pointer(bp + 520))++
+	goto __690
 __689:
+	*(*I64)(unsafe.Pointer(bp + 520))++
+__690:
 	;
-__687:
+__688:
 	;
-__684:
+__685:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __690
+		goto __691
 	}
 
 	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
-		goto __691
+		goto __692
 	}
 	pFrame1 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__693:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
-		goto __695
-	}
-	goto __694
 __694:
-	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
-	goto __693
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent != 0) {
+		goto __696
+	}
 	goto __695
 __695:
+	pFrame1 = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FpParent
+	goto __694
+	goto __696
+__696:
 	;
 	pMem = (*VdbeFrame)(unsafe.Pointer(pFrame1)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __692
-__691:
+	goto __693
+__692:
 	;
 	pMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
-__692:
+__693:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pMem)
 
 	if !(*(*I64)(unsafe.Pointer(pMem)) == int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) || Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __696
+		goto __697
 	}
 	rc = SQLITE_FULL
 	goto abort_due_to_error
-__696:
-	;
-	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
-		goto __697
-	}
-	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
 __697:
+	;
+	if !(*(*I64)(unsafe.Pointer(bp + 520)) < *(*I64)(unsafe.Pointer(pMem))+int64(1)) {
+		goto __698
+	}
+	*(*I64)(unsafe.Pointer(bp + 520)) = *(*I64)(unsafe.Pointer(pMem)) + int64(1)
+__698:
 	;
 	*(*I64)(unsafe.Pointer(pMem)) = *(*I64)(unsafe.Pointer(bp + 520))
-__690:
+__691:
 	;
 	if !(Bool(int32(*(*uint8)(unsafe.Pointer(pC11 + 8))&0x2>>1)) != 0) {
-		goto __698
+		goto __699
 	}
 
 	cnt1 = 0
-__699:
+__700:
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(I64(0))), bp+520)
 	*(*I64)(unsafe.Pointer(bp + 520)) &= int64(uint64(0x7fffffff)<<32|uint64(0xffffffff)) >> 1
 	*(*I64)(unsafe.Pointer(bp + 520))++
-	goto __700
-__700:
+	goto __701
+__701:
 	if libc.AssignInt32(&rc, Xsqlite3BtreeTableMoveto(tls, *(*uintptr)(unsafe.Pointer(pC11 + 48)), int64(U64(*(*I64)(unsafe.Pointer(bp + 520)))),
 		0, bp+516)) == SQLITE_OK &&
 		*(*int32)(unsafe.Pointer(bp + 516)) == 0 &&
 		libc.PreIncInt32(&cnt1, 1) < 100 {
-		goto __699
+		goto __700
 	}
-	goto __701
-__701:
-	;
-	if !(rc != 0) {
-		goto __702
-	}
-	goto abort_due_to_error
+	goto __702
 __702:
 	;
-	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+	if !(rc != 0) {
 		goto __703
 	}
-	rc = SQLITE_FULL
 	goto abort_due_to_error
 __703:
 	;
-__698:
+	if !(*(*int32)(unsafe.Pointer(bp + 516)) == 0) {
+		goto __704
+	}
+	rc = SQLITE_FULL
+	goto abort_due_to_error
+__704:
+	;
+__699:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC11)).FcacheStatus = U32(CACHE_STALE)
 
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 520))
-	goto __8
+	goto __9
 
-__107:
+__108:
 	pData = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	pC12 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -94345,52 +94509,52 @@ __107:
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey = *(*I64)(unsafe.Pointer(pKey))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __704
+		goto __705
 	}
 
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC12)).FiDb)*32)).FzDbSName
 	pTab1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
-	goto __705
-__704:
+	goto __706
+__705:
 	pTab1 = uintptr(0)
 	zDb = uintptr(0)
-__705:
+__706:
 	;
 	if !(pTab1 != 0) {
-		goto __706
-	}
-	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
 		goto __707
 	}
+	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISUPDATE != 0)) {
+		goto __708
+	}
 	Xsqlite3VdbePreUpdateHook(tls, p, pC12, SQLITE_INSERT, zDb, pTab1, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey, (*Op)(unsafe.Pointer(pOp)).Fp2, -1)
-__707:
+__708:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback == uintptr(0) || (*Table)(unsafe.Pointer(pTab1)).FaCol == uintptr(0)) {
-		goto __708
+		goto __709
 	}
 
 	pTab1 = uintptr(0)
-__708:
-	;
-__706:
-	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
-		goto __709
-	}
-	goto __8
 __709:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
+__707:
+	;
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_ISNOOP != 0) {
 		goto __710
 	}
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	goto __9
 __710:
 	;
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
 		goto __711
 	}
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_LASTROWID != 0) {
+		goto __712
+	}
 	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = (*BtreePayload)(unsafe.Pointer(bp + 528)).FnKey
+__712:
+	;
 __711:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpData = (*Mem)(unsafe.Pointer(pData)).Fz
@@ -94402,15 +94566,16 @@ __711:
 		return 0
 	}()
 	if !(int32((*Mem)(unsafe.Pointer(pData)).Fflags)&MEM_Zero != 0) {
-		goto __712
+		goto __713
 	}
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = *(*int32)(unsafe.Pointer(pData))
-	goto __713
-__712:
-	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+	goto __714
 __713:
+	(*BtreePayload)(unsafe.Pointer(bp + 528)).FnZero = 0
+__714:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 528)).FpKey = uintptr(0)
+
 	rc = Xsqlite3BtreeInsert(tls, *(*uintptr)(unsafe.Pointer(pC12 + 48)), bp+528,
 		int32((*Op)(unsafe.Pointer(pOp)).Fp5)&(OPFLAG_APPEND|OPFLAG_SAVEPOSITION|OPFLAG_PREFORMAT),
 		seekResult)
@@ -94418,13 +94583,13 @@ __713:
 	(*VdbeCursor)(unsafe.Pointer(pC12)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc != 0) {
-		goto __714
+		goto __715
 	}
 	goto abort_due_to_error
-__714:
+__715:
 	;
 	if !(pTab1 != 0) {
-		goto __715
+		goto __716
 	}
 
 	(*struct {
@@ -94437,11 +94602,11 @@ __714:
 			return SQLITE_INSERT
 		}(),
 		zDb, (*Table)(unsafe.Pointer(pTab1)).FzName, (*BtreePayload)(unsafe.Pointer(bp+528)).FnKey)
-__715:
+__716:
 	;
-	goto __8
+	goto __9
 
-__108:
+__109:
 	;
 	pDest1 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pSrc = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*8))
@@ -94452,38 +94617,38 @@ __108:
 	}
 	rc = Xsqlite3BtreeTransferRow(tls, *(*uintptr)(unsafe.Pointer(pDest1 + 48)), *(*uintptr)(unsafe.Pointer(pSrc + 48)), iKey2)
 	if !(rc != SQLITE_OK) {
-		goto __716
+		goto __717
 	}
 	goto abort_due_to_error
-__716:
+__717:
 	;
-	goto __8
+	goto __9
 
-__109:
+__110:
 	opflags = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	pC13 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp4type) == -5 && ((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 || (*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0)) {
-		goto __717
+		goto __718
 	}
 
 	zDb1 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*VdbeCursor)(unsafe.Pointer(pC13)).FiDb)*32)).FzDbSName
 	pTab2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_SAVEPOSITION != 0 && (*VdbeCursor)(unsafe.Pointer(pC13)).FisTable != 0) {
-		goto __719
+		goto __720
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)))
-__719:
+__720:
 	;
-	goto __718
-__717:
+	goto __719
+__718:
 	zDb1 = uintptr(0)
 	pTab2 = uintptr(0)
-__718:
+__719:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 && pTab2 != 0) {
-		goto __720
+		goto __721
 	}
 
 	Xsqlite3VdbePreUpdateHook(tls, p, pC13,
@@ -94495,47 +94660,47 @@ __718:
 		}(),
 		zDb1, pTab2, (*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget,
 		(*Op)(unsafe.Pointer(pOp)).Fp3, -1)
-__720:
+__721:
 	;
 	if !(opflags&OPFLAG_ISNOOP != 0) {
-		goto __721
+		goto __722
 	}
-	goto __8
-__721:
+	goto __9
+__722:
 	;
 	rc = Xsqlite3BtreeDelete(tls, *(*uintptr)(unsafe.Pointer(pC13 + 48)), uint8((*Op)(unsafe.Pointer(pOp)).Fp5))
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC13)).FseekResult = 0
 	if !(rc != 0) {
-		goto __722
+		goto __723
 	}
 	goto abort_due_to_error
-__722:
+__723:
 	;
 	if !(opflags&OPFLAG_NCHANGE != 0) {
-		goto __723
+		goto __724
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 	if !((*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback != 0 && pTab2 != uintptr(0) && (*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __724
+		goto __725
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, Sqlite_int64)
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxUpdateCallback})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpUpdateArg, SQLITE_DELETE, zDb1, (*Table)(unsafe.Pointer(pTab2)).FzName,
 		(*VdbeCursor)(unsafe.Pointer(pC13)).FmovetoTarget)
 
+__725:
+	;
 __724:
 	;
-__723:
-	;
-	goto __8
-
-__110:
-	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
-	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
-	goto __8
+	goto __9
 
 __111:
+	Xsqlite3VdbeSetChanges(tls, db, (*Vdbe)(unsafe.Pointer(p)).FnChange)
+	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
+	goto __9
+
+__112:
 	pC14 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
@@ -94544,35 +94709,35 @@ __111:
 	rc = Xsqlite3VdbeSorterCompare(tls, pC14, pIn3, nKeyCol, bp+576)
 
 	if !(rc != 0) {
-		goto __725
-	}
-	goto abort_due_to_error
-__725:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
 		goto __726
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __726:
 	;
-	goto __8
+	if !(*(*int32)(unsafe.Pointer(bp + 576)) != 0) {
+		goto __727
+	}
+	goto jump_to_p2
+__727:
+	;
+	goto __9
 
-__112:
+__113:
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	pC15 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterRowkey(tls, pC15, pOut)
 
 	if !(rc != 0) {
-		goto __727
+		goto __728
 	}
 	goto abort_due_to_error
-__727:
+__728:
 	;
 	(*VdbeCursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8)))).FcacheStatus = U32(CACHE_STALE)
-	goto __8
+	goto __9
 
-__113:
+__114:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC16 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -94581,51 +94746,51 @@ __113:
 
 	n3 = Xsqlite3BtreePayloadSize(tls, pCrsr3)
 	if !(n3 > U32(*(*int32)(unsafe.Pointer(db + 136)))) {
-		goto __728
+		goto __729
 	}
 	goto too_big
-__728:
+__729:
 	;
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCrsr3, n3, pOut)
 	if !(rc != 0) {
-		goto __729
-	}
-	goto abort_due_to_error
-__729:
-	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
 		goto __730
 	}
-	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
-		goto __731
-	}
-	goto no_mem
-__731:
-	;
+	goto abort_due_to_error
 __730:
 	;
-	goto __8
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
+		goto __731
+	}
+	if !(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&MEM_Ephem != 0 && Xsqlite3VdbeMemMakeWriteable(tls, pOut) != 0) {
+		goto __732
+	}
+	goto no_mem
+__732:
+	;
+__731:
+	;
+	goto __9
 
-__114:
+__115:
 	pOut = out2Prerelease(tls, p, pOp)
 
 	pC17 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __732
+		goto __733
 	}
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-	goto __733
-__732:
+	goto __9
+	goto __734
+__733:
 	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FdeferredMoveto != 0) {
-		goto __734
+		goto __735
 	}
 	*(*I64)(unsafe.Pointer(bp + 584)) = (*VdbeCursor)(unsafe.Pointer(pC17)).FmovetoTarget
-	goto __735
-__734:
+	goto __736
+__735:
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC17)).FeCurType) == CURTYPE_VTAB) {
-		goto __736
+		goto __737
 	}
 
 	pVtab = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pC17 + 48)))).FpVtab
@@ -94635,72 +94800,72 @@ __734:
 		f func(*libc.TLS, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule)).FxRowid})).f(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)), bp+584)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab)
-	if !(rc != 0) {
-		goto __738
-	}
-	goto abort_due_to_error
-__738:
-	;
-	goto __737
-__736:
-	;
-	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
 	if !(rc != 0) {
 		goto __739
 	}
 	goto abort_due_to_error
 __739:
 	;
-	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
-		goto __740
-	}
-	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	goto __8
-__740:
-	;
-	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+	goto __738
 __737:
 	;
-__735:
+	rc = Xsqlite3VdbeCursorRestore(tls, pC17)
+	if !(rc != 0) {
+		goto __740
+	}
+	goto abort_due_to_error
+__740:
 	;
-__733:
+	if !((*VdbeCursor)(unsafe.Pointer(pC17)).FnullRow != 0) {
+		goto __741
+	}
+	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
+	goto __9
+__741:
+	;
+	*(*I64)(unsafe.Pointer(bp + 584)) = Xsqlite3BtreeIntegerKey(tls, *(*uintptr)(unsafe.Pointer(pC17 + 48)))
+__738:
+	;
+__736:
+	;
+__734:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 584))
-	goto __8
+	goto __9
 
-__115:
+__116:
 	;
 	pC18 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !(pC18 == uintptr(0)) {
-		goto __741
+		goto __742
 	}
 
 	pC18 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 1, uint8(CURTYPE_PSEUDO))
 	if !(pC18 == uintptr(0)) {
-		goto __742
+		goto __743
 	}
 	goto no_mem
-__742:
+__743:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FseekResult = 0
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FisTable = U8(1)
 	libc.SetBitFieldPtr8Uint32(pC18+8, Bool(1), 3, 0x8)
 	*(*uintptr)(unsafe.Pointer(pC18 + 48)) = Xsqlite3BtreeFakeValidCursor(tls)
-__741:
+__742:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FnullRow = U8(1)
 	(*VdbeCursor)(unsafe.Pointer(pC18)).FcacheStatus = U32(CACHE_STALE)
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC18)).FeCurType) == CURTYPE_BTREE) {
-		goto __743
+		goto __744
 	}
 
 	Xsqlite3BtreeClearCursor(tls, *(*uintptr)(unsafe.Pointer(pC18 + 48)))
-__743:
+__744:
 	;
-	goto __8
+	goto __9
 
-__116:
 __117:
+__118:
 	;
 	pC19 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94708,43 +94873,43 @@ __117:
 	*(*int32)(unsafe.Pointer(bp + 592)) = 0
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_SeekEnd) {
-		goto __744
+		goto __745
 	}
 
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FseekResult = -1
 	if !(Xsqlite3BtreeCursorIsValidNN(tls, pCrsr4) != 0) {
-		goto __745
+		goto __746
 	}
-	goto __8
-__745:
+	goto __9
+__746:
 	;
-__744:
+__745:
 	;
 	rc = Xsqlite3BtreeLast(tls, pCrsr4, bp+592)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 592)))
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC19)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __746
+		goto __747
 	}
 	goto abort_due_to_error
-__746:
+__747:
 	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
-		goto __747
+		goto __748
 	}
 
 	if !(*(*int32)(unsafe.Pointer(bp + 592)) != 0) {
-		goto __748
+		goto __749
 	}
 	goto jump_to_p2
+__749:
+	;
 __748:
 	;
-__747:
-	;
-	goto __8
+	goto __9
 
-__118:
+__119:
 	;
 	pC20 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94752,84 +94917,89 @@ __118:
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr5, bp+596)
 	if !(rc != 0) {
-		goto __749
+		goto __750
 	}
 	goto abort_due_to_error
-__749:
+__750:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 596)) == 0) {
-		goto __750
+		goto __751
 	}
 	sz = Xsqlite3BtreeRowCountEst(tls, pCrsr5)
 	if !(sz >= int64(0) && int32(Xsqlite3LogEst(tls, U64(sz))) < (*Op)(unsafe.Pointer(pOp)).Fp3) {
-		goto __751
-	}
-	*(*int32)(unsafe.Pointer(bp + 596)) = 1
-__751:
-	;
-__750:
-	;
-	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
 		goto __752
 	}
-	goto jump_to_p2
+	*(*int32)(unsafe.Pointer(bp + 596)) = 1
 __752:
 	;
-	goto __8
+__751:
+	;
+	if !(*(*int32)(unsafe.Pointer(bp + 596)) != 0) {
+		goto __753
+	}
+	goto jump_to_p2
+__753:
+	;
+	goto __9
 
-__119:
 __120:
+__121:
 	*(*U32)(unsafe.Pointer(p + 212 + 2*4))++
 
-__121:
+__122:
 	;
 	pC21 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	*(*int32)(unsafe.Pointer(bp + 600)) = 1
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC21)).FeCurType) == CURTYPE_SORTER) {
-		goto __753
+		goto __754
 	}
 	rc = Xsqlite3VdbeSorterRewind(tls, pC21, bp+600)
-	goto __754
-__753:
+	goto __755
+__754:
 	;
 	pCrsr6 = *(*uintptr)(unsafe.Pointer(pC21 + 48))
 
 	rc = Xsqlite3BtreeFirst(tls, pCrsr6, bp+600)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FdeferredMoveto = U8(0)
 	(*VdbeCursor)(unsafe.Pointer(pC21)).FcacheStatus = U32(CACHE_STALE)
-__754:
-	;
-	if !(rc != 0) {
-		goto __755
-	}
-	goto abort_due_to_error
 __755:
 	;
-	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
-
-	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+	if !(rc != 0) {
 		goto __756
 	}
-	goto jump_to_p2
+	goto abort_due_to_error
 __756:
 	;
-	goto __8
+	(*VdbeCursor)(unsafe.Pointer(pC21)).FnullRow = U8(*(*int32)(unsafe.Pointer(bp + 600)))
+	if !((*Op)(unsafe.Pointer(pOp)).Fp2 > 0) {
+		goto __757
+	}
 
-__122:
+	if !(*(*int32)(unsafe.Pointer(bp + 600)) != 0) {
+		goto __758
+	}
+	goto jump_to_p2
+__758:
+	;
+__757:
+	;
+	goto __9
+
+__123:
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeSorterNext(tls, db, pC22)
 	goto next_tail
 
-__123:
+__124:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3BtreePrevious(tls, *(*uintptr)(unsafe.Pointer(pC22 + 48)), (*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto next_tail
 
-__124:
+__125:
 	;
 	pC22 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94839,34 +95009,34 @@ next_tail:
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FcacheStatus = U32(CACHE_STALE)
 
 	if !(rc == SQLITE_OK) {
-		goto __757
+		goto __759
 	}
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(0)
 	*(*U32)(unsafe.Pointer(p + 212 + uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*4))++
 	goto jump_to_p2_and_check_for_interrupt
-__757:
+__759:
 	;
 	if !(rc != SQLITE_DONE) {
-		goto __758
+		goto __760
 	}
 	goto abort_due_to_error
-__758:
+__760:
 	;
 	rc = SQLITE_OK
 	(*VdbeCursor)(unsafe.Pointer(pC22)).FnullRow = U8(1)
 	goto check_for_interrupt
 
-__125:
+__126:
 	;
 	pC23 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NCHANGE != 0) {
-		goto __759
+		goto __761
 	}
 	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__759:
+__761:
 	;
 	rc = func() int32 {
 		if int32((*Mem)(unsafe.Pointer(pIn2)).Fflags)&MEM_Zero != 0 {
@@ -94875,10 +95045,10 @@ __759:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __760
+		goto __762
 	}
 	goto abort_due_to_error
-__760:
+__762:
 	;
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FnKey = Sqlite3_int64((*Mem)(unsafe.Pointer(pIn2)).Fn)
 	(*BtreePayload)(unsafe.Pointer(bp + 608)).FpKey = (*Mem)(unsafe.Pointer(pIn2)).Fz
@@ -94895,14 +95065,14 @@ __760:
 
 	(*VdbeCursor)(unsafe.Pointer(pC23)).FcacheStatus = U32(CACHE_STALE)
 	if !(rc != 0) {
-		goto __761
+		goto __763
 	}
 	goto abort_due_to_error
-__761:
+__763:
 	;
-	goto __8
+	goto __9
 
-__126:
+__127:
 	;
 	pC24 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94915,21 +95085,21 @@ __126:
 		return 0
 	}()
 	if !(rc != 0) {
-		goto __762
+		goto __764
 	}
 	goto abort_due_to_error
-__762:
+__764:
 	;
 	rc = Xsqlite3VdbeSorterWrite(tls, pC24, pIn2)
 	if !(rc != 0) {
-		goto __763
+		goto __765
 	}
 	goto abort_due_to_error
-__763:
+__765:
 	;
-	goto __8
+	goto __9
 
-__127:
+__128:
 	;
 	pC25 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
@@ -94941,62 +95111,62 @@ __127:
 	(*UnpackedRecord)(unsafe.Pointer(bp + 656)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	rc = Xsqlite3BtreeIndexMoveto(tls, pCrsr7, bp+656, bp+696)
 	if !(rc != 0) {
-		goto __764
+		goto __766
 	}
 	goto abort_due_to_error
-__764:
+__766:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 696)) == 0) {
-		goto __765
+		goto __767
 	}
 	rc = Xsqlite3BtreeDelete(tls, pCrsr7, uint8(BTREE_AUXDELETE))
 	if !(rc != 0) {
-		goto __767
+		goto __769
 	}
 	goto abort_due_to_error
+__769:
+	;
+	goto __768
 __767:
-	;
-	goto __766
-__765:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0 && !(Xsqlite3WritableSchema(tls, db) != 0)) {
-		goto __768
+		goto __770
 	}
-	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96085, ts+7228)
+	rc = Xsqlite3ReportError(tls, SQLITE_CORRUPT|int32(3)<<8, 96635, ts+7218)
 	goto abort_due_to_error
-__768:
+__770:
 	;
-__766:
+__768:
 	;
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FcacheStatus = U32(CACHE_STALE)
 	(*VdbeCursor)(unsafe.Pointer(pC25)).FseekResult = 0
-	goto __8
+	goto __9
 
-__128:
 __129:
+__130:
 	;
 	pC26 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	rc = Xsqlite3VdbeCursorRestore(tls, pC26)
 
 	if !(rc != SQLITE_OK) {
-		goto __769
+		goto __771
 	}
 	goto abort_due_to_error
-__769:
+__771:
 	;
 	if !!(int32((*VdbeCursor)(unsafe.Pointer(pC26)).FnullRow) != 0) {
-		goto __770
+		goto __772
 	}
 	*(*I64)(unsafe.Pointer(bp + 704)) = int64(0)
 	rc = Xsqlite3VdbeIdxRowid(tls, db, *(*uintptr)(unsafe.Pointer(pC26 + 48)), bp+704)
 	if !(rc != SQLITE_OK) {
-		goto __772
+		goto __774
 	}
 	goto abort_due_to_error
-__772:
+__774:
 	;
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_DeferredSeek) {
-		goto __773
+		goto __775
 	}
 
 	pTabCur = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*8))
@@ -95009,56 +95179,56 @@ __772:
 	*(*uintptr)(unsafe.Pointer(pTabCur + 16)) = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	(*VdbeCursor)(unsafe.Pointer(pTabCur)).FpAltCursor = pC26
-	goto __774
-__773:
+	goto __776
+__775:
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 704))
-__774:
+__776:
 	;
-	goto __771
-__770:
+	goto __773
+__772:
 	;
 	Xsqlite3VdbeMemSetNull(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-__771:
+__773:
 	;
-	goto __8
+	goto __9
 
-__130:
+__131:
 	;
 	pC27 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	if !((*VdbeCursor)(unsafe.Pointer(pC27)).FdeferredMoveto != 0) {
-		goto __775
+		goto __777
 	}
 	rc = Xsqlite3VdbeFinishMoveto(tls, pC27)
 	if !(rc != 0) {
-		goto __776
+		goto __778
 	}
 	goto abort_due_to_error
-__776:
+__778:
 	;
-__775:
+__777:
 	;
-	goto __8
+	goto __9
 
-__131:
 __132:
 __133:
 __134:
+__135:
 	;
 	pC28 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FpKeyInfo = (*VdbeCursor)(unsafe.Pointer(pC28)).FpKeyInfo
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FnField = U16(*(*int32)(unsafe.Pointer(pOp + 16)))
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) < OP_IdxLT) {
-		goto __777
+		goto __779
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(-1)
-	goto __778
-__777:
+	goto __780
+__779:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).Fdefault_rc = int8(0)
-__778:
+__780:
 	;
 	(*UnpackedRecord)(unsafe.Pointer(bp + 768)).FaMem = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
@@ -95069,54 +95239,54 @@ __778:
 	nCellKey = I64(Xsqlite3BtreePayloadSize(tls, pCur2))
 
 	if !(nCellKey <= int64(0) || nCellKey > int64(0x7fffffff)) {
-		goto __779
+		goto __781
 	}
-	rc = Xsqlite3CorruptError(tls, 96290)
+	rc = Xsqlite3CorruptError(tls, 96840)
 	goto abort_due_to_error
-__779:
+__781:
 	;
 	Xsqlite3VdbeMemInit(tls, bp+712, db, uint16(0))
 	rc = Xsqlite3VdbeMemFromBtreeZeroOffset(tls, pCur2, U32(nCellKey), bp+712)
 	if !(rc != 0) {
-		goto __780
+		goto __782
 	}
 	goto abort_due_to_error
-__780:
+__782:
 	;
 	res11 = Xsqlite3VdbeRecordCompareWithSkip(tls, (*Mem)(unsafe.Pointer(bp+712)).Fn, (*Mem)(unsafe.Pointer(bp+712)).Fz, bp+768, 0)
 	Xsqlite3VdbeMemReleaseMalloc(tls, bp+712)
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode)&1 == OP_IdxLT&1) {
-		goto __781
+		goto __783
 	}
 
 	res11 = -res11
-	goto __782
-__781:
-	;
-	res11++
-__782:
-	;
-	if !(res11 > 0) {
-		goto __783
-	}
-	goto jump_to_p2
+	goto __784
 __783:
 	;
-	goto __8
+	res11++
+__784:
+	;
+	if !(res11 > 0) {
+		goto __785
+	}
+	goto jump_to_p2
+__785:
+	;
+	goto __9
 
-__135:
+__136:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > (*Sqlite3)(unsafe.Pointer(db)).FnVDestroy+1) {
-		goto __784
+		goto __786
 	}
 	rc = SQLITE_LOCKED
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = U8(OE_Abort)
 	goto abort_due_to_error
-	goto __785
-__784:
+	goto __787
+__786:
 	iDb2 = (*Op)(unsafe.Pointer(pOp)).Fp3
 
 	*(*int32)(unsafe.Pointer(bp + 808)) = 0
@@ -95124,72 +95294,72 @@ __784:
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Int)
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*int32)(unsafe.Pointer(bp + 808)))
 	if !(rc != 0) {
-		goto __786
+		goto __788
 	}
 	goto abort_due_to_error
-__786:
+__788:
 	;
 	if !(*(*int32)(unsafe.Pointer(bp + 808)) != 0) {
-		goto __787
+		goto __789
 	}
 	Xsqlite3RootPageMoved(tls, db, iDb2, uint32(*(*int32)(unsafe.Pointer(bp + 808))), uint32((*Op)(unsafe.Pointer(pOp)).Fp1))
 
 	resetSchemaOnFault = U8(iDb2 + 1)
+__789:
+	;
 __787:
 	;
-__785:
-	;
-	goto __8
+	goto __9
 
-__136:
+__137:
 	;
 	*(*I64)(unsafe.Pointer(bp + 816)) = int64(0)
 
 	rc = Xsqlite3BtreeClearTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*32)).FpBt, int32(U32((*Op)(unsafe.Pointer(pOp)).Fp1)), bp+816)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __788
+		goto __790
 	}
 	*(*I64)(unsafe.Pointer(p + 56)) += *(*I64)(unsafe.Pointer(bp + 816))
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 > 0) {
-		goto __789
+		goto __791
 	}
 
 	*(*I64)(unsafe.Pointer(aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56)) += *(*I64)(unsafe.Pointer(bp + 816))
-__789:
+__791:
 	;
-__788:
-	;
-	if !(rc != 0) {
-		goto __790
-	}
-	goto abort_due_to_error
 __790:
 	;
-	goto __8
+	if !(rc != 0) {
+		goto __792
+	}
+	goto abort_due_to_error
+__792:
+	;
+	goto __9
 
-__137:
+__138:
 	;
 	pC29 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !(int32((*VdbeCursor)(unsafe.Pointer(pC29)).FeCurType) == CURTYPE_SORTER) {
-		goto __791
+		goto __793
 	}
 	Xsqlite3VdbeSorterReset(tls, db, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
-	goto __792
-__791:
+	goto __794
+__793:
 	;
 	rc = Xsqlite3BtreeClearTableOfCursor(tls, *(*uintptr)(unsafe.Pointer(pC29 + 48)))
 	if !(rc != 0) {
-		goto __793
+		goto __795
 	}
 	goto abort_due_to_error
-__793:
+__795:
 	;
-__792:
+__794:
 	;
-	goto __8
+	goto __9
 
-__138:
+__139:
 	;
 	pOut = out2Prerelease(tls, p, pOp)
 	*(*Pgno)(unsafe.Pointer(bp + 824)) = Pgno(0)
@@ -95198,55 +95368,55 @@ __138:
 
 	rc = Xsqlite3BtreeCreateTable(tls, (*Db)(unsafe.Pointer(pDb3)).FpBt, bp+824, (*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(rc != 0) {
-		goto __794
+		goto __796
 	}
 	goto abort_due_to_error
-__794:
+__796:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(*(*Pgno)(unsafe.Pointer(bp + 824)))
-	goto __8
+	goto __9
 
-__139:
+__140:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec++
 	rc = Xsqlite3_exec(tls, db, *(*uintptr)(unsafe.Pointer(pOp + 16)), uintptr(0), uintptr(0), uintptr(0))
 	(*Sqlite3)(unsafe.Pointer(db)).FnSqlExec--
 	if !(rc != 0) {
-		goto __795
+		goto __797
 	}
 	goto abort_due_to_error
-__795:
+__797:
 	;
-	goto __8
+	goto __9
 
-__140:
+__141:
 	iDb3 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	if !(*(*uintptr)(unsafe.Pointer(pOp + 16)) == uintptr(0)) {
-		goto __796
+		goto __798
 	}
 	Xsqlite3SchemaClear(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpSchema)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	rc = Xsqlite3InitOne(tls, db, iDb3, p+168, uint32((*Op)(unsafe.Pointer(pOp)).Fp5))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
-	goto __797
-__796:
-	zSchema = ts + 7245
+	goto __799
+__798:
+	zSchema = ts + 7235
 	(*InitData)(unsafe.Pointer(bp + 832)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 832)).FiDb = iDb3
 	(*InitData)(unsafe.Pointer(bp + 832)).FpzErrMsg = p + 168
 	(*InitData)(unsafe.Pointer(bp + 832)).FmInitFlags = U32(0)
 	(*InitData)(unsafe.Pointer(bp + 832)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FpBt)
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+7259,
+		ts+7249,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb3)*32)).FzDbSName, zSchema, *(*uintptr)(unsafe.Pointer(pOp + 16))))
 	if !(zSql == uintptr(0)) {
-		goto __798
+		goto __800
 	}
 	rc = SQLITE_NOMEM
-	goto __799
-__798:
+	goto __801
+__800:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 	(*InitData)(unsafe.Pointer(bp + 832)).Frc = SQLITE_OK
@@ -95256,66 +95426,66 @@ __798:
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
 	}{Xsqlite3InitCallback})), bp+832, uintptr(0))
 	if !(rc == SQLITE_OK) {
-		goto __800
+		goto __802
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 832)).Frc
-__800:
+__802:
 	;
 	if !(rc == SQLITE_OK && (*InitData)(unsafe.Pointer(bp+832)).FnInitRow == U32(0)) {
-		goto __801
+		goto __803
 	}
 
-	rc = Xsqlite3CorruptError(tls, 96542)
-__801:
+	rc = Xsqlite3CorruptError(tls, 97092)
+__803:
 	;
 	Xsqlite3DbFreeNN(tls, db, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
+__801:
+	;
 __799:
 	;
-__797:
-	;
-	if !(rc != 0) {
-		goto __802
-	}
-	Xsqlite3ResetAllSchemasOfConnection(tls, db)
-	if !(rc == SQLITE_NOMEM) {
-		goto __803
-	}
-	goto no_mem
-__803:
-	;
-	goto abort_due_to_error
-__802:
-	;
-	goto __8
-
-__141:
-	;
-	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	if !(rc != 0) {
 		goto __804
 	}
+	Xsqlite3ResetAllSchemasOfConnection(tls, db)
+	if !(rc == SQLITE_NOMEM) {
+		goto __805
+	}
+	goto no_mem
+__805:
+	;
 	goto abort_due_to_error
 __804:
 	;
-	goto __8
+	goto __9
 
 __142:
 	;
-	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	rc = Xsqlite3AnalysisLoad(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1)
+	if !(rc != 0) {
+		goto __806
+	}
+	goto abort_due_to_error
+__806:
+	;
+	goto __9
 
 __143:
 	;
-	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteTable(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __144:
 	;
-	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-	goto __8
+	Xsqlite3UnlinkAndDeleteIndex(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
 
 __145:
+	;
+	Xsqlite3UnlinkAndDeleteTrigger(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
+	goto __9
+
+__146:
 	;
 	nRoot = (*Op)(unsafe.Pointer(pOp)).Fp2
 	aRoot = *(*uintptr)(unsafe.Pointer(pOp + 16))
@@ -95324,151 +95494,152 @@ __145:
 
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	z = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
-		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872)
+	rc = Xsqlite3BtreeIntegrityCheck(tls, db, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp5)*32)).FpBt, aRoot+1*4, nRoot,
+		int32(*(*I64)(unsafe.Pointer(pnErr)))+1, bp+872, bp+880)
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 	if !(*(*int32)(unsafe.Pointer(bp + 872)) == 0) {
-		goto __805
-	}
-
-	goto __806
-__805:
-	if !(z == uintptr(0)) {
 		goto __807
 	}
-	goto no_mem
+
 	goto __808
 __807:
+	if !(rc != 0) {
+		goto __809
+	}
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 880)))
+	goto abort_due_to_error
+	goto __810
+__809:
 	*(*I64)(unsafe.Pointer(pnErr)) -= I64(*(*int32)(unsafe.Pointer(bp + 872)) - 1)
-	Xsqlite3VdbeMemSetStr(tls, pIn1, z, int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-__808:
+	Xsqlite3VdbeMemSetStr(tls, pIn1, *(*uintptr)(unsafe.Pointer(bp + 880)), int64(-1), uint8(SQLITE_UTF8), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+__810:
 	;
-__806:
+__808:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pIn1, int32(encoding))
 	goto check_for_interrupt
 
-__146:
+__147:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __809
+		goto __811
 	}
 	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __810
+		goto __812
 	}
 	goto no_mem
-__810:
+__812:
 	;
-__809:
+__811:
 	;
 	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn2)))
-	goto __8
+	goto __9
 
-__147:
+__148:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0 ||
-		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+880) == 0) {
-		goto __811
+		Xsqlite3RowSetNext(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, bp+888) == 0) {
+		goto __813
 	}
 
 	Xsqlite3VdbeMemSetNull(tls, pIn1)
 
 	goto jump_to_p2_and_check_for_interrupt
-	goto __812
-__811:
+	goto __814
+__813:
 	;
-	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 880)))
-__812:
+	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*I64)(unsafe.Pointer(bp + 888)))
+__814:
 	;
 	goto check_for_interrupt
 
-__148:
+__149:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	iSet = *(*int32)(unsafe.Pointer(pOp + 16))
 
 	if !(int32((*Mem)(unsafe.Pointer(pIn1)).Fflags)&MEM_Blob == 0) {
-		goto __813
-	}
-	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
-		goto __814
-	}
-	goto no_mem
-__814:
-	;
-__813:
-	;
-	if !(iSet != 0) {
 		goto __815
 	}
-	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
-
-	if !(exists != 0) {
+	if !(Xsqlite3VdbeMemSetRowSet(tls, pIn1) != 0) {
 		goto __816
 	}
-	goto jump_to_p2
+	goto no_mem
 __816:
 	;
 __815:
 	;
-	if !(iSet >= 0) {
+	if !(iSet != 0) {
 		goto __817
 	}
-	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+	exists = Xsqlite3RowSetTest(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, iSet, *(*I64)(unsafe.Pointer(pIn3)))
+
+	if !(exists != 0) {
+		goto __818
+	}
+	goto jump_to_p2
+__818:
+	;
 __817:
 	;
-	goto __8
+	if !(iSet >= 0) {
+		goto __819
+	}
+	Xsqlite3RowSetInsert(tls, (*Mem)(unsafe.Pointer(pIn1)).Fz, *(*I64)(unsafe.Pointer(pIn3)))
+__819:
+	;
+	goto __9
 
-__149:
+__150:
 	pProgram = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pRt = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp5 != 0) {
-		goto __818
+		goto __820
 	}
 	t1 = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 	pFrame2 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__819:
-	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
-		goto __821
-	}
-	goto __820
-__820:
-	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
-	goto __819
-	goto __821
 __821:
-	;
-	if !(pFrame2 != 0) {
-		goto __822
-	}
-	goto __8
-__822:
-	;
-__818:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+	if !(pFrame2 != 0 && (*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken != t1) {
 		goto __823
 	}
-	rc = SQLITE_ERROR
-	Xsqlite3VdbeError(tls, p, ts+7302, 0)
-	goto abort_due_to_error
+	goto __822
+__822:
+	pFrame2 = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent
+	goto __821
+	goto __823
 __823:
 	;
-	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+	if !(pFrame2 != 0) {
 		goto __824
 	}
+	goto __9
+__824:
+	;
+__820:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFrame >= *(*int32)(unsafe.Pointer(db + 136 + 10*4))) {
+		goto __825
+	}
+	rc = SQLITE_ERROR
+	Xsqlite3VdbeError(tls, p, ts+7292, 0)
+	goto abort_due_to_error
+__825:
+	;
+	if !(int32((*Mem)(unsafe.Pointer(pRt)).Fflags)&MEM_Blob == 0) {
+		goto __826
+	}
 
 	nMem = (*SubProgram)(unsafe.Pointer(pProgram)).FnMem + (*SubProgram)(unsafe.Pointer(pProgram)).FnCsr
 
 	if !((*SubProgram)(unsafe.Pointer(pProgram)).FnCsr == 0) {
-		goto __826
+		goto __828
 	}
 	nMem++
-__826:
+__828:
 	;
 	nByte2 = int32((uint64(unsafe.Sizeof(VdbeFrame{}))+uint64(7))&libc.Uint64FromInt32(libc.CplInt32(7)) +
 		uint64(nMem)*uint64(unsafe.Sizeof(Mem{})) +
@@ -95476,10 +95647,10 @@ __826:
 		uint64(((*SubProgram)(unsafe.Pointer(pProgram)).FnOp+7)/8))
 	pFrame2 = Xsqlite3DbMallocZero(tls, db, uint64(nByte2))
 	if !!(pFrame2 != 0) {
-		goto __827
+		goto __829
 	}
 	goto no_mem
-__827:
+__829:
 	;
 	Xsqlite3VdbeMemRelease(tls, pRt)
 	(*Mem)(unsafe.Pointer(pRt)).Fflags = U16(MEM_Blob | MEM_Dyn)
@@ -95499,26 +95670,26 @@ __827:
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FnOp = (*Vdbe)(unsafe.Pointer(p)).FnOp
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).Ftoken = (*SubProgram)(unsafe.Pointer(pProgram)).Ftoken
 
-	pEnd = pFrame2 + 120 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
-	pMem1 = pFrame2 + 120
-__828:
+	pEnd = pFrame2 + 112 + uintptr((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem)*56
+	pMem1 = pFrame2 + 112
+__830:
 	if !(pMem1 != pEnd) {
-		goto __830
+		goto __832
 	}
 	(*Mem)(unsafe.Pointer(pMem1)).Fflags = U16(MEM_Undefined)
 	(*Mem)(unsafe.Pointer(pMem1)).Fdb = db
-	goto __829
-__829:
+	goto __831
+__831:
 	pMem1 += 56
-	goto __828
 	goto __830
-__830:
+	goto __832
+__832:
 	;
-	goto __825
-__824:
+	goto __827
+__826:
 	pFrame2 = (*Mem)(unsafe.Pointer(pRt)).Fz
 
-__825:
+__827:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).FnFrame++
 	(*VdbeFrame)(unsafe.Pointer(pFrame2)).FpParent = (*Vdbe)(unsafe.Pointer(p)).FpFrame
@@ -95530,7 +95701,7 @@ __825:
 	(*Vdbe)(unsafe.Pointer(p)).FpAuxData = uintptr(0)
 	(*Vdbe)(unsafe.Pointer(p)).FnChange = int64(0)
 	(*Vdbe)(unsafe.Pointer(p)).FpFrame = pFrame2
-	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+120)
+	(*Vdbe)(unsafe.Pointer(p)).FaMem = libc.AssignUintptr(&aMem, pFrame2+112)
 	(*Vdbe)(unsafe.Pointer(p)).FnMem = (*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildMem
 	(*Vdbe)(unsafe.Pointer(p)).FnCursor = int32(U16((*VdbeFrame)(unsafe.Pointer(pFrame2)).FnChildCsr))
 	(*Vdbe)(unsafe.Pointer(p)).FapCsr = aMem + uintptr((*Vdbe)(unsafe.Pointer(p)).FnMem)*56
@@ -95541,170 +95712,170 @@ __825:
 	pOp = aOp + libc.UintptrFromInt32(-1)*24
 	goto check_for_interrupt
 
-__150:
+__151:
 	pOut = out2Prerelease(tls, p, pOp)
 	pFrame3 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 	pIn = (*VdbeFrame)(unsafe.Pointer(pFrame3)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1+(*Op)(unsafe.Pointer((*VdbeFrame)(unsafe.Pointer(pFrame3)).FaOp+uintptr((*VdbeFrame)(unsafe.Pointer(pFrame3)).Fpc)*24)).Fp1)*56
 	Xsqlite3VdbeMemShallowCopy(tls, pOut, pIn, MEM_Ephem)
-	goto __8
-
-__151:
-	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
-		goto __831
-	}
-	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __832
-__831:
-	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __833
-	}
-	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __834
-__833:
-	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
-__834:
-	;
-__832:
-	;
-	goto __8
+	goto __9
 
 __152:
+	if !((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_DeferFKs) != 0) {
+		goto __833
+	}
+	*(*I64)(unsafe.Pointer(db + 792)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __834
+__833:
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
 		goto __835
 	}
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __837
-	}
-	goto jump_to_p2
-__837:
-	;
+	*(*I64)(unsafe.Pointer(db + 784)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 	goto __836
 __835:
-	;
-	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
-		goto __838
-	}
-	goto jump_to_p2
-__838:
-	;
+	*(*I64)(unsafe.Pointer(p + 80)) += I64((*Op)(unsafe.Pointer(pOp)).Fp2)
 __836:
 	;
-	goto __8
+__834:
+	;
+	goto __9
 
 __153:
-	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __837
+	}
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnDeferredCons == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
 		goto __839
 	}
-	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
-__841:
-	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
-		goto __843
+	goto jump_to_p2
+__839:
+	;
+	goto __838
+__837:
+	;
+	if !((*Vdbe)(unsafe.Pointer(p)).FnFkConstraint == int64(0) && (*Sqlite3)(unsafe.Pointer(db)).FnDeferredImmCons == int64(0)) {
+		goto __840
 	}
-	goto __842
-__842:
-	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
-	goto __841
-	goto __843
+	goto jump_to_p2
+__840:
+	;
+__838:
+	;
+	goto __9
+
+__154:
+	if !((*Vdbe)(unsafe.Pointer(p)).FpFrame != 0) {
+		goto __841
+	}
+	pFrame4 = (*Vdbe)(unsafe.Pointer(p)).FpFrame
 __843:
+	if !((*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent != 0) {
+		goto __845
+	}
+	goto __844
+__844:
+	pFrame4 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FpParent
+	goto __843
+	goto __845
+__845:
 	;
 	pIn1 = (*VdbeFrame)(unsafe.Pointer(pFrame4)).FaMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	goto __840
-__839:
+	goto __842
+__841:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-__840:
+__842:
 	;
 	Xsqlite3VdbeMemIntegerify(tls, pIn1)
 	pIn2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56
 	Xsqlite3VdbeMemIntegerify(tls, pIn2)
 	if !(*(*I64)(unsafe.Pointer(pIn1)) < *(*I64)(unsafe.Pointer(pIn2))) {
-		goto __844
+		goto __846
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) = *(*I64)(unsafe.Pointer(pIn2))
-__844:
+__846:
 	;
-	goto __8
+	goto __9
 
-__154:
+__155:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __845
+		goto __847
 	}
 	*(*I64)(unsafe.Pointer(pIn1)) -= I64((*Op)(unsafe.Pointer(pOp)).Fp3)
 	goto jump_to_p2
-__845:
+__847:
 	;
-	goto __8
+	goto __9
 
-__155:
+__156:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 	pIn3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 
-	*(*I64)(unsafe.Pointer(bp + 888)) = *(*I64)(unsafe.Pointer(pIn1))
-	if !(*(*I64)(unsafe.Pointer(bp + 888)) <= int64(0) || Xsqlite3AddInt64(tls, bp+888, func() int64 {
+	*(*I64)(unsafe.Pointer(bp + 896)) = *(*I64)(unsafe.Pointer(pIn1))
+	if !(*(*I64)(unsafe.Pointer(bp + 896)) <= int64(0) || Xsqlite3AddInt64(tls, bp+896, func() int64 {
 		if *(*I64)(unsafe.Pointer(pIn3)) > int64(0) {
 			return *(*I64)(unsafe.Pointer(pIn3))
 		}
 		return int64(0)
 	}()) != 0) {
-		goto __846
+		goto __848
 	}
 
 	*(*I64)(unsafe.Pointer(pOut)) = int64(-1)
-	goto __847
-__846:
-	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 888))
-__847:
-	;
-	goto __8
-
-__156:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-
-	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
-		goto __848
-	}
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
-		goto __849
-	}
-	*(*I64)(unsafe.Pointer(pIn1))--
+	goto __849
+__848:
+	*(*I64)(unsafe.Pointer(pOut)) = *(*I64)(unsafe.Pointer(bp + 896))
 __849:
 	;
-	goto jump_to_p2
-__848:
-	;
-	goto __8
+	goto __9
 
 __157:
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
-	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) != 0) {
 		goto __850
 	}
-	*(*I64)(unsafe.Pointer(pIn1))--
-__850:
-	;
-	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(0)) {
 		goto __851
 	}
-	goto jump_to_p2
+	*(*I64)(unsafe.Pointer(pIn1))--
 __851:
 	;
-	goto __8
+	goto jump_to_p2
+__850:
+	;
+	goto __9
 
 __158:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+
+	if !(*(*I64)(unsafe.Pointer(pIn1)) > int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32)) {
+		goto __852
+	}
+	*(*I64)(unsafe.Pointer(pIn1))--
+__852:
+	;
+	if !(*(*I64)(unsafe.Pointer(pIn1)) == int64(0)) {
+		goto __853
+	}
+	goto jump_to_p2
+__853:
+	;
+	goto __9
+
 __159:
+__160:
 	;
 	n4 = int32((*Op)(unsafe.Pointer(pOp)).Fp5)
 
 	pCtx = Xsqlite3DbMallocRawNN(tls, db, uint64(n4)*uint64(unsafe.Sizeof(uintptr(0)))+(uint64(unsafe.Sizeof(Sqlite3_context{}))+uint64(unsafe.Sizeof(Mem{}))-uint64(unsafe.Sizeof(uintptr(0)))))
 	if !(pCtx == uintptr(0)) {
-		goto __852
+		goto __854
 	}
 	goto no_mem
-__852:
+__854:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpMem = uintptr(0)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx)).FpOut = pCtx + 48 + uintptr(n4)*8
@@ -95721,146 +95892,146 @@ __852:
 
 	(*Op)(unsafe.Pointer(pOp)).Fopcode = U8(OP_AggStep1)
 
-__160:
+__161:
 	;
 	pCtx1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	pMem2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem != pMem2) {
-		goto __853
+		goto __855
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpMem = pMem2
 	i5 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc) - 1
-__854:
+__856:
 	if !(i5 >= 0) {
-		goto __856
+		goto __858
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx1 + 48 + uintptr(i5)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i5)*56
-	goto __855
-__855:
+	goto __857
+__857:
 	i5--
-	goto __854
 	goto __856
-__856:
+	goto __858
+__858:
 	;
-__853:
+__855:
 	;
 	(*Mem)(unsafe.Pointer(pMem2)).Fn++
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __857
+		goto __859
 	}
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxInverse})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-	goto __858
-__857:
+	goto __860
+__859:
 	(*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpFunc)).FxSFunc})).f(tls, pCtx1, int32((*Sqlite3_context)(unsafe.Pointer(pCtx1)).Fargc), pCtx1+48)
-__858:
+__860:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError != 0) {
-		goto __859
+		goto __861
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError > 0) {
-		goto __860
+		goto __862
 	}
 	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+120, Xsqlite3_value_text(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError
-__860:
+__862:
 	;
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag != 0) {
-		goto __861
+		goto __863
 	}
 
 	i5 = (*Op)(unsafe.Pointer(pOp + libc.UintptrFromInt32(-1)*24)).Fp1
 	if !(i5 != 0) {
-		goto __862
+		goto __864
 	}
 	Xsqlite3VdbeMemSetInt64(tls, aMem+uintptr(i5)*56, int64(1))
-__862:
+__864:
 	;
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FskipFlag = U8(0)
-__861:
+__863:
 	;
 	Xsqlite3VdbeMemRelease(tls, (*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)
 	(*Mem)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx1)).FpOut)).Fflags = U16(MEM_Null)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx1)).FisError = 0
 	if !(rc != 0) {
-		goto __863
+		goto __865
 	}
 	goto abort_due_to_error
-__863:
+__865:
 	;
-__859:
+__861:
 	;
-	goto __8
+	goto __9
 
-__161:
 __162:
+__163:
 	;
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __864
+		goto __866
 	}
 
 	rc = Xsqlite3VdbeMemAggValue(tls, pMem3, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	pMem3 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-	goto __865
-__864:
+	goto __867
+__866:
 	rc = Xsqlite3VdbeMemFinalize(tls, pMem3, *(*uintptr)(unsafe.Pointer(pOp + 16)))
-__865:
+__867:
 	;
 	if !(rc != 0) {
-		goto __866
+		goto __868
 	}
 	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+128, Xsqlite3_value_text(tls, pMem3)))
 	goto abort_due_to_error
-__866:
+__868:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pMem3, int32(encoding))
 
-	goto __8
+	goto __9
 
-__163:
+__164:
 	;
-	*(*int32)(unsafe.Pointer(bp + 896)) = 0
-	*(*int32)(unsafe.Pointer(bp + 896 + 1*4)) = libc.AssignPtrInt32(bp+896+2*4, -1)
+	*(*int32)(unsafe.Pointer(bp + 904)) = 0
+	*(*int32)(unsafe.Pointer(bp + 904 + 1*4)) = libc.AssignPtrInt32(bp+904+2*4, -1)
 
-	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+896+1*4, bp+896+2*4)
+	rc = Xsqlite3Checkpoint(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, (*Op)(unsafe.Pointer(pOp)).Fp2, bp+904+1*4, bp+904+2*4)
 	if !(rc != 0) {
-		goto __867
+		goto __869
 	}
 	if !(rc != SQLITE_BUSY) {
-		goto __868
+		goto __870
 	}
 	goto abort_due_to_error
-__868:
+__870:
 	;
 	rc = SQLITE_OK
-	*(*int32)(unsafe.Pointer(bp + 896)) = 1
-__867:
+	*(*int32)(unsafe.Pointer(bp + 904)) = 1
+__869:
 	;
 	i6 = 0
 	pMem4 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
-__869:
+__871:
 	if !(i6 < 3) {
-		goto __871
+		goto __873
 	}
-	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 896 + uintptr(i6)*4))))
-	goto __870
-__870:
+	Xsqlite3VdbeMemSetInt64(tls, pMem4, I64(*(*int32)(unsafe.Pointer(bp + 904 + uintptr(i6)*4))))
+	goto __872
+__872:
 	i6++
 	pMem4 += 56
-	goto __869
 	goto __871
-__871:
+	goto __873
+__873:
 	;
-	goto __8
+	goto __9
 
-__164:
+__165:
 	pOut = out2Prerelease(tls, p, pOp)
 	eNew = (*Op)(unsafe.Pointer(pOp)).Fp3
 
@@ -95868,70 +96039,70 @@ __164:
 	pPager = Xsqlite3BtreePager(tls, pBt1)
 	eOld = Xsqlite3PagerGetJournalMode(tls, pPager)
 	if !(eNew == -1) {
-		goto __872
+		goto __874
 	}
 	eNew = eOld
-__872:
+__874:
 	;
 	if !!(Xsqlite3PagerOkToChangeJournalMode(tls, pPager) != 0) {
-		goto __873
+		goto __875
 	}
 	eNew = eOld
-__873:
+__875:
 	;
 	zFilename = Xsqlite3PagerFilename(tls, pPager, 1)
 
 	if !(eNew == PAGER_JOURNALMODE_WAL &&
 		(Xsqlite3Strlen30(tls, zFilename) == 0 ||
 			!(Xsqlite3PagerWalSupported(tls, pPager) != 0))) {
-		goto __874
+		goto __876
 	}
 	eNew = eOld
-__874:
+__876:
 	;
 	if !(eNew != eOld &&
 		(eOld == PAGER_JOURNALMODE_WAL || eNew == PAGER_JOURNALMODE_WAL)) {
-		goto __875
+		goto __877
 	}
 	if !(!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) || (*Sqlite3)(unsafe.Pointer(db)).FnVdbeRead > 1) {
-		goto __876
+		goto __878
 	}
 	rc = SQLITE_ERROR
 	Xsqlite3VdbeError(tls, p,
-		ts+7339,
+		ts+7329,
 		libc.VaList(bp+136, func() uintptr {
 			if eNew == PAGER_JOURNALMODE_WAL {
-				return ts + 7391
+				return ts + 7381
 			}
-			return ts + 7396
+			return ts + 7386
 		}()))
 	goto abort_due_to_error
-	goto __877
-__876:
+	goto __879
+__878:
 	if !(eOld == PAGER_JOURNALMODE_WAL) {
-		goto __878
+		goto __880
 	}
 
 	rc = Xsqlite3PagerCloseWal(tls, pPager, db)
 	if !(rc == SQLITE_OK) {
-		goto __880
+		goto __882
 	}
 	Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
-__880:
+__882:
 	;
-	goto __879
-__878:
+	goto __881
+__880:
 	if !(eOld == PAGER_JOURNALMODE_MEMORY) {
-		goto __881
+		goto __883
 	}
 
 	Xsqlite3PagerSetJournalMode(tls, pPager, PAGER_JOURNALMODE_OFF)
+__883:
+	;
 __881:
 	;
-__879:
-	;
 	if !(rc == SQLITE_OK) {
-		goto __882
+		goto __884
 	}
 	rc = Xsqlite3BtreeSetVersion(tls, pBt1, func() int32 {
 		if eNew == PAGER_JOURNALMODE_WAL {
@@ -95939,17 +96110,17 @@ __879:
 		}
 		return 1
 	}())
-__882:
+__884:
+	;
+__879:
 	;
 __877:
 	;
-__875:
-	;
 	if !(rc != 0) {
-		goto __883
+		goto __885
 	}
 	eNew = eOld
-__883:
+__885:
 	;
 	eNew = Xsqlite3PagerSetJournalMode(tls, pPager, eNew)
 
@@ -95959,14 +96130,14 @@ __883:
 	(*Mem)(unsafe.Pointer(pOut)).Fenc = U8(SQLITE_UTF8)
 	Xsqlite3VdbeChangeEncoding(tls, pOut, int32(encoding))
 	if !(rc != 0) {
-		goto __884
+		goto __886
 	}
 	goto abort_due_to_error
-__884:
+__886:
 	;
-	goto __8
+	goto __9
 
-__165:
+__166:
 	;
 	rc = Xsqlite3RunVacuum(tls, p+168, db, (*Op)(unsafe.Pointer(pOp)).Fp1,
 		func() uintptr {
@@ -95976,197 +96147,197 @@ __165:
 			return uintptr(0)
 		}())
 	if !(rc != 0) {
-		goto __885
-	}
-	goto abort_due_to_error
-__885:
-	;
-	goto __8
-
-__166:
-	;
-	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
-	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
-
-	if !(rc != 0) {
-		goto __886
-	}
-	if !(rc != SQLITE_DONE) {
 		goto __887
 	}
 	goto abort_due_to_error
 __887:
 	;
-	rc = SQLITE_OK
-	goto jump_to_p2
-__886:
-	;
-	goto __8
+	goto __9
 
 __167:
 	;
-	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+	pBt2 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
+	rc = Xsqlite3BtreeIncrVacuum(tls, pBt2)
+
+	if !(rc != 0) {
 		goto __888
 	}
-	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
-	goto __889
-__888:
-	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+	if !(rc != SQLITE_DONE) {
+		goto __889
+	}
+	goto abort_due_to_error
 __889:
 	;
-	goto __8
+	rc = SQLITE_OK
+	goto jump_to_p2
+__888:
+	;
+	goto __9
 
 __168:
+	;
+	if !!((*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
+		goto __890
+	}
+	Xsqlite3ExpirePreparedStatements(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	goto __891
+__890:
+	libc.SetBitFieldPtr8Uint32(p+200, Bft((*Op)(unsafe.Pointer(pOp)).Fp2+1), 0, 0x3)
+__891:
+	;
+	goto __9
+
+__169:
 	;
 	pC30 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorPin(tls, *(*uintptr)(unsafe.Pointer(pC30 + 48)))
-	goto __8
+	goto __9
 
-__169:
+__170:
 	;
 	pC31 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	Xsqlite3BtreeCursorUnpin(tls, *(*uintptr)(unsafe.Pointer(pC31 + 48)))
-	goto __8
+	goto __9
 
-__170:
+__171:
 	isWriteLock = U8((*Op)(unsafe.Pointer(pOp)).Fp3)
 	if !(isWriteLock != 0 || uint64(0) == (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ReadUncommit)) {
-		goto __890
+		goto __892
 	}
 	p13 = (*Op)(unsafe.Pointer(pOp)).Fp1
 
 	rc = Xsqlite3BtreeLockTable(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(p13)*32)).FpBt, (*Op)(unsafe.Pointer(pOp)).Fp2, isWriteLock)
 	if !(rc != 0) {
-		goto __891
+		goto __893
 	}
 	if !(rc&0xFF == SQLITE_LOCKED) {
-		goto __892
+		goto __894
 	}
 	z1 = *(*uintptr)(unsafe.Pointer(pOp + 16))
-	Xsqlite3VdbeError(tls, p, ts+7403, libc.VaList(bp+144, z1))
-__892:
+	Xsqlite3VdbeError(tls, p, ts+7393, libc.VaList(bp+144, z1))
+__894:
 	;
 	goto abort_due_to_error
-__891:
+__893:
 	;
-__890:
+__892:
 	;
-	goto __8
+	goto __9
 
-__171:
+__172:
 	pVTab = *(*uintptr)(unsafe.Pointer(pOp + 16))
 	rc = Xsqlite3VtabBegin(tls, db, pVTab)
 	if !(pVTab != 0) {
-		goto __893
-	}
-	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
-__893:
-	;
-	if !(rc != 0) {
-		goto __894
-	}
-	goto abort_due_to_error
-__894:
-	;
-	goto __8
-
-__172:
-	libc.Xmemset(tls, bp+912, 0, uint64(unsafe.Sizeof(Mem{})))
-	(*Mem)(unsafe.Pointer(bp + 912)).Fdb = db
-
-	rc = Xsqlite3VdbeMemCopy(tls, bp+912, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
-
-	zTab = Xsqlite3_value_text(tls, bp+912)
-
-	if !(zTab != 0) {
 		goto __895
 	}
-	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+	Xsqlite3VtabImportErrmsg(tls, p, (*VTable)(unsafe.Pointer(pVTab)).FpVtab)
 __895:
 	;
-	Xsqlite3VdbeMemRelease(tls, bp+912)
 	if !(rc != 0) {
 		goto __896
 	}
 	goto abort_due_to_error
 __896:
 	;
-	goto __8
+	goto __9
 
 __173:
+	libc.Xmemset(tls, bp+920, 0, uint64(unsafe.Sizeof(Mem{})))
+	(*Mem)(unsafe.Pointer(bp + 920)).Fdb = db
+
+	rc = Xsqlite3VdbeMemCopy(tls, bp+920, aMem+uintptr((*Op)(unsafe.Pointer(pOp)).Fp2)*56)
+
+	zTab = Xsqlite3_value_text(tls, bp+920)
+
+	if !(zTab != 0) {
+		goto __897
+	}
+	rc = Xsqlite3VtabCallCreate(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, zTab, p+168)
+__897:
+	;
+	Xsqlite3VdbeMemRelease(tls, bp+920)
+	if !(rc != 0) {
+		goto __898
+	}
+	goto abort_due_to_error
+__898:
+	;
+	goto __9
+
+__174:
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy++
 	rc = Xsqlite3VtabCallDestroy(tls, db, (*Op)(unsafe.Pointer(pOp)).Fp1, *(*uintptr)(unsafe.Pointer(pOp + 16)))
 	(*Sqlite3)(unsafe.Pointer(db)).FnVDestroy--
 
-	if !(rc != 0) {
-		goto __897
-	}
-	goto abort_due_to_error
-__897:
-	;
-	goto __8
-
-__174:
-	;
-	pCur3 = uintptr(0)
-	*(*uintptr)(unsafe.Pointer(bp + 968)) = uintptr(0)
-	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
-	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
-		goto __898
-	}
-	rc = SQLITE_LOCKED
-	goto abort_due_to_error
-__898:
-	;
-	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+968)
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
 	if !(rc != 0) {
 		goto __899
 	}
 	goto abort_due_to_error
 __899:
 	;
-	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 968)))).FpVtab = pVtab1
+	goto __9
+
+__175:
+	;
+	pCur3 = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 976)) = uintptr(0)
+	pVtab1 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
+	if !(pVtab1 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule == uintptr(0)) {
+		goto __900
+	}
+	rc = SQLITE_LOCKED
+	goto abort_due_to_error
+__900:
+	;
+	pModule1 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FpModule
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxOpen})).f(tls, pVtab1, bp+976)
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab1)
+	if !(rc != 0) {
+		goto __901
+	}
+	goto abort_due_to_error
+__901:
+	;
+	(*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 976)))).FpVtab = pVtab1
 
 	pCur3 = allocateCursor(tls, p, (*Op)(unsafe.Pointer(pOp)).Fp1, 0, uint8(CURTYPE_VTAB))
 	if !(pCur3 != 0) {
-		goto __900
+		goto __902
 	}
-	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 968))
+	*(*uintptr)(unsafe.Pointer(pCur3 + 48)) = *(*uintptr)(unsafe.Pointer(bp + 976))
 	(*Sqlite3_vtab)(unsafe.Pointer(pVtab1)).FnRef++
-	goto __901
-__900:
+	goto __903
+__902:
 	;
 	(*struct {
 		f func(*libc.TLS, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 968)))
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule1)).FxClose})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 976)))
 	goto no_mem
-__901:
+__903:
 	;
-	goto __8
+	goto __9
 
-__175:
+__176:
 	pC32 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 	pRhs = Xsqlite3_malloc64(tls, uint64(unsafe.Sizeof(ValueList{})))
 	if !(pRhs == uintptr(0)) {
-		goto __902
+		goto __904
 	}
 	goto no_mem
-__902:
+__904:
 	;
 	(*ValueList)(unsafe.Pointer(pRhs)).FpCsr = *(*uintptr)(unsafe.Pointer(pC32 + 48))
 	(*ValueList)(unsafe.Pointer(pRhs)).FpOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pOut = out2Prerelease(tls, p, pOp)
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(MEM_Null)
-	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+6709, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
-	goto __8
+	Xsqlite3VdbeMemSetPointer(tls, pOut, pRhs, ts+7422, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3VdbeValueListFree})))
+	goto __9
 
-__176:
+__177:
 	pQuery = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	pArgc = pQuery + 1*56
 	pCur4 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
@@ -96180,27 +96351,27 @@ __176:
 
 	apArg = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	i7 = 0
-__903:
+__905:
 	if !(i7 < nArg) {
-		goto __905
+		goto __907
 	}
 	*(*uintptr)(unsafe.Pointer(apArg + uintptr(i7)*8)) = pArgc + uintptr(i7+1)*56
-	goto __904
-__904:
+	goto __906
+__906:
 	i7++
-	goto __903
 	goto __905
-__905:
+	goto __907
+__907:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule2)).FxFilter})).f(tls, pVCur1, iQuery, *(*uintptr)(unsafe.Pointer(pOp + 16)), nArg, apArg)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab2)
 	if !(rc != 0) {
-		goto __906
+		goto __908
 	}
 	goto abort_due_to_error
-__906:
+__908:
 	;
 	res12 = (*struct {
 		f func(*libc.TLS, uintptr) int32
@@ -96208,72 +96379,72 @@ __906:
 	(*VdbeCursor)(unsafe.Pointer(pCur4)).FnullRow = U8(0)
 
 	if !(res12 != 0) {
-		goto __907
+		goto __909
 	}
 	goto jump_to_p2
-__907:
+__909:
 	;
-	goto __8
+	goto __9
 
-__177:
+__178:
 	pCur5 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	pDest2 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur5)).FnullRow != 0) {
-		goto __908
+		goto __910
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
-	goto __8
-__908:
+	goto __9
+__910:
 	;
 	pVtab3 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur5 + 48)))).FpVtab
 	pModule3 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab3)).FpModule
 
-	libc.Xmemset(tls, bp+976, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).FpOut = pDest2
-	(*Sqlite3_context)(unsafe.Pointer(bp + 976)).Fenc = encoding
+	libc.Xmemset(tls, bp+984, 0, uint64(unsafe.Sizeof(Sqlite3_context{})))
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).FpOut = pDest2
+	(*Sqlite3_context)(unsafe.Pointer(bp + 984)).Fenc = encoding
 
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5)&OPFLAG_NOCHNG != 0) {
-		goto __909
+		goto __911
 	}
 	Xsqlite3VdbeMemSetNull(tls, pDest2)
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(MEM_Null | MEM_Zero)
 	*(*int32)(unsafe.Pointer(pDest2)) = 0
-	goto __910
-__909:
+	goto __912
+__911:
 	(*Mem)(unsafe.Pointer(pDest2)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pDest2)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
-__910:
+__912:
 	;
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, uintptr, int32) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+976, (*Op)(unsafe.Pointer(pOp)).Fp2)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule3)).FxColumn})).f(tls, *(*uintptr)(unsafe.Pointer(pCur5 + 48)), bp+984, (*Op)(unsafe.Pointer(pOp)).Fp2)
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab3)
-	if !((*Sqlite3_context)(unsafe.Pointer(bp+976)).FisError > 0) {
-		goto __911
+	if !((*Sqlite3_context)(unsafe.Pointer(bp+984)).FisError > 0) {
+		goto __913
 	}
 	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+152, Xsqlite3_value_text(tls, pDest2)))
-	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 976)).FisError
-__911:
+	rc = (*Sqlite3_context)(unsafe.Pointer(bp + 984)).FisError
+__913:
 	;
 	Xsqlite3VdbeChangeEncoding(tls, pDest2, int32(encoding))
 
 	if !(rc != 0) {
-		goto __912
+		goto __914
 	}
 	goto abort_due_to_error
-__912:
+__914:
 	;
-	goto __8
+	goto __9
 
-__178:
+__179:
 	pCur6 = *(*uintptr)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FapCsr + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*8))
 
 	if !((*VdbeCursor)(unsafe.Pointer(pCur6)).FnullRow != 0) {
-		goto __913
+		goto __915
 	}
-	goto __8
-__913:
+	goto __9
+__915:
 	;
 	pVtab4 = (*Sqlite3_vtab_cursor)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pCur6 + 48)))).FpVtab
 	pModule4 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab4)).FpModule
@@ -96283,192 +96454,192 @@ __913:
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxNext})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab4)
 	if !(rc != 0) {
-		goto __914
+		goto __916
 	}
 	goto abort_due_to_error
-__914:
+__916:
 	;
 	res13 = (*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule4)).FxEof})).f(tls, *(*uintptr)(unsafe.Pointer(pCur6 + 48)))
 
 	if !!(res13 != 0) {
-		goto __915
+		goto __917
 	}
 
 	goto jump_to_p2_and_check_for_interrupt
-__915:
+__917:
 	;
 	goto check_for_interrupt
 
-__179:
+__180:
 	isLegacy = int32((*Sqlite3)(unsafe.Pointer(db)).Fflags & uint64(SQLITE_LegacyAlter))
 	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(SQLITE_LegacyAlter)
 	pVtab5 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	pName = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	rc = Xsqlite3VdbeChangeEncoding(tls, pName, SQLITE_UTF8)
-	if !(rc != 0) {
-		goto __916
-	}
-	goto abort_due_to_error
-__916:
-	;
-	rc = (*struct {
-		f func(*libc.TLS, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
-	if !(isLegacy == 0) {
-		goto __917
-	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
-__917:
-	;
-	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
-	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
 	if !(rc != 0) {
 		goto __918
 	}
 	goto abort_due_to_error
 __918:
 	;
-	goto __8
-
-__180:
-	*(*Sqlite_int64)(unsafe.Pointer(bp + 1032)) = int64(0)
-
-	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+	rc = (*struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(pVtab5)).FpModule)).FxRename})).f(tls, pVtab5, (*Mem)(unsafe.Pointer(pName)).Fz)
+	if !(isLegacy == 0) {
 		goto __919
 	}
-	goto no_mem
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyAlter))
 __919:
+	;
+	Xsqlite3VtabImportErrmsg(tls, p, pVtab5)
+	libc.SetBitFieldPtr8Uint32(p+200, Bft(0), 0, 0x3)
+	if !(rc != 0) {
+		goto __920
+	}
+	goto abort_due_to_error
+__920:
+	;
+	goto __9
+
+__181:
+	*(*Sqlite_int64)(unsafe.Pointer(bp + 1040)) = int64(0)
+
+	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
+		goto __921
+	}
+	goto no_mem
+__921:
 	;
 	pVtab6 = (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FpVtab
 	if !(pVtab6 == uintptr(0) || (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule == uintptr(0)) {
-		goto __920
+		goto __922
 	}
 	rc = SQLITE_LOCKED
 	goto abort_due_to_error
-__920:
+__922:
 	;
 	pModule5 = (*Sqlite3_vtab)(unsafe.Pointer(pVtab6)).FpModule
 	nArg1 = (*Op)(unsafe.Pointer(pOp)).Fp2
 
 	if !((*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate != 0) {
-		goto __921
+		goto __923
 	}
 	vtabOnConflict = (*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict
 	apArg1 = (*Vdbe)(unsafe.Pointer(p)).FapArg
 	pX1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	i8 = 0
-__922:
+__924:
 	if !(i8 < nArg1) {
-		goto __924
+		goto __926
 	}
 
 	*(*uintptr)(unsafe.Pointer(apArg1 + uintptr(i8)*8)) = pX1
 	pX1 += 56
-	goto __923
-__923:
+	goto __925
+__925:
 	i8++
-	goto __922
 	goto __924
-__924:
+	goto __926
+__926:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = U8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	rc = (*struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr) int32
-	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1032)
+	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer(pModule5)).FxUpdate})).f(tls, pVtab6, nArg1, apArg1, bp+1040)
 	(*Sqlite3)(unsafe.Pointer(db)).FvtabOnConflict = vtabOnConflict
 	Xsqlite3VtabImportErrmsg(tls, p, pVtab6)
 	if !(rc == SQLITE_OK && (*Op)(unsafe.Pointer(pOp)).Fp1 != 0) {
-		goto __925
+		goto __927
 	}
 
-	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1032))
-__925:
+	(*Sqlite3)(unsafe.Pointer(db)).FlastRowid = *(*Sqlite_int64)(unsafe.Pointer(bp + 1040))
+__927:
 	;
 	if !(rc&0xff == SQLITE_CONSTRAINT && (*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pOp + 16)))).FbConstraint != 0) {
-		goto __926
-	}
-	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
 		goto __928
 	}
+	if !(int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Ignore) {
+		goto __930
+	}
 	rc = SQLITE_OK
-	goto __929
-__928:
+	goto __931
+__930:
 	(*Vdbe)(unsafe.Pointer(p)).FerrorAction = func() uint8 {
 		if int32((*Op)(unsafe.Pointer(pOp)).Fp5) == OE_Replace {
 			return uint8(OE_Abort)
 		}
 		return uint8((*Op)(unsafe.Pointer(pOp)).Fp5)
 	}()
+__931:
+	;
+	goto __929
+__928:
+	(*Vdbe)(unsafe.Pointer(p)).FnChange++
 __929:
-	;
-	goto __927
-__926:
-	(*Vdbe)(unsafe.Pointer(p)).FnChange++
-__927:
 	;
 	if !(rc != 0) {
-		goto __930
+		goto __932
 	}
 	goto abort_due_to_error
-__930:
+__932:
 	;
-__921:
+__923:
 	;
-	goto __8
-
-__181:
-	pOut = out2Prerelease(tls, p, pOp)
-	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
-	goto __8
+	goto __9
 
 __182:
+	pOut = out2Prerelease(tls, p, pOp)
+	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt))
+	goto __9
+
+__183:
 	pOut = out2Prerelease(tls, p, pOp)
 	pBt3 = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*32)).FpBt
 	newMax = uint32(0)
 	if !((*Op)(unsafe.Pointer(pOp)).Fp3 != 0) {
-		goto __931
+		goto __933
 	}
 	newMax = Xsqlite3BtreeLastPage(tls, pBt3)
 	if !(newMax < uint32((*Op)(unsafe.Pointer(pOp)).Fp3)) {
-		goto __932
+		goto __934
 	}
 	newMax = uint32((*Op)(unsafe.Pointer(pOp)).Fp3)
-__932:
+__934:
 	;
-__931:
+__933:
 	;
 	*(*I64)(unsafe.Pointer(pOut)) = I64(Xsqlite3BtreeMaxPageCount(tls, pBt3, newMax))
-	goto __8
+	goto __9
 
-__183:
 __184:
+__185:
 	;
 	pCtx2 = *(*uintptr)(unsafe.Pointer(pOp + 16))
 
 	pOut = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp3)*56
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut != pOut) {
-		goto __933
+		goto __935
 	}
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpVdbe = p
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpOut = pOut
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fenc = encoding
 	i9 = int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc) - 1
-__934:
+__936:
 	if !(i9 >= 0) {
-		goto __936
+		goto __938
 	}
 	*(*uintptr)(unsafe.Pointer(pCtx2 + 48 + uintptr(i9)*8)) = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp2+i9)*56
-	goto __935
-__935:
+	goto __937
+__937:
 	i9--
-	goto __934
 	goto __936
-__936:
+	goto __938
+__938:
 	;
-__933:
+__935:
 	;
 	(*Mem)(unsafe.Pointer(pOut)).Fflags = U16(int32((*Mem)(unsafe.Pointer(pOut)).Fflags)&libc.CplInt32(MEM_TypeMask|MEM_Zero) | MEM_Null)
 
@@ -96477,63 +96648,63 @@ __933:
 	})(unsafe.Pointer(&struct{ uintptr }{(*FuncDef)(unsafe.Pointer((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FpFunc)).FxSFunc})).f(tls, pCtx2, int32((*Sqlite3_context)(unsafe.Pointer(pCtx2)).Fargc), pCtx2+48)
 
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError != 0) {
-		goto __937
+		goto __939
 	}
 	if !((*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError > 0) {
-		goto __938
+		goto __940
 	}
 	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+160, Xsqlite3_value_text(tls, pOut)))
 	rc = (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError
-__938:
+__940:
 	;
 	Xsqlite3VdbeDeleteAuxData(tls, db, p+296, (*Sqlite3_context)(unsafe.Pointer(pCtx2)).FiOp, (*Op)(unsafe.Pointer(pOp)).Fp1)
 	(*Sqlite3_context)(unsafe.Pointer(pCtx2)).FisError = 0
 	if !(rc != 0) {
-		goto __939
+		goto __941
 	}
 	goto abort_due_to_error
+__941:
+	;
 __939:
 	;
-__937:
-	;
-	goto __8
-
-__185:
-	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
-	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
-	goto __8
+	goto __9
 
 __186:
+	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
+	*(*U16)(unsafe.Pointer(pIn1 + 20)) &= libc.Uint16FromInt32(libc.CplInt32(MEM_Subtype))
+	goto __9
+
+__187:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h = filterHash(tls, aMem, pOp)
 	h = h % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h/uint64(8)))) |= int8(int32(1) << (h & uint64(7)))
-	goto __8
+	goto __9
 
-__187:
+__188:
 	;
 	pIn1 = aMem + uintptr((*Op)(unsafe.Pointer(pOp)).Fp1)*56
 
 	h1 = filterHash(tls, aMem, pOp)
 	h1 = h1 % U64((*Mem)(unsafe.Pointer(pIn1)).Fn)
 	if !(int32(*(*int8)(unsafe.Pointer((*Mem)(unsafe.Pointer(pIn1)).Fz + uintptr(h1/uint64(8)))))&(int32(1)<<(h1&uint64(7))) == 0) {
-		goto __940
+		goto __942
 	}
 
 	*(*U32)(unsafe.Pointer(p + 212 + 8*4))++
 	goto jump_to_p2
-	goto __941
-__940:
+	goto __943
+__942:
 	*(*U32)(unsafe.Pointer(p + 212 + 7*4))++
 
-__941:
+__943:
 	;
-	goto __8
+	goto __9
 
-__188:
 __189:
+__190:
 	;
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&(SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY) != 0 &&
 		int32((*Vdbe)(unsafe.Pointer(p)).FminWriteFileFormat) != 254 &&
@@ -96543,104 +96714,104 @@ __189:
 			}
 			return (*Vdbe)(unsafe.Pointer(p)).FzSql
 		}()) != uintptr(0)) {
-		goto __942
+		goto __944
 	}
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_LEGACY != 0) {
-		goto __943
+		goto __945
 	}
 	z2 = Xsqlite3VdbeExpandSql(tls, p, zTrace)
 	(*struct {
 		f func(*libc.TLS, uintptr, uintptr)
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, z2)
 	Xsqlite3_free(tls, z2)
-	goto __944
-__943:
+	goto __946
+__945:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeExec > 1) {
-		goto __945
+		goto __947
 	}
 	z3 = Xsqlite3MPrintf(tls, db, ts+7432, libc.VaList(bp+168, zTrace))
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, z3)
 	Xsqlite3DbFree(tls, db, z3)
-	goto __946
-__945:
+	goto __948
+__947:
 	(*struct {
 		f func(*libc.TLS, U32, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{*(*uintptr)(unsafe.Pointer(db + 248))})).f(tls, uint32(SQLITE_TRACE_STMT), (*Sqlite3)(unsafe.Pointer(db)).FpTraceArg, p, zTrace)
+__948:
+	;
 __946:
 	;
 __944:
 	;
-__942:
-	;
 	if !((*Op)(unsafe.Pointer(pOp)).Fp1 >= Xsqlite3Config.FiOnceResetThreshold) {
-		goto __947
+		goto __949
 	}
 	if !(int32((*Op)(unsafe.Pointer(pOp)).Fopcode) == OP_Trace) {
-		goto __948
+		goto __950
 	}
-	goto __8
-__948:
+	goto __9
+__950:
 	;
 	i10 = 1
-__949:
+__951:
 	if !(i10 < (*Vdbe)(unsafe.Pointer(p)).FnOp) {
-		goto __951
+		goto __953
 	}
 	if !(int32((*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp+uintptr(i10)*24)).Fopcode) == OP_Once) {
-		goto __952
+		goto __954
 	}
 	(*Op)(unsafe.Pointer((*Vdbe)(unsafe.Pointer(p)).FaOp + uintptr(i10)*24)).Fp1 = 0
-__952:
+__954:
 	;
-	goto __950
-__950:
+	goto __952
+__952:
 	i10++
-	goto __949
 	goto __951
-__951:
+	goto __953
+__953:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1 = 0
-__947:
+__949:
 	;
 	(*Op)(unsafe.Pointer(pOp)).Fp1++
 	*(*U32)(unsafe.Pointer(p + 212 + 6*4))++
 	goto jump_to_p2
 
-__190:
+__191:
 	;
-	goto __8
+	goto __9
 
-__8:
+__9:
 	;
-	goto __6
-__6:
-	pOp += 24
-	goto __5
 	goto __7
 __7:
+	pOp += 24
+	goto __6
+	goto __8
+__8:
 	;
 abort_due_to_error:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __953
-	}
-	rc = SQLITE_NOMEM
-	goto __954
-__953:
-	if !(rc == SQLITE_IOERR|int32(33)<<8) {
 		goto __955
 	}
-	rc = Xsqlite3CorruptError(tls, 98486)
+	rc = SQLITE_NOMEM
+	goto __956
 __955:
+	if !(rc == SQLITE_IOERR|int32(33)<<8) {
+		goto __957
+	}
+	rc = Xsqlite3CorruptError(tls, 99031)
+__957:
 	;
-__954:
+__956:
 	;
 	if !((*Vdbe)(unsafe.Pointer(p)).FzErrMsg == uintptr(0) && rc != SQLITE_IOERR|int32(12)<<8) {
-		goto __956
+		goto __958
 	}
 	Xsqlite3VdbeError(tls, p, ts+4493, libc.VaList(bp+176, Xsqlite3ErrStr(tls, rc)))
-__956:
+__958:
 	;
 	(*Vdbe)(unsafe.Pointer(p)).Frc = rc
 	Xsqlite3SystemError(tls, db, rc)
@@ -96648,52 +96819,56 @@ __956:
 	Xsqlite3_log(tls, rc, ts+7438,
 		libc.VaList(bp+184, int32((int64(pOp)-int64(aOp))/24), (*Vdbe)(unsafe.Pointer(p)).FzSql, (*Vdbe)(unsafe.Pointer(p)).FzErrMsg))
 	if !(int32((*Vdbe)(unsafe.Pointer(p)).FeVdbeState) == VDBE_RUN_STATE) {
-		goto __957
-	}
-	Xsqlite3VdbeHalt(tls, p)
-__957:
-	;
-	if !(rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __958
-	}
-	Xsqlite3OomFault(tls, db)
-__958:
-	;
-	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
 		goto __959
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+	Xsqlite3VdbeHalt(tls, p)
 __959:
+	;
+	if !(rc == SQLITE_IOERR|int32(12)<<8) {
+		goto __960
+	}
+	Xsqlite3OomFault(tls, db)
+__960:
+	;
+	if !(rc == SQLITE_CORRUPT && int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) == 0) {
+		goto __961
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) |= uint64(0x00002) << 32
+__961:
 	;
 	rc = SQLITE_ERROR
 	if !(int32(resetSchemaOnFault) > 0) {
-		goto __960
+		goto __962
 	}
 	Xsqlite3ResetOneSchema(tls, db, int32(resetSchemaOnFault)-1)
-__960:
+__962:
 	;
 vdbe_return:
-__961:
+__963:
 	if !(nVmStep >= nProgressLimit && (*Sqlite3)(unsafe.Pointer(db)).FxProgress != uintptr(0)) {
-		goto __962
+		goto __964
 	}
 	nProgressLimit = nProgressLimit + U64((*Sqlite3)(unsafe.Pointer(db)).FnProgressOps)
 	if !((*struct {
 		f func(*libc.TLS, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxProgress})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpProgressArg) != 0) {
-		goto __963
+		goto __965
 	}
 	nProgressLimit = uint64(0xffffffff) | uint64(0xffffffff)<<32
 	rc = SQLITE_INTERRUPT
 	goto abort_due_to_error
-__963:
+__965:
 	;
-	goto __961
-__962:
+	goto __963
+__964:
 	;
 	*(*U32)(unsafe.Pointer(p + 212 + 4*4)) += U32(int32(nVmStep))
+	if !((*Vdbe)(unsafe.Pointer(p)).FlockMask != YDbMask(0)) {
+		goto __966
+	}
 	Xsqlite3VdbeLeave(tls, p)
-
+__966:
+	;
 	return rc
 
 too_big:
@@ -96812,8 +96987,8 @@ func blobSeekToRow(tls *libc.TLS, p uintptr, iRow Sqlite3_int64, pzErr uintptr)
 
 // Open a blob handle.
 func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr, zColumn uintptr, iRow Sqlite_int64, wrFlag int32, ppBlob uintptr) int32 {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var nAttempt int32
 	var iCol int32
@@ -96833,7 +97008,7 @@ func Xsqlite3_blob_open(tls *libc.TLS, db uintptr, zDb uintptr, zTable uintptr,
 	var aOp uintptr
 	nAttempt = 0
 	rc = SQLITE_OK
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 	pBlob = uintptr(0)
 
 	*(*uintptr)(unsafe.Pointer(ppBlob)) = uintptr(0)
@@ -96853,8 +97028,8 @@ __1:
 	goto blob_open_out
 __3:
 	;
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = uintptr(0)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = uintptr(0)
 
 	Xsqlite3BtreeEnterAll(tls, db)
 	pTab = Xsqlite3LocateTable(tls, bp+48, uint32(0), zTable, zDb)
@@ -96885,8 +97060,8 @@ __6:
 	if !((*Parse)(unsafe.Pointer(bp+48)).FzErrMsg != 0) {
 		goto __8
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = (*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg
 	(*Parse)(unsafe.Pointer(bp + 48)).FzErrMsg = uintptr(0)
 __8:
 	;
@@ -96919,8 +97094,8 @@ __11:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __13
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+7658, libc.VaList(bp+24, zColumn))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7658, libc.VaList(bp+24, zColumn))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -97000,8 +97175,8 @@ __25:
 	if !(zFault != 0) {
 		goto __30
 	}
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
-	*(*uintptr)(unsafe.Pointer(bp + 464)) = Xsqlite3MPrintf(tls, db, ts+7699, libc.VaList(bp+32, zFault))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
+	*(*uintptr)(unsafe.Pointer(bp + 472)) = Xsqlite3MPrintf(tls, db, ts+7699, libc.VaList(bp+32, zFault))
 	rc = SQLITE_ERROR
 	Xsqlite3BtreeLeaveAll(tls, db)
 	goto blob_open_out
@@ -97070,7 +97245,7 @@ __31:
 	goto blob_open_out
 __35:
 	;
-	rc = blobSeekToRow(tls, pBlob, iRow, bp+464)
+	rc = blobSeekToRow(tls, pBlob, iRow, bp+472)
 	if !(libc.PreIncInt32(&nAttempt, 1) >= SQLITE_MAX_SCHEMA_RETRY || rc != SQLITE_SCHEMA) {
 		goto __36
 	}
@@ -97098,12 +97273,12 @@ __39:
 __38:
 	;
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
-		if *(*uintptr)(unsafe.Pointer(bp + 464)) != 0 {
+		if *(*uintptr)(unsafe.Pointer(bp + 472)) != 0 {
 			return ts + 4493
 		}
 		return uintptr(0)
-	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 464))))
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 464)))
+	}(), libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 472))))
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 472)))
 	Xsqlite3ParseObjectReset(tls, bp+48)
 	rc = Xsqlite3ApiExit(tls, db, rc)
 	Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -97147,7 +97322,7 @@ func blobReadWrite(tls *libc.TLS, pBlob uintptr, z uintptr, n int32, iOffset int
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 98957)
+		return Xsqlite3MisuseError(tls, 99516)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -97230,7 +97405,7 @@ func Xsqlite3_blob_reopen(tls *libc.TLS, pBlob uintptr, iRow Sqlite3_int64) int3
 	var db uintptr
 
 	if p == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 99057)
+		return Xsqlite3MisuseError(tls, 99616)
 	}
 	db = (*Incrblob)(unsafe.Pointer(p)).Fdb
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
@@ -99769,6 +99944,34 @@ func extendFJMatch(tls *libc.TLS, pParse uintptr, ppList uintptr, pMatch uintptr
 	}
 }
 
+func isValidSchemaTableName(tls *libc.TLS, zTab uintptr, pTab uintptr, pSchema uintptr) int32 {
+	var zLegacy uintptr
+
+	if Xsqlite3_strnicmp(tls, zTab, ts+7733, 7) != 0 {
+		return 0
+	}
+	zLegacy = (*Table)(unsafe.Pointer(pTab)).FzName
+	if libc.Xstrcmp(tls, zLegacy+uintptr(7), ts+7741+7) == 0 {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7760+7) == 0 {
+			return 1
+		}
+		if pSchema == uintptr(0) {
+			return 0
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7235+7) == 0 {
+			return 1
+		}
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7779+7) == 0 {
+			return 1
+		}
+	} else {
+		if Xsqlite3StrICmp(tls, zTab+uintptr(7), ts+7779+7) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
 func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol uintptr, pNC uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(104)
 	defer tls.Free(104)
@@ -99788,7 +99991,6 @@ func lookupName(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uintptr, zCol u
 	var pCol uintptr
 
 	var hit int32
-	var zTabName uintptr
 	var hCol U8
 	var op int32
 	var pUpsert uintptr
@@ -99843,7 +100045,7 @@ __5:
 	goto __6
 __6:
 	;
-	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+7733, zDb) == 0) {
+	if !(i == (*Sqlite3)(unsafe.Pointer(db)).FnDb && Xsqlite3StrICmp(tls, ts+7793, zDb) == 0) {
 		goto __8
 	}
 
@@ -99964,7 +100166,7 @@ __16:
 	goto __14
 __32:
 	;
-	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+7738) != 0) {
+	if !(pSchema == uintptr(0) && libc.Xstrcmp(tls, zDb, ts+7798) != 0) {
 		goto __33
 	}
 	goto __14
@@ -99972,73 +100174,91 @@ __33:
 	;
 __31:
 	;
-	if (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0 {
-		zTabName = (*SrcItem)(unsafe.Pointer(pItem)).FzAlias
-	} else {
-		zTabName = (*Table)(unsafe.Pointer(pTab)).FzName
-	}
-
-	if !(Xsqlite3StrICmp(tls, zTabName, zTab) != 0) {
+	if !((*SrcItem)(unsafe.Pointer(pItem)).FzAlias != uintptr(0)) {
 		goto __34
 	}
+	if !(Xsqlite3StrICmp(tls, zTab, (*SrcItem)(unsafe.Pointer(pItem)).FzAlias) != 0) {
+		goto __36
+	}
 	goto __14
+__36:
+	;
+	goto __35
 __34:
+	if !(Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+		goto __37
+	}
+	if !((*Table)(unsafe.Pointer(pTab)).Ftnum != Pgno(1)) {
+		goto __38
+	}
+	goto __14
+__38:
+	;
+	if !!(isValidSchemaTableName(tls, zTab, pTab, pSchema) != 0) {
+		goto __39
+	}
+	goto __14
+__39:
+	;
+__37:
+	;
+__35:
 	;
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME && (*SrcItem)(unsafe.Pointer(pItem)).FzAlias != 0) {
-		goto __35
+		goto __40
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr+64)
-__35:
+__40:
 	;
 __30:
 	;
 	hCol = Xsqlite3StrIHash(tls, zCol)
 	j = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__36:
+__41:
 	if !(j < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __38
+		goto __43
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __39
+		goto __44
 	}
 	if !(cnt > 0) {
-		goto __40
+		goto __45
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x400>>10) == 0 ||
 		Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pItem + 72)), zCol) < 0) {
-		goto __41
+		goto __46
 	}
 
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __42
-__41:
+	goto __47
+__46:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_RIGHT == 0) {
-		goto __43
+		goto __48
 	}
 
-	goto __37
-	goto __44
-__43:
+	goto __42
+	goto __49
+__48:
 	if !(int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT == 0) {
-		goto __45
+		goto __50
 	}
 
 	cnt = 0
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-	goto __46
-__45:
+	goto __51
+__50:
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
-__46:
+__51:
 	;
-__44:
+__49:
 	;
-__42:
+__47:
 	;
-__40:
+__45:
 	;
 	cnt++
 	pMatch = pItem
@@ -100050,28 +100270,28 @@ __40:
 		return I16(j)
 	}()
 	if !(uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x2000>>13)) != 0) {
-		goto __47
+		goto __52
 	}
 	Xsqlite3SrcItemColumnUsed(tls, pItem, j)
-__47:
+__52:
 	;
-	goto __38
-__39:
+	goto __43
+__44:
 	;
-	goto __37
-__37:
+	goto __42
+__42:
 	j++
 	pCol += 24
-	goto __36
-	goto __38
-__38:
+	goto __41
+	goto __43
+__43:
 	;
 	if !(0 == cnt && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __48
+		goto __53
 	}
 	cntTab++
 	pMatch = pItem
-__48:
+__53:
 	;
 	goto __14
 __14:
@@ -100082,160 +100302,161 @@ __14:
 __15:
 	;
 	if !(pMatch != 0) {
-		goto __49
+		goto __54
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*SrcItem)(unsafe.Pointer(pMatch)).FiCursor
 
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = (*SrcItem)(unsafe.Pointer(pMatch)).FpTab
 	if !(int32((*SrcItem)(unsafe.Pointer(pMatch)).Ffg.Fjointype)&(JT_LEFT|JT_LTORJ) != 0) {
-		goto __50
+		goto __55
 	}
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_CanBeNull)
-__50:
+__55:
 	;
 	pSchema = (*Table)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpSchema
-__49:
+__54:
 	;
 __12:
 	;
 	if !(cnt == 0 && zDb == uintptr(0)) {
-		goto __51
+		goto __56
 	}
 	pTab = uintptr(0)
 	if !((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != uintptr(0)) {
-		goto __52
+		goto __57
 	}
 	op = int32((*Parse)(unsafe.Pointer(pParse)).FeTriggerOp)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __53
+		goto __58
 	}
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UBaseReg != 0 &&
 		(zTab == uintptr(0) || Xsqlite3StrICmp(tls, zTab, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab)).FzName) == 0)) {
-		goto __55
+		goto __60
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = libc.Bool32(op != TK_DELETE)
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__55:
+__60:
 	;
-	goto __54
-__53:
-	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+7740, zTab) == 0) {
-		goto __56
+	goto __59
+__58:
+	if !(op != TK_DELETE && zTab != 0 && Xsqlite3StrICmp(tls, ts+7800, zTab) == 0) {
+		goto __61
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 1
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-	goto __57
-__56:
-	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+7744, zTab) == 0) {
-		goto __58
+	goto __62
+__61:
+	if !(op != TK_INSERT && zTab != 0 && Xsqlite3StrICmp(tls, ts+7804, zTab) == 0) {
+		goto __63
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = 0
 	pTab = (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab
-__58:
+__63:
 	;
-__57:
-	;
-__54:
-	;
-__52:
-	;
-	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
-		goto __59
-	}
-	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
-	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+7748, zTab) == 0) {
-		goto __60
-	}
-	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
-	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
-__60:
+__62:
 	;
 __59:
 	;
+__57:
+	;
+	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UUpsert != 0 && zTab != uintptr(0)) {
+		goto __64
+	}
+	pUpsert = *(*uintptr)(unsafe.Pointer(pNC + 16))
+	if !(pUpsert != 0 && Xsqlite3StrICmp(tls, ts+7808, zTab) == 0) {
+		goto __65
+	}
+	pTab = (*SrcItem)(unsafe.Pointer((*Upsert)(unsafe.Pointer(pUpsert)).FpUpsertSrc + 8)).FpTab
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = EXCLUDED_TABLE_NUMBER
+__65:
+	;
+__64:
+	;
 	if !(pTab != 0) {
-		goto __61
+		goto __66
 	}
 	hCol1 = Xsqlite3StrIHash(tls, zCol)
 	pSchema = (*Table)(unsafe.Pointer(pTab)).FpSchema
 	cntTab++
 	iCol = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
-__62:
+__67:
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __64
+		goto __69
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol)).FhName) == int32(hCol1) &&
 		Xsqlite3StrICmp(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName, zCol) == 0) {
-		goto __65
+		goto __70
 	}
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FiPKey)) {
-		goto __66
+		goto __71
 	}
 	iCol = -1
-__66:
+__71:
 	;
-	goto __64
-__65:
+	goto __69
+__70:
 	;
-	goto __63
-__63:
+	goto __68
+__68:
 	iCol++
 	pCol += 24
-	goto __62
-	goto __64
-__64:
+	goto __67
+	goto __69
+__69:
 	;
 	if !(iCol >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) && Xsqlite3IsRowid(tls, zCol) != 0 && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __67
+		goto __72
 	}
 
 	iCol = -1
-__67:
+__72:
 	;
 	if !(iCol < int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
-		goto __68
+		goto __73
 	}
 	cnt++
 	pMatch = uintptr(0)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == EXCLUDED_TABLE_NUMBER) {
-		goto __69
+		goto __74
 	}
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __71
+		goto __76
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	eNewExprOp = TK_COLUMN
-	goto __72
-__71:
+	goto __77
+__76:
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*Upsert)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNC + 16)))).FregData + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol)))
 	eNewExprOp = TK_REGISTER
-__72:
+__77:
 	;
-	goto __70
-__69:
+	goto __75
+__74:
 	;
 	*(*uintptr)(unsafe.Pointer(pExpr + 64)) = pTab
 	if !((*Parse)(unsafe.Pointer(pParse)).FbReturning != 0) {
-		goto __73
+		goto __78
 	}
 	eNewExprOp = TK_REGISTER
 	(*Expr)(unsafe.Pointer(pExpr)).Fop2 = U8(TK_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = YnVar(iCol)
 	(*Expr)(unsafe.Pointer(pExpr)).FiTable = *(*int32)(unsafe.Pointer(pNC + 16)) + (int32((*Table)(unsafe.Pointer(pTab)).FnCol)+1)*(*Expr)(unsafe.Pointer(pExpr)).FiTable + int32(Xsqlite3TableColumnToStorage(tls, pTab, int16(iCol))) + 1
-	goto __74
-__73:
+	goto __79
+__78:
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = I16(iCol)
 	eNewExprOp = TK_TRIGGER
 	if !(iCol < 0) {
-		goto __75
+		goto __80
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-	goto __76
-__75:
+	goto __81
+__80:
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable == 0) {
-		goto __77
+		goto __82
 	}
 
 	*(*U32)(unsafe.Pointer(pParse + 212)) |= func() uint32 {
@@ -100244,8 +100465,8 @@ __75:
 		}
 		return U32(1) << iCol
 	}()
-	goto __78
-__77:
+	goto __83
+__82:
 	;
 	*(*U32)(unsafe.Pointer(pParse + 216)) |= func() uint32 {
 		if iCol >= 32 {
@@ -100253,19 +100474,19 @@ __77:
 		}
 		return U32(1) << iCol
 	}()
-__78:
+__83:
 	;
-__76:
+__81:
 	;
-__74:
+__79:
 	;
-__70:
+__75:
 	;
-__68:
+__73:
 	;
-__61:
+__66:
 	;
-__51:
+__56:
 	;
 	if !(cnt == 0 &&
 		cntTab == 1 &&
@@ -100273,81 +100494,81 @@ __51:
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) == 0 &&
 		Xsqlite3IsRowid(tls, zCol) != 0 &&
 		(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pMatch)).FpTab)).FtabFlags&U32(TF_NoVisibleRowid) == U32(0)) {
-		goto __79
+		goto __84
 	}
 	cnt = 1
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = int16(-1)
 	(*Expr)(unsafe.Pointer(pExpr)).FaffExpr = int8(SQLITE_AFF_INTEGER)
-__79:
+__84:
 	;
 	if !(cnt == 0 &&
 		(*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_UEList != 0 &&
 		zTab == uintptr(0)) {
-		goto __80
+		goto __85
 	}
 	pEList = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	j = 0
-__81:
+__86:
 	if !(j < (*ExprList)(unsafe.Pointer(pEList)).FnExpr) {
-		goto __83
+		goto __88
 	}
 	zAs = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FzEName
 	if !(int32(*(*uint16)(unsafe.Pointer(pEList + 8 + uintptr(j)*32 + 16 + 4))&0x3>>0) == ENAME_NAME &&
 		Xsqlite3_stricmp(tls, zAs, zCol) == 0) {
-		goto __84
+		goto __89
 	}
 
 	pOrig = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(j)*32)).FpExpr
 	if !((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 && (*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Agg) != U32(0)) {
-		goto __85
+		goto __90
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7757, libc.VaList(bp, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7817, libc.VaList(bp, zAs))
 	return WRC_Abort
-__85:
+__90:
 	;
 	if !((*Expr)(unsafe.Pointer(pOrig)).Fflags&U32(EP_Win) != U32(0) &&
 		((*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 || pNC != pTopNC)) {
-		goto __86
+		goto __91
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7788, libc.VaList(bp+8, zAs))
+	Xsqlite3ErrorMsg(tls, pParse, ts+7848, libc.VaList(bp+8, zAs))
 	return WRC_Abort
-__86:
+__91:
 	;
 	if !(Xsqlite3ExprVectorSize(tls, pOrig) != 1) {
-		goto __87
+		goto __92
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7825, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
 	return WRC_Abort
-__87:
+__92:
 	;
 	resolveAlias(tls, pParse, pEList, j, pExpr, nSubquery)
 	cnt = 1
 	pMatch = uintptr(0)
 
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
-		goto __88
+		goto __93
 	}
 	Xsqlite3RenameTokenRemap(tls, pParse, uintptr(0), pExpr)
-__88:
+__93:
 	;
 	goto lookupname_end
-__84:
+__89:
 	;
-	goto __82
-__82:
+	goto __87
+__87:
 	j++
-	goto __81
-	goto __83
-__83:
+	goto __86
+	goto __88
+__88:
 	;
-__80:
+__85:
 	;
 	if !(cnt != 0) {
-		goto __89
+		goto __94
 	}
 	goto __11
-__89:
+__94:
 	;
 	pNC = (*NameContext)(unsafe.Pointer(pNC)).FpNext
 	nSubquery++
@@ -100360,141 +100581,141 @@ __10:
 __11:
 	;
 	if !(cnt == 0 && zTab == uintptr(0)) {
-		goto __90
+		goto __95
 	}
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_DblQuoted) != U32(0) &&
 		areDoubleQuotedStringsEnabled(tls, db, pTopNC) != 0) {
-		goto __91
+		goto __96
 	}
 
 	Xsqlite3_log(tls, SQLITE_WARNING,
-		ts+7843, libc.VaList(bp+16, zCol))
+		ts+7903, libc.VaList(bp+16, zCol))
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_STRING)
 	libc.Xmemset(tls, pExpr+64, 0, uint64(unsafe.Sizeof(struct{ FpTab uintptr }{})))
 	return WRC_Prune
-__91:
+__96:
 	;
 	if !(Xsqlite3ExprIdToTrueFalse(tls, pExpr) != 0) {
-		goto __92
-	}
-	return WRC_Prune
-__92:
-	;
-__90:
-	;
-	if !(cnt != 1) {
-		goto __93
-	}
-	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
-		goto __94
-	}
-	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
-		goto __95
-	}
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
 		goto __97
 	}
-	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
-	goto __98
+	return WRC_Prune
 __97:
+	;
+__95:
+	;
+	if !(cnt != 1) {
+		goto __98
+	}
+	if !(*(*uintptr)(unsafe.Pointer(bp + 96)) != 0) {
+		goto __99
+	}
+	if !((*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 96)))).FnExpr == cnt-1) {
+		goto __100
+	}
+	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) {
+		goto __102
+	}
+	*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_Leaf))
+	goto __103
+__102:
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
-__98:
+__103:
 	;
 	extendFJMatch(tls, pParse, bp+96, pMatch, (*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_FUNCTION)
-	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7878
+	*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 7938
 	*(*uintptr)(unsafe.Pointer(pExpr + 32)) = *(*uintptr)(unsafe.Pointer(bp + 96))
 	cnt = 1
 	goto lookupname_end
-	goto __96
-__95:
+	goto __101
+__100:
 	Xsqlite3ExprListDelete(tls, db, *(*uintptr)(unsafe.Pointer(bp + 96)))
 	*(*uintptr)(unsafe.Pointer(bp + 96)) = uintptr(0)
-__96:
+__101:
 	;
-__94:
+__99:
 	;
 	if cnt == 0 {
-		zErr = ts + 7887
+		zErr = ts + 7947
 	} else {
-		zErr = ts + 7902
+		zErr = ts + 7962
 	}
 	if !(zDb != 0) {
-		goto __99
+		goto __104
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7924, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
-	goto __100
-__99:
+	Xsqlite3ErrorMsg(tls, pParse, ts+7984, libc.VaList(bp+24, zErr, zDb, zTab, zCol))
+	goto __105
+__104:
 	if !(zTab != 0) {
-		goto __101
+		goto __106
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+7937, libc.VaList(bp+56, zErr, zTab, zCol))
-	goto __102
-__101:
-	Xsqlite3ErrorMsg(tls, pParse, ts+7947, libc.VaList(bp+80, zErr, zCol))
-__102:
+	Xsqlite3ErrorMsg(tls, pParse, ts+7997, libc.VaList(bp+56, zErr, zTab, zCol))
+	goto __107
+__106:
+	Xsqlite3ErrorMsg(tls, pParse, ts+8007, libc.VaList(bp+80, zErr, zCol))
+__107:
 	;
-__100:
+__105:
 	;
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnNcErr++
-__93:
+__98:
 	;
 	if !!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_TokenOnly|EP_Leaf) != U32(0)) {
-		goto __103
+		goto __108
 	}
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 	(*Expr)(unsafe.Pointer(pExpr)).FpLeft = uintptr(0)
 	Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 	(*Expr)(unsafe.Pointer(pExpr)).FpRight = uintptr(0)
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_Leaf)
-__103:
+__108:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) >= 0 && pMatch != uintptr(0)) {
-		goto __104
+		goto __109
 	}
 	*(*Bitmask)(unsafe.Pointer(pMatch + 80)) |= Xsqlite3ExprColUsed(tls, pExpr)
-__104:
+__109:
 	;
 	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(eNewExprOp)
 lookupname_end:
 	if !(cnt == 1) {
-		goto __105
+		goto __110
 	}
 
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FxAuth != 0 &&
 		(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_TRIGGER)) {
-		goto __107
+		goto __112
 	}
 	Xsqlite3AuthRead(tls, pParse, pExpr, pSchema, (*NameContext)(unsafe.Pointer(pNC)).FpSrcList)
-__107:
+__112:
 	;
-__108:
+__113:
 	;
 	(*NameContext)(unsafe.Pointer(pTopNC)).FnRef++
 	if !(pTopNC == pNC) {
-		goto __111
+		goto __116
 	}
-	goto __110
-__111:
+	goto __115
+__116:
 	;
 	pTopNC = (*NameContext)(unsafe.Pointer(pTopNC)).FpNext
-	goto __109
-__109:
-	goto __108
-	goto __110
-__110:
+	goto __114
+__114:
+	goto __113
+	goto __115
+__115:
 	;
 	return WRC_Prune
-	goto __106
-__105:
+	goto __111
+__110:
 	return WRC_Abort
-__106:
+__111:
 	;
 	return int32(0)
 }
@@ -100538,15 +100759,15 @@ func notValidImpl(tls *libc.TLS, pParse uintptr, pNC uintptr, zMsg uintptr, pExp
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zIn uintptr = ts + 7954
+	var zIn uintptr = ts + 8014
 	if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IdxExpr != 0 {
-		zIn = ts + 7982
+		zIn = ts + 8042
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_IsCheck != 0 {
-		zIn = ts + 8000
+		zIn = ts + 8060
 	} else if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_GenCol != 0 {
-		zIn = ts + 8018
+		zIn = ts + 8078
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8036, libc.VaList(bp, zMsg, zIn))
+	Xsqlite3ErrorMsg(tls, pParse, ts+8096, libc.VaList(bp, zMsg, zIn))
 	if pExpr != 0 {
 		(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 	}
@@ -100625,10 +100846,10 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			Xsqlite3WalkExpr(tls, pWalker, (*Expr)(unsafe.Pointer(pExpr)).FpLeft)
 			if 0 == Xsqlite3ExprCanBeNull(tls, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) && !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_NOTNULL {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8056
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8116
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsTrue)
 				} else {
-					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8061
+					*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8121
 					*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 				}
 				(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
@@ -100675,7 +100896,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var pLeft uintptr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_GenCol) != 0 {
-					notValidImpl(tls, pParse, pNC, ts+8067, uintptr(0), pExpr)
+					notValidImpl(tls, pParse, pNC, ts+8127, uintptr(0), pExpr)
 				}
 
 				pRight = (*Expr)(unsafe.Pointer(pExpr)).FpRight
@@ -100739,7 +100960,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 						(*Expr)(unsafe.Pointer(pExpr)).FiTable = exprProbability(tls, (*ExprList_item)(unsafe.Pointer(pList+8+1*32)).FpExpr)
 						if (*Expr)(unsafe.Pointer(pExpr)).FiTable < 0 {
 							Xsqlite3ErrorMsg(tls, pParse,
-								ts+8084, libc.VaList(bp, pExpr))
+								ts+8144, libc.VaList(bp, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
 					} else {
@@ -100755,7 +100976,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					var auth int32 = Xsqlite3AuthCheck(tls, pParse, SQLITE_FUNCTION, uintptr(0), (*FuncDef)(unsafe.Pointer(pDef)).FzName, uintptr(0))
 					if auth != SQLITE_OK {
 						if auth == SQLITE_DENY {
-							Xsqlite3ErrorMsg(tls, pParse, ts+8148,
+							Xsqlite3ErrorMsg(tls, pParse, ts+8208,
 								libc.VaList(bp+8, pExpr))
 							(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 						}
@@ -100769,7 +100990,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				}
 				if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_CONSTANT) == U32(0) {
 					if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IdxExpr|NC_PartIdx|NC_GenCol) != 0 {
-						notValidImpl(tls, pParse, pNC, ts+8184, uintptr(0), pExpr)
+						notValidImpl(tls, pParse, pNC, ts+8244, uintptr(0), pExpr)
 					}
 
 				} else {
@@ -100792,30 +101013,30 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			if 0 == libc.Bool32(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 				if pDef != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FxValue == uintptr(0) && pWin != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+8212, libc.VaList(bp+16, pExpr))
+						ts+8272, libc.VaList(bp+16, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowAgg == 0 ||
 					is_agg != 0 && (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 && !(pWin != 0) ||
 					is_agg != 0 && pWin != 0 && (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_AllowWin == 0 {
 					var zType uintptr
 					if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 || pWin != 0 {
-						zType = ts + 8255
+						zType = ts + 8315
 					} else {
-						zType = ts + 8262
+						zType = ts + 8322
 					}
-					Xsqlite3ErrorMsg(tls, pParse, ts+8272, libc.VaList(bp+24, zType, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+8332, libc.VaList(bp+24, zType, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 					is_agg = 0
 				} else if no_such_func != 0 && int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+8300, libc.VaList(bp+40, pExpr))
+					Xsqlite3ErrorMsg(tls, pParse, ts+8360, libc.VaList(bp+40, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if wrong_num_args != 0 {
-					Xsqlite3ErrorMsg(tls, pParse, ts+8322,
+					Xsqlite3ErrorMsg(tls, pParse, ts+8382,
 						libc.VaList(bp+48, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				} else if is_agg == 0 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+8366,
+						ts+8426,
 						libc.VaList(bp+56, pExpr))
 					(*NameContext)(unsafe.Pointer(pNC)).FnNcErr++
 				}
@@ -100887,7 +101108,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				var nRef int32 = (*NameContext)(unsafe.Pointer(pNC)).FnRef
 
 				if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_SelfRef != 0 {
-					notValidImpl(tls, pParse, pNC, ts+8414, pExpr, pExpr)
+					notValidImpl(tls, pParse, pNC, ts+8474, pExpr, pExpr)
 				} else {
 					Xsqlite3WalkSelect(tls, pWalker, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
 				}
@@ -100903,7 +101124,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	case TK_VARIABLE:
 		{
 			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_IsCheck|NC_PartIdx|NC_IdxExpr|NC_GenCol) != 0 {
-				notValidImpl(tls, pParse, pNC, ts+8425, pExpr, pExpr)
+				notValidImpl(tls, pParse, pNC, ts+8485, pExpr, pExpr)
 			}
 
 			break
@@ -100959,7 +101180,7 @@ func resolveExprStep(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				nRight = Xsqlite3ExprVectorSize(tls, (*Expr)(unsafe.Pointer(pExpr)).FpRight)
 			}
 			if nLeft != nRight {
-				Xsqlite3ErrorMsg(tls, pParse, ts+7825, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 			}
 			break
@@ -101034,7 +101255,7 @@ func resolveOutOfRangeError(tls *libc.TLS, pParse uintptr, zType uintptr, i int3
 	defer tls.Free(24)
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+8436, libc.VaList(bp, i, zType, mx))
+		ts+8496, libc.VaList(bp, i, zType, mx))
 	Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pError)
 }
 
@@ -101054,7 +101275,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	}
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8492, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8552, 0)
 		return 1
 	}
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
@@ -101089,7 +101310,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 			}
 			if Xsqlite3ExprIsInteger(tls, pE, bp+8) != 0 {
 				if *(*int32)(unsafe.Pointer(bp + 8)) <= 0 || *(*int32)(unsafe.Pointer(bp + 8)) > (*ExprList)(unsafe.Pointer(pEList)).FnExpr {
-					resolveOutOfRangeError(tls, pParse, ts+8526, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
+					resolveOutOfRangeError(tls, pParse, ts+8586, i+1, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pE)
 					return 1
 				}
 			} else {
@@ -101146,7 +101367,7 @@ func resolveCompoundOrderBy(tls *libc.TLS, pParse uintptr, pSelect uintptr) int3
 	for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
 		if int32(*(*uint16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 16 + 4))&0x4>>2) == 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+8532, libc.VaList(bp, i+1))
+				ts+8592, libc.VaList(bp, i+1))
 			return 1
 		}
 	}
@@ -101174,7 +101395,7 @@ func Xsqlite3ResolveOrderGroupBy(tls *libc.TLS, pParse uintptr, pSelect uintptr,
 		return 0
 	}
 	if (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8593, libc.VaList(bp, zType))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8653, libc.VaList(bp, zType))
 		return 1
 	}
 	pEList = (*Select)(unsafe.Pointer(pSelect)).FpEList
@@ -101388,7 +101609,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		*(*int32)(unsafe.Pointer(bp + 40)) |= NC_UEList
 		if (*Select)(unsafe.Pointer(p)).FpHaving != 0 {
 			if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Aggregate) == U32(0) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+8624, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+8684, 0)
 				return WRC_Abort
 			}
 			if Xsqlite3ResolveExprNames(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving) != 0 {
@@ -101428,7 +101649,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 
 		if (*Select)(unsafe.Pointer(p)).FpOrderBy != uintptr(0) &&
 			isCompound <= nCompound &&
-			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8526) != 0 {
+			resolveOrderGroupBy(tls, bp, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8586) != 0 {
 			return WRC_Abort
 		}
 		if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -101439,7 +101660,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 		if pGroupBy != 0 {
 			var pItem uintptr
 
-			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+8663) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+			if resolveOrderGroupBy(tls, bp, p, pGroupBy, ts+8723) != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 				return WRC_Abort
 			}
 			i = 0
@@ -101451,7 +101672,7 @@ func resolveSelectStep(tls *libc.TLS, pWalker uintptr, p uintptr) int32 {
 			{
 				if (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pItem)).FpExpr)).Fflags&U32(EP_Agg) != U32(0) {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+8669, 0)
+						ts+8729, 0)
 					return WRC_Abort
 				}
 
@@ -101551,12 +101772,12 @@ func Xsqlite3ResolveExprNames(tls *libc.TLS, pNC uintptr, pExpr uintptr) int32 {
 	}()
 	(*Walker)(unsafe.Pointer(bp)).FxSelectCallback2 = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = pNC
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 	if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 		return SQLITE_ERROR
 	}
 	Xsqlite3WalkExpr(tls, bp, pExpr)
-	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+	*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 	*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
 	*(*int32)(unsafe.Pointer(pNC + 40)) |= savedHasAgg
@@ -101592,12 +101813,12 @@ func Xsqlite3ResolveExprListNames(tls *libc.TLS, pNC uintptr, pList uintptr) int
 		if pExpr == uintptr(0) {
 			continue
 		}
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) += (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 		if Xsqlite3ExprCheckHeight(tls, (*Walker)(unsafe.Pointer(bp)).FpParse, (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse)).FnHeight) != 0 {
 			return WRC_Abort
 		}
 		Xsqlite3WalkExpr(tls, bp, pExpr)
-		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 308)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
+		*(*int32)(unsafe.Pointer((*Walker)(unsafe.Pointer(bp)).FpParse + 316)) -= (*Expr)(unsafe.Pointer(pExpr)).FnHeight
 
 		if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg) != 0 {
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32((*NameContext)(unsafe.Pointer(pNC)).FncFlags & (NC_HasAgg | NC_HasWin))
@@ -101707,33 +101928,134 @@ func Xsqlite3TableColumnAffinity(tls *libc.TLS, pTab uintptr, iCol int32) int8 {
 // SELECT * FROM t1 WHERE (select a from t1);
 func Xsqlite3ExprAffinity(tls *libc.TLS, pExpr uintptr) int8 {
 	var op int32
-	for (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
-		pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
-
-	}
 	op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
-	if op == TK_REGISTER {
-		op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)
-	}
-	if op == TK_COLUMN || op == TK_AGG_COLUMN {
-		return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
-	}
-	if op == TK_SELECT {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
-	}
-	if op == TK_CAST {
-		return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
-	}
-	if op == TK_SELECT_COLUMN {
-		return Xsqlite3ExprAffinity(tls,
-			(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
-	}
-	if op == TK_VECTOR {
-		return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+	for 1 != 0 {
+		if op == TK_COLUMN || op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(pExpr + 64)) != uintptr(0) {
+			return Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
+		}
+		if op == TK_SELECT {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList+8)).FpExpr)
+		}
+		if op == TK_CAST {
+			return Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))
+		}
+		if op == TK_SELECT_COLUMN {
+			return Xsqlite3ExprAffinity(tls,
+				(*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft + 32)))).FpEList+8+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiColumn)*32)).FpExpr)
+		}
+		if op == TK_VECTOR {
+			return Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32))+8)).FpExpr)
+		}
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Skip|EP_IfNullRow) != U32(0) {
+			pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+			op = int32((*Expr)(unsafe.Pointer(pExpr)).Fop)
+			continue
+		}
+		if op != TK_REGISTER || libc.AssignInt32(&op, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2)) == TK_REGISTER {
+			break
+		}
 	}
 	return (*Expr)(unsafe.Pointer(pExpr)).FaffExpr
 }
 
+// Make a guess at all the possible datatypes of the result that could
+// be returned by an expression.  Return a bitmask indicating the answer:
+//
+//	0x01         Numeric
+//	0x02         Text
+//	0x04         Blob
+//
+// If the expression must return NULL, then 0x00 is returned.
+func Xsqlite3ExprDataType(tls *libc.TLS, pExpr uintptr) int32 {
+	for pExpr != 0 {
+		switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+		case TK_COLLATE:
+			fallthrough
+		case TK_IF_NULL_ROW:
+			fallthrough
+		case TK_UPLUS:
+			{
+				pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
+				break
+
+			}
+		case TK_NULL:
+			{
+				pExpr = uintptr(0)
+				break
+
+			}
+		case TK_STRING:
+			{
+				return 0x02
+
+			}
+		case TK_BLOB:
+			{
+				return 0x04
+
+			}
+		case TK_CONCAT:
+			{
+				return 0x06
+
+			}
+		case TK_VARIABLE:
+			fallthrough
+		case TK_AGG_FUNCTION:
+			fallthrough
+		case TK_FUNCTION:
+			{
+				return 0x07
+
+			}
+		case TK_COLUMN:
+			fallthrough
+		case TK_AGG_COLUMN:
+			fallthrough
+		case TK_SELECT:
+			fallthrough
+		case TK_CAST:
+			fallthrough
+		case TK_SELECT_COLUMN:
+			fallthrough
+		case TK_VECTOR:
+			{
+				var aff int32 = int32(Xsqlite3ExprAffinity(tls, pExpr))
+				if aff >= SQLITE_AFF_NUMERIC {
+					return 0x05
+				}
+				if aff == SQLITE_AFF_TEXT {
+					return 0x06
+				}
+				return 0x07
+
+			}
+		case TK_CASE:
+			{
+				var res int32 = 0
+				var ii int32
+				var pList uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
+
+				for ii = 1; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii = ii + 2 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+				}
+				if (*ExprList)(unsafe.Pointer(pList)).FnExpr%2 != 0 {
+					res = res | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr((*ExprList)(unsafe.Pointer(pList)).FnExpr-1)*32)).FpExpr)
+				}
+				return res
+
+			}
+		default:
+			{
+				return 0x01
+
+			}
+		}
+	}
+	return 0x00
+}
+
 // Set the collating sequence for expression pExpr to be the collating
 // sequence named by pToken.   Return a pointer to a new Expr node that
 // implements the COLLATE operator.
@@ -101803,7 +102125,8 @@ func Xsqlite3ExprCollSeq(tls *libc.TLS, pParse uintptr, pExpr uintptr) uintptr {
 		if op == TK_REGISTER {
 			op = int32((*Expr)(unsafe.Pointer(p)).Fop2)
 		}
-		if op == TK_AGG_COLUMN || op == TK_COLUMN || op == TK_TRIGGER {
+		if op == TK_AGG_COLUMN && *(*uintptr)(unsafe.Pointer(p + 64)) != uintptr(0) ||
+			op == TK_COLUMN || op == TK_TRIGGER {
 			var j int32
 
 			if libc.AssignInt32(&j, int32((*Expr)(unsafe.Pointer(p)).FiColumn)) >= 0 {
@@ -102138,7 +102461,7 @@ func codeVectorCompare(tls *libc.TLS, pParse uintptr, pExpr uintptr, dest int32,
 		return
 	}
 	if nLeft != Xsqlite3ExprVectorSize(tls, pRight) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7825, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
 		return
 	}
 
@@ -102213,7 +102536,7 @@ func Xsqlite3ExprCheckHeight(tls *libc.TLS, pParse uintptr, nHeight int32) int32
 	var mxHeight int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 3*4))
 	if nHeight > mxHeight {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+8728, libc.VaList(bp, mxHeight))
+			ts+8788, libc.VaList(bp, mxHeight))
 		rc = SQLITE_ERROR
 	}
 	return rc
@@ -102462,10 +102785,10 @@ func Xsqlite3ExprListToValues(tls *libc.TLS, pParse uintptr, nElem int32, pEList
 			nExprElem = 1
 		}
 		if nExprElem != nElem {
-			Xsqlite3ErrorMsg(tls, pParse, ts+8776,
+			Xsqlite3ErrorMsg(tls, pParse, ts+8836,
 				libc.VaList(bp, nExprElem, func() uintptr {
 					if nExprElem > 1 {
-						return ts + 8820
+						return ts + 8880
 					}
 					return ts + 1544
 				}(), nElem))
@@ -102506,7 +102829,7 @@ func Xsqlite3ExprAnd(tls *libc.TLS, pParse uintptr, pLeft uintptr, pRight uintpt
 		!(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
 		Xsqlite3ExprDeferredDelete(tls, pParse, pLeft)
 		Xsqlite3ExprDeferredDelete(tls, pParse, pRight)
-		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+8822)
+		return Xsqlite3Expr(tls, db, TK_INTEGER, ts+8882)
 	} else {
 		return Xsqlite3PExpr(tls, pParse, TK_AND, pLeft, pRight)
 	}
@@ -102532,7 +102855,7 @@ func Xsqlite3ExprFunction(tls *libc.TLS, pParse uintptr, pList uintptr, pToken u
 	if pList != 0 &&
 		(*ExprList)(unsafe.Pointer(pList)).FnExpr > *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 6*4)) &&
 		!(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8824, libc.VaList(bp, pToken))
+		Xsqlite3ErrorMsg(tls, pParse, ts+8884, libc.VaList(bp, pToken))
 	}
 	*(*uintptr)(unsafe.Pointer(pNew + 32)) = pList
 	*(*U32)(unsafe.Pointer(pNew + 4)) |= U32(EP_HasFunc)
@@ -102560,7 +102883,7 @@ func Xsqlite3ExprFunctionUsable(tls *libc.TLS, pParse uintptr, pExpr uintptr, pD
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FromDDL) != U32(0) {
 		if (*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT) != U32(0) ||
 			(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) == uint64(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+8858, libc.VaList(bp, pExpr))
+			Xsqlite3ErrorMsg(tls, pParse, ts+8918, libc.VaList(bp, pExpr))
 		}
 	}
 }
@@ -102607,7 +102930,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 			}
 
 			if bOk == 0 || *(*I64)(unsafe.Pointer(bp + 8)) < int64(1) || *(*I64)(unsafe.Pointer(bp + 8)) > I64(*(*int32)(unsafe.Pointer(db + 136 + 9*4))) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+8878,
+				Xsqlite3ErrorMsg(tls, pParse, ts+8938,
 					libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 9*4))))
 				Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 				return
@@ -102632,7 +102955,7 @@ func Xsqlite3ExprAssignVarNumber(tls *libc.TLS, pParse uintptr, pExpr uintptr, n
 	}
 	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = x
 	if int32(x) > *(*int32)(unsafe.Pointer(db + 136 + 9*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8921, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+8981, 0)
 		Xsqlite3RecordErrorOffsetOfExpr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
 	}
 }
@@ -103207,7 +103530,7 @@ __2:
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_SELECT && (*IdList)(unsafe.Pointer(pColumns)).FnId != libc.AssignInt32(&n, Xsqlite3ExprVectorSize(tls, pExpr))) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8944,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9004,
 		libc.VaList(bp, (*IdList)(unsafe.Pointer(pColumns)).FnId, n))
 	goto vector_append_error
 __3:
@@ -103330,7 +103653,7 @@ func Xsqlite3ExprListCheckLength(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	var mx int32 = *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 2*4))
 
 	if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr > mx {
-		Xsqlite3ErrorMsg(tls, pParse, ts+8974, libc.VaList(bp, zObject))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9034, libc.VaList(bp, zObject))
 	}
 }
 
@@ -103386,10 +103709,10 @@ func Xsqlite3SelectWalkFail(tls *libc.TLS, pWalker uintptr, NotUsed uintptr) int
 //	  "false"                        EP_IsFalse
 //	  anything else                  0
 func Xsqlite3IsTrueOrFalse(tls *libc.TLS, zIn uintptr) U32 {
-	if Xsqlite3StrICmp(tls, zIn, ts+8056) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+8116) == 0 {
 		return U32(EP_IsTrue)
 	}
-	if Xsqlite3StrICmp(tls, zIn, ts+8061) == 0 {
+	if Xsqlite3StrICmp(tls, zIn, ts+8121) == 0 {
 		return U32(EP_IsFalse)
 	}
 	return U32(0)
@@ -103819,13 +104142,13 @@ func Xsqlite3ExprNeedsNoAffinityChange(tls *libc.TLS, p uintptr, aff int8) int32
 
 // Return TRUE if the given string is a row-id column name.
 func Xsqlite3IsRowid(tls *libc.TLS, z uintptr) int32 {
-	if Xsqlite3StrICmp(tls, z, ts+8997) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9057) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+9005) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9065) == 0 {
 		return 1
 	}
-	if Xsqlite3StrICmp(tls, z, ts+9011) == 0 {
+	if Xsqlite3StrICmp(tls, z, ts+9071) == 0 {
 		return 1
 	}
 	return 0
@@ -104029,7 +104352,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 			Xsqlite3OpenTable(tls, pParse, iTab, iDb, pTab, OP_OpenRead)
 			eType = IN_INDEX_ROWID
-			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9015, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+			Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9075, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VdbeJumpHere(tls, v, iAddr)
 		} else {
 			var pIdx uintptr
@@ -104107,7 +104430,7 @@ func Xsqlite3FindInIndex(tls *libc.TLS, pParse uintptr, pX uintptr, inFlags U32,
 
 					if colUsed == uint64(1)<<nExpr-uint64(1) {
 						var iAddr int32 = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
-						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9062, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
+						Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9122, libc.VaList(bp+8, (*Index)(unsafe.Pointer(pIdx)).FzName))
 						Xsqlite3VdbeAddOp3(tls, v, OP_OpenRead, iTab, int32((*Index)(unsafe.Pointer(pIdx)).Ftnum), iDb)
 						Xsqlite3VdbeSetP4KeyInfo(tls, pParse, pIdx)
 
@@ -104201,7 +104524,7 @@ func Xsqlite3SubselectError(tls *libc.TLS, pParse uintptr, nActual int32, nExpec
 	defer tls.Free(16)
 
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 {
-		var zFmt uintptr = ts + 9093
+		var zFmt uintptr = ts + 9153
 		Xsqlite3ErrorMsg(tls, pParse, zFmt, libc.VaList(bp, nActual, nExpect))
 	}
 }
@@ -104219,7 +104542,7 @@ func Xsqlite3VectorErrorMsg(tls *libc.TLS, pParse uintptr, pExpr uintptr) {
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
 		Xsqlite3SubselectError(tls, pParse, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr, 1)
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+7825, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
 	}
 }
 
@@ -104260,7 +104583,7 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
 			addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 			if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) {
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9137, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9197, libc.VaList(bp, (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselId))
 			}
 
 			Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
@@ -104290,11 +104613,11 @@ func Xsqlite3CodeRhsOfIN(tls *libc.TLS, pParse uintptr, pExpr uintptr, iTab int3
 		var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 		var pEList uintptr = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9160, libc.VaList(bp+8, func() uintptr {
+		Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9220, libc.VaList(bp+8, func() uintptr {
 			if addrOnce != 0 {
 				return ts + 1544
 			}
-			return ts + 9179
+			return ts + 9239
 		}(), (*Select)(unsafe.Pointer(pSelect)).FselId))
 
 		if (*ExprList)(unsafe.Pointer(pEList)).FnExpr == nVal {
@@ -104421,7 +104744,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	pSel = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 
 	if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Subrtn) != U32(0) {
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9191, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+9251, libc.VaList(bp, (*Select)(unsafe.Pointer(pSel)).FselId))
 
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, *(*int32)(unsafe.Pointer(pExpr + 64 + 4)),
 			*(*int32)(unsafe.Pointer(pExpr + 64)))
@@ -104436,12 +104759,13 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		addrOnce = Xsqlite3VdbeAddOp0(tls, v, OP_Once)
 	}
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9209, libc.VaList(bp+8, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+9269, libc.VaList(bp+8, func() uintptr {
 		if addrOnce != 0 {
 			return ts + 1544
 		}
-		return ts + 9179
+		return ts + 9239
 	}(), (*Select)(unsafe.Pointer(pSel)).FselId))
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_SELECT {
 		nReg = (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr
 	} else {
@@ -104462,7 +104786,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 	}
 	if (*Select)(unsafe.Pointer(pSel)).FpLimit != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8822)
+		pLimit = Xsqlite3Expr(tls, db, TK_INTEGER, ts+8882)
 		if pLimit != 0 {
 			(*Expr)(unsafe.Pointer(pLimit)).FaffExpr = int8(SQLITE_AFF_NUMERIC)
 			pLimit = Xsqlite3PExpr(tls, pParse, TK_NE,
@@ -104471,7 +104795,7 @@ func Xsqlite3CodeSubselect(tls *libc.TLS, pParse uintptr, pExpr uintptr) int32 {
 		Xsqlite3ExprDeferredDelete(tls, pParse, (*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft)
 		(*Expr)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpLimit)).FpLeft = pLimit
 	} else {
-		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+9230)
+		pLimit = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_INTEGER, ts+9290)
 		(*Select)(unsafe.Pointer(pSel)).FpLimit = Xsqlite3PExpr(tls, pParse, TK_LIMIT, pLimit, uintptr(0))
 	}
 	(*Select)(unsafe.Pointer(pSel)).FiLimit = 0
@@ -104857,8 +105181,8 @@ func codeInteger(tls *libc.TLS, pParse uintptr, pExpr uintptr, negFlag int32, iM
 
 		c = Xsqlite3DecOrHexToI64(tls, z, bp+16)
 		if c == 3 && !(negFlag != 0) || c == 2 || negFlag != 0 && *(*I64)(unsafe.Pointer(bp + 16)) == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-			if Xsqlite3_strnicmp(tls, z, ts+9232, 2) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+9235,
+			if Xsqlite3_strnicmp(tls, z, ts+9292, 2) == 0 {
+				Xsqlite3ErrorMsg(tls, pParse, ts+9295,
 					libc.VaList(bp, func() uintptr {
 						if negFlag != 0 {
 							return ts + 6284
@@ -104934,7 +105258,7 @@ func Xsqlite3ExprCodeGetColumnOfTable(tls *libc.TLS, v uintptr, pTab uintptr, iT
 		} else if int32((*Column)(unsafe.Pointer(libc.AssignUintptr(&pCol, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24))).FcolFlags)&COLFLAG_VIRTUAL != 0 {
 			var pParse uintptr = Xsqlite3VdbeParser(tls, v)
 			if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_BUSY != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+9262,
+				Xsqlite3ErrorMsg(tls, pParse, ts+9322,
 					libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			} else {
 				var savedSelfTab int32 = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
@@ -105020,8 +105344,8 @@ func setDoNotMergeFlagOnCopy(tls *libc.TLS, v uintptr) {
 }
 
 func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncId int32, target int32) int32 {
-	bp := tls.Alloc(112)
-	defer tls.Free(112)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var nFarg int32
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
@@ -105107,14 +105431,16 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 
 	case INLINEFUNC_affinity:
 		{
-			*(*[5]uintptr)(unsafe.Pointer(bp + 72)) = [5]uintptr{ts + 9292, ts + 9297, ts + 9302, ts + 7543, ts + 7538}
+			*(*[6]uintptr)(unsafe.Pointer(bp + 72)) = [6]uintptr{ts + 9352, ts + 9357, ts + 9362, ts + 7543,
+				ts + 7538, ts + 9370}
 			var aff int8
 
 			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+
 			Xsqlite3VdbeLoadString(tls, v, target,
 				func() uintptr {
 					if int32(aff) <= SQLITE_AFF_NONE {
-						return ts + 9310
+						return ts + 9378
 					}
 					return *(*uintptr)(unsafe.Pointer(bp + 72 + uintptr(int32(aff)-SQLITE_AFF_BLOB)*8))
 				}())
@@ -105128,7 +105454,7 @@ func exprCodeInlineFunction(tls *libc.TLS, pParse uintptr, pFarg uintptr, iFuncI
 func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, target int32) int32 {
 	var p uintptr
 	var v uintptr
-	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
+	for p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; p != 0; p = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext {
 		var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(p)).FiDataCur
 		if iDataCur < 0 {
 			continue
@@ -105151,10 +105477,10 @@ func sqlite3IndexedExprLookup(tls *libc.TLS, pParse uintptr, pExpr uintptr, targ
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
 
 			Xsqlite3VdbeGoto(tls, v, 0)
-			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = uintptr(0)
+			p = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = uintptr(0)
 			Xsqlite3ExprCode(tls, pParse, pExpr, target)
-			(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+			(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 			Xsqlite3VdbeJumpHere(tls, v, addr+2)
 		} else {
 			Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur, (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol, target)
@@ -105254,7 +105580,7 @@ expr_code_doover:
 	op = TK_NULL
 	goto __2
 __1:
-	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) &&
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) &&
 		!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Leaf) != U32(0)) &&
 		libc.AssignInt32(&r1, sqlite3IndexedExprLookup(tls, pParse, pExpr, target)) >= 0) {
 		goto __3
@@ -105384,12 +105710,13 @@ __2:
 __6:
 	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode) != 0) {
 		goto __58
 	}
-
-	return (*AggInfo_col)(unsafe.Pointer(pCol)).FiMem
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __59
 __58:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx != 0) {
@@ -105398,110 +105725,123 @@ __58:
 	pTab = (*AggInfo_col)(unsafe.Pointer(pCol)).FpTab
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdxPTab,
 		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn), target)
+	if !(pTab == uintptr(0)) {
+		goto __62
+	}
+
+	goto __63
+__62:
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) < 0) {
-		goto __61
-	}
-
-	goto __62
-__61:
-	if !(pTab != uintptr(0)) {
-		goto __63
-	}
-
-	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
 		goto __64
 	}
-	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+
+	goto __65
 __64:
 	;
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn)*24)).Faffinity) == SQLITE_AFF_REAL) {
+		goto __66
+	}
+	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
+__66:
+	;
+__65:
+	;
 __63:
 	;
-__62:
-	;
 	return target
+	goto __61
 __60:
+	if !(*(*uintptr)(unsafe.Pointer(pExpr + 64)) == uintptr(0)) {
+		goto __67
+	}
+
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*Expr)(unsafe.Pointer(pExpr)).FiTable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
+	return target
+__67:
+	;
+__61:
 	;
 __59:
 	;
 __7:
 	iTab = (*Expr)(unsafe.Pointer(pExpr)).FiTable
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_FixedCol) != U32(0)) {
-		goto __65
+		goto __68
 	}
 	iReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 
 	aff = int32(Xsqlite3TableColumnAffinity(tls, *(*uintptr)(unsafe.Pointer(pExpr + 64)), int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)))
 	if !(aff > SQLITE_AFF_BLOB) {
-		goto __66
+		goto __69
 	}
 
 	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, iReg, 1, 0,
 		uintptr(unsafe.Pointer(&zAff))+uintptr((aff-'B')*2), -1)
-__66:
+__69:
 	;
 	return iReg
-__65:
+__68:
 	;
 	if !(iTab < 0) {
-		goto __67
+		goto __70
 	}
 	if !((*Parse)(unsafe.Pointer(pParse)).FiSelfTab < 0) {
-		goto __68
+		goto __71
 	}
 	iCol = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
 	pTab1 = *(*uintptr)(unsafe.Pointer(pExpr + 64))
 
 	if !(iCol < 0) {
-		goto __70
+		goto __73
 	}
 	return -1 - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
-__70:
+__73:
 	;
 	pCol1 = (*Table)(unsafe.Pointer(pTab1)).FaCol + uintptr(iCol)*24
 
 	iSrc = int32(Xsqlite3TableColumnToStorage(tls, pTab1, int16(iCol))) - (*Parse)(unsafe.Pointer(pParse)).FiSelfTab
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_GENERATED != 0) {
-		goto __71
+		goto __74
 	}
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_BUSY != 0) {
-		goto __73
+		goto __76
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9262,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9322,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	return 0
-__73:
+__76:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) |= U16(COLFLAG_BUSY)
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_NOTAVAIL != 0) {
-		goto __74
+		goto __77
 	}
 	Xsqlite3ExprCodeGeneratedColumn(tls, pParse, pTab1, pCol1, iSrc)
-__74:
+__77:
 	;
 	*(*U16)(unsafe.Pointer(pCol1 + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_BUSY | COLFLAG_NOTAVAIL))
 	return iSrc
-	goto __72
-__71:
+	goto __75
+__74:
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __75
+		goto __78
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, iSrc, target)
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
 	return target
-	goto __76
-__75:
+	goto __79
+__78:
 	return iSrc
-__76:
+__79:
 	;
+__75:
+	;
+	goto __72
+__71:
+	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
 __72:
 	;
-	goto __69
-__68:
-	iTab = (*Parse)(unsafe.Pointer(pParse)).FiSelfTab - 1
-__69:
-	;
-__67:
+__70:
 	;
 	iReg = Xsqlite3ExprCodeGetColumn(tls, pParse, *(*uintptr)(unsafe.Pointer(pExpr + 64)),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), iTab, target,
@@ -105544,13 +105884,13 @@ __14:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Variable, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn), target)
 	if !(int32(*(*int8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 8)) + 1))) != 0) {
-		goto __77
+		goto __80
 	}
 	z1 = Xsqlite3VListNumToName(tls, (*Parse)(unsafe.Pointer(pParse)).FpVList, int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn))
 
 	*(*VList)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).FpVList)) = 0
 	Xsqlite3VdbeAppendP4(tls, v, z1, -1)
-__77:
+__80:
 	;
 	return target
 
@@ -105560,11 +105900,11 @@ __15:
 __16:
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __78
+		goto __81
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__78:
+__81:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Cast, target,
 		int32(Xsqlite3AffinityType(tls, *(*uintptr)(unsafe.Pointer(pExpr + 8)), uintptr(0))))
@@ -105587,11 +105927,11 @@ __23:
 __24:
 	pLeft = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !(Xsqlite3ExprIsVector(tls, pLeft) != 0) {
-		goto __79
+		goto __82
 	}
 	codeVectorCompare(tls, pParse, pExpr, target, uint8(op), uint8(p5))
-	goto __80
-__79:
+	goto __83
+__82:
 	r1 = Xsqlite3ExprCodeTemp(tls, pParse, pLeft, bp+40)
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpRight, bp+44)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, inReg)
@@ -105600,15 +105940,15 @@ __79:
 		libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Commuted) != U32(0)))
 
 	if !(p5 == SQLITE_NULLEQ) {
-		goto __81
+		goto __84
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, inReg)
-	goto __82
-__81:
+	goto __85
+__84:
 	Xsqlite3VdbeAddOp3(tls, v, OP_ZeroOrNull, r1, inReg, r2)
-__82:
+__85:
 	;
-__80:
+__83:
 	;
 	goto __5
 
@@ -105635,20 +105975,20 @@ __37:
 	pLeft1 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_INTEGER) {
-		goto __83
+		goto __86
 	}
 	codeInteger(tls, pParse, pLeft1, 1, target)
 	return target
-	goto __84
-__83:
+	goto __87
+__86:
 	if !(int32((*Expr)(unsafe.Pointer(pLeft1)).Fop) == TK_FLOAT) {
-		goto __85
+		goto __88
 	}
 
 	codeReal(tls, v, *(*uintptr)(unsafe.Pointer(pLeft1 + 8)), 1, target)
 	return target
-	goto __86
-__85:
+	goto __89
+__88:
 	(*Expr)(unsafe.Pointer(bp + 48)).Fop = U8(TK_INTEGER)
 	(*Expr)(unsafe.Pointer(bp + 48)).Fflags = U32(EP_IntValue | EP_TokenOnly)
 	*(*int32)(unsafe.Pointer(bp + 48 + 8)) = 0
@@ -105657,9 +105997,9 @@ __85:
 	r2 = Xsqlite3ExprCodeTemp(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, bp+44)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Subtract, r2, r1, target)
 
-__86:
+__89:
 	;
-__84:
+__87:
 	;
 	goto __5
 
@@ -105697,14 +106037,16 @@ __43:
 	if !(pInfo == uintptr(0) ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) < 0 ||
 		int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg) >= (*AggInfo)(unsafe.Pointer(pInfo)).FnFunc) {
-		goto __87
+		goto __90
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+9315, libc.VaList(bp+8, pExpr))
-	goto __88
-__87:
-	return (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pInfo)).FaFunc + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
-__88:
+	Xsqlite3ErrorMsg(tls, pParse, ts+9383, libc.VaList(bp+8, pExpr))
+	goto __91
+__90:
+	return func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pInfo)).FnColumn + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
+__91:
 	;
 	goto __5
 
@@ -105715,17 +106057,17 @@ __44:
 	pColl = uintptr(0)
 
 	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __89
+		goto __92
 	}
 	return (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FregResult
-__89:
+__92:
 	;
 	if !((*Parse)(unsafe.Pointer(pParse)).FokConstFactor != 0 && Xsqlite3ExprIsConstantNotJoin(tls, pExpr) != 0) {
-		goto __90
+		goto __93
 	}
 
 	return Xsqlite3ExprCodeRunJustOnce(tls, pParse, pExpr, -1)
-__90:
+__93:
 	;
 	pFarg = *(*uintptr)(unsafe.Pointer(pExpr + 32))
 	if pFarg != 0 {
@@ -105737,128 +106079,128 @@ __90:
 	zId = *(*uintptr)(unsafe.Pointer(pExpr + 8))
 	pDef = Xsqlite3FindFunction(tls, db, zId, nFarg, enc, uint8(0))
 	if !(pDef == uintptr(0) || (*FuncDef)(unsafe.Pointer(pDef)).FxFinalize != uintptr(0)) {
-		goto __91
+		goto __94
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+9342, libc.VaList(bp+16, pExpr))
+	Xsqlite3ErrorMsg(tls, pParse, ts+9410, libc.VaList(bp+16, pExpr))
 	goto __5
-__91:
+__94:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_INLINE) != 0) {
-		goto __92
+		goto __95
 	}
 
 	return exprCodeInlineFunction(tls, pParse, pFarg,
 		int32((*FuncDef)(unsafe.Pointer(pDef)).FpUserData), target)
-	goto __93
-__92:
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
-		goto __94
-	}
-	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
-__94:
-	;
-__93:
-	;
-	i = 0
+	goto __96
 __95:
-	if !(i < nFarg) {
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE) != 0) {
 		goto __97
 	}
+	Xsqlite3ExprFunctionUsable(tls, pParse, pExpr, pDef)
+__97:
+	;
+__96:
+	;
+	i = 0
+__98:
+	if !(i < nFarg) {
+		goto __100
+	}
 	if !(i < 32 && Xsqlite3ExprIsConstant(tls, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr) != 0) {
-		goto __98
+		goto __101
 	}
 
 	constMask = constMask | uint32(1)<<i
-__98:
+__101:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != U32(0) && !(pColl != 0)) {
-		goto __99
+		goto __102
 	}
 	pColl = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pFarg+8+uintptr(i)*32)).FpExpr)
-__99:
+__102:
 	;
-	goto __96
-__96:
+	goto __99
+__99:
 	i++
-	goto __95
-	goto __97
-__97:
+	goto __98
+	goto __100
+__100:
 	;
 	if !(pFarg != 0) {
-		goto __100
+		goto __103
 	}
 	if !(constMask != 0) {
-		goto __102
+		goto __105
 	}
 	r1 = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
 	*(*int32)(unsafe.Pointer(pParse + 56)) += nFarg
-	goto __103
-__102:
+	goto __106
+__105:
 	r1 = Xsqlite3GetTempRange(tls, pParse, nFarg)
-__103:
+__106:
 	;
 	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF) != U32(0)) {
-		goto __104
+		goto __107
 	}
 
 	exprOp = (*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop
 	if !(int32(exprOp) == TK_COLUMN || int32(exprOp) == TK_AGG_COLUMN) {
-		goto __105
+		goto __108
 	}
 
 	(*Expr)(unsafe.Pointer((*ExprList_item)(unsafe.Pointer(pFarg + 8)).FpExpr)).Fop2 = U8((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags & U32(OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))
-__105:
-	;
-__104:
-	;
-	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
-		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
-	goto __101
-__100:
-	r1 = 0
-__101:
-	;
-	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
-		goto __106
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
-	goto __107
-__106:
-	if !(nFarg > 0) {
-		goto __108
-	}
-	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
 __108:
 	;
 __107:
 	;
-	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+	Xsqlite3ExprCodeExprList(tls, pParse, pFarg, r1, 0,
+		uint8(SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR))
+	goto __104
+__103:
+	r1 = 0
+__104:
+	;
+	if !(nFarg >= 2 && (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_InfixFunc) != U32(0)) {
 		goto __109
 	}
-	if !!(pColl != 0) {
-		goto __110
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8+1*32)).FpExpr)
+	goto __110
+__109:
+	if !(nFarg > 0) {
+		goto __111
 	}
-	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+	pDef = Xsqlite3VtabOverloadFunction(tls, db, pDef, nFarg, (*ExprList_item)(unsafe.Pointer(pFarg+8)).FpExpr)
+__111:
+	;
 __110:
+	;
+	if !((*FuncDef)(unsafe.Pointer(pDef)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
+		goto __112
+	}
+	if !!(pColl != 0) {
+		goto __113
+	}
+	pColl = (*Sqlite3)(unsafe.Pointer(db)).FpDfltColl
+__113:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, 0, 0, 0, pColl, -2)
-__109:
+__112:
 	;
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, int32(constMask), r1, target, nFarg,
 		pDef, int32((*Expr)(unsafe.Pointer(pExpr)).Fop2))
 	if !(nFarg != 0) {
-		goto __111
+		goto __114
 	}
 	if !(constMask == U32(0)) {
-		goto __112
+		goto __115
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r1, nFarg)
-	goto __113
-__112:
+	goto __116
+__115:
 	;
-__113:
+__116:
 	;
-__111:
+__114:
 	;
 	return target
 
@@ -105866,42 +106208,42 @@ __45:
 __46:
 	;
 	if !((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FmallocFailed != 0) {
-		goto __114
+		goto __117
 	}
 	return 0
-	goto __115
-__114:
+	goto __118
+__117:
 	if !(op == TK_SELECT &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
 		libc.AssignInt32(&nCol, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpEList)).FnExpr) != 1) {
-		goto __116
+		goto __119
 	}
 	Xsqlite3SubselectError(tls, pParse, nCol, 1)
-	goto __117
-__116:
+	goto __120
+__119:
 	return Xsqlite3CodeSubselect(tls, pParse, pExpr)
-__117:
+__120:
 	;
-__115:
+__118:
 	;
 	goto __5
 
 __47:
 	pLeft2 = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	if !((*Expr)(unsafe.Pointer(pLeft2)).FiTable == 0 || int32((*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn) > int32((*Expr)(unsafe.Pointer(pLeft2)).Fop2)) {
-		goto __118
+		goto __121
 	}
 	(*Expr)(unsafe.Pointer(pLeft2)).FiTable = Xsqlite3CodeSubselect(tls, pParse, pLeft2)
 	(*Expr)(unsafe.Pointer(pLeft2)).Fop2 = (*Parse)(unsafe.Pointer(pParse)).FwithinRJSubrtn
-__118:
+__121:
 	;
 	n1 = Xsqlite3ExprVectorSize(tls, pLeft2)
 	if !((*Expr)(unsafe.Pointer(pExpr)).FiTable != n1) {
-		goto __119
+		goto __122
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+8944,
+	Xsqlite3ErrorMsg(tls, pParse, ts+9004,
 		libc.VaList(bp+24, (*Expr)(unsafe.Pointer(pExpr)).FiTable, n1))
-__119:
+__122:
 	;
 	return (*Expr)(unsafe.Pointer(pLeft2)).FiTable + int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 
@@ -105924,23 +106266,23 @@ __50:
 	if !(!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_Collate) != U32(0)) &&
 		(*Expr)(unsafe.Pointer(pExpr)).FpLeft != 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_FUNCTION) {
-		goto __120
+		goto __123
 	}
 	inReg = Xsqlite3ExprCodeTarget(tls, pParse, (*Expr)(unsafe.Pointer(pExpr)).FpLeft, target)
 	if !(inReg != target) {
-		goto __122
+		goto __125
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SCopy, inReg, target)
 	inReg = target
-__122:
+__125:
 	;
 	Xsqlite3VdbeAddOp1(tls, v, OP_ClrSubtype, inReg)
 	return inReg
-	goto __121
-__120:
+	goto __124
+__123:
 	pExpr = (*Expr)(unsafe.Pointer(pExpr)).FpLeft
 	goto expr_code_doover
-__121:
+__124:
 	;
 __51:
 __52:
@@ -105957,42 +106299,44 @@ __53:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Param, p1, target)
 
 	if !(iCol1 >= 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab2)).FaCol+uintptr(iCol1)*24)).Faffinity) == SQLITE_AFF_REAL) {
-		goto __123
+		goto __126
 	}
 	Xsqlite3VdbeAddOp1(tls, v, OP_RealAffinity, target)
-__123:
+__126:
 	;
 	goto __5
 
 __54:
-	Xsqlite3ErrorMsg(tls, pParse, ts+7825, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+7885, 0)
 	goto __5
 
 __55:
 	okConstFactor = (*Parse)(unsafe.Pointer(pParse)).FokConstFactor
 	pAggInfo1 = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
 	if !(pAggInfo1 != 0) {
-		goto __124
+		goto __127
 	}
 
 	if !!(int32((*AggInfo)(unsafe.Pointer(pAggInfo1)).FdirectMode) != 0) {
-		goto __125
+		goto __128
 	}
-	inReg = (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiMem
+	inReg = func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo1)).FiFirstReg + int32((*Expr)(unsafe.Pointer(pExpr)).FiAgg)
+	}()
 	goto __5
-__125:
+__128:
 	;
 	if !((*AggInfo)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpAggInfo)).FuseSortingIdx != 0) {
-		goto __126
+		goto __129
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, (*AggInfo)(unsafe.Pointer(pAggInfo1)).FsortingIdxPTab,
-		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*32)).FiSorterColumn),
+		int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo1)).FaCol+uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24)).FiSorterColumn),
 		target)
 	inReg = target
 	goto __5
-__126:
+__129:
 	;
-__124:
+__127:
 	;
 	addrINR = Xsqlite3VdbeAddOp1(tls, v, OP_IfNullRow, (*Expr)(unsafe.Pointer(pExpr)).FiTable)
 
@@ -106013,15 +106357,15 @@ __56:
 	nExpr = (*ExprList)(unsafe.Pointer(pEList)).FnExpr
 	endLabel = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(libc.AssignUintptr(&pX, (*Expr)(unsafe.Pointer(pExpr)).FpLeft) != uintptr(0)) {
-		goto __127
+		goto __130
 	}
 	pDel = Xsqlite3ExprDup(tls, db1, pX, 0)
 	if !((*Sqlite3)(unsafe.Pointer(db1)).FmallocFailed != 0) {
-		goto __128
+		goto __131
 	}
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	goto __5
-__128:
+__131:
 	;
 	exprToRegister(tls, pDel, exprCodeVector(tls, pParse, pDel, bp+40))
 
@@ -106031,22 +106375,22 @@ __128:
 	pTest = bp + 120
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = 0
-__127:
+__130:
 	;
 	i1 = 0
-__129:
+__132:
 	if !(i1 < nExpr-1) {
-		goto __131
+		goto __134
 	}
 	if !(pX != 0) {
-		goto __132
+		goto __135
 	}
 
 	(*Expr)(unsafe.Pointer(bp + 120)).FpRight = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-	goto __133
-__132:
+	goto __136
+__135:
 	pTest = (*ExprList_item)(unsafe.Pointer(aListelem + uintptr(i1)*32)).FpExpr
-__133:
+__136:
 	;
 	nextCase = Xsqlite3VdbeMakeLabel(tls, pParse)
 
@@ -106055,21 +106399,21 @@ __133:
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(aListelem+uintptr(i1+1)*32)).FpExpr, target)
 	Xsqlite3VdbeGoto(tls, v, endLabel)
 	Xsqlite3VdbeResolveLabel(tls, v, nextCase)
-	goto __130
-__130:
+	goto __133
+__133:
 	i1 = i1 + 2
-	goto __129
-	goto __131
-__131:
+	goto __132
+	goto __134
+__134:
 	;
 	if !(nExpr&1 != 0) {
-		goto __134
+		goto __137
 	}
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pEList+8+uintptr(nExpr-1)*32)).FpExpr, target)
-	goto __135
-__134:
+	goto __138
+__137:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, target)
-__135:
+__138:
 	;
 	Xsqlite3ExprDelete(tls, db1, pDel)
 	setDoNotMergeFlagOnCopy(tls, v)
@@ -106079,27 +106423,27 @@ __135:
 __57:
 	;
 	if !(!(int32((*Parse)(unsafe.Pointer(pParse)).FpTriggerTab) != 0) && !(int32((*Parse)(unsafe.Pointer(pParse)).Fnested) != 0)) {
-		goto __136
+		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+9366, 0)
+		ts+9434, 0)
 	return 0
-__136:
+__139:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Abort) {
-		goto __137
+		goto __140
 	}
 	Xsqlite3MayAbort(tls, pParse)
-__137:
+__140:
 	;
 	if !(int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr) == OE_Ignore) {
-		goto __138
+		goto __141
 	}
 	Xsqlite3VdbeAddOp4(tls,
 		v, OP_Halt, SQLITE_OK, OE_Ignore, 0, *(*uintptr)(unsafe.Pointer(pExpr + 8)), 0)
 
-	goto __139
-__138:
+	goto __142
+__141:
 	Xsqlite3HaltConstraint(tls, pParse,
 		func() int32 {
 			if (*Parse)(unsafe.Pointer(pParse)).FpTriggerTab != 0 {
@@ -106108,7 +106452,7 @@ __138:
 			return SQLITE_ERROR
 		}(),
 		int32((*Expr)(unsafe.Pointer(pExpr)).FaffExpr), *(*uintptr)(unsafe.Pointer(pExpr + 8)), int8(0), uint8(0))
-__139:
+__142:
 	;
 	goto __5
 
@@ -106119,7 +106463,7 @@ __5:
 	return inReg
 }
 
-var zAff = *(*[8]int8)(unsafe.Pointer(ts + 9416))
+var zAff = *(*[10]int8)(unsafe.Pointer(ts + 9484))
 
 // Generate code that will evaluate expression pExpr just one time
 // per prepared statement execution.
@@ -107491,18 +107835,18 @@ func agginfoPersistExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 		var pParse uintptr = (*Walker)(unsafe.Pointer(pWalker)).FpParse
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_FUNCTION {
-			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*32)).FpCExpr == pExpr {
+			if (*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(iAgg)*24)).FpCExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*32)).FpCExpr = pExpr
+					(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(iAgg)*24)).FpCExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
 		} else {
-			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*32)).FpFExpr == pExpr {
+			if (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(iAgg)*24)).FpFExpr == pExpr {
 				pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 				if pExpr != 0 {
-					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*32)).FpFExpr = pExpr
+					(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(iAgg)*24)).FpFExpr = pExpr
 					Xsqlite3ExprDeferredDelete(tls, pParse, pExpr)
 				}
 			}
@@ -107532,7 +107876,7 @@ func addAggInfoColumn(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaCol,
 		int32(unsafe.Sizeof(AggInfo_col{})),
-		pInfo+40,
+		pInfo+32,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -107545,12 +107889,110 @@ func addAggInfoFunc(tls *libc.TLS, db uintptr, pInfo uintptr) int32 {
 		db,
 		(*AggInfo)(unsafe.Pointer(pInfo)).FaFunc,
 		int32(unsafe.Sizeof(AggInfo_func{})),
-		pInfo+56,
+		pInfo+48,
 		bp)
 	return *(*int32)(unsafe.Pointer(bp))
 }
 
+func findOrCreateAggInfoColumn(tls *libc.TLS, pParse uintptr, pAggInfo uintptr, pExpr uintptr) {
+	var pCol uintptr
+	var k int32
+	var pE uintptr
+	var j int32
+	var n int32
+	var pGB uintptr
+	var pTerm uintptr
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
+	k = 0
+__1:
+	if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
+		goto __3
+	}
+	if !((*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
+		int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __4
+	}
+	goto fix_up_expr
+__4:
+	;
+	goto __2
+__2:
+	k++
+	pCol += 24
+	goto __1
+	goto __3
+__3:
+	;
+	k = addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
+	if !(k < 0) {
+		goto __5
+	}
+
+	return
+__5:
+	;
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*24
+
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
+	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW) {
+		goto __6
+	}
+	pGB = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
+	pTerm = pGB + 8
+	n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
+	j = 0
+__7:
+	if !(j < n) {
+		goto __9
+	}
+	pE = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
+	if !(int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
+		(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
+		int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)) {
+		goto __10
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
+	goto __9
+__10:
+	;
+	goto __8
+__8:
+	j++
+	pTerm += 32
+	goto __7
+	goto __9
+__9:
+	;
+__6:
+	;
+	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0) {
+		goto __11
+	}
+	(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncUint16(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
+__11:
+	;
+fix_up_expr:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+	if !(int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN) {
+		goto __12
+	}
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+__12:
+	;
+	(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+}
+
 func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
+
 	var i int32
 	var pNC uintptr = *(*uintptr)(unsafe.Pointer(pWalker + 40))
 	var pParse uintptr = (*NameContext)(unsafe.Pointer(pNC)).FpParse
@@ -107558,6 +108000,46 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 	var pAggInfo uintptr = *(*uintptr)(unsafe.Pointer(pNC + 16))
 
 	switch int32((*Expr)(unsafe.Pointer(pExpr)).Fop) {
+	default:
+		{
+			var pIEpr uintptr
+
+			if (*NameContext)(unsafe.Pointer(pNC)).FncFlags&NC_InAggFunc == 0 {
+				break
+			}
+			if (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr == uintptr(0) {
+				break
+			}
+			for pIEpr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr; pIEpr != 0; pIEpr = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpIENext {
+				var iDataCur int32 = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiDataCur
+				if iDataCur < 0 {
+					continue
+				}
+				if Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*IndexedExpr)(unsafe.Pointer(pIEpr)).FpExpr, iDataCur) == 0 {
+					break
+				}
+			}
+			if pIEpr == uintptr(0) {
+				break
+			}
+			if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc|EP_Subrtn) == U32(0)) {
+				break
+			}
+			if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo != uintptr(0) {
+				break
+			}
+
+			libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Expr{})))
+			(*Expr)(unsafe.Pointer(bp)).Fop = U8(TK_AGG_COLUMN)
+			(*Expr)(unsafe.Pointer(bp)).FiTable = (*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCur
+			(*Expr)(unsafe.Pointer(bp)).FiColumn = YnVar((*IndexedExpr)(unsafe.Pointer(pIEpr)).FiIdxCol)
+			findOrCreateAggInfoColumn(tls, pParse, pAggInfo, bp)
+			(*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(bp)).FiAgg)*24)).FpCExpr = pExpr
+			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
+			(*Expr)(unsafe.Pointer(pExpr)).FiAgg = (*Expr)(unsafe.Pointer(bp)).FiAgg
+			return WRC_Prune
+
+		}
 	case TK_IF_NULL_ROW:
 		fallthrough
 	case TK_AGG_COLUMN:
@@ -107572,81 +108054,8 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 					goto __3
 				}
 				{
-					var pCol uintptr
-
 					if (*Expr)(unsafe.Pointer(pExpr)).FiTable == (*SrcItem)(unsafe.Pointer(pItem)).FiCursor {
-						var k int32
-						pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol
-						k = 0
-					__4:
-						if !(k < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-							goto __6
-						}
-						{
-							if (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-								int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) &&
-								int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								goto __6
-							}
-
-						}
-						goto __5
-					__5:
-						k++
-						pCol += 32
-						goto __4
-						goto __6
-					__6:
-						;
-						if k >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn &&
-							libc.AssignInt32(&k, addAggInfoColumn(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)) >= 0 {
-							pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(k)*32
-
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpTab = *(*uintptr)(unsafe.Pointer(pExpr + 64))
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiTable = (*Expr)(unsafe.Pointer(pExpr)).FiTable
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn = (*Expr)(unsafe.Pointer(pExpr)).FiColumn
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = int16(-1)
-							(*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr = pExpr
-							if (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_IF_NULL_ROW {
-								var j int32
-								var n int32
-								var pGB uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy
-								var pTerm uintptr = pGB + 8
-								n = (*ExprList)(unsafe.Pointer(pGB)).FnExpr
-								j = 0
-							__7:
-								if !(j < n) {
-									goto __9
-								}
-								{
-									var pE uintptr = (*ExprList_item)(unsafe.Pointer(pTerm)).FpExpr
-									if int32((*Expr)(unsafe.Pointer(pE)).Fop) == TK_COLUMN &&
-										(*Expr)(unsafe.Pointer(pE)).FiTable == (*Expr)(unsafe.Pointer(pExpr)).FiTable &&
-										int32((*Expr)(unsafe.Pointer(pE)).FiColumn) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
-										(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(j)
-										goto __9
-									}
-
-								}
-								goto __8
-							__8:
-								j++
-								pTerm += 32
-								goto __7
-								goto __9
-							__9:
-							}
-							if int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) < 0 {
-								(*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn = I16(libc.PostIncInt32(&(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn, 1))
-							}
-						}
-
-						(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo = pAggInfo
-						if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
-							(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
-						}
-						(*Expr)(unsafe.Pointer(pExpr)).FiAgg = I16(k)
+						findOrCreateAggInfoColumn(tls, pParse, pAggInfo, pExpr)
 						goto __3
 					}
 
@@ -107668,34 +108077,33 @@ func analyzeAggregate(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 				(*Walker)(unsafe.Pointer(pWalker)).FwalkerDepth == int32((*Expr)(unsafe.Pointer(pExpr)).Fop2) {
 				var pItem uintptr = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 				i = 0
-			__10:
+			__4:
 				if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-					goto __12
+					goto __6
 				}
 				{
 					if (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr == pExpr {
-						goto __12
+						goto __6
 					}
 					if Xsqlite3ExprCompare(tls, uintptr(0), (*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr, pExpr, -1) == 0 {
-						goto __12
+						goto __6
 					}
 
 				}
-				goto __11
-			__11:
+				goto __5
+			__5:
 				i++
-				pItem += 32
-				goto __10
-				goto __12
-			__12:
+				pItem += 24
+				goto __4
+				goto __6
+			__6:
 				;
 				if i >= (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc {
 					var enc U8 = (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc
 					i = addAggInfoFunc(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pAggInfo)
 					if i >= 0 {
-						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32
+						pItem = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFExpr = pExpr
-						(*AggInfo_func)(unsafe.Pointer(pItem)).FiMem = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 
 						(*AggInfo_func)(unsafe.Pointer(pItem)).FpFunc = Xsqlite3FindFunction(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb,
 							*(*uintptr)(unsafe.Pointer(pExpr + 8)),
@@ -107785,7 +108193,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 	if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) == 0 {
 		return libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	}
-	return *(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
+	return *(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PreDecUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4))
 }
 
 // Deallocate a register, making available for reuse for some other
@@ -107793,7 +108201,7 @@ func Xsqlite3GetTempReg(tls *libc.TLS, pParse uintptr) int32 {
 func Xsqlite3ReleaseTempReg(tls *libc.TLS, pParse uintptr, iReg int32) {
 	if iReg != 0 {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FnTempReg) < int32(uint64(unsafe.Sizeof([8]int32{}))/uint64(unsafe.Sizeof(int32(0)))) {
-			*(*int32)(unsafe.Pointer(pParse + 224 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
+			*(*int32)(unsafe.Pointer(pParse + 228 + uintptr(libc.PostIncUint8(&(*Parse)(unsafe.Pointer(pParse)).FnTempReg, 1))*4)) = iReg
 		}
 	}
 }
@@ -107844,11 +108252,11 @@ func isAlterableTable(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+9424, 7) ||
+	if 0 == Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Eponymous) != U32(0) ||
 		(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Shadow) != U32(0) &&
 			Xsqlite3ReadOnlyShadowTables(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9432, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9494, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -107860,13 +108268,13 @@ func renameTestSchema(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32, z
 
 	(*Parse)(unsafe.Pointer(pParse)).FcolNamesSet = U8(1)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9460,
+		ts+9522,
 		libc.VaList(bp, zDb,
 			zDb, bTemp, zWhen, bNoDQS))
 
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9635,
+			ts+9697,
 			libc.VaList(bp+40, zDb, zWhen, bNoDQS))
 	}
 }
@@ -107876,10 +108284,10 @@ func renameFixQuotes(tls *libc.TLS, pParse uintptr, zDb uintptr, bTemp int32) {
 	defer tls.Free(16)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+9809, libc.VaList(bp, zDb, zDb))
+		ts+9871, libc.VaList(bp, zDb, zDb))
 	if bTemp == 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+9956, 0)
+			ts+10018, 0)
 	}
 }
 
@@ -107943,7 +108351,7 @@ __3:
 		goto __4
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+10107, libc.VaList(bp, zName))
+		ts+10169, libc.VaList(bp, zName))
 	goto exit_rename_table
 __4:
 	;
@@ -107953,7 +108361,7 @@ __4:
 	goto exit_rename_table
 __5:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+10166, zName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+10228, zName)) {
 		goto __6
 	}
 	goto exit_rename_table
@@ -107962,7 +108370,7 @@ __6:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+10172, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+10234, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_rename_table
 __7:
 	;
@@ -108003,19 +108411,19 @@ __12:
 	nTabName = Xsqlite3Utf8CharLen(tls, zTabName, -1)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10199, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
+		ts+10261, libc.VaList(bp+16, zDb, zDb, zTabName, zName, libc.Bool32(iDb == 1), zTabName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10383,
+		ts+10445,
 		libc.VaList(bp+64, zDb,
 			zName, zName, zName,
 			nTabName, zTabName))
 
-	if !(Xsqlite3FindTable(tls, db, ts+10688, zDb) != 0) {
+	if !(Xsqlite3FindTable(tls, db, ts+10750, zDb) != 0) {
 		goto __13
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10704,
+		ts+10766,
 		libc.VaList(bp+112, zDb, zName, (*Table)(unsafe.Pointer(pTab)).FzName))
 __13:
 	;
@@ -108023,7 +108431,7 @@ __13:
 		goto __14
 	}
 	Xsqlite3NestedParse(tls, pParse,
-		ts+10762, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
+		ts+10824, libc.VaList(bp+136, zDb, zTabName, zName, zTabName, zDb, zName))
 __14:
 	;
 	if !(pVTab != 0) {
@@ -108035,7 +108443,7 @@ __14:
 __15:
 	;
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11027, 0)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+11089, 0)
 
 exit_rename_table:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -108047,7 +108455,7 @@ func sqlite3ErrorIfNotEmpty(tls *libc.TLS, pParse uintptr, zDb uintptr, zTab uin
 	defer tls.Free(24)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11040,
+		ts+11102,
 		libc.VaList(bp, zErr, zDb, zTab))
 }
 
@@ -108093,12 +108501,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 	}
 
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+11078, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+11140, 0)
 		return
 	}
 	if (*Table)(unsafe.Pointer(pNew)).FpIndex != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+11110, 0)
+			ts+11172, 0)
 		return
 	}
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED == 0 {
@@ -108108,11 +108516,11 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 
 		if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_ForeignKeys) != 0 && *(*uintptr)(unsafe.Pointer(pNew + 64 + 8)) != 0 && pDflt != 0 {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+11137)
+				ts+11199)
 		}
 		if uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && !(pDflt != 0) {
 			sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-				ts+11196)
+				ts+11258)
 		}
 
 		if pDflt != 0 {
@@ -108125,12 +108533,12 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 			}
 			if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
 				sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab,
-					ts+11249)
+					ts+11311)
 			}
 			Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 		}
 	} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_STORED != 0 {
-		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+11295)
+		sqlite3ErrorIfNotEmpty(tls, pParse, zDb, zTab, ts+11357)
 	}
 
 	zCol = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pColDef)).Fz, uint64((*Token)(unsafe.Pointer(pColDef)).Fn))
@@ -108141,7 +108549,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+11322,
+			ts+11384,
 			libc.VaList(bp, zDb, *(*int32)(unsafe.Pointer(pNew + 64)), zCol, *(*int32)(unsafe.Pointer(pNew + 64)),
 				zTab))
 		Xsqlite3DbFree(tls, db, zCol)
@@ -108163,7 +108571,7 @@ func Xsqlite3AlterFinishAddColumn(tls *libc.TLS, pParse uintptr, pColDef uintptr
 		if (*Table)(unsafe.Pointer(pNew)).FpCheck != uintptr(0) ||
 			uint32(int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf>>0)) != 0 && int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+11468,
+				ts+11530,
 				libc.VaList(bp+40, zTab, zDb))
 		}
 	}
@@ -108211,14 +108619,14 @@ __2:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11698, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+11760, 0)
 	goto exit_begin_add_column
 __3:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11732, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+11794, 0)
 	goto exit_begin_add_column
 __4:
 	;
@@ -108246,7 +108654,7 @@ __6:
 	nAlloc = (int32((*Table)(unsafe.Pointer(pNew)).FnCol)-1)/8*8 + 8
 
 	(*Table)(unsafe.Pointer(pNew)).FaCol = Xsqlite3DbMallocZero(tls, db, uint64(unsafe.Sizeof(Column{}))*uint64(nAlloc))
-	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+11762, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	(*Table)(unsafe.Pointer(pNew)).FzName = Xsqlite3MPrintf(tls, db, ts+11824, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(!(int32((*Table)(unsafe.Pointer(pNew)).FaCol) != 0) || !(int32((*Table)(unsafe.Pointer(pNew)).FzName) != 0)) {
 		goto __7
 	}
@@ -108286,18 +108694,18 @@ func isRealTable(tls *libc.TLS, pParse uintptr, pTab uintptr, bDrop int32) int32
 
 	var zType uintptr = uintptr(0)
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		zType = ts + 11781
+		zType = ts + 11843
 	}
 	if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB {
-		zType = ts + 11786
+		zType = ts + 11848
 	}
 	if zType != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+11800,
+		Xsqlite3ErrorMsg(tls, pParse, ts+11862,
 			libc.VaList(bp, func() uintptr {
 				if bDrop != 0 {
-					return ts + 11818
+					return ts + 11880
 				}
-				return ts + 11835
+				return ts + 11897
 			}(),
 				zType, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
@@ -108381,7 +108789,7 @@ __8:
 	if !(iCol == int32((*Table)(unsafe.Pointer(pTab)).FnCol)) {
 		goto __10
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11853, libc.VaList(bp, pOld))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11915, libc.VaList(bp, pOld))
 	goto exit_rename_column
 __10:
 	;
@@ -108398,17 +108806,17 @@ __11:
 	;
 	bQuote = int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(pNew)).Fz)))]) & 0x80
 	Xsqlite3NestedParse(tls, pParse,
-		ts+11874,
+		ts+11936,
 		libc.VaList(bp+8, zDb,
 			zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote, libc.Bool32(iSchema == 1),
 			(*Table)(unsafe.Pointer(pTab)).FzName))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+12056,
+		ts+12118,
 		libc.VaList(bp+72, zDb, (*Table)(unsafe.Pointer(pTab)).FzName, iCol, zNew, bQuote))
 
 	renameReloadSchema(tls, pParse, iSchema, uint16(INITFLAG_AlterRename))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+11027, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iSchema == 1), ts+11089, 1)
 
 exit_rename_column:
 	Xsqlite3SrcListDelete(tls, db, pSrc)
@@ -108603,7 +109011,7 @@ func renameTokenFind(tls *libc.TLS, pParse uintptr, pCtx uintptr, pPtr uintptr)
 	if pPtr == uintptr(0) {
 		return uintptr(0)
 	}
-	for pp = pParse + 408; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
+	for pp = pParse + 416; *(*uintptr)(unsafe.Pointer(pp)) != 0; pp = *(*uintptr)(unsafe.Pointer(pp)) + 24 {
 		if (*RenameToken)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pp)))).Fp == pPtr {
 			var pToken uintptr = *(*uintptr)(unsafe.Pointer(pp))
 			if pCtx != 0 {
@@ -108666,10 +109074,10 @@ func renameColumnParseError(tls *libc.TLS, pCtx uintptr, zWhen uintptr, pType ui
 	var zN uintptr = Xsqlite3_value_text(tls, pObject)
 	var zErr uintptr
 
-	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12187,
+	zErr = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+12249,
 		libc.VaList(bp, zT, zN, func() uintptr {
 			if *(*int8)(unsafe.Pointer(zWhen)) != 0 {
-				return ts + 12210
+				return ts + 12272
 			}
 			return ts + 1544
 		}(), zWhen,
@@ -108711,8 +109119,8 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	if zSql == uintptr(0) {
 		return SQLITE_NOMEM
 	}
-	if Xsqlite3_strnicmp(tls, zSql, ts+12212, 7) != 0 {
-		return Xsqlite3CorruptError(tls, 112777)
+	if Xsqlite3_strnicmp(tls, zSql, ts+12274, 7) != 0 {
+		return Xsqlite3CorruptError(tls, 113494)
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = func() uint8 {
 		if bTemp != 0 {
@@ -108729,7 +109137,7 @@ func renameParseSql(tls *libc.TLS, p uintptr, zDb uintptr, db uintptr, zSql uint
 	}
 	if rc == SQLITE_OK &&
 		((*Parse)(unsafe.Pointer(p)).FpNewTable == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewIndex == uintptr(0) && (*Parse)(unsafe.Pointer(p)).FpNewTrigger == uintptr(0)) {
-		rc = Xsqlite3CorruptError(tls, 112788)
+		rc = Xsqlite3CorruptError(tls, 113505)
 	}
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
@@ -108751,7 +109159,7 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 	var zBuf2 uintptr = uintptr(0)
 
 	if zNew != 0 {
-		zQuot = Xsqlite3MPrintf(tls, db, ts+12220, libc.VaList(bp, zNew))
+		zQuot = Xsqlite3MPrintf(tls, db, ts+12282, libc.VaList(bp, zNew))
 		if zQuot == uintptr(0) {
 			return SQLITE_NOMEM
 		} else {
@@ -108791,10 +109199,10 @@ func renameEditSql(tls *libc.TLS, pCtx uintptr, pRename uintptr, zSql uintptr, z
 				libc.Xmemcpy(tls, zBuf1, (*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz, uint64((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))
 				*(*int8)(unsafe.Pointer(zBuf1 + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn))) = int8(0)
 				Xsqlite3Dequote(tls, zBuf1)
-				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+12226, libc.VaList(bp+8, zBuf1,
+				Xsqlite3_snprintf(tls, int32(nSql*int64(2)), zBuf2, ts+12288, libc.VaList(bp+8, zBuf1,
 					func() uintptr {
 						if int32(*(*int8)(unsafe.Pointer((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fz + uintptr((*RenameToken)(unsafe.Pointer(pBest)).Ft.Fn)))) == '\'' {
-							return ts + 12210
+							return ts + 12272
 						}
 						return ts + 1544
 					}()))
@@ -108970,8 +109378,8 @@ func renameParseCleanup(tls *libc.TLS, pParse uintptr) {
 }
 
 func renameColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr
 
@@ -109054,15 +109462,15 @@ __5:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = uintptr(0)
 	rc = renameParseSql(tls, bp+32, zDb, db, zSql, bTemp)
 
-	libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-	(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp + 32
-	(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp + 32
+	(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnExprCb}))
-	(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+	(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{renameColumnSelectCb}))
-	*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp
+	*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp
 
 	(*RenameCtx)(unsafe.Pointer(bp)).FpTab = pTab
 	if !(rc != SQLITE_OK) {
@@ -109090,7 +109498,7 @@ __6:
 	if !(rc == SQLITE_OK) {
 		goto __11
 	}
-	Xsqlite3WalkSelect(tls, bp+448, pSelect)
+	Xsqlite3WalkSelect(tls, bp+456, pSelect)
 __11:
 	;
 	if !(rc != SQLITE_OK) {
@@ -109123,13 +109531,13 @@ __15:
 	renameTokenFind(tls, bp+32, bp, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable+52)
 __16:
 	;
-	Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
+	Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FpCheck)
 	pIdx = (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp + 32)).FpNewTable)).FpIndex
 __17:
 	if !(pIdx != 0) {
 		goto __19
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __18
 __18:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -109142,7 +109550,7 @@ __20:
 	if !(pIdx != 0) {
 		goto __22
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer(pIdx)).FaColExpr)
 	goto __21
 __21:
 	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
@@ -109157,7 +109565,7 @@ __23:
 	}
 	pExpr = Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp+32)).FpNewTable,
 		(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTable)).FaCol+uintptr(i)*24)
-	Xsqlite3WalkExpr(tls, bp+448, pExpr)
+	Xsqlite3WalkExpr(tls, bp+456, pExpr)
 	goto __24
 __24:
 	i++
@@ -109213,8 +109621,8 @@ __7:
 	if !((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex != 0) {
 		goto __34
 	}
-	Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
-	Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
+	Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FaColExpr)
+	Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewIndex)).FpPartIdxWhere)
 	goto __35
 __34:
 	rc = renameResolveTrigger(tls, bp+32)
@@ -109262,7 +109670,7 @@ __39:
 	renameColumnIdlistNames(tls, bp+32, bp, (*Trigger)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)).FpColumns, zOld)
 __43:
 	;
-	renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
+	renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp+32)).FpNewTrigger)
 __35:
 	;
 __8:
@@ -109330,8 +109738,8 @@ func renameTableSelectCb(tls *libc.TLS, pWalker uintptr, pSelect uintptr) int32
 }
 
 func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(552)
-	defer tls.Free(552)
+	bp := tls.Alloc(560)
+	defer tls.Free(560)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -109373,11 +109781,11 @@ func renameTableFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 					if isLegacy == 0 {
 						var pSelect uintptr = *(*uintptr)(unsafe.Pointer(pTab + 64))
 
-						libc.Xmemset(tls, bp+496, 0, uint64(unsafe.Sizeof(NameContext{})))
-						(*NameContext)(unsafe.Pointer(bp + 496)).FpParse = bp + 80
+						libc.Xmemset(tls, bp+504, 0, uint64(unsafe.Sizeof(NameContext{})))
+						(*NameContext)(unsafe.Pointer(bp + 504)).FpParse = bp + 80
 
 						*(*U32)(unsafe.Pointer(pSelect + 4)) &= libc.Uint32FromInt32(libc.CplInt32(SF_View))
-						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+496)
+						Xsqlite3SelectPrep(tls, bp+80, *(*uintptr)(unsafe.Pointer(pTab + 64)), bp+504)
 						if (*Parse)(unsafe.Pointer(bp+80)).FnErr != 0 {
 							rc = (*Parse)(unsafe.Pointer(bp + 80)).Frc
 						} else {
@@ -109470,8 +109878,8 @@ func renameQuotefixExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 }
 
 func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(496)
-	defer tls.Free(496)
+	bp := tls.Alloc(504)
+	defer tls.Free(504)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -109489,16 +109897,16 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 		rc = renameParseSql(tls, bp, zDb, db, zInput, 0)
 
 		if rc == SQLITE_OK {
-			libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(RenameCtx{})))
-			libc.Xmemset(tls, bp+448, 0, uint64(unsafe.Sizeof(Walker{})))
-			(*Walker)(unsafe.Pointer(bp + 448)).FpParse = bp
-			(*Walker)(unsafe.Pointer(bp + 448)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(RenameCtx{})))
+			libc.Xmemset(tls, bp+456, 0, uint64(unsafe.Sizeof(Walker{})))
+			(*Walker)(unsafe.Pointer(bp + 456)).FpParse = bp
+			(*Walker)(unsafe.Pointer(bp + 456)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameQuotefixExprCb}))
-			(*Walker)(unsafe.Pointer(bp + 448)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
+			(*Walker)(unsafe.Pointer(bp + 456)).FxSelectCallback = *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr) int32
 			}{renameColumnSelectCb}))
-			*(*uintptr)(unsafe.Pointer(bp + 448 + 40)) = bp + 416
+			*(*uintptr)(unsafe.Pointer(bp + 456 + 40)) = bp + 424
 
 			if (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 {
 				if int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
@@ -109513,31 +109921,31 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 						return (*Parse)(unsafe.Pointer(bp)).Frc
 					}()
 					if rc == SQLITE_OK {
-						Xsqlite3WalkSelect(tls, bp+448, pSelect)
+						Xsqlite3WalkSelect(tls, bp+456, pSelect)
 					}
 				} else {
 					var i int32
-					Xsqlite3WalkExprList(tls, bp+448, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
+					Xsqlite3WalkExprList(tls, bp+456, (*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FpCheck)
 					for i = 0; i < int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FnCol); i++ {
-						Xsqlite3WalkExpr(tls, bp+448,
+						Xsqlite3WalkExpr(tls, bp+456,
 							Xsqlite3ColumnExpr(tls, (*Parse)(unsafe.Pointer(bp)).FpNewTable,
 								(*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FaCol+uintptr(i)*24))
 					}
 				}
 			} else if (*Parse)(unsafe.Pointer(bp)).FpNewIndex != 0 {
-				Xsqlite3WalkExprList(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
-				Xsqlite3WalkExpr(tls, bp+448, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
+				Xsqlite3WalkExprList(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FaColExpr)
+				Xsqlite3WalkExpr(tls, bp+456, (*Index)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewIndex)).FpPartIdxWhere)
 			} else {
 				rc = renameResolveTrigger(tls, bp)
 				if rc == SQLITE_OK {
-					renameWalkTrigger(tls, bp+448, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
+					renameWalkTrigger(tls, bp+456, (*Parse)(unsafe.Pointer(bp)).FpNewTrigger)
 				}
 			}
 
 			if rc == SQLITE_OK {
-				rc = renameEditSql(tls, context, bp+416, zInput, uintptr(0), 0)
+				rc = renameEditSql(tls, context, bp+424, zInput, uintptr(0), 0)
 			}
-			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+416)).FpList)
+			renameTokenFree(tls, db, (*RenameCtx)(unsafe.Pointer(bp+424)).FpList)
 		}
 		if rc != SQLITE_OK {
 			if Xsqlite3WritableSchema(tls, db) != 0 && rc == SQLITE_ERROR {
@@ -109555,8 +109963,8 @@ func renameQuotefixFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uint
 }
 
 func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(472)
-	defer tls.Free(472)
+	bp := tls.Alloc(480)
+	defer tls.Free(480)
 
 	var db uintptr = Xsqlite3_context_db_handle(tls, context)
 	var zDb uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -109582,9 +109990,9 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 		*(*U64)(unsafe.Pointer(db + 48)) |= U64(flags & (SQLITE_DqsDML | SQLITE_DqsDDL))
 		if rc == SQLITE_OK {
 			if isLegacy == 0 && (*Parse)(unsafe.Pointer(bp)).FpNewTable != 0 && int32((*Table)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable)).FeTabType) == TABTYP_VIEW {
-				libc.Xmemset(tls, bp+416, 0, uint64(unsafe.Sizeof(NameContext{})))
-				(*NameContext)(unsafe.Pointer(bp + 416)).FpParse = bp
-				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+416)
+				libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
+				(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp
+				Xsqlite3SelectPrep(tls, bp, *(*uintptr)(unsafe.Pointer((*Parse)(unsafe.Pointer(bp)).FpNewTable + 64)), bp+424)
 				if (*Parse)(unsafe.Pointer(bp)).FnErr != 0 {
 					rc = (*Parse)(unsafe.Pointer(bp)).Frc
 				}
@@ -109612,8 +110020,8 @@ func renameTableTest(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr
 }
 
 func dropColumnFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(440)
-	defer tls.Free(440)
+	bp := tls.Alloc(448)
+	defer tls.Free(448)
 
 	var db uintptr
 	var iSchema int32
@@ -109650,7 +110058,7 @@ __1:
 		goto __2
 	}
 
-	rc = Xsqlite3CorruptError(tls, 113724)
+	rc = Xsqlite3CorruptError(tls, 114441)
 	goto drop_column_done
 __2:
 	;
@@ -109674,7 +110082,7 @@ __6:
 	;
 __4:
 	;
-	zNew = Xsqlite3MPrintf(tls, db, ts+12231, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
+	zNew = Xsqlite3MPrintf(tls, db, ts+12293, libc.VaList(bp, (int64((*RenameToken)(unsafe.Pointer(pCol)).Ft.Fz)-int64(zSql))/1, zSql, zEnd))
 	Xsqlite3_result_text(tls, context, zNew, -1, libc.UintptrFromInt32(-1))
 	Xsqlite3_free(tls, zNew)
 
@@ -109755,17 +110163,17 @@ __5:
 	if !(iCol < 0) {
 		goto __6
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+11853, libc.VaList(bp, pName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+11915, libc.VaList(bp, pName))
 	goto exit_drop_column
 __6:
 	;
 	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&(COLFLAG_PRIMKEY|COLFLAG_UNIQUE) != 0) {
 		goto __7
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12238,
+	Xsqlite3ErrorMsg(tls, pParse, ts+12300,
 		libc.VaList(bp+8, func() uintptr {
 			if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_PRIMKEY != 0 {
-				return ts + 12266
+				return ts + 12328
 			}
 			return ts + 7479
 		}(),
@@ -109776,7 +110184,7 @@ __7:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) <= 1) {
 		goto __8
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+12278, libc.VaList(bp+24, zCol))
+	Xsqlite3ErrorMsg(tls, pParse, ts+12340, libc.VaList(bp+24, zCol))
 	goto exit_drop_column
 __8:
 	;
@@ -109793,10 +110201,10 @@ __9:
 	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+1544, 0)
 	renameFixQuotes(tls, pParse, zDb, libc.Bool32(iDb == 1))
 	Xsqlite3NestedParse(tls, pParse,
-		ts+12326, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+12388, libc.VaList(bp+32, zDb, iDb, iCol, (*Table)(unsafe.Pointer(pTab)).FzName))
 
 	renameReloadSchema(tls, pParse, iDb, uint16(INITFLAG_AlterDrop))
-	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+12447, 1)
+	renameTestSchema(tls, pParse, zDb, libc.Bool32(iDb == 1), ts+12509, 1)
 
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr == 0 && int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
 		goto __10
@@ -109914,11 +110322,11 @@ func Xsqlite3AlterFunctions(tls *libc.TLS) {
 }
 
 var aAlterTableFuncs = [5]FuncDef{
-	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12465},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12486},
-	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12506},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12525},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12544}}
+	{FnArg: int8(9), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12527},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12548},
+	{FnArg: int8(7), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12568},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12587},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_INTERNAL | SQLITE_UTF8 | SQLITE_FUNC_CONSTANT), FxSFunc: 0, FzName: ts + 12606}}
 
 func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWhere uintptr, zWhereType uintptr) {
 	bp := tls.Alloc(88)
@@ -109952,7 +110360,7 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 		if libc.AssignUintptr(&pStat, Xsqlite3FindTable(tls, db, zTab, (*Db)(unsafe.Pointer(pDb)).FzDbSName)) == uintptr(0) {
 			if i < nToOpen {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+12567, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
+					ts+12629, libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, aTable[i].FzCols))
 				*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)) = U32((*Parse)(unsafe.Pointer(pParse)).FregRoot)
 				*(*U8)(unsafe.Pointer(bp + 72 + uintptr(i))) = U8(OPFLAG_P2ISREG)
 			}
@@ -109961,10 +110369,10 @@ func openStatTable(tls *libc.TLS, pParse uintptr, iDb int32, iStatCur int32, zWh
 			Xsqlite3TableLock(tls, pParse, iDb, *(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4)), uint8(1), zTab)
 			if zWhere != 0 {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+12590,
+					ts+12652,
 					libc.VaList(bp+24, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab, zWhereType, zWhere))
 			} else if (*Sqlite3)(unsafe.Pointer(db)).FxPreUpdateCallback != 0 {
-				Xsqlite3NestedParse(tls, pParse, ts+12620, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
+				Xsqlite3NestedParse(tls, pParse, ts+12682, libc.VaList(bp+56, (*Db)(unsafe.Pointer(pDb)).FzDbSName, zTab))
 			} else {
 				Xsqlite3VdbeAddOp2(tls, v, OP_Clear, int32(*(*U32)(unsafe.Pointer(bp + 76 + uintptr(i)*4))), iDb)
 			}
@@ -109982,9 +110390,9 @@ var aTable = [3]struct {
 	FzName uintptr
 	FzCols uintptr
 }{
-	{FzName: ts + 12638, FzCols: ts + 12651},
-	{FzName: ts + 12664, FzCols: ts + 12677},
-	{FzName: ts + 12705},
+	{FzName: ts + 12700, FzCols: ts + 12713},
+	{FzName: ts + 12726, FzCols: ts + 12739},
+	{FzName: ts + 12767},
 }
 
 // Three SQL functions - stat_init(), stat_push(), and stat_get() -
@@ -110003,7 +110411,6 @@ type StatAccum1 = struct {
 	FnPSample    TRowcnt
 	FmxSample    int32
 	FiPrn        U32
-	F__ccgo_pad2 [4]byte
 	FaBest       uintptr
 	FiMin        int32
 	FnSample     int32
@@ -110082,7 +110489,7 @@ func statAccumDestructor(tls *libc.TLS, pOld uintptr) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FmxSample; i++ {
 			sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)
 		}
-		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32)
+		sampleClear(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40)
 	}
 	Xsqlite3DbFree(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p)
 }
@@ -110128,13 +110535,13 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	(*StatAccum)(unsafe.Pointer(p)).Fdb = db
 	(*StatAccum)(unsafe.Pointer(p)).FnEst = TRowcnt(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
-	(*StatAccum)(unsafe.Pointer(p)).FnRow = TRowcnt(0)
+	(*StatAccum)(unsafe.Pointer(p)).FnRow = uint64(0)
 	(*StatAccum)(unsafe.Pointer(p)).FnLimit = int32(Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	(*StatAccum)(unsafe.Pointer(p)).FnCol = nCol
 	(*StatAccum)(unsafe.Pointer(p)).FnKeyCol = nKeyCol
 	(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead = U8(0)
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*128
-	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*4
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt = p + 1*136
+	(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(nColUp)*8
 
 	(*StatAccum)(unsafe.Pointer(p)).FmxSample = func() int32 {
 		if (*StatAccum)(unsafe.Pointer(p)).FnLimit == 0 {
@@ -110147,11 +110554,11 @@ func statInit(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		(*StatAccum)(unsafe.Pointer(p)).FiGet = -1
-		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + TRowcnt(1)
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).FnPSample = (*StatAccum)(unsafe.Pointer(p)).FnEst/TRowcnt(mxSample/3+1) + uint64(1)
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FiPrn = U32(0x689e962d)*U32(nCol) ^ 0xd0944565*U32(Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 
-		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*4
+		(*StatAccum)(unsafe.Pointer(p)).Fa = (*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(nColUp)*8
 		(*StatAccum)(unsafe.Pointer(p)).FaBest = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample)*48
 		pSpace = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(mxSample+nCol)*48
 		for i = 0; i < mxSample+nCol; i++ {
@@ -110175,17 +110582,17 @@ var statInitFuncdef = FuncDef{
 	FnArg:      int8(4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12718}
+	FzName:     ts + 12780}
 
 func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
 	var nCol int32 = (*StatAccum)(unsafe.Pointer(pAccum)).FnCol
 	var i int32
 
 	for i = (*StatSample)(unsafe.Pointer(pNew)).FiCol + 1; i < nCol; i++ {
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) > *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 1
 		}
-		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*4)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*4)) {
+		if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr(i)*8)) < *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr(i)*8)) {
 			return 0
 		}
 	}
@@ -110196,8 +110603,8 @@ func sampleIsBetterPost(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintpt
 }
 
 func sampleIsBetter(tls *libc.TLS, pAccum uintptr, pNew uintptr, pOld uintptr) int32 {
-	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4))
-	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*4))
+	var nEqNew TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8))
+	var nEqOld TRowcnt = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pOld)).FiCol)*8))
 
 	if nEqNew > nEqOld {
 		return 1
@@ -110240,7 +110647,7 @@ __3:
 		goto __5
 	}
 	pOld = (*StatAccum)(unsafe.Pointer(p)).Fa + uintptr(i)*48
-	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*4)) == TRowcnt(0)) {
+	if !(*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pOld)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pNew)).FiCol)*8)) == uint64(0)) {
 		goto __6
 	}
 	if !((*StatSample)(unsafe.Pointer(pOld)).FisPSample != 0) {
@@ -110268,7 +110675,7 @@ __5:
 		goto __9
 	}
 	(*StatSample)(unsafe.Pointer(pUpgrade)).FiCol = (*StatSample)(unsafe.Pointer(pNew)).FiCol
-	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*4))
+	*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pUpgrade)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pNew)).FanEq + uintptr((*StatSample)(unsafe.Pointer(pUpgrade)).FiCol)*8))
 	goto find_new_min
 __9:
 	;
@@ -110335,7 +110742,7 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 
 	for i = (*StatAccum)(unsafe.Pointer(p)).FnCol - 2; i >= iChng; i-- {
 		var pBest uintptr = (*StatAccum)(unsafe.Pointer(p)).FaBest + uintptr(i)*48
-		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+		*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer(pBest)).FanEq + uintptr(i)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 		if (*StatAccum)(unsafe.Pointer(p)).FnSample < (*StatAccum)(unsafe.Pointer(p)).FmxSample || sampleIsBetter(tls, p, pBest, (*StatAccum)(unsafe.Pointer(p)).Fa+uintptr((*StatAccum)(unsafe.Pointer(p)).FiMin)*48) != 0 {
 			sampleInsert(tls, p, pBest, i)
 		}
@@ -110351,8 +110758,8 @@ func samplePushPrevious(tls *libc.TLS, p uintptr, iChng int32) {
 		for i = (*StatAccum)(unsafe.Pointer(p)).FnSample - 1; i >= 0; i-- {
 			var j int32
 			for j = iChng; j < (*StatAccum)(unsafe.Pointer(p)).FnCol; j++ {
-				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) == TRowcnt(0) {
-					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*4)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*4))
+				if *(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) == uint64(0) {
+					*(*TRowcnt)(unsafe.Pointer((*StatSample)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fa+uintptr(i)*48)).FanEq + uintptr(j)*8)) = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(j)*8))
 				}
 			}
 		}
@@ -110369,9 +110776,9 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
 	_ = context
 
-	if (*StatAccum)(unsafe.Pointer(p)).FnRow == TRowcnt(0) {
+	if (*StatAccum)(unsafe.Pointer(p)).FnRow == uint64(0) {
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	} else {
 		if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
@@ -110379,14 +110786,14 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 
 		for i = 0; i < iChng; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))++
 		}
 		for i = iChng; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4))++
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8))++
 			if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
-				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*4)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4))
+				*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr(i)*8)) += *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8))
 			}
-			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanEq + uintptr(i)*8)) = uint64(1)
 		}
 	}
 
@@ -110394,31 +110801,31 @@ func statPush(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	if (*StatAccum)(unsafe.Pointer(p)).FmxSample != 0 {
 		var nLt TRowcnt
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))) == SQLITE_INTEGER {
-			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
+			sampleSetRowidInt64(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		} else {
-			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+32, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
+			sampleSetRowid(tls, (*StatAccum)(unsafe.Pointer(p)).Fdb, p+40, Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))),
 				Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(argv + 2*8))))
 		}
-		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+88, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
+		(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiHash = libc.AssignPtrUint32(p+100, (*StatAccum)(unsafe.Pointer(p)).FiPrn*U32(1103515245)+U32(12345))
 
-		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*4))
+		nLt = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanLt + uintptr((*StatAccum)(unsafe.Pointer(p)).FnCol-1)*8))
 
-		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+TRowcnt(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
+		if nLt/(*StatAccum)(unsafe.Pointer(p)).FnPSample != (nLt+uint64(1))/(*StatAccum)(unsafe.Pointer(p)).FnPSample {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = 0
-			sampleInsert(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
+			sampleInsert(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FnCol-1)
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FisPSample = U8(0)
 		}
 
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol-1; i++ {
 			(*StatAccum)(unsafe.Pointer(p)).Fcurrent.FiCol = i
-			if i >= iChng || sampleIsBetterPost(tls, p, p+32, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
-				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+32)
+			if i >= iChng || sampleIsBetterPost(tls, p, p+40, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48) != 0 {
+				sampleCopy(tls, p, (*StatAccum)(unsafe.Pointer(p)).FaBest+uintptr(i)*48, p+40)
 			}
 		}
 	} else if (*StatAccum)(unsafe.Pointer(p)).FnLimit != 0 && (*StatAccum)(unsafe.Pointer(p)).FnRow > TRowcnt((*StatAccum)(unsafe.Pointer(p)).FnLimit)*TRowcnt(int32((*StatAccum)(unsafe.Pointer(p)).FnSkipAhead)+1) {
 		(*StatAccum)(unsafe.Pointer(p)).FnSkipAhead++
-		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > TRowcnt(0)))
+		Xsqlite3_result_int(tls, context, libc.Bool32(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt)) > uint64(0)))
 	}
 }
 
@@ -110426,7 +110833,7 @@ var statPushFuncdef = FuncDef{
 	FnArg:      int8(2 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12728}
+	FzName:     ts + 12790}
 
 func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(88)
@@ -110440,20 +110847,20 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var i int32
 
 		Xsqlite3StrAccumInit(tls, bp+24, uintptr(0), uintptr(0), 0, ((*StatAccum)(unsafe.Pointer(p)).FnKeyCol+1)*100)
-		Xsqlite3_str_appendf(tls, bp+24, ts+12738,
+		Xsqlite3_str_appendf(tls, bp+24, ts+12800,
 			libc.VaList(bp, func() uint64 {
 				if (*StatAccum)(unsafe.Pointer(p)).FnSkipAhead != 0 {
-					return U64((*StatAccum)(unsafe.Pointer(p)).FnEst)
+					return (*StatAccum)(unsafe.Pointer(p)).FnEst
 				}
-				return U64((*StatAccum)(unsafe.Pointer(p)).FnRow)
+				return (*StatAccum)(unsafe.Pointer(p)).FnRow
 			}()))
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnKeyCol; i++ {
-			var nDistinct U64 = U64(*(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*4)) + TRowcnt(1))
-			var iVal U64 = (U64((*StatAccum)(unsafe.Pointer(p)).FnRow) + nDistinct - uint64(1)) / nDistinct
-			if iVal == uint64(2) && U64((*StatAccum)(unsafe.Pointer(p)).FnRow*TRowcnt(10)) <= nDistinct*uint64(11) {
+			var nDistinct U64 = *(*TRowcnt)(unsafe.Pointer((*StatAccum)(unsafe.Pointer(p)).Fcurrent.FanDLt + uintptr(i)*8)) + uint64(1)
+			var iVal U64 = ((*StatAccum)(unsafe.Pointer(p)).FnRow + nDistinct - uint64(1)) / nDistinct
+			if iVal == uint64(2) && (*StatAccum)(unsafe.Pointer(p)).FnRow*uint64(10) <= nDistinct*uint64(11) {
 				iVal = uint64(1)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+12743, libc.VaList(bp+8, iVal))
+			Xsqlite3_str_appendf(tls, bp+24, ts+12805, libc.VaList(bp+8, iVal))
 
 		}
 		Xsqlite3ResultStrAccum(tls, context, bp+24)
@@ -110495,7 +110902,7 @@ func statGet(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		Xsqlite3StrAccumInit(tls, bp+56, uintptr(0), uintptr(0), 0, (*StatAccum)(unsafe.Pointer(p)).FnCol*100)
 		for i = 0; i < (*StatAccum)(unsafe.Pointer(p)).FnCol; i++ {
-			Xsqlite3_str_appendf(tls, bp+56, ts+12749, libc.VaList(bp+16, U64(*(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*4)))))
+			Xsqlite3_str_appendf(tls, bp+56, ts+12811, libc.VaList(bp+16, *(*TRowcnt)(unsafe.Pointer(aCnt + uintptr(i)*8))))
 		}
 		if (*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar != 0 {
 			(*Sqlite3_str)(unsafe.Pointer(bp+56)).FnChar--
@@ -110509,7 +110916,7 @@ var statGetFuncdef = FuncDef{
 	FnArg:      int8(1 + IsStat4),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 12755}
+	FzName:     ts + 12817}
 
 func callStatGet(tls *libc.TLS, pParse uintptr, regStat int32, iParam int32, regOut int32) {
 	Xsqlite3VdbeAddOp2(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Integer, iParam, regStat+1)
@@ -110553,7 +110960,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_NORM) {
 		return
 	}
-	if Xsqlite3_strlike(tls, ts+12764, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
+	if Xsqlite3_strlike(tls, ts+12826, (*Table)(unsafe.Pointer(pTab)).FzName, uint32('\\')) == 0 {
 		return
 	}
 
@@ -110570,7 +110977,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 			return
 		}
 		(*Table)(unsafe.Pointer(pStat1)).FzName = pStat1 + 1*104
-		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+12638, uint64(13))
+		libc.Xmemcpy(tls, (*Table)(unsafe.Pointer(pStat1)).FzName, ts+12700, uint64(13))
 		(*Table)(unsafe.Pointer(pStat1)).FnCol = int16(3)
 		(*Table)(unsafe.Pointer(pStat1)).FiPKey = int16(-1)
 		Xsqlite3VdbeAddOp4(tls, (*Parse)(unsafe.Pointer(pParse)).FpVdbe, OP_Noop, 0, 0, 0, pStat1, -6)
@@ -110726,7 +111133,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 
 		callStatGet(tls, pParse, regStat, STAT_GET_STAT1, regStat1)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12774, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12836, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP4(tls, v, -1, pStat1, -5)
@@ -110783,7 +111190,7 @@ func analyzeOneTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintp
 		jZeroRows = Xsqlite3VdbeAddOp1(tls, v, OP_IfNot, regStat1)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regIdxname)
 
-		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12774, 0)
+		Xsqlite3VdbeAddOp4(tls, v, OP_MakeRecord, regTabname, 3, regTemp, ts+12836, 0)
 		Xsqlite3VdbeAddOp2(tls, v, OP_NewRowid, iStatCur, regNewRowid)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Insert, iStatCur, regTemp, regNewRowid)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(OPFLAG_APPEND))
@@ -110830,9 +111237,9 @@ func analyzeTable(tls *libc.TLS, pParse uintptr, pTab uintptr, pOnlyIdx uintptr)
 	iStatCur = (*Parse)(unsafe.Pointer(pParse)).FnTab
 	*(*int32)(unsafe.Pointer(pParse + 52)) += 3
 	if pOnlyIdx != 0 {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+12778)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Index)(unsafe.Pointer(pOnlyIdx)).FzName, ts+12840)
 	} else {
-		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12782)
+		openStatTable(tls, pParse, iDb, iStatCur, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12844)
 	}
 	analyzeOneTable(tls, pParse, pTab, pOnlyIdx, iStatCur, (*Parse)(unsafe.Pointer(pParse)).FnMem+1, (*Parse)(unsafe.Pointer(pParse)).FnTab)
 	loadAnalysis(tls, pParse, iDb)
@@ -110918,16 +111325,16 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		z = ts + 1544
 	}
 	for i = 0; *(*int8)(unsafe.Pointer(z)) != 0 && i < nOut; i++ {
-		v = TRowcnt(0)
+		v = uint64(0)
 		for libc.AssignInt32(&c, int32(*(*int8)(unsafe.Pointer(z)))) >= '0' && c <= '9' {
-			v = v*TRowcnt(10) + TRowcnt(c) - TRowcnt('0')
+			v = v*uint64(10) + TRowcnt(c) - uint64('0')
 			z++
 		}
 		if aOut != 0 {
-			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*4)) = v
+			*(*TRowcnt)(unsafe.Pointer(aOut + uintptr(i)*8)) = v
 		}
 		if aLog != 0 {
-			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, uint64(v))
+			*(*LogEst)(unsafe.Pointer(aLog + uintptr(i)*2)) = Xsqlite3LogEst(tls, v)
 		}
 		if int32(*(*int8)(unsafe.Pointer(z))) == ' ' {
 			z++
@@ -110937,15 +111344,15 @@ func decodeIntArray(tls *libc.TLS, zIntArray uintptr, nOut int32, aOut uintptr,
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 2, 0x4)
 		libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(0), 6, 0x40)
 		for *(*int8)(unsafe.Pointer(z)) != 0 {
-			if Xsqlite3_strglob(tls, ts+12786, z) == 0 {
+			if Xsqlite3_strglob(tls, ts+12848, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 2, 0x4)
-			} else if Xsqlite3_strglob(tls, ts+12797, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+12859, z) == 0 {
 				var sz int32 = Xsqlite3Atoi(tls, z+uintptr(3))
 				if sz < 2 {
 					sz = 2
 				}
 				(*Index)(unsafe.Pointer(pIndex)).FszIdxRow = Xsqlite3LogEst(tls, uint64(sz))
-			} else if Xsqlite3_strglob(tls, ts+12807, z) == 0 {
+			} else if Xsqlite3_strglob(tls, ts+12869, z) == 0 {
 				libc.SetBitFieldPtr16Uint32(pIndex+100, uint32(1), 6, 0x40)
 			}
 			for int32(*(*int8)(unsafe.Pointer(z))) != 0 && int32(*(*int8)(unsafe.Pointer(z))) != ' ' {
@@ -111025,7 +111432,7 @@ func Xsqlite3DeleteIndexSamples(tls *libc.TLS, db uintptr, pIdx uintptr) {
 		}
 		Xsqlite3DbFree(tls, db, (*Index)(unsafe.Pointer(pIdx)).FaSample)
 	}
-	if db != 0 && (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
+	if (*Sqlite3)(unsafe.Pointer(db)).FpnBytesFreed == uintptr(0) {
 		(*Index)(unsafe.Pointer(pIdx)).FnSample = 0
 		(*Index)(unsafe.Pointer(pIdx)).FaSample = uintptr(0)
 	}
@@ -111039,42 +111446,42 @@ func initAvgEq(tls *libc.TLS, pIdx uintptr) {
 		var nCol int32 = 1
 		if (*Index)(unsafe.Pointer(pIdx)).FnSampleCol > 1 {
 			nCol = (*Index)(unsafe.Pointer(pIdx)).FnSampleCol - 1
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*4)) = TRowcnt(1)
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nCol)*8)) = uint64(1)
 		}
 		for iCol = 0; iCol < nCol; iCol++ {
 			var nSample int32 = (*Index)(unsafe.Pointer(pIdx)).FnSample
 			var i int32
-			var sumEq TRowcnt = TRowcnt(0)
-			var avgEq TRowcnt = TRowcnt(0)
+			var sumEq TRowcnt = uint64(0)
+			var avgEq TRowcnt = uint64(0)
 			var nRow TRowcnt
 			var nSum100 I64 = int64(0)
 			var nDist100 I64
 
-			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)) == TRowcnt(0) {
-				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*4))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*4)))
+			if !(int32((*Index)(unsafe.Pointer(pIdx)).FaiRowEst) != 0) || iCol >= int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol) || *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)) == uint64(0) {
+				nRow = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanLt + uintptr(iCol)*8))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(pFinal)).FanDLt + uintptr(iCol)*8)))
 				nSample--
 			} else {
 				nRow = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))
-				nDist100 = int64(100) * I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst))) / I64(*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*4)))
+				nDist100 = I64(TRowcnt(int64(100)) * *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst)) / *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiRowEst + uintptr(iCol+1)*8)))
 			}
 			(*Index)(unsafe.Pointer(pIdx)).FnRowEst0 = nRow
 
 			for i = 0; i < nSample; i++ {
 				if i == (*Index)(unsafe.Pointer(pIdx)).FnSample-1 ||
-					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*4)) {
-					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+					*(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanDLt + uintptr(iCol)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i+1)*40)).FanDLt + uintptr(iCol)*8)) {
+					sumEq = sumEq + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 					nSum100 = nSum100 + int64(100)
 				}
 			}
 
 			if nDist100 > nSum100 && sumEq < nRow {
-				avgEq = TRowcnt(int64(100) * I64(nRow-sumEq) / (nDist100 - nSum100))
+				avgEq = TRowcnt(int64(100)) * (nRow - sumEq) / TRowcnt(nDist100-nSum100)
 			}
-			if avgEq == TRowcnt(0) {
-				avgEq = TRowcnt(1)
+			if avgEq == uint64(0) {
+				avgEq = uint64(1)
 			}
-			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*4)) = avgEq
+			*(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(iCol)*8)) = avgEq
 		}
 	}
 }
@@ -111148,15 +111555,15 @@ func loadStatTbl(tls *libc.TLS, db uintptr, zSql1 uintptr, zSql2 uintptr, zDb ui
 		}
 		pSpace = (*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(nSample)*40
 		(*Index)(unsafe.Pointer(pIdx)).FaAvgEq = pSpace
-		pSpace += 4 * uintptr(nIdxCol)
+		pSpace += 8 * uintptr(nIdxCol)
 		*(*U32)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable + 48)) |= U32(TF_HasStat4)
 		for i = 0; i < nSample; i++ {
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanEq = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 			(*IndexSample)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSample + uintptr(i)*40)).FanDLt = pSpace
-			pSpace += 4 * uintptr(nIdxCol)
+			pSpace += 8 * uintptr(nIdxCol)
 		}
 
 	}
@@ -111221,11 +111628,11 @@ func loadStat4(tls *libc.TLS, db uintptr, zDb uintptr) int32 {
 	var rc int32 = SQLITE_OK
 	var pStat4 uintptr
 
-	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+12664, zDb)) != uintptr(0) &&
+	if libc.AssignUintptr(&pStat4, Xsqlite3FindTable(tls, db, ts+12726, zDb)) != uintptr(0) &&
 		int32((*Table)(unsafe.Pointer(pStat4)).FeTabType) == TABTYP_NORM {
 		rc = loadStatTbl(tls, db,
-			ts+12819,
-			ts+12873,
+			ts+12881,
+			ts+12935,
 			zDb)
 	}
 	return rc
@@ -111272,10 +111679,10 @@ func Xsqlite3AnalysisLoad(tls *libc.TLS, db uintptr, iDb int32) int32 {
 
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).Fdb = db
 	(*AnalysisInfo)(unsafe.Pointer(bp + 8)).FzDatabase = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
-	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+12638, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
+	if libc.AssignUintptr(&pStat1, Xsqlite3FindTable(tls, db, ts+12700, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase)) != 0 &&
 		int32((*Table)(unsafe.Pointer(pStat1)).FeTabType) == TABTYP_NORM {
 		zSql = Xsqlite3MPrintf(tls, db,
-			ts+12925, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
+			ts+12987, libc.VaList(bp, (*AnalysisInfo)(unsafe.Pointer(bp+8)).FzDatabase))
 		if zSql == uintptr(0) {
 			rc = SQLITE_NOMEM
 		} else {
@@ -111333,12 +111740,12 @@ func resolveAttachExpr(tls *libc.TLS, pName uintptr, pExpr uintptr) int32 {
 // database iDb attached to handle db.
 func Xsqlite3DbIsNamed(tls *libc.TLS, db uintptr, iDb int32, zName uintptr) int32 {
 	return libc.Bool32(Xsqlite3StrICmp(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName) == 0 ||
-		iDb == 0 && Xsqlite3StrICmp(tls, ts+7733, zName) == 0)
+		iDb == 0 && Xsqlite3StrICmp(tls, ts+7793, zName) == 0)
 }
 
 func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
-	bp := tls.Alloc(64)
-	defer tls.Free(64)
+	bp := tls.Alloc(72)
+	defer tls.Free(72)
 
 	var i int32
 	var rc int32
@@ -111349,13 +111756,16 @@ func attachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	var aNew uintptr
 	var pNew uintptr
 
+	var pNewSchema uintptr
+
 	var pPager uintptr
 	var iDb int32
 	rc = 0
 	db = Xsqlite3_context_db_handle(tls, context)
-	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 48)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
+	pNew = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 	_ = NotUsed
 	zFile = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
@@ -111376,128 +111786,151 @@ __2:
 		goto __3
 	}
 
-	*(*uintptr)(unsafe.Pointer(bp + 32)) = Xsqlite3_vfs_find(tls, ts+5187)
-	if !(*(*uintptr)(unsafe.Pointer(bp + 32)) == uintptr(0)) {
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
+	*(*uintptr)(unsafe.Pointer(bp + 40)) = Xsqlite3_vfs_find(tls, ts+5187)
+	if !(*(*uintptr)(unsafe.Pointer(bp + 40)) == uintptr(0)) {
 		goto __5
 	}
 	return
 __5:
 	;
-	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
-	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), ts+13028, db, bp+24, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc == SQLITE_OK) {
 		goto __6
 	}
+	pNewSchema = Xsqlite3SchemaGet(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	if !(pNewSchema != 0) {
+		goto __7
+	}
+
+	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)*32
+	if !((*Db)(unsafe.Pointer(pNew)).FpBt != 0) {
+		goto __9
+	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
+__9:
+	;
+	(*Db)(unsafe.Pointer(pNew)).FpBt = *(*uintptr)(unsafe.Pointer(bp + 24))
+	(*Db)(unsafe.Pointer(pNew)).FpSchema = pNewSchema
+	goto __8
+__7:
+	Xsqlite3BtreeClose(tls, *(*uintptr)(unsafe.Pointer(bp + 24)))
+	rc = SQLITE_NOMEM
+__8:
+	;
 __6:
 	;
-	(*Db)(unsafe.Pointer(pNew)).FpBt = uintptr(0)
-	(*Db)(unsafe.Pointer(pNew)).FpSchema = uintptr(0)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), ts+12966, db, pNew+8, 0, SQLITE_OPEN_MAIN_DB)
+	if !(rc != 0) {
+		goto __10
+	}
+	goto attach_error
+__10:
+	;
 	goto __4
 __3:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnDb >= *(*int32)(unsafe.Pointer(db + 136 + 7*4))+2) {
-		goto __7
-	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+12969,
-		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
-	goto attach_error
-__7:
-	;
-	i = 0
-__8:
-	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
-		goto __10
-	}
-
-	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
 		goto __11
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+13006, libc.VaList(bp+8, zName))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13031,
+		libc.VaList(bp, *(*int32)(unsafe.Pointer(db + 136 + 7*4))))
 	goto attach_error
 __11:
 	;
-	goto __9
-__9:
+	i = 0
+__12:
+	if !(i < (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
+		goto __14
+	}
+
+	if !(Xsqlite3DbIsNamed(tls, db, i, zName) != 0) {
+		goto __15
+	}
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13068, libc.VaList(bp+8, zName))
+	goto attach_error
+__15:
+	;
+	goto __13
+__13:
 	i++
-	goto __8
-	goto __10
-__10:
+	goto __12
+	goto __14
+__14:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FaDb == db+696) {
-		goto __12
+		goto __16
 	}
 	aNew = Xsqlite3DbMallocRawNN(tls, db, uint64(unsafe.Sizeof(Db{}))*uint64(3))
 	if !(aNew == uintptr(0)) {
-		goto __14
+		goto __18
 	}
 	return
-__14:
+__18:
 	;
 	libc.Xmemcpy(tls, aNew, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64(2))
-	goto __13
-__12:
+	goto __17
+__16:
 	aNew = Xsqlite3DbRealloc(tls, db, (*Sqlite3)(unsafe.Pointer(db)).FaDb, uint64(unsafe.Sizeof(Db{}))*uint64((*Sqlite3)(unsafe.Pointer(db)).FnDb+1))
 	if !(aNew == uintptr(0)) {
-		goto __15
+		goto __19
 	}
 	return
-__15:
+__19:
 	;
-__13:
+__17:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FaDb = aNew
 	pNew = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr((*Sqlite3)(unsafe.Pointer(db)).FnDb)*32
 	libc.Xmemset(tls, pNew, 0, uint64(unsafe.Sizeof(Db{})))
 
-	*(*uint32)(unsafe.Pointer(bp + 24)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
-	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+24, bp+32, bp+40, bp+48)
+	*(*uint32)(unsafe.Pointer(bp + 32)) = (*Sqlite3)(unsafe.Pointer(db)).FopenFlags
+	rc = Xsqlite3ParseUri(tls, (*Sqlite3_vfs)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FpVfs)).FzName, zFile, bp+32, bp+40, bp+48, bp+56)
 	if !(rc != SQLITE_OK) {
-		goto __16
+		goto __20
 	}
 	if !(rc == SQLITE_NOMEM) {
-		goto __17
+		goto __21
 	}
 	Xsqlite3OomFault(tls, db)
-__17:
+__21:
 	;
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 48)), -1)
-	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
+	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
 	return
-__16:
+__20:
 	;
-	*(*uint32)(unsafe.Pointer(bp + 24)) |= uint32(SQLITE_OPEN_MAIN_DB)
-	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), *(*uintptr)(unsafe.Pointer(bp + 40)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 24))))
+	*(*uint32)(unsafe.Pointer(bp + 32)) |= uint32(SQLITE_OPEN_MAIN_DB)
+	rc = Xsqlite3BtreeOpen(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), *(*uintptr)(unsafe.Pointer(bp + 48)), db, pNew+8, 0, int32(*(*uint32)(unsafe.Pointer(bp + 32))))
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb++
 	(*Db)(unsafe.Pointer(pNew)).FzDbSName = Xsqlite3DbStrDup(tls, db, zName)
 __4:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).FnoSharedCache = U8(0)
 	if !(rc == SQLITE_CONSTRAINT) {
-		goto __18
+		goto __22
 	}
 	rc = SQLITE_ERROR
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+13036, 0)
-	goto __19
-__18:
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13098, 0)
+	goto __23
+__22:
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __24
 	}
 	(*Db)(unsafe.Pointer(pNew)).FpSchema = Xsqlite3SchemaGet(tls, db, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	if !!(int32((*Db)(unsafe.Pointer(pNew)).FpSchema) != 0) {
-		goto __21
+		goto __25
 	}
 	rc = SQLITE_NOMEM
-	goto __22
-__21:
+	goto __26
+__25:
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Ffile_format != 0 && int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pNew)).FpSchema)).Fenc) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __23
+		goto __27
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db,
-		ts+13065, 0)
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db,
+		ts+13127, 0)
 	rc = SQLITE_ERROR
-__23:
+__27:
 	;
-__22:
+__26:
 	;
 	Xsqlite3BtreeEnter(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
 	pPager = Xsqlite3BtreePager(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
@@ -111507,89 +111940,89 @@ __22:
 	Xsqlite3BtreeSetPagerFlags(tls, (*Db)(unsafe.Pointer(pNew)).FpBt,
 		uint32(uint64(PAGER_SYNCHRONOUS_FULL)|(*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(PAGER_FLAGS_MASK)))
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pNew)).FpBt)
-__20:
+__24:
 	;
-__19:
+__23:
 	;
 	(*Db)(unsafe.Pointer(pNew)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
 	if !(rc == SQLITE_OK && (*Db)(unsafe.Pointer(pNew)).FzDbSName == uintptr(0)) {
-		goto __24
+		goto __28
 	}
 	rc = SQLITE_NOMEM
-__24:
+__28:
 	;
-	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 40)))
+	Xsqlite3_free_filename(tls, *(*uintptr)(unsafe.Pointer(bp + 48)))
 
 	if !(rc == SQLITE_OK) {
-		goto __25
+		goto __29
 	}
 	Xsqlite3BtreeEnterAll(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_SchemaKnownOk))
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __26
+		goto __30
 	}
-	rc = Xsqlite3Init(tls, db, bp+56)
-__26:
+	rc = Xsqlite3Init(tls, db, bp+64)
+__30:
 	;
 	Xsqlite3BtreeLeaveAll(tls, db)
 
-__25:
+__29:
 	;
 	if !(rc != 0) {
-		goto __27
+		goto __31
 	}
 	if !!(int32(*(*uint8)(unsafe.Pointer(db + 192 + 8))&0x4>>2) != 0) {
-		goto __28
+		goto __32
 	}
 	iDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 
 	if !((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt != 0) {
-		goto __29
+		goto __33
 	}
 	Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpBt = uintptr(0)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema = uintptr(0)
-__29:
+__33:
 	;
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	(*Sqlite3)(unsafe.Pointer(db)).FnDb = iDb
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __30
+		goto __34
 	}
 	Xsqlite3OomFault(tls, db)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+1480, 0)
-	goto __31
-__30:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) == uintptr(0)) {
-		goto __32
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+1480, 0)
+	goto __35
+__34:
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0)) {
+		goto __36
 	}
-	*(*uintptr)(unsafe.Pointer(bp + 56)) = Xsqlite3MPrintf(tls, db, ts+13133, libc.VaList(bp+16, zFile))
+	*(*uintptr)(unsafe.Pointer(bp + 64)) = Xsqlite3MPrintf(tls, db, ts+13195, libc.VaList(bp+16, zFile))
+__36:
+	;
+__35:
+	;
 __32:
 	;
-__31:
-	;
-__28:
-	;
 	goto attach_error
-__27:
+__31:
 	;
 	return
 
 attach_error:
-	if !(*(*uintptr)(unsafe.Pointer(bp + 56)) != 0) {
-		goto __33
+	if !(*(*uintptr)(unsafe.Pointer(bp + 64)) != 0) {
+		goto __37
 	}
-	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 56)), -1)
-	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 56)))
-__33:
+	Xsqlite3_result_error(tls, context, *(*uintptr)(unsafe.Pointer(bp + 64)), -1)
+	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 64)))
+__37:
 	;
 	if !(rc != 0) {
-		goto __34
+		goto __38
 	}
 	Xsqlite3_result_error_code(tls, context, rc)
-__34:
+__38:
 }
 
 func detachFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
@@ -111643,14 +112076,14 @@ __4:
 	if !(i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb) {
 		goto __7
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13161, libc.VaList(bp, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13223, libc.VaList(bp, zName))
 	goto detach_error
 __7:
 	;
 	if !(i < 2) {
 		goto __8
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13182, libc.VaList(bp+8, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13244, libc.VaList(bp+8, zName))
 	goto detach_error
 __8:
 	;
@@ -111658,7 +112091,7 @@ __8:
 		Xsqlite3BtreeIsInBackup(tls, (*Db)(unsafe.Pointer(pDb)).FpBt) != 0) {
 		goto __9
 	}
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13208, libc.VaList(bp+16, zName))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([128]int8{})), bp+24, ts+13270, libc.VaList(bp+16, zName))
 	goto detach_error
 __9:
 	;
@@ -111700,42 +112133,48 @@ func codeAttach(tls *libc.TLS, pParse uintptr, type1 int32, pFunc uintptr, pAuth
 	var zAuthArg uintptr
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
+	if !(SQLITE_OK != Xsqlite3ReadSchema(tls, pParse)) {
 		goto __1
 	}
 	goto attach_end
 __1:
 	;
-	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
-
-	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
+	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __2
 	}
 	goto attach_end
 __2:
 	;
-	if !(pAuthArg != 0) {
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp)).FpParse = pParse
+
+	if !(SQLITE_OK != resolveAttachExpr(tls, bp, pFilename) || SQLITE_OK != resolveAttachExpr(tls, bp, pDbname) || SQLITE_OK != resolveAttachExpr(tls, bp, pKey)) {
 		goto __3
 	}
-	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+	goto attach_end
+__3:
+	;
+	if !(pAuthArg != 0) {
 		goto __4
 	}
+	if !(int32((*Expr)(unsafe.Pointer(pAuthArg)).Fop) == TK_STRING) {
+		goto __5
+	}
 
 	zAuthArg = *(*uintptr)(unsafe.Pointer(pAuthArg + 8))
-	goto __5
-__4:
-	zAuthArg = uintptr(0)
+	goto __6
 __5:
+	zAuthArg = uintptr(0)
+__6:
 	;
 	rc = Xsqlite3AuthCheck(tls, pParse, type1, zAuthArg, uintptr(0), uintptr(0))
 	if !(rc != SQLITE_OK) {
-		goto __6
+		goto __7
 	}
 	goto attach_end
-__6:
+__7:
 	;
-__3:
+__4:
 	;
 	v = Xsqlite3GetVdbe(tls, pParse)
 	regArgs = Xsqlite3GetTempRange(tls, pParse, 4)
@@ -111744,13 +112183,13 @@ __3:
 	Xsqlite3ExprCode(tls, pParse, pKey, regArgs+2)
 
 	if !(v != 0) {
-		goto __7
+		goto __8
 	}
 	Xsqlite3VdbeAddFunctionCall(tls, pParse, 0, regArgs+3-int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), regArgs+3,
 		int32((*FuncDef)(unsafe.Pointer(pFunc)).FnArg), pFunc, 0)
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_Expire, libc.Bool32(type1 == SQLITE_ATTACH))
-__7:
+__8:
 	;
 attach_end:
 	Xsqlite3ExprDelete(tls, db, pFilename)
@@ -111769,7 +112208,7 @@ var detach_func = FuncDef{
 	FnArg:      int8(1),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 13230}
+	FzName:     ts + 13292}
 
 // Called by the parser to compile an ATTACH statement.
 //
@@ -111782,7 +112221,7 @@ var attach_func = FuncDef{
 	FnArg:      int8(3),
 	FfuncFlags: U32(SQLITE_UTF8),
 	FxSFunc:    0,
-	FzName:     ts + 13244}
+	FzName:     ts + 13306}
 
 func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 	bp := tls.Alloc(8)
@@ -111796,7 +112235,7 @@ func fixExprCb(tls *libc.TLS, p uintptr, pExpr uintptr) int32 {
 		if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer((*DbFixer)(unsafe.Pointer(pFix)).FpParse)).Fdb)).Finit.Fbusy != 0 {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_NULL)
 		} else {
-			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+13258, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
+			Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse, ts+13320, libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType))
 			return WRC_Abort
 		}
 	}
@@ -111828,7 +112267,7 @@ __1:
 			if (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase != 0 {
 				if iDb != Xsqlite3FindDbName(tls, db, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase) {
 					Xsqlite3ErrorMsg(tls, (*DbFixer)(unsafe.Pointer(pFix)).FpParse,
-						ts+13282,
+						ts+13344,
 						libc.VaList(bp, (*DbFixer)(unsafe.Pointer(pFix)).FzType, (*DbFixer)(unsafe.Pointer(pFix)).FpName, (*SrcItem)(unsafe.Pointer(pItem)).FzDatabase))
 					return WRC_Abort
 				}
@@ -112003,7 +112442,7 @@ func Xsqlite3_set_authorizer(tls *libc.TLS, db uintptr, xAuth uintptr, pArg uint
 }
 
 func sqliteAuthBadReturnCode(tls *libc.TLS, pParse uintptr) {
-	Xsqlite3ErrorMsg(tls, pParse, ts+13328, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13390, 0)
 	(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR
 }
 
@@ -112029,11 +112468,11 @@ func Xsqlite3AuthReadCol(tls *libc.TLS, pParse uintptr, zTab uintptr, zCol uintp
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, SQLITE_READ, zTab, zCol, zDb, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		var z uintptr = Xsqlite3_mprintf(tls, ts+13351, libc.VaList(bp, zTab, zCol))
+		var z uintptr = Xsqlite3_mprintf(tls, ts+13413, libc.VaList(bp, zTab, zCol))
 		if (*Sqlite3)(unsafe.Pointer(db)).FnDb > 2 || iDb != 0 {
-			z = Xsqlite3_mprintf(tls, ts+13357, libc.VaList(bp+16, zDb, z))
+			z = Xsqlite3_mprintf(tls, ts+13419, libc.VaList(bp+16, zDb, z))
 		}
-		Xsqlite3ErrorMsg(tls, pParse, ts+13363, libc.VaList(bp+32, z))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13425, libc.VaList(bp+32, z))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_IGNORE && rc != SQLITE_OK {
 		sqliteAuthBadReturnCode(tls, pParse)
@@ -112080,7 +112519,7 @@ func Xsqlite3AuthRead(tls *libc.TLS, pParse uintptr, pExpr uintptr, pSchema uint
 	} else if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
 		zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName
 	} else {
-		zCol = ts + 9005
+		zCol = ts + 9065
 	}
 
 	if SQLITE_IGNORE == Xsqlite3AuthReadCol(tls, pParse, (*Table)(unsafe.Pointer(pTab)).FzName, zCol, iDb) {
@@ -112104,7 +112543,7 @@ func Xsqlite3AuthCheck(tls *libc.TLS, pParse uintptr, code int32, zArg1 uintptr,
 		f func(*libc.TLS, uintptr, int32, uintptr, uintptr, uintptr, uintptr) int32
 	})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3)(unsafe.Pointer(db)).FxAuth})).f(tls, (*Sqlite3)(unsafe.Pointer(db)).FpAuthArg, code, zArg1, zArg2, zArg3, (*Parse)(unsafe.Pointer(pParse)).FzAuthContext)
 	if rc == SQLITE_DENY {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13390, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13452, 0)
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_AUTH
 	} else if rc != SQLITE_OK && rc != SQLITE_IGNORE {
 		rc = SQLITE_DENY
@@ -112329,6 +112768,9 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
+	if (*Parse)(unsafe.Pointer(pParse)).FeParseMode != 0 {
+		return
+	}
 
 	ap = va
 	zSql = Xsqlite3VMPrintf(tls, db, zFormat, ap)
@@ -112341,13 +112783,13 @@ func Xsqlite3NestedParse(tls *libc.TLS, pParse uintptr, zFormat uintptr, va uint
 		return
 	}
 	(*Parse)(unsafe.Pointer(pParse)).Fnested++
-	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+280)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, bp, pParse+uintptr(uint64(uintptr(0)+288)), uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_PreferBuiltin)
 	Xsqlite3RunParser(tls, pParse, zSql)
 	(*Sqlite3)(unsafe.Pointer(db)).FmDbFlags = savedDbFlags
 	Xsqlite3DbFree(tls, db, zSql)
-	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+280)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemcpy(tls, pParse+uintptr(uint64(uintptr(0)+288)), bp, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(pParse)).Fnested--
 }
 
@@ -112372,25 +112814,25 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 			}
 		}
 		if i >= (*Sqlite3)(unsafe.Pointer(db)).FnDb {
-			if Xsqlite3StrICmp(tls, zDatabase, ts+7733) == 0 {
+			if Xsqlite3StrICmp(tls, zDatabase, ts+7793) == 0 {
 				i = 0
 			} else {
 				return uintptr(0)
 			}
 		}
 		p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8, zName)
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+9424, 7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+7733, 7) == 0 {
 			if i == 1 {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13405+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13424+7) == 0 ||
-					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7245+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7760+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 ||
+					Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7235+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-						ts+13438)
+						ts+7741)
 				}
 			} else {
-				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13424+7) == 0 {
+				if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 {
 					p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i)*32)).FpSchema+8,
-						ts+7245)
+						ts+7235)
 				}
 			}
 		}
@@ -112411,12 +112853,12 @@ func Xsqlite3FindTable(tls *libc.TLS, db uintptr, zName uintptr, zDatabase uintp
 				break
 			}
 		}
-		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+9424, 7) == 0 {
-			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13424+7) == 0 {
-				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+7245)
-			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13405+7) == 0 {
+		if p == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+7733, 7) == 0 {
+			if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7779+7) == 0 {
+				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema+8, ts+7235)
+			} else if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7760+7) == 0 {
 				p = Xsqlite3HashFind(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema+8,
-					ts+13438)
+					ts+7741)
 			}
 		}
 	}
@@ -112447,7 +112889,7 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		if int32((*Parse)(unsafe.Pointer(pParse)).FprepFlags)&SQLITE_PREPARE_NO_VTAB == 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 {
 			var pMod uintptr = Xsqlite3HashFind(tls, db+576, zName)
-			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+13457, 7) == 0 {
+			if pMod == uintptr(0) && Xsqlite3_strnicmp(tls, zName, ts+13467, 7) == 0 {
 				pMod = Xsqlite3PragmaVtabRegister(tls, db, zName)
 			}
 			if pMod != 0 && Xsqlite3VtabEponymousTableInit(tls, pParse, pMod) != 0 {
@@ -112465,14 +112907,14 @@ func Xsqlite3LocateTable(tls *libc.TLS, pParse uintptr, flags U32, zName uintptr
 	if p == uintptr(0) {
 		var zMsg uintptr
 		if flags&U32(LOCATE_VIEW) != 0 {
-			zMsg = ts + 13465
+			zMsg = ts + 13475
 		} else {
-			zMsg = ts + 13478
+			zMsg = ts + 13488
 		}
 		if zDbase != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7937, libc.VaList(bp, zMsg, zDbase, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+7997, libc.VaList(bp, zMsg, zDbase, zName))
 		} else {
-			Xsqlite3ErrorMsg(tls, pParse, ts+7947, libc.VaList(bp+24, zMsg, zName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+8007, libc.VaList(bp+24, zMsg, zName))
 		}
 	} else {
 	}
@@ -112502,12 +112944,12 @@ func Xsqlite3LocateTableItem(tls *libc.TLS, pParse uintptr, flags U32, p uintptr
 // Return the preferred table name for system tables.  Translate legacy
 // names into the new preferred names, as appropriate.
 func Xsqlite3PreferredTableName(tls *libc.TLS, zName uintptr) uintptr {
-	if Xsqlite3_strnicmp(tls, zName, ts+9424, 7) == 0 {
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7245+7) == 0 {
-			return ts + 13424
+	if Xsqlite3_strnicmp(tls, zName, ts+7733, 7) == 0 {
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7235+7) == 0 {
+			return ts + 7779
 		}
-		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+13438+7) == 0 {
-			return ts + 13405
+		if Xsqlite3StrICmp(tls, zName+uintptr(7), ts+7741+7) == 0 {
+			return ts + 7760
 		}
 	}
 	return zName
@@ -112865,7 +113307,7 @@ func Xsqlite3NameFromToken(tls *libc.TLS, db uintptr, pName uintptr) uintptr {
 // writing. The table is opened using cursor 0.
 func Xsqlite3OpenSchemaTable(tls *libc.TLS, p uintptr, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, p)
-	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+7245)
+	Xsqlite3TableLock(tls, p, iDb, uint32(SCHEMA_ROOT), uint8(1), ts+7235)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenWrite, 0, SCHEMA_ROOT, iDb, 5)
 	if (*Parse)(unsafe.Pointer(p)).FnTab == 0 {
 		(*Parse)(unsafe.Pointer(p)).FnTab = 1
@@ -112891,7 +113333,7 @@ func Xsqlite3FindDbName(tls *libc.TLS, db uintptr, zName uintptr) int32 {
 				goto __3
 			}
 
-			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+7733, zName) {
+			if i == 0 && 0 == Xsqlite3_stricmp(tls, ts+7793, zName) {
 				goto __3
 			}
 
@@ -112944,13 +113386,13 @@ func Xsqlite3TwoPartName(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 u
 
 	if (*Token)(unsafe.Pointer(pName2)).Fn > uint32(0) {
 		if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13492, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13502, 0)
 			return -1
 		}
 		*(*uintptr)(unsafe.Pointer(pUnqual)) = pName2
 		iDb = Xsqlite3FindDb(tls, db, pName1)
 		if iDb < 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13509, libc.VaList(bp, pName1))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13519, libc.VaList(bp, pName1))
 			return -1
 		}
 	} else {
@@ -112992,9 +113434,9 @@ func Xsqlite3CheckObjectName(tls *libc.TLS, pParse uintptr, zName uintptr, zType
 			return SQLITE_ERROR
 		}
 	} else {
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+9424, 7) ||
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 && 0 == Xsqlite3_strnicmp(tls, zName, ts+7733, 7) ||
 			Xsqlite3ReadOnlyShadowTables(tls, db) != 0 && Xsqlite3ShadowTableName(tls, db, zName) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13529,
+			Xsqlite3ErrorMsg(tls, pParse, ts+13539,
 				libc.VaList(bp, zName))
 			return SQLITE_ERROR
 		}
@@ -113154,9 +113596,9 @@ func Xsqlite3StartTable(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 ui
 	iDb = int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb)
 	zName = Xsqlite3DbStrDup(tls, db, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = pName1
 	goto __2
@@ -113172,7 +113614,7 @@ __3:
 		goto __4
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+13571, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+13581, 0)
 	return
 __4:
 	;
@@ -113200,9 +113642,9 @@ __7:
 	;
 	if !(Xsqlite3CheckObjectName(tls, pParse, zName, func() uintptr {
 		if isView != 0 {
-			return ts + 11781
+			return ts + 11843
 		}
-		return ts + 10166
+		return ts + 10228
 	}(), zName) != 0) {
 		goto __8
 	}
@@ -113218,9 +113660,9 @@ __9:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && isTemp == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}(), uintptr(0), zDb) != 0) {
 		goto __10
 	}
@@ -113251,12 +113693,12 @@ __13:
 	if !!(noErr != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13612,
+	Xsqlite3ErrorMsg(tls, pParse, ts+13622,
 		libc.VaList(bp, func() uintptr {
 			if int32((*Table)(unsafe.Pointer(pTable)).FeTabType) == TABTYP_VIEW {
-				return ts + 11781
+				return ts + 11843
 			}
-			return ts + 10166
+			return ts + 10228
 		}(), *(*uintptr)(unsafe.Pointer(bp + 24))))
 	goto __16
 __15:
@@ -113271,7 +113713,7 @@ __14:
 	if !(Xsqlite3FindIndex(tls, db, zName, zDb1) != uintptr(0)) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+13633, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+13643, libc.VaList(bp+16, zName))
 	goto begin_table_error
 __17:
 	;
@@ -113358,7 +113800,7 @@ var nullRow = [6]int8{int8(6), int8(0), int8(0), int8(0), int8(0), int8(0)}
 func sqlite3DeleteReturning(tls *libc.TLS, db uintptr, pRet uintptr) {
 	var pHash uintptr
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
-	Xsqlite3HashInsert(tls, pHash, ts+13668, uintptr(0))
+	Xsqlite3HashInsert(tls, pHash, ts+13678, uintptr(0))
 	Xsqlite3ExprListDelete(tls, db, (*Returning)(unsafe.Pointer(pRet)).FpReturnEL)
 	Xsqlite3DbFree(tls, db, pRet)
 }
@@ -113382,7 +113824,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	var pHash uintptr
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 	if (*Parse)(unsafe.Pointer(pParse)).FpNewTrigger != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13685, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+13695, 0)
 	} else {
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FbReturning = U8(1)
@@ -113402,7 +113844,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
-	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 13668
+	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FzName = ts + 13678
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Fop = U8(TK_RETURNING)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.Ftr_tm = U8(TRIGGER_AFTER)
 	(*Returning)(unsafe.Pointer(pRet)).FretTrig.FbReturning = U8(1)
@@ -113414,7 +113856,7 @@ func Xsqlite3AddReturning(tls *libc.TLS, pParse uintptr, pList uintptr) {
 	(*Returning)(unsafe.Pointer(pRet)).FretTStep.FpExprList = pList
 	pHash = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema + 56
 
-	if Xsqlite3HashInsert(tls, pHash, ts+13668, pRet+16) ==
+	if Xsqlite3HashInsert(tls, pHash, ts+13678, pRet+16) ==
 		pRet+16 {
 		Xsqlite3OomFault(tls, db)
 	}
@@ -113448,7 +113890,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 		return
 	}
 	if int32((*Table)(unsafe.Pointer(p)).FnCol)+1 > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13719, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13729, libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName))
 		return
 	}
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) >= PARSE_MODE_RENAME) {
@@ -113456,13 +113898,13 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	}
 
 	if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(16) &&
-		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+13742, 6) == 0 {
+		Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(6)), ts+13752, 6) == 0 {
 		*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(6)
 		for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 			(*Token)(unsafe.Pointer(bp+32)).Fn--
 		}
 		if (*Token)(unsafe.Pointer(bp+32)).Fn >= uint32(9) &&
-			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+13749, 9) == 0 {
+			Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(bp+32)).Fz+uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(9)), ts+13759, 9) == 0 {
 			*(*uint32)(unsafe.Pointer(bp + 32 + 8)) -= uint32(9)
 			for (*Token)(unsafe.Pointer(bp+32)).Fn > uint32(0) && int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp+32)).Fz + uintptr((*Token)(unsafe.Pointer(bp+32)).Fn-uint32(1)))))])&0x01 != 0 {
 				(*Token)(unsafe.Pointer(bp+32)).Fn--
@@ -113499,7 +113941,7 @@ func Xsqlite3AddColumn(tls *libc.TLS, pParse uintptr, sName Token, sType Token)
 	hName = Xsqlite3StrIHash(tls, z)
 	for i = 0; i < int32((*Table)(unsafe.Pointer(p)).FnCol); i++ {
 		if int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FhName) == int32(hName) && Xsqlite3StrICmp(tls, z, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(i)*24)).FzCnName) == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13759, libc.VaList(bp+8, z))
+			Xsqlite3ErrorMsg(tls, pParse, ts+13769, libc.VaList(bp+8, z))
 			Xsqlite3DbFree(tls, db, z)
 			return
 		}
@@ -113663,10 +114105,10 @@ func Xsqlite3AddDefaultValue(tls *libc.TLS, pParse uintptr, pExpr uintptr, zStar
 		var isInit int32 = libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 && int32((*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb) != 1)
 		pCol = (*Table)(unsafe.Pointer(p)).FaCol + uintptr(int32((*Table)(unsafe.Pointer(p)).FnCol)-1)*24
 		if !(Xsqlite3ExprIsConstantOrFunction(tls, pExpr, uint8(isInit)) != 0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13785,
+			Xsqlite3ErrorMsg(tls, pParse, ts+13795,
 				libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 		} else if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+13830, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+13840, 0)
 		} else {
 			var pDfltExpr uintptr
 			libc.Xmemset(tls, bp+8, 0, uint64(unsafe.Sizeof(Expr{})))
@@ -113697,7 +114139,7 @@ func makeColumnPartOfPrimaryKey(tls *libc.TLS, pParse uintptr, pCol uintptr) {
 	*(*U16)(unsafe.Pointer(pCol + 16)) |= U16(COLFLAG_PRIMKEY)
 	if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_GENERATED != 0 {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+13871, 0)
+			ts+13881, 0)
 	}
 }
 
@@ -113742,7 +114184,7 @@ __1:
 		goto __2
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13923, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		ts+13933, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto primary_key_exit
 __2:
 	;
@@ -113831,7 +114273,7 @@ __13:
 		goto __17
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+13964, 0)
+		ts+13974, 0)
 	goto __18
 __17:
 	Xsqlite3CreateIndex(tls, pParse, uintptr(0), uintptr(0), uintptr(0), pList, onError, uintptr(0),
@@ -113926,7 +114368,7 @@ __1:
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FeParseMode) == PARSE_MODE_DECLARE_VTAB) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14020, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14030, 0)
 	goto generated_done
 __2:
 	;
@@ -113939,13 +114381,13 @@ __3:
 	if !(pType != 0) {
 		goto __4
 	}
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+14063, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(7) && Xsqlite3_strnicmp(tls, ts+14073, (*Token)(unsafe.Pointer(pType)).Fz, 7) == 0) {
 		goto __5
 	}
 
 	goto __6
 __5:
-	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+14071, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
+	if !((*Token)(unsafe.Pointer(pType)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, ts+14081, (*Token)(unsafe.Pointer(pType)).Fz, 6) == 0) {
 		goto __7
 	}
 	eType = U8(COLFLAG_STORED)
@@ -113972,13 +114414,20 @@ __9:
 	}
 	makeColumnPartOfPrimaryKey(tls, pParse, pCol)
 __10:
+	;
+	if !(pExpr != 0 && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_ID) {
+		goto __11
+	}
+
+	pExpr = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pExpr, uintptr(0))
+__11:
 	;
 	Xsqlite3ColumnSetExpr(tls, pParse, pTab, pCol, pExpr)
 	pExpr = uintptr(0)
 	goto generated_done
 
 generated_error:
-	Xsqlite3ErrorMsg(tls, pParse, ts+14078,
+	Xsqlite3ErrorMsg(tls, pParse, ts+14088,
 		libc.VaList(bp, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 generated_done:
 	Xsqlite3ExprDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr)
@@ -114100,12 +114549,12 @@ __3:
 	n = n + identLength(tls, (*Table)(unsafe.Pointer(p)).FzName)
 	if n < 50 {
 		zSep = ts + 1544
-		zSep2 = ts + 14109
+		zSep2 = ts + 14119
 		zEnd = ts + 6309
 	} else {
-		zSep = ts + 14111
-		zSep2 = ts + 14115
-		zEnd = ts + 14120
+		zSep = ts + 14121
+		zSep2 = ts + 14125
+		zEnd = ts + 14130
 	}
 	n = n + (35 + 6*int32((*Table)(unsafe.Pointer(p)).FnCol))
 	zStmt = Xsqlite3DbMallocRaw(tls, uintptr(0), uint64(n))
@@ -114113,7 +114562,7 @@ __3:
 		Xsqlite3OomFault(tls, db)
 		return uintptr(0)
 	}
-	Xsqlite3_snprintf(tls, n, zStmt, ts+14123, 0)
+	Xsqlite3_snprintf(tls, n, zStmt, ts+14133, 0)
 	*(*int32)(unsafe.Pointer(bp + 8)) = Xsqlite3Strlen30(tls, zStmt)
 	identPut(tls, zStmt, bp+8, (*Table)(unsafe.Pointer(p)).FzName)
 	*(*int8)(unsafe.Pointer(zStmt + uintptr(libc.PostIncInt32(&*(*int32)(unsafe.Pointer(bp + 8)), 1)))) = int8('(')
@@ -114151,11 +114600,12 @@ __6:
 	return zStmt
 }
 
-var azType1 = [5]uintptr{
+var azType1 = [6]uintptr{
 	ts + 1544,
-	ts + 14137,
-	ts + 14143,
-	ts + 14148,
+	ts + 14147,
+	ts + 14153,
+	ts + 14158,
+	ts + 14163,
 	ts + 14153,
 }
 
@@ -114563,10 +115013,10 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			if int32(*(*uint8)(unsafe.Pointer(pCol + 8))&0xf0>>4) == COLTYPE_CUSTOM {
 				if int32((*Column)(unsafe.Pointer(pCol)).FcolFlags)&COLFLAG_HASTYPE != 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+14159,
+						ts+14169,
 						libc.VaList(bp, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName, Xsqlite3ColumnType(tls, pCol, ts+1544)))
 				} else {
-					Xsqlite3ErrorMsg(tls, pParse, ts+14192,
+					Xsqlite3ErrorMsg(tls, pParse, ts+14202,
 						libc.VaList(bp+24, (*Table)(unsafe.Pointer(p)).FzName, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 				}
 				return
@@ -114585,11 +115035,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 	if tabOpts&U32(TF_WithoutRowid) != 0 {
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_Autoincrement) != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+14219, 0)
+				ts+14229, 0)
 			return
 		}
 		if (*Table)(unsafe.Pointer(p)).FtabFlags&U32(TF_HasPrimaryKey) == U32(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14269, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+14279, libc.VaList(bp+40, (*Table)(unsafe.Pointer(p)).FzName))
 			return
 		}
 		*(*U32)(unsafe.Pointer(p + 48)) |= U32(TF_WithoutRowid | TF_NoVisibleRowid)
@@ -114623,7 +115073,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 			}
 		}
 		if nNG == 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+14301, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+14311, 0)
 			return
 		}
 	}
@@ -114648,11 +115098,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		Xsqlite3VdbeAddOp1(tls, v, OP_Close, 0)
 
 		if int32((*Table)(unsafe.Pointer(p)).FeTabType) == TABTYP_NORM {
-			zType = ts + 10166
-			zType2 = ts + 14345
+			zType = ts + 10228
+			zType2 = ts + 14355
 		} else {
-			zType = ts + 11781
-			zType2 = ts + 14351
+			zType = ts + 11843
+			zType2 = ts + 14361
 		}
 
 		if pSelect != 0 {
@@ -114714,7 +115164,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		} else {
 			var pEnd2 uintptr
 			if tabOpts != 0 {
-				pEnd2 = pParse + 280
+				pEnd2 = pParse + 288
 			} else {
 				pEnd2 = pEnd
 			}
@@ -114723,11 +115173,11 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 				n = int32(uint32(n) + (*Token)(unsafe.Pointer(pEnd2)).Fn)
 			}
 			zStmt = Xsqlite3MPrintf(tls, db,
-				ts+14356, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
+				ts+14366, libc.VaList(bp+48, zType2, n, (*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))
 		}
 
 		Xsqlite3NestedParse(tls, pParse,
-			ts+14371,
+			ts+14381,
 			libc.VaList(bp+72, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				zType,
 				(*Table)(unsafe.Pointer(p)).FzName,
@@ -114743,13 +115193,13 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 
 			if (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).FpSeqTab == uintptr(0) {
 				Xsqlite3NestedParse(tls, pParse,
-					ts+14469,
+					ts+14479,
 					libc.VaList(bp+128, (*Db)(unsafe.Pointer(pDb)).FzDbSName))
 			}
 		}
 
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-			Xsqlite3MPrintf(tls, db, ts+14511, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
+			Xsqlite3MPrintf(tls, db, ts+14521, libc.VaList(bp+136, (*Table)(unsafe.Pointer(p)).FzName)), uint16(0))
 	}
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy != 0 {
@@ -114764,7 +115214,7 @@ func Xsqlite3EndTable(tls *libc.TLS, pParse uintptr, pCons uintptr, pEnd uintptr
 		(*Parse)(unsafe.Pointer(pParse)).FpNewTable = uintptr(0)
 		*(*U32)(unsafe.Pointer(db + 44)) |= U32(DBFLAG_SchemaChange)
 
-		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+10688) == 0 {
+		if libc.Xstrcmp(tls, (*Table)(unsafe.Pointer(p)).FzName, ts+10750) == 0 {
 			(*Schema)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FpSchema)).FpSeqTab = p
 		}
 	}
@@ -114794,7 +115244,7 @@ func Xsqlite3CreateView(tls *libc.TLS, pParse uintptr, pBegin uintptr, pName1 ui
 	if !(int32((*Parse)(unsafe.Pointer(pParse)).FnVar) > 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14545, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+14555, 0)
 	goto create_view_fail
 __1:
 	;
@@ -114810,7 +115260,7 @@ __2:
 
 	Xsqlite3TwoPartName(tls, pParse, pName1, pName2, bp)
 	iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(p)).FpSchema)
-	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+11781, *(*uintptr)(unsafe.Pointer(bp)))
+	Xsqlite3FixInit(tls, bp+8, pParse, iDb, ts+11843, *(*uintptr)(unsafe.Pointer(bp)))
 	if !(Xsqlite3FixSelect(tls, bp+8, pSelect) != 0) {
 		goto __3
 	}
@@ -114892,7 +115342,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 	}
 
 	if int32((*Table)(unsafe.Pointer(pTable)).FnCol) < 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14581, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+14591, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 		return 1
 	}
 
@@ -114920,8 +115370,7 @@ func viewGetColumnNames(tls *libc.TLS, pParse uintptr, pTable uintptr) int32 {
 				pTable+54, pTable+8)
 			if (*Parse)(unsafe.Pointer(pParse)).FnErr == 0 &&
 				int32((*Table)(unsafe.Pointer(pTable)).FnCol) == (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSel)).FpEList)).FnExpr {
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTable, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTable, pSel, int8(SQLITE_AFF_NONE))
 			}
 		} else {
 			(*Table)(unsafe.Pointer(pTable)).FnCol = (*Table)(unsafe.Pointer(pSelTab)).FnCol
@@ -115018,13 +115467,13 @@ func destroyRootPage(tls *libc.TLS, pParse uintptr, iTable int32, iDb int32) {
 	var v uintptr = Xsqlite3GetVdbe(tls, pParse)
 	var r1 int32 = Xsqlite3GetTempReg(tls, pParse)
 	if iTable < 2 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+14611, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+14621, 0)
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Destroy, iTable, r1, iDb)
 	Xsqlite3MayAbort(tls, pParse)
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14626,
+		ts+14636,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb+uintptr(iDb)*32)).FzDbSName, iTable, r1, r1))
 	Xsqlite3ReleaseTempReg(tls, pParse, r1)
 }
@@ -115065,10 +115514,10 @@ func sqlite3ClearStatTables(tls *libc.TLS, pParse uintptr, iDb int32, zType uint
 	var i int32
 	var zDbName uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FaDb + uintptr(iDb)*32)).FzDbSName
 	for i = 1; i <= 4; i++ {
-		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+14693, libc.VaList(bp, i))
+		Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([24]int8{})), bp+40, ts+14703, libc.VaList(bp, i))
 		if Xsqlite3FindTable(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, bp+40, zDbName) != 0 {
 			Xsqlite3NestedParse(tls, pParse,
-				ts+12590,
+				ts+12652,
 				libc.VaList(bp+8, zDbName, bp+40, zType, zName))
 		}
 	}
@@ -115100,12 +115549,12 @@ func Xsqlite3CodeDropTable(tls *libc.TLS, pParse uintptr, pTab uintptr, iDb int3
 
 	if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Autoincrement) != 0 {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+14707,
+			ts+14717,
 			libc.VaList(bp, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+14752,
+		ts+14762,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer(pDb)).FzDbSName, (*Table)(unsafe.Pointer(pTab)).FzName))
 	if !(isView != 0) && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		destroyTable(tls, pParse, pTab)
@@ -115133,11 +115582,11 @@ func Xsqlite3ReadOnlyShadowTables(tls *libc.TLS, db uintptr) int32 {
 }
 
 func tableMayNotBeDropped(tls *libc.TLS, db uintptr, pTab uintptr) int32 {
-	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+9424, 7) == 0 {
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+14819, 4) == 0 {
+	if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+14829, 4) == 0 {
 			return 0
 		}
-		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+8425, 10) == 0 {
+		if Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName+uintptr(7), ts+8485, 10) == 0 {
 			return 0
 		}
 		return 1
@@ -115215,9 +115664,9 @@ __7:
 	;
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}()
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zArg2 = uintptr(0)
@@ -115276,21 +115725,21 @@ __18:
 	if !(tableMayNotBeDropped(tls, db, pTab) != 0) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14824, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14834, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __19:
 	;
 	if !(isView != 0 && !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW)) {
 		goto __20
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14852, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14862, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __20:
 	;
 	if !(!(isView != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __21
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+14886, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+14896, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_drop_table
 __21:
 	;
@@ -115302,7 +115751,7 @@ __21:
 	if !!(isView != 0) {
 		goto __23
 	}
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+12782, (*Table)(unsafe.Pointer(pTab)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+12844, (*Table)(unsafe.Pointer(pTab)).FzName)
 	Xsqlite3FkDropTable(tls, pParse, pName, pTab)
 __23:
 	;
@@ -115366,7 +115815,7 @@ __4:
 		goto __5
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14918,
+		ts+14928,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(p)).FaCol+uintptr(iCol)*24)).FzCnName, pTo))
 	goto fk_end
 __5:
@@ -115378,7 +115827,7 @@ __2:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+14981, 0)
+		ts+14991, 0)
 	goto fk_end
 	goto __7
 __6:
@@ -115463,7 +115912,7 @@ __21:
 		goto __23
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15075,
+		ts+15085,
 		libc.VaList(bp+16, (*ExprList_item)(unsafe.Pointer(pFromCol+8+uintptr(i)*32)).FzEName))
 	goto fk_end
 __23:
@@ -115690,12 +116139,12 @@ func Xsqlite3HasExplicitNulls(tls *libc.TLS, pParse uintptr, pList uintptr) int3
 		for i = 0; i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pList + 8 + uintptr(i)*32 + 16 + 4))&0x20>>5)) != 0 {
 				var sf U8 = (*ExprList_item)(unsafe.Pointer(pList + 8 + uintptr(i)*32)).Ffg.FsortFlags
-				Xsqlite3ErrorMsg(tls, pParse, ts+15121,
+				Xsqlite3ErrorMsg(tls, pParse, ts+15131,
 					libc.VaList(bp, func() uintptr {
 						if int32(sf) == 0 || int32(sf) == 3 {
-							return ts + 15149
+							return ts + 15159
 						}
-						return ts + 15155
+						return ts + 15165
 					}()))
 				return 1
 			}
@@ -115816,7 +116265,7 @@ __9:
 	;
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+15160, *(*uintptr)(unsafe.Pointer(bp + 128)))
+	Xsqlite3FixInit(tls, bp+136, pParse, iDb, ts+15170, *(*uintptr)(unsafe.Pointer(bp + 128)))
 	if !(Xsqlite3FixSrcList(tls, bp+136, pTblName) != 0) {
 		goto __10
 	}
@@ -115835,7 +116284,7 @@ __11:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15166,
+		ts+15176,
 		libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __12:
@@ -115861,26 +116310,26 @@ __6:
 	;
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
 
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+9424, 7) == 0 &&
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) == 0 &&
 		int32((*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy) == 0 &&
 		pTblName != uintptr(0)) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15216, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15226, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto exit_create_index
 __15:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15244, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15254, 0)
 	goto exit_create_index
 __16:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __17
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15269, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15279, 0)
 	goto exit_create_index
 __17:
 	;
@@ -115894,7 +116343,7 @@ __17:
 	goto exit_create_index
 __20:
 	;
-	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+15160, (*Table)(unsafe.Pointer(pTab)).FzName)) {
+	if !(SQLITE_OK != Xsqlite3CheckObjectName(tls, pParse, zName, ts+15170, (*Table)(unsafe.Pointer(pTab)).FzName)) {
 		goto __21
 	}
 	goto exit_create_index
@@ -115909,7 +116358,7 @@ __21:
 	if !(Xsqlite3FindTable(tls, db, zName, (*Db)(unsafe.Pointer(pDb)).FzDbSName) != uintptr(0)) {
 		goto __24
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15303, libc.VaList(bp+16, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15313, libc.VaList(bp+16, zName))
 	goto exit_create_index
 __24:
 	;
@@ -115921,7 +116370,7 @@ __23:
 	if !!(ifNotExist != 0) {
 		goto __26
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15337, libc.VaList(bp+24, zName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15347, libc.VaList(bp+24, zName))
 	goto __27
 __26:
 	;
@@ -115950,7 +116399,7 @@ __29:
 	goto __30
 __30:
 	;
-	zName = Xsqlite3MPrintf(tls, db, ts+15361, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
+	zName = Xsqlite3MPrintf(tls, db, ts+15371, libc.VaList(bp+32, (*Table)(unsafe.Pointer(pTab)).FzName, n))
 	if !(zName == uintptr(0)) {
 		goto __31
 	}
@@ -115971,9 +116420,9 @@ __19:
 	zDb = (*Db)(unsafe.Pointer(pDb)).FzDbSName
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}(), uintptr(0), zDb) != 0) {
 		goto __34
 	}
@@ -116012,7 +116461,7 @@ __39:
 	Xsqlite3ExprListSetSortOrder(tls, pList, sortOrder, -1)
 	goto __38
 __37:
-	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+15160)
+	Xsqlite3ExprListCheckLength(tls, pParse, pList, ts+15170)
 	if !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0) {
 		goto __40
 	}
@@ -116113,7 +116562,7 @@ __53:
 		goto __56
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15384, 0)
+		ts+15394, 0)
 	goto exit_create_index
 __56:
 	;
@@ -116330,7 +116779,7 @@ __88:
 		goto __93
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15445, libc.VaList(bp+48, 0))
+		ts+15455, libc.VaList(bp+48, 0))
 __93:
 	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx)).FonError) == OE_Default) {
@@ -116382,8 +116831,8 @@ __81:
 	if !(Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0) {
 		goto __101
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15487, 0)
-	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121090)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15497, 0)
+	(*Parse)(unsafe.Pointer(pParse)).Frc = Xsqlite3CorruptError(tls, 121835)
 	goto exit_create_index
 __101:
 	;
@@ -116429,12 +116878,12 @@ __104:
 	n1--
 __107:
 	;
-	zStmt = Xsqlite3MPrintf(tls, db, ts+15504,
+	zStmt = Xsqlite3MPrintf(tls, db, ts+15514,
 		libc.VaList(bp+56, func() uintptr {
 			if onError == OE_None {
 				return ts + 1544
 			}
-			return ts + 15524
+			return ts + 15534
 		}(), n1, (*Token)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 128)))).Fz))
 	goto __106
 __105:
@@ -116442,7 +116891,7 @@ __105:
 __106:
 	;
 	Xsqlite3NestedParse(tls, pParse,
-		ts+15532,
+		ts+15542,
 		libc.VaList(bp+80, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 			(*Index)(unsafe.Pointer(pIndex)).FzName,
 			(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -116456,7 +116905,7 @@ __106:
 	sqlite3RefillIndex(tls, pParse, pIndex, iMem)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+15591, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+15601, libc.VaList(bp+120, (*Index)(unsafe.Pointer(pIndex)).FzName)), uint16(0))
 	Xsqlite3VdbeAddOp2(tls, v, OP_Expire, 0, 1)
 __108:
 	;
@@ -116617,7 +117066,7 @@ __2:
 	if !!(ifExists != 0) {
 		goto __4
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15618, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+15628, libc.VaList(bp, pName+8))
 	goto __5
 __4:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, (*SrcItem)(unsafe.Pointer(pName+8)).FzDatabase)
@@ -116632,7 +117081,7 @@ __3:
 		goto __6
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+15636, libc.VaList(bp+8, 0))
+		ts+15646, libc.VaList(bp+8, 0))
 	goto exit_drop_index
 __6:
 	;
@@ -116643,9 +117092,9 @@ __6:
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 	zTab = func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}()
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_DELETE, zTab, uintptr(0), zDb) != 0) {
 		goto __7
@@ -116671,9 +117120,9 @@ __9:
 	}
 	Xsqlite3BeginWriteOperation(tls, pParse, 1, iDb)
 	Xsqlite3NestedParse(tls, pParse,
-		ts+15709,
+		ts+15719,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Index)(unsafe.Pointer(pIndex)).FzName))
-	sqlite3ClearStatTables(tls, pParse, iDb, ts+12778, (*Index)(unsafe.Pointer(pIndex)).FzName)
+	sqlite3ClearStatTables(tls, pParse, iDb, ts+12840, (*Index)(unsafe.Pointer(pIndex)).FzName)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	destroyRootPage(tls, pParse, int32((*Index)(unsafe.Pointer(pIndex)).Ftnum), iDb)
 	Xsqlite3VdbeAddOp4(tls, v, OP_DropIndex, iDb, 0, 0, (*Index)(unsafe.Pointer(pIndex)).FzName, 0)
@@ -116808,7 +117257,7 @@ func Xsqlite3SrcListEnlarge(tls *libc.TLS, pParse uintptr, pSrc uintptr, nExtra
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc+nExtra >= SQLITE_MAX_SRCLIST {
-			Xsqlite3ErrorMsg(tls, pParse, ts+15769,
+			Xsqlite3ErrorMsg(tls, pParse, ts+15779,
 				libc.VaList(bp, SQLITE_MAX_SRCLIST))
 			return uintptr(0)
 		}
@@ -117016,12 +117465,12 @@ func Xsqlite3SrcListAppendFromTerm(tls *libc.TLS, pParse uintptr, p uintptr, pTa
 	if !(!(p != 0) && pOnUsing != uintptr(0) && ((*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 || (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpUsing != 0)) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15805,
+	Xsqlite3ErrorMsg(tls, pParse, ts+15815,
 		libc.VaList(bp, func() uintptr {
 			if (*OnOrUsing)(unsafe.Pointer(pOnUsing)).FpOn != 0 {
-				return ts + 15841
+				return ts + 15851
 			}
-			return ts + 15844
+			return ts + 15854
 		}()))
 	goto append_from_error
 __1:
@@ -117190,7 +117639,7 @@ func Xsqlite3BeginTransaction(tls *libc.TLS, pParse uintptr, type1 int32) {
 
 	db = (*Parse)(unsafe.Pointer(pParse)).Fdb
 
-	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+15850, uintptr(0), uintptr(0)) != 0 {
+	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION, ts+15860, uintptr(0), uintptr(0)) != 0 {
 		return
 	}
 	v = Xsqlite3GetVdbe(tls, pParse)
@@ -117226,9 +117675,9 @@ func Xsqlite3EndTransaction(tls *libc.TLS, pParse uintptr, eType int32) {
 	if Xsqlite3AuthCheck(tls, pParse, SQLITE_TRANSACTION,
 		func() uintptr {
 			if isRollback != 0 {
-				return ts + 15856
+				return ts + 15866
 			}
-			return ts + 15865
+			return ts + 15875
 		}(), uintptr(0), uintptr(0)) != 0 {
 		return
 	}
@@ -117253,7 +117702,7 @@ func Xsqlite3Savepoint(tls *libc.TLS, pParse uintptr, op int32, pName uintptr) {
 	}
 }
 
-var az = [3]uintptr{ts + 15850, ts + 15872, ts + 15856}
+var az = [3]uintptr{ts + 15860, ts + 15882, ts + 15866}
 
 // Make sure the TEMP database is open and available for use.  Return
 // the number of errors.  Leave any error messages in the pParse structure.
@@ -117268,7 +117717,7 @@ func Xsqlite3OpenTempDatabase(tls *libc.TLS, pParse uintptr) int32 {
 		rc = Xsqlite3BtreeOpen(tls, (*Sqlite3)(unsafe.Pointer(db)).FpVfs, uintptr(0), db, bp, 0, flags)
 		if rc != SQLITE_OK {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+15880, 0)
+				ts+15890, 0)
 			(*Parse)(unsafe.Pointer(pParse)).Frc = rc
 			return 1
 		}
@@ -117405,14 +117854,14 @@ func Xsqlite3UniqueConstraint(tls *libc.TLS, pParse uintptr, onError int32, pIdx
 	Xsqlite3StrAccumInit(tls, bp+8, (*Parse)(unsafe.Pointer(pParse)).Fdb, uintptr(0), 0,
 		*(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136)))
 	if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
-		Xsqlite3_str_appendf(tls, bp+8, ts+15950, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
+		Xsqlite3_str_appendf(tls, bp+8, ts+15960, libc.VaList(bp, (*Index)(unsafe.Pointer(pIdx)).FzName))
 	} else {
 		for j = 0; j < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); j++ {
 			var zCol uintptr
 
 			zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(j)*2)))*24)).FzCnName
 			if j != 0 {
-				Xsqlite3_str_append(tls, bp+8, ts+15961, 2)
+				Xsqlite3_str_append(tls, bp+8, ts+15971, 2)
 			}
 			Xsqlite3_str_appendall(tls, bp+8, (*Table)(unsafe.Pointer(pTab)).FzName)
 			Xsqlite3_str_append(tls, bp+8, ts+1557, 1)
@@ -117438,11 +117887,11 @@ func Xsqlite3RowidConstraint(tls *libc.TLS, pParse uintptr, onError int32, pTab
 	var zMsg uintptr
 	var rc int32
 	if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+13351, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		rc = SQLITE_CONSTRAINT | int32(6)<<8
 	} else {
-		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15964, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
+		zMsg = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+15974, libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 		rc = SQLITE_CONSTRAINT | int32(10)<<8
 	}
 	Xsqlite3HaltConstraint(tls, pParse, rc, onError, zMsg, int8(-6),
@@ -117572,7 +118021,7 @@ func Xsqlite3Reindex(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2 uintp
 		sqlite3RefillIndex(tls, pParse, pIndex, -1)
 		return
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+15973, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+15983, 0)
 }
 
 // Return a KeyInfo structure that is appropriate for the given Index.
@@ -117668,7 +118117,7 @@ func Xsqlite3WithAdd(tls *libc.TLS, pParse uintptr, pWith uintptr, pCte uintptr)
 		var i int32
 		for i = 0; i < (*With)(unsafe.Pointer(pWith)).FnCte; i++ {
 			if Xsqlite3StrICmp(tls, zName, (*Cte)(unsafe.Pointer(pWith+16+uintptr(i)*48)).FzName) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+16019, libc.VaList(bp, zName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+16029, libc.VaList(bp, zName))
 			}
 		}
 	}
@@ -117861,7 +118310,7 @@ func Xsqlite3GetCollSeq(tls *libc.TLS, pParse uintptr, enc U8, pColl uintptr, zN
 	}
 
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+16049, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16059, libc.VaList(bp, zName))
 		(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_ERROR | int32(1)<<8
 	}
 	return p
@@ -118141,7 +118590,7 @@ func vtabIsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr) int32 {
 
 	if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != uintptr(0) &&
 		int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+16080,
+		Xsqlite3ErrorMsg(tls, pParse, ts+16090,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 	}
 	return 0
@@ -118173,11 +118622,11 @@ func Xsqlite3IsReadOnly(tls *libc.TLS, pParse uintptr, pTab uintptr, viewOk int3
 	defer tls.Free(16)
 
 	if tabIsReadOnly(tls, pParse, pTab) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+16113, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16123, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	if !(viewOk != 0) && int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
-		Xsqlite3ErrorMsg(tls, pParse, ts+16142, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+16152, libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 		return 1
 	}
 	return 0
@@ -118681,7 +119130,7 @@ __61:
 	if !(memCnt != 0) {
 		goto __62
 	}
-	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+16180)
+	Xsqlite3CodeChangeCount(tls, v, memCnt, ts+16190)
 __62:
 	;
 delete_from_cleanup:
@@ -118796,7 +119245,7 @@ func Xsqlite3GenerateRowDelete(tls *libc.TLS, pParse uintptr, pTab uintptr, pTri
 			}
 			return 0
 		}())
-		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12638) {
+		if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 || 0 == Xsqlite3_stricmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+12700) {
 			Xsqlite3VdbeAppendP4(tls, v, pTab, -5)
 		}
 		if int32(eMode) != ONEPASS_OFF {
@@ -119026,7 +119475,7 @@ func typeofFunc(tls *libc.TLS, context uintptr, NotUsed int32, argv uintptr) {
 	Xsqlite3_result_text(tls, context, azType2[i], -1, uintptr(0))
 }
 
-var azType2 = [5]uintptr{ts + 7543, ts + 7538, ts + 9297, ts + 9292, ts + 7533}
+var azType2 = [5]uintptr{ts + 7543, ts + 7538, ts + 9357, ts + 9352, ts + 7533}
 
 func subtypeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	_ = argc
@@ -119085,7 +119534,7 @@ func absFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			var iVal I64 = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(argv)))
 			if iVal < int64(0) {
 				if iVal == int64(-1)-(int64(0xffffffff)|int64(0x7fffffff)<<32) {
-					Xsqlite3_result_error(tls, context, ts+16193, -1)
+					Xsqlite3_result_error(tls, context, ts+16203, -1)
 					return
 				}
 				iVal = -iVal
@@ -119389,7 +119838,7 @@ func roundFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 			return +0.5
 		}()))
 	} else {
-		zBuf = Xsqlite3_mprintf(tls, ts+16210, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
+		zBuf = Xsqlite3_mprintf(tls, ts+16220, libc.VaList(bp, n, *(*float64)(unsafe.Pointer(bp + 16))))
 		if zBuf == uintptr(0) {
 			Xsqlite3_result_error_nomem(tls, context)
 			return
@@ -119735,7 +120184,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	nPat = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
 
 	if nPat > *(*int32)(unsafe.Pointer(db + 136 + 8*4)) {
-		Xsqlite3_result_error(tls, context, ts+16215, -1)
+		Xsqlite3_result_error(tls, context, ts+16225, -1)
 		return
 	}
 	if argc == 3 {
@@ -119745,7 +120194,7 @@ func likeFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		if Xsqlite3Utf8CharLen(tls, *(*uintptr)(unsafe.Pointer(bp)), -1) != 1 {
 			Xsqlite3_result_error(tls, context,
-				ts+16248, -1)
+				ts+16258, -1)
 			return
 		}
 		escape = Xsqlite3Utf8Read(tls, bp)
@@ -119844,7 +120293,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 				Xsqlite3AtoF(tls, zVal, bp+32, int32((*StrAccum)(unsafe.Pointer(pStr)).FnChar), uint8(SQLITE_UTF8))
 				if r1 != *(*float64)(unsafe.Pointer(bp + 32)) {
 					Xsqlite3_str_reset(tls, pStr)
-					Xsqlite3_str_appendf(tls, pStr, ts+16293, libc.VaList(bp+8, r1))
+					Xsqlite3_str_appendf(tls, pStr, ts+16303, libc.VaList(bp+8, r1))
 				}
 			}
 			break
@@ -119859,21 +120308,21 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_BLOB:
 		{
 			var zBlob uintptr = Xsqlite3_value_blob(tls, pValue)
-			var nBlob int32 = Xsqlite3_value_bytes(tls, pValue)
+			var nBlob I64 = I64(Xsqlite3_value_bytes(tls, pValue))
 
-			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*2+4)
+			Xsqlite3StrAccumEnlarge(tls, pStr, nBlob*int64(2)+int64(4))
 			if int32((*StrAccum)(unsafe.Pointer(pStr)).FaccError) == 0 {
 				var zText uintptr = (*StrAccum)(unsafe.Pointer(pStr)).FzText
 				var i int32
-				for i = 0; i < nBlob; i++ {
+				for i = 0; I64(i) < nBlob; i++ {
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+2))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))>>4&0x0F]
 					*(*int8)(unsafe.Pointer(zText + uintptr(i*2+3))) = hexdigits[int32(*(*int8)(unsafe.Pointer(zBlob + uintptr(i))))&0x0F]
 				}
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+2))) = int8('\'')
-				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*2+3))) = int8(0)
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(2)))) = int8('\'')
+				*(*int8)(unsafe.Pointer(zText + uintptr(nBlob*int64(2)+int64(3)))) = int8(0)
 				*(*int8)(unsafe.Pointer(zText)) = int8('X')
 				*(*int8)(unsafe.Pointer(zText + 1)) = int8('\'')
-				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*2 + 3)
+				(*StrAccum)(unsafe.Pointer(pStr)).FnChar = U32(nBlob*int64(2) + int64(3))
 			}
 			break
 
@@ -119881,7 +120330,7 @@ func Xsqlite3QuoteValue(tls *libc.TLS, pStr uintptr, pValue uintptr) {
 	case SQLITE_TEXT:
 		{
 			var zArg uintptr = Xsqlite3_value_text(tls, pValue)
-			Xsqlite3_str_appendf(tls, pStr, ts+16300, libc.VaList(bp+24, zArg))
+			Xsqlite3_str_appendf(tls, pStr, ts+16310, libc.VaList(bp+24, zArg))
 			break
 
 		}
@@ -119995,6 +120444,119 @@ func hexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	}
 }
 
+func strContainsChar(tls *libc.TLS, zStr uintptr, nStr int32, ch U32) int32 {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zEnd uintptr = zStr + uintptr(nStr)
+	*(*uintptr)(unsafe.Pointer(bp)) = zStr
+	for *(*uintptr)(unsafe.Pointer(bp)) < zEnd {
+		var tst U32 = func() uint32 {
+			if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+				return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+			}
+			return Xsqlite3Utf8Read(tls, bp)
+		}()
+		if tst == ch {
+			return 1
+		}
+	}
+	return 0
+}
+
+func unhexFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
+	var zPass uintptr
+	var nPass int32
+
+	var nHex int32
+	var pBlob uintptr
+	var p uintptr
+	var ch U32
+	var c U8
+	var d U8
+	zPass = ts + 1544
+	nPass = 0
+	*(*uintptr)(unsafe.Pointer(bp)) = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	nHex = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv)))
+	pBlob = uintptr(0)
+	p = uintptr(0)
+
+	if !(argc == 2) {
+		goto __1
+	}
+	zPass = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+	nPass = Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8)))
+__1:
+	;
+	if !(!(*(*uintptr)(unsafe.Pointer(bp)) != 0) || !(zPass != 0)) {
+		goto __2
+	}
+	return
+__2:
+	;
+	p = libc.AssignUintptr(&pBlob, contextMalloc(tls, pCtx, int64(nHex/2+1)))
+	if !(pBlob != 0) {
+		goto __3
+	}
+
+__4:
+	if !(int32(libc.AssignUint8(&c, *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))))) != 0x00) {
+		goto __5
+	}
+__6:
+	if !!(int32(Xsqlite3CtypeMap[c])&0x08 != 0) {
+		goto __7
+	}
+	ch = func() uint32 {
+		if int32(*(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))) < 0x80 {
+			return uint32(*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1))))
+		}
+		return Xsqlite3Utf8Read(tls, bp)
+	}()
+
+	if !!(strContainsChar(tls, zPass, nPass, ch) != 0) {
+		goto __8
+	}
+	goto unhex_null
+__8:
+	;
+	c = *(*U8)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp))))
+	if !(int32(c) == 0x00) {
+		goto __9
+	}
+	goto unhex_done
+__9:
+	;
+	goto __6
+__7:
+	;
+	*(*uintptr)(unsafe.Pointer(bp))++
+
+	d = *(*U8)(unsafe.Pointer(libc.PostIncUintptr(&*(*uintptr)(unsafe.Pointer(bp)), 1)))
+	if !!(int32(Xsqlite3CtypeMap[d])&0x08 != 0) {
+		goto __10
+	}
+	goto unhex_null
+__10:
+	;
+	*(*U8)(unsafe.Pointer(libc.PostIncUintptr(&p, 1))) = U8(int32(Xsqlite3HexToInt(tls, int32(c)))<<4 | int32(Xsqlite3HexToInt(tls, int32(d))))
+	goto __4
+__5:
+	;
+__3:
+	;
+unhex_done:
+	Xsqlite3_result_blob(tls, pCtx, pBlob, int32((int64(p)-int64(pBlob))/1), *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
+	return
+
+unhex_null:
+	Xsqlite3_free(tls, pBlob)
+	return
+}
+
 func zeroblobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var n I64
 	var rc int32
@@ -120197,7 +120759,7 @@ func trimFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 var lenOne = [1]uint32{uint32(1)}
-var azOne = [1]uintptr{ts + 12210}
+var azOne = [1]uintptr{ts + 12272}
 
 func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	bp := tls.Alloc(8)
@@ -120233,7 +120795,7 @@ func soundexFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		*(*int8)(unsafe.Pointer(bp + uintptr(j))) = int8(0)
 		Xsqlite3_result_text(tls, context, bp, 4, libc.UintptrFromInt32(-1))
 	} else {
-		Xsqlite3_result_text(tls, context, ts+16303, 4, uintptr(0))
+		Xsqlite3_result_text(tls, context, ts+16313, 4, uintptr(0))
 	}
 }
 
@@ -120258,7 +120820,7 @@ func loadExt(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 
 	if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_LoadExtFunc) == uint64(0) {
-		Xsqlite3_result_error(tls, context, ts+13390, -1)
+		Xsqlite3_result_error(tls, context, ts+13452, -1)
 		return
 	}
 
@@ -120336,7 +120898,7 @@ func sumFinalize(tls *libc.TLS, context uintptr) {
 	p = Xsqlite3_aggregate_context(tls, context, 0)
 	if p != 0 && (*SumCtx)(unsafe.Pointer(p)).Fcnt > int64(0) {
 		if (*SumCtx)(unsafe.Pointer(p)).Foverflow != 0 {
-			Xsqlite3_result_error(tls, context, ts+16193, -1)
+			Xsqlite3_result_error(tls, context, ts+16203, -1)
 		} else if (*SumCtx)(unsafe.Pointer(p)).Fapprox != 0 {
 			Xsqlite3_result_double(tls, context, (*SumCtx)(unsafe.Pointer(p)).FrSum)
 		} else {
@@ -120598,7 +121160,7 @@ func groupConcatValue(tls *libc.TLS, context uintptr) {
 // of the built-in functions above are part of the global function set.
 // This routine only deals with those that are not global.
 func Xsqlite3RegisterPerConnectionBuiltinFunctions(tls *libc.TLS, db uintptr) {
-	var rc int32 = Xsqlite3_overload_function(tls, db, ts+16308, 2)
+	var rc int32 = Xsqlite3_overload_function(tls, db, ts+16318, 2)
 
 	if rc == SQLITE_NOMEM {
 		Xsqlite3OomFault(tls, db)
@@ -120618,14 +121180,14 @@ func Xsqlite3RegisterLikeFunctions(tls *libc.TLS, db uintptr, caseSensitive int3
 		pInfo = uintptr(unsafe.Pointer(&likeInfoNorm))
 		flags = SQLITE_FUNC_LIKE
 	}
-	Xsqlite3CreateFunc(tls, db, ts+16314, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+16324, 2, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	Xsqlite3CreateFunc(tls, db, ts+16314, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
+	Xsqlite3CreateFunc(tls, db, ts+16324, 3, SQLITE_UTF8, pInfo, *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{likeFunc})), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16314, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
-	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16314, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16324, 2, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
+	*(*U32)(unsafe.Pointer(Xsqlite3FindFunction(tls, db, ts+16324, 3, uint8(SQLITE_UTF8), uint8(0)) + 4)) |= U32(flags)
 }
 
 // pExpr points to an expression which implements a function.  If
@@ -120755,17 +121317,17 @@ func logFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		}
 		ans = libc.Xlog(tls, x) / b
 	} else {
-		ans = libc.Xlog(tls, x)
 		switch int32(Xsqlite3_user_data(tls, context)) {
 		case 1:
-			ans = ans / 2.30258509299404568402
+			ans = libc.Xlog10(tls, x)
 			break
 			fallthrough
 		case 2:
-			ans = ans / 0.69314718055994530942
+			ans = libc.Xlog2(tls, x)
 			break
 			fallthrough
 		default:
+			ans = libc.Xlog(tls, x)
 			break
 		}
 	}
@@ -120824,6 +121386,7 @@ func math2Func(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 }
 
 func piFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = argv
 	Xsqlite3_result_double(tls, context, 3.14159265358979323846)
 }
 
@@ -120864,108 +121427,110 @@ func Xsqlite3RegisterBuiltinFunctions(tls *libc.TLS) {
 
 }
 
-var aBuiltinFunc = [101]FuncDef{
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 16319},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 16339},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 16352},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 16370},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16379},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16387},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16387},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16402},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16428},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16453},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16462},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16473},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 16480},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16494},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16494},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16500},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16500},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 16506},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 16506},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16511},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 16511},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 16511},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16515},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 16515},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 16515},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16519},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16526},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 16534},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16541},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16547},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16554},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16561},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16569},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16574},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16578},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16578},
+var aBuiltinFunc = [103]FuncDef{
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_implies_nonnull_row)), FxSFunc: 0, FzName: ts + 16329},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_compare)), FxSFunc: 0, FzName: ts + 16349},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_expr_implies_expr)), FxSFunc: 0, FzName: ts + 16362},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INTERNAL | SQLITE_FUNC_TEST | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_affinity)), FxSFunc: 0, FzName: ts + 16380},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16389},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16397},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_DIRECTONLY | SQLITE_FUNC_UNSAFE), FxSFunc: 0, FzName: ts + 16397},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16412},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16438},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16463},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16472},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | SQLITE_FUNC_UNLIKELY), FpUserData: uintptr(int64(INLINEFUNC_unlikely)), FxSFunc: 0, FzName: ts + 16483},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_sqlite_offset)), FxSFunc: 0, FzName: ts + 16490},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16504},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16504},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16510},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16510},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 16516},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(3)), FxSFunc: 0, FzName: ts + 16516},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16521},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FzName: ts + 16521},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 16521},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16525},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FzName: ts + 16525},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_MINMAX | SQLITE_FUNC_ANYORDER), FpUserData: uintptr(int64(1)), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FzName: ts + 16525},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16529},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_TYPEOF), FxSFunc: 0, FzName: ts + 16536},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_LENGTH), FxSFunc: 0, FzName: ts + 16544},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16551},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16557},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16564},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16571},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16579},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16584},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16590},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16596},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 16600},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16607},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16614},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16625},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16632},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16647},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16664},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16675},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16681},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16699},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16707},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16721},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16729},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16738},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16738},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16745},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16745},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16755},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16759},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16765},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16769},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16769},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16588},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16588},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16594},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16600},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16606},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16610},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16610},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 16616},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16623},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16630},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 1*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16641},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16648},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_SLOCHNG | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 16663},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16680},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16691},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16697},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16715},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16723},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16737},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16745},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16754},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16754},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16761},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16761},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16771},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16775},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16775},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16788},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16314},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16314},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7878},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7878},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16793},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16798},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16806},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16812},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16818},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16821},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16825},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16831},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16821},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16836},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16840},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16844},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16850},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16854},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16859},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16864},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16869},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16781},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_COUNT | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16785},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_FUNC_ANYORDER), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16785},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16791},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | 0), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 16791},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16804},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16324},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | SQLITE_FUNC_LIKE), FpUserData: 0, FxSFunc: 0, FzName: ts + 16324},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7938},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FzName: ts + 7938},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16809},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16814},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16822},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16828},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16834},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16837},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(1)), FxSFunc: 0, FzName: ts + 16841},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FpUserData: uintptr(int64(2)), FxSFunc: 0, FzName: ts + 16847},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16837},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16852},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16856},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16860},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16866},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16870},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16875},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16879},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16883},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16887},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16892},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16897},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16902},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16880},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16885},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16891},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16895},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16899},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16903},
 	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16908},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16914},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16920},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16925},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16933},
-	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16941},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16944},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 7878},
-	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 16949}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16913},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16918},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16924},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16930},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16936},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16941},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: 0, FxSFunc: 0, FzName: ts + 16949},
+	{FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16957},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_FUNC_CONSTANT | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL), FxSFunc: 0, FzName: ts + 16960},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FxSFunc: 0, FzName: ts + 7938},
+	{FnArg: int8(3), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | SQLITE_FUNC_INLINE | SQLITE_FUNC_CONSTANT | 0), FpUserData: uintptr(int64(INLINEFUNC_iif)), FxSFunc: 0, FzName: ts + 16965}}
 
 // A foreign key constraint requires that the key columns in the parent
 // table are collectively subject to a UNIQUE or PRIMARY KEY constraint.
@@ -121086,7 +121651,7 @@ func Xsqlite3FkLocateIndex(tls *libc.TLS, pParse uintptr, pParent uintptr, pFKey
 	if !(pIdx != 0) {
 		if !(int32((*Parse)(unsafe.Pointer(pParse)).FdisableTriggers) != 0) {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+16953,
+				ts+16969,
 				libc.VaList(bp, (*Table)(unsafe.Pointer((*FKey)(unsafe.Pointer(pFKey)).FpFrom)).FzName, (*FKey)(unsafe.Pointer(pFKey)).FzTo))
 		}
 		Xsqlite3DbFree(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, aiCol)
@@ -121746,8 +122311,8 @@ func fkActionTrigger(tls *libc.TLS, pParse uintptr, pTab uintptr, pFKey uintptr,
 		}
 
 		for i = 0; i < (*FKey)(unsafe.Pointer(pFKey)).FnCol; i++ {
-			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 7744, Fn: uint32(3)}
-			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 7740, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 48)) = Token{Fz: ts + 7804, Fn: uint32(3)}
+			*(*Token)(unsafe.Pointer(bp + 64)) = Token{Fz: ts + 7800, Fn: uint32(3)}
 
 			var iFromCol int32
 			var pEq uintptr
@@ -122248,7 +122813,7 @@ func Xsqlite3ComputeGeneratedColumns(tls *libc.TLS, pParse uintptr, iRegStore in
 		}
 	}
 	if pRedo != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+9262, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+9322, libc.VaList(bp, (*Column)(unsafe.Pointer(pRedo)).FzCnName))
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
 }
@@ -122716,7 +123281,7 @@ __23:
 		goto __24
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+16998,
+		ts+17014,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto insert_cleanup
 __24:
@@ -122741,7 +123306,7 @@ __20:
 	bIdListInOrder = U8(0)
 	goto __27
 __26:
-	Xsqlite3ErrorMsg(tls, pParse, ts+17039,
+	Xsqlite3ErrorMsg(tls, pParse, ts+17055,
 		libc.VaList(bp+8, pTabList+8, (*IdList_item)(unsafe.Pointer(pColumn+8+uintptr(i)*16)).FzName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto insert_cleanup
@@ -122890,7 +123455,7 @@ __42:
 		goto __47
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+17071,
+		ts+17087,
 		libc.VaList(bp+24, pTabList+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol)-nHidden, nColumn))
 	goto insert_cleanup
 __47:
@@ -122900,7 +123465,7 @@ __36:
 	if !(pColumn != uintptr(0) && nColumn != (*IdList)(unsafe.Pointer(pColumn)).FnId) {
 		goto __48
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17123, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
+	Xsqlite3ErrorMsg(tls, pParse, ts+17139, libc.VaList(bp+48, nColumn, (*IdList)(unsafe.Pointer(pColumn)).FnId))
 	goto insert_cleanup
 __48:
 	;
@@ -122952,7 +123517,7 @@ __50:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __56
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17148,
+	Xsqlite3ErrorMsg(tls, pParse, ts+17164,
 		libc.VaList(bp+64, (*Table)(unsafe.Pointer(pTab)).FzName))
 	goto insert_cleanup
 __56:
@@ -122960,7 +123525,7 @@ __56:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) {
 		goto __57
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+17194, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+17210, 0)
 	goto insert_cleanup
 __57:
 	;
@@ -123372,7 +123937,7 @@ __124:
 	if !(regRowCount != 0) {
 		goto __125
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+17215)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+17231)
 __125:
 	;
 insert_cleanup:
@@ -123688,8 +124253,9 @@ func Xsqlite3GenerateConstraintChecks(tls *libc.TLS, pParse uintptr, pTab uintpt
 						fallthrough
 					case OE_Fail:
 						{
-							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+13351, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
+							var zMsg uintptr = Xsqlite3MPrintf(tls, db, ts+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 								(*Column)(unsafe.Pointer(pCol)).FzCnName))
+
 							Xsqlite3VdbeAddOp3(tls, v, OP_HaltIfNull, SQLITE_CONSTRAINT|int32(5)<<8,
 								onError, iReg)
 							Xsqlite3VdbeAppendP4(tls, v, zMsg, -6)
@@ -124779,7 +125345,7 @@ func Xsqlite3_exec(tls *libc.TLS, db uintptr, zSql uintptr, xCallback Sqlite3_ca
 	if !!(Xsqlite3SafetyCheckOk(tls, db) != 0) {
 		goto __1
 	}
-	return Xsqlite3MisuseError(tls, 131055)
+	return Xsqlite3MisuseError(tls, 131895)
 __1:
 	;
 	if !(zSql == uintptr(0)) {
@@ -125225,6 +125791,7 @@ var sqlite3Apis = Sqlite3_api_routines{
 	Fserialize:              0,
 	Fdb_name:                0,
 	Fvalue_encoding:         0,
+	Fis_interrupted:         0,
 }
 
 func sqlite3LoadExtension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -125263,7 +125830,7 @@ __1:
 	if !(pzErrMsg != 0) {
 		goto __3
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+13390, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+13452, 0)
 __3:
 	;
 	return SQLITE_ERROR
@@ -125272,7 +125839,7 @@ __2:
 	if zProc != 0 {
 		zEntry = zProc
 	} else {
-		zEntry = ts + 17229
+		zEntry = ts + 17245
 	}
 
 	if !(nMsg > uint64(FILENAME_MAX)) {
@@ -125287,7 +125854,7 @@ __5:
 	if !(ii < int32(uint64(unsafe.Sizeof(azEndings))/uint64(unsafe.Sizeof(uintptr(0)))) && handle == uintptr(0)) {
 		goto __7
 	}
-	zAltFile = Xsqlite3_mprintf(tls, ts+13351, libc.VaList(bp, zFile, azEndings[ii]))
+	zAltFile = Xsqlite3_mprintf(tls, ts+13413, libc.VaList(bp, zFile, azEndings[ii]))
 	if !(zAltFile == uintptr(0)) {
 		goto __8
 	}
@@ -125323,7 +125890,7 @@ __9:
 	return SQLITE_NOMEM
 __11:
 	;
-	libc.Xmemcpy(tls, zAltEntry, ts+17252, uint64(8))
+	libc.Xmemcpy(tls, zAltEntry, ts+17268, uint64(8))
 	iFile = ncFile - 1
 __12:
 	if !(iFile >= 0 && !(int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '/' || int32(*(*int8)(unsafe.Pointer(zFile + uintptr(iFile)))) == '\\')) {
@@ -125337,7 +125904,7 @@ __13:
 __14:
 	;
 	iFile++
-	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+17261, 3) == 0) {
+	if !(Xsqlite3_strnicmp(tls, zFile+uintptr(iFile), ts+17277, 3) == 0) {
 		goto __15
 	}
 	iFile = iFile + 3
@@ -125361,7 +125928,7 @@ __17:
 	goto __18
 __18:
 	;
-	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+17265, uint64(6))
+	libc.Xmemcpy(tls, zAltEntry+uintptr(iEntry), ts+17281, uint64(6))
 	zEntry = zAltEntry
 	xInit = Xsqlite3OsDlSym(tls, pVfs, handle, zEntry)
 __10:
@@ -125379,7 +125946,7 @@ __10:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+17271, libc.VaList(bp+16, zEntry, zFile))
+		ts+17287, libc.VaList(bp+16, zEntry, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __22:
 	;
@@ -125406,7 +125973,7 @@ __24:
 	if !(pzErrMsg != 0) {
 		goto __25
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+17314, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+17330, libc.VaList(bp+32, *(*uintptr)(unsafe.Pointer(bp + 56))))
 __25:
 	;
 	Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 56)))
@@ -125444,7 +126011,7 @@ extension_not_found:
 	}
 
 	Xsqlite3_snprintf(tls, int32(nMsg), *(*uintptr)(unsafe.Pointer(bp + 56)),
-		ts+17346, libc.VaList(bp+40, FILENAME_MAX, zFile))
+		ts+17362, libc.VaList(bp+40, FILENAME_MAX, zFile))
 	Xsqlite3OsDlError(tls, pVfs, int32(nMsg-uint64(1)), *(*uintptr)(unsafe.Pointer(bp + 56)))
 __29:
 	;
@@ -125454,7 +126021,7 @@ __28:
 }
 
 var azEndings = [1]uintptr{
-	ts + 17383,
+	ts + 17399,
 }
 
 func Xsqlite3_load_extension(tls *libc.TLS, db uintptr, zFile uintptr, zProc uintptr, pzErrMsg uintptr) int32 {
@@ -125610,7 +126177,7 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 			f func(*libc.TLS, uintptr, uintptr, uintptr) int32
 		})(unsafe.Pointer(&struct{ uintptr }{xInit})).f(tls, db, bp+8, pThunk)) != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, rc,
-				ts+17387, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
+				ts+17403, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 8))))
 			go1 = 0
 		}
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -125619,62 +126186,62 @@ func Xsqlite3AutoLoadExtensions(tls *libc.TLS, db uintptr) {
 
 var pragCName = [57]uintptr{
 	ts + 6409,
-	ts + 17426,
-	ts + 10166,
-	ts + 17430,
-	ts + 17435,
-	ts + 17438,
-	ts + 17448,
-	ts + 17458,
+	ts + 17442,
+	ts + 10228,
+	ts + 17446,
+	ts + 17451,
+	ts + 17454,
 	ts + 17464,
-	ts + 17468,
-	ts + 17473,
-	ts + 17478,
-	ts + 17486,
-	ts + 17497,
-	ts + 17500,
-	ts + 17507,
-	ts + 17468,
-	ts + 17473,
-	ts + 17514,
-	ts + 17519,
-	ts + 17522,
-	ts + 17529,
-	ts + 17464,
-	ts + 17468,
+	ts + 17474,
+	ts + 17480,
+	ts + 17484,
+	ts + 17489,
+	ts + 17494,
+	ts + 17502,
+	ts + 17513,
+	ts + 17516,
+	ts + 17523,
+	ts + 17484,
+	ts + 17489,
+	ts + 17530,
 	ts + 17535,
-	ts + 17540,
+	ts + 17538,
 	ts + 17545,
-	ts + 17468,
-	ts + 17549,
-	ts + 17473,
-	ts + 17557,
+	ts + 17480,
+	ts + 17484,
+	ts + 17551,
+	ts + 17556,
 	ts + 17561,
-	ts + 17566,
-	ts + 12782,
-	ts + 12778,
-	ts + 17572,
+	ts + 17484,
+	ts + 17565,
+	ts + 17489,
+	ts + 17573,
 	ts + 17577,
 	ts + 17582,
-	ts + 17426,
-	ts + 17468,
-	ts + 17587,
-	ts + 17594,
-	ts + 17601,
-	ts + 10166,
-	ts + 17609,
-	ts + 6412,
-	ts + 17615,
-	ts + 17426,
-	ts + 17468,
-	ts + 17620,
+	ts + 12844,
+	ts + 12840,
+	ts + 17588,
+	ts + 17593,
+	ts + 17598,
+	ts + 17442,
+	ts + 17484,
+	ts + 17603,
+	ts + 17610,
+	ts + 17617,
+	ts + 10228,
 	ts + 17625,
-	ts + 16821,
-	ts + 17630,
-	ts + 17643,
-	ts + 17652,
+	ts + 6412,
+	ts + 17631,
+	ts + 17442,
+	ts + 17484,
+	ts + 17636,
+	ts + 17641,
+	ts + 16837,
+	ts + 17646,
 	ts + 17659,
-	ts + 17670,
+	ts + 17668,
+	ts + 17675,
+	ts + 17686,
 }
 
 // Definitions of all built-in pragmas
@@ -125692,241 +126259,241 @@ type PragmaName1 = struct {
 type PragmaName = PragmaName1
 
 var aPragmaName = [67]PragmaName{
-	{FzName: ts + 17678,
+	{FzName: ts + 17694,
 		FePragTyp: U8(PragTyp_ANALYSIS_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17693,
+	{FzName: ts + 17709,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_APPLICATION_ID)},
-	{FzName: ts + 17708,
+	{FzName: ts + 17724,
 		FePragTyp: U8(PragTyp_AUTO_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17720,
+	{FzName: ts + 17736,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_AutoIndex)},
-	{FzName: ts + 17736,
+	{FzName: ts + 17752,
 		FePragTyp:   U8(PragTyp_BUSY_TIMEOUT),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(56), FnPragCName: U8(1)},
-	{FzName: ts + 17659,
+	{FzName: ts + 17675,
 		FePragTyp: U8(PragTyp_CACHE_SIZE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17749,
+	{FzName: ts + 17765,
 		FePragTyp: U8(PragTyp_CACHE_SPILL),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 17761,
+	{FzName: ts + 17777,
 		FePragTyp: U8(PragTyp_CASE_SENSITIVE_LIKE),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 17781,
-		FePragTyp: U8(PragTyp_FLAG),
-		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
-		FiArg:     uint64(SQLITE_CellSizeCk)},
 	{FzName: ts + 17797,
+		FePragTyp: U8(PragTyp_FLAG),
+		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
+		FiArg:     uint64(SQLITE_CellSizeCk)},
+	{FzName: ts + 17813,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_CkptFullFSync)},
-	{FzName: ts + 17818,
+	{FzName: ts + 17834,
 		FePragTyp:   U8(PragTyp_COLLATION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(38), FnPragCName: U8(2)},
-	{FzName: ts + 17833,
+	{FzName: ts + 17849,
 		FePragTyp: U8(PragTyp_COMPILE_OPTIONS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 17849,
+	{FzName: ts + 17865,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(0x00001) << 32},
-	{FzName: ts + 17863,
+	{FzName: ts + 17879,
 		FePragTyp: U8(PragTyp_DATA_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 17884,
+	{FzName: ts + 17900,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0),
 		FiArg:     uint64(BTREE_DATA_VERSION)},
-	{FzName: ts + 17897,
+	{FzName: ts + 17913,
 		FePragTyp:   U8(PragTyp_DATABASE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(47), FnPragCName: U8(3)},
-	{FzName: ts + 17911,
+	{FzName: ts + 17927,
 		FePragTyp:   U8(PragTyp_DEFAULT_CACHE_SIZE),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1),
 		FiPragCName: U8(55), FnPragCName: U8(1)},
-	{FzName: ts + 17930,
+	{FzName: ts + 17946,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_DeferFKs)},
-	{FzName: ts + 17949,
+	{FzName: ts + 17965,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_NullCallback)},
-	{FzName: ts + 17972,
+	{FzName: ts + 17988,
 		FePragTyp: U8(PragTyp_ENCODING),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 17981,
+	{FzName: ts + 17997,
 		FePragTyp:   U8(PragTyp_FOREIGN_KEY_CHECK),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(43), FnPragCName: U8(4)},
-	{FzName: ts + 17999,
+	{FzName: ts + 18015,
 		FePragTyp: U8(PragTyp_FOREIGN_KEY_LIST),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt), FnPragCName: U8(8)},
-	{FzName: ts + 18016,
+	{FzName: ts + 18032,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ForeignKeys)},
-	{FzName: ts + 18029,
+	{FzName: ts + 18045,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_ReadOnly | PragFlg_Result0)},
-	{FzName: ts + 18044,
+	{FzName: ts + 18060,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullColNames)},
-	{FzName: ts + 18062,
+	{FzName: ts + 18078,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_FullFSync)},
-	{FzName: ts + 18072,
+	{FzName: ts + 18088,
 		FePragTyp:   U8(PragTyp_FUNCTION_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(27), FnPragCName: U8(6)},
-	{FzName: ts + 18086,
+	{FzName: ts + 18102,
 		FePragTyp: U8(PragTyp_HARD_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18102,
+	{FzName: ts + 18118,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_IgnoreChecks)},
-	{FzName: ts + 18127,
+	{FzName: ts + 18143,
 		FePragTyp: U8(PragTyp_INCREMENTAL_VACUUM),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_NoColumns)},
-	{FzName: ts + 18146,
+	{FzName: ts + 18162,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(3)},
-	{FzName: ts + 18157,
+	{FzName: ts + 18173,
 		FePragTyp:   U8(PragTyp_INDEX_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(38), FnPragCName: U8(5)},
-	{FzName: ts + 18168,
+	{FzName: ts + 18184,
 		FePragTyp:   U8(PragTyp_INDEX_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(21), FnPragCName: U8(6),
 		FiArg: uint64(1)},
-	{FzName: ts + 18180,
+	{FzName: ts + 18196,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 18196,
+	{FzName: ts + 18212,
 		FePragTyp: U8(PragTyp_JOURNAL_MODE),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18209,
+	{FzName: ts + 18225,
 		FePragTyp: U8(PragTyp_JOURNAL_SIZE_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18228,
+	{FzName: ts + 18244,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_LegacyAlter)},
-	{FzName: ts + 18247,
+	{FzName: ts + 18263,
 		FePragTyp: U8(PragTyp_LOCKING_MODE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18260,
+	{FzName: ts + 18276,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18275,
+	{FzName: ts + 18291,
 		FePragTyp: U8(PragTyp_MMAP_SIZE)},
-	{FzName: ts + 18285,
+	{FzName: ts + 18301,
 		FePragTyp:   U8(PragTyp_MODULE_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 18297,
+	{FzName: ts + 18313,
 		FePragTyp: U8(PragTyp_OPTIMIZE),
 		FmPragFlg: U8(PragFlg_Result1 | PragFlg_NeedSchema)},
-	{FzName: ts + 18306,
+	{FzName: ts + 18322,
 		FePragTyp: U8(PragTyp_PAGE_COUNT),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq)},
-	{FzName: ts + 18317,
+	{FzName: ts + 18333,
 		FePragTyp: U8(PragTyp_PAGE_SIZE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 18327,
+	{FzName: ts + 18343,
 		FePragTyp:   U8(PragTyp_PRAGMA_LIST),
 		FmPragFlg:   U8(PragFlg_Result0),
 		FiPragCName: U8(9), FnPragCName: U8(1)},
-	{FzName: ts + 18339,
+	{FzName: ts + 18355,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_QueryOnly)},
-	{FzName: ts + 18350,
+	{FzName: ts + 18366,
 		FePragTyp: U8(PragTyp_INTEGRITY_CHECK),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_Result1 | PragFlg_SchemaOpt)},
-	{FzName: ts + 18362,
+	{FzName: ts + 18378,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReadUncommit)},
-	{FzName: ts + 18379,
+	{FzName: ts + 18395,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_RecTriggers)},
-	{FzName: ts + 18398,
+	{FzName: ts + 18414,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ReverseOrder)},
-	{FzName: ts + 18424,
+	{FzName: ts + 18440,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_SCHEMA_VERSION)},
-	{FzName: ts + 18439,
+	{FzName: ts + 18455,
 		FePragTyp: U8(PragTyp_SECURE_DELETE),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18453,
+	{FzName: ts + 18469,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_ShortColNames)},
-	{FzName: ts + 18472,
+	{FzName: ts + 18488,
 		FePragTyp: U8(PragTyp_SHRINK_MEMORY),
 		FmPragFlg: U8(PragFlg_NoColumns)},
-	{FzName: ts + 18486,
+	{FzName: ts + 18502,
 		FePragTyp: U8(PragTyp_SOFT_HEAP_LIMIT),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18502,
+	{FzName: ts + 18518,
 		FePragTyp: U8(PragTyp_SYNCHRONOUS),
 		FmPragFlg: U8(PragFlg_NeedSchema | PragFlg_Result0 | PragFlg_SchemaReq | PragFlg_NoColumns1)},
-	{FzName: ts + 18514,
+	{FzName: ts + 18530,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(6)},
-	{FzName: ts + 18525,
+	{FzName: ts + 18541,
 		FePragTyp:   U8(PragTyp_TABLE_LIST),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1),
 		FiPragCName: U8(15), FnPragCName: U8(6)},
-	{FzName: ts + 18536,
+	{FzName: ts + 18552,
 		FePragTyp:   U8(PragTyp_TABLE_INFO),
 		FmPragFlg:   U8(PragFlg_NeedSchema | PragFlg_Result1 | PragFlg_SchemaOpt),
 		FiPragCName: U8(8), FnPragCName: U8(7),
 		FiArg: uint64(1)},
-	{FzName: ts + 18548,
+	{FzName: ts + 18564,
 		FePragTyp: U8(PragTyp_TEMP_STORE),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1)},
-	{FzName: ts + 18559,
+	{FzName: ts + 18575,
 		FePragTyp: U8(PragTyp_TEMP_STORE_DIRECTORY),
 		FmPragFlg: U8(PragFlg_NoColumns1)},
-	{FzName: ts + 18580,
+	{FzName: ts + 18596,
 		FePragTyp: U8(PragTyp_THREADS),
 		FmPragFlg: U8(PragFlg_Result0)},
-	{FzName: ts + 18588,
+	{FzName: ts + 18604,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_TrustedSchema)},
-	{FzName: ts + 18603,
+	{FzName: ts + 18619,
 		FePragTyp: U8(PragTyp_HEADER_VALUE),
 		FmPragFlg: U8(PragFlg_NoColumns1 | PragFlg_Result0),
 		FiArg:     uint64(BTREE_USER_VERSION)},
-	{FzName: ts + 18616,
+	{FzName: ts + 18632,
 		FePragTyp: U8(PragTyp_WAL_AUTOCHECKPOINT)},
-	{FzName: ts + 18635,
+	{FzName: ts + 18651,
 		FePragTyp:   U8(PragTyp_WAL_CHECKPOINT),
 		FmPragFlg:   U8(PragFlg_NeedSchema),
 		FiPragCName: U8(50), FnPragCName: U8(3)},
-	{FzName: ts + 18650,
+	{FzName: ts + 18666,
 		FePragTyp: U8(PragTyp_FLAG),
 		FmPragFlg: U8(PragFlg_Result0 | PragFlg_NoColumns1),
 		FiArg:     uint64(SQLITE_WriteSchema | SQLITE_NoSchemaError)},
@@ -125948,7 +126515,7 @@ func getSafetyLevel(tls *libc.TLS, z uintptr, omitFull int32, dflt U8) U8 {
 	return dflt
 }
 
-var zText = *(*[25]int8)(unsafe.Pointer(ts + 18666))
+var zText = *(*[25]int8)(unsafe.Pointer(ts + 18682))
 var iOffset = [8]U8{U8(0), U8(1), U8(2), U8(4), U8(9), U8(12), U8(15), U8(20)}
 var iLength = [8]U8{U8(2), U8(2), U8(3), U8(5), U8(3), U8(4), U8(5), U8(4)}
 var iValue = [8]U8{U8(1), U8(0), U8(0), U8(0), U8(1), U8(1), U8(3), U8(2)}
@@ -125963,7 +126530,7 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 		if 0 == Xsqlite3StrICmp(tls, z, ts+5017) {
 			return PAGER_LOCKINGMODE_EXCLUSIVE
 		}
-		if 0 == Xsqlite3StrICmp(tls, z, ts+18691) {
+		if 0 == Xsqlite3StrICmp(tls, z, ts+18707) {
 			return PAGER_LOCKINGMODE_NORMAL
 		}
 	}
@@ -125972,13 +126539,13 @@ func getLockingMode(tls *libc.TLS, z uintptr) int32 {
 
 func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 	var i int32
-	if 0 == Xsqlite3StrICmp(tls, z, ts+9310) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+9378) {
 		return BTREE_AUTOVACUUM_NONE
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+18698) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+18714) {
 		return BTREE_AUTOVACUUM_FULL
 	}
-	if 0 == Xsqlite3StrICmp(tls, z, ts+18703) {
+	if 0 == Xsqlite3StrICmp(tls, z, ts+18719) {
 		return BTREE_AUTOVACUUM_INCR
 	}
 	i = Xsqlite3Atoi(tls, z)
@@ -125993,9 +126560,9 @@ func getAutoVacuum(tls *libc.TLS, z uintptr) int32 {
 func getTempStore(tls *libc.TLS, z uintptr) int32 {
 	if int32(*(*int8)(unsafe.Pointer(z))) >= '0' && int32(*(*int8)(unsafe.Pointer(z))) <= '2' {
 		return int32(*(*int8)(unsafe.Pointer(z))) - '0'
-	} else if Xsqlite3StrICmp(tls, z, ts+17620) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+17636) == 0 {
 		return 1
-	} else if Xsqlite3StrICmp(tls, z, ts+18715) == 0 {
+	} else if Xsqlite3StrICmp(tls, z, ts+18731) == 0 {
 		return 2
 	} else {
 		return 0
@@ -126009,7 +126576,7 @@ func invalidateTempStorage(tls *libc.TLS, pParse uintptr) int32 {
 		if !(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) ||
 			Xsqlite3BtreeTxnState(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt) != SQLITE_TXN_NONE {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+18722, 0)
+				ts+18738, 0)
 			return SQLITE_ERROR
 		}
 		Xsqlite3BtreeClose(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpBt)
@@ -126100,19 +126667,19 @@ func actionName(tls *libc.TLS, action U8) uintptr {
 	var zName uintptr
 	switch int32(action) {
 	case OE_SetNull:
-		zName = ts + 18784
+		zName = ts + 18800
 		break
 	case OE_SetDflt:
-		zName = ts + 18793
+		zName = ts + 18809
 		break
 	case OE_Cascade:
-		zName = ts + 18805
+		zName = ts + 18821
 		break
 	case OE_Restrict:
-		zName = ts + 18813
+		zName = ts + 18829
 		break
 	default:
-		zName = ts + 18822
+		zName = ts + 18838
 		break
 	}
 	return zName
@@ -126129,7 +126696,7 @@ func Xsqlite3JournalModename(tls *libc.TLS, eMode int32) uintptr {
 }
 
 var azModeName = [6]uintptr{
-	ts + 18832, ts + 18839, ts + 18847, ts + 18851, ts + 18715, ts + 18860,
+	ts + 18848, ts + 18855, ts + 18863, ts + 18867, ts + 18731, ts + 18876,
 }
 
 func pragmaLocate(tls *libc.TLS, zName uintptr) uintptr {
@@ -126176,13 +126743,13 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 			continue
 		}
 		if (*FuncDef)(unsafe.Pointer(p)).FxValue != uintptr(0) {
-			zType = ts + 18864
+			zType = ts + 18880
 		} else if (*FuncDef)(unsafe.Pointer(p)).FxFinalize != uintptr(0) {
-			zType = ts + 18866
+			zType = ts + 18882
 		} else {
-			zType = ts + 8820
+			zType = ts + 8880
 		}
-		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18868,
+		Xsqlite3VdbeMultiLoad(tls, v, 1, ts+18884,
 			libc.VaList(bp, (*FuncDef)(unsafe.Pointer(p)).FzName, isBuiltin,
 				zType, azEnc[(*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK)],
 				int32((*FuncDef)(unsafe.Pointer(p)).FnArg),
@@ -126190,7 +126757,7 @@ func pragmaFunclistLine(tls *libc.TLS, v uintptr, p uintptr, isBuiltin int32, sh
 	}
 }
 
-var azEnc = [4]uintptr{uintptr(0), ts + 18875, ts + 18880, ts + 18888}
+var azEnc = [4]uintptr{uintptr(0), ts + 18891, ts + 18896, ts + 18904}
 
 func integrityCheckResultRow(tls *libc.TLS, v uintptr) int32 {
 	var addr int32
@@ -126341,14 +126908,16 @@ func Xsqlite3Pragma(tls *libc.TLS, pParse uintptr, pId1 uintptr, pId2 uintptr, p
 	var zErr2 uintptr
 	var k3 int32
 	var pCheck uintptr
+	var jmp6 int32
 	var iCol1 int32
 	var uniqOk int32
-	var jmp6 int32
-	var kk int32
+	var jmp61 int32
 	var jmp21 int32
 
 	var jmp4 int32
 	var jmp5 int32
+	var label6 int32
+	var kk int32
 	var ckUniq int32
 	var pTab9 uintptr
 	var pIdx5 uintptr
@@ -126435,7 +127004,7 @@ __4:
 	if !(minusFlag != 0) {
 		goto __5
 	}
-	zRight = Xsqlite3MPrintf(tls, db, ts+18896, libc.VaList(bp, pValue))
+	zRight = Xsqlite3MPrintf(tls, db, ts+18912, libc.VaList(bp, pValue))
 	goto __6
 __5:
 	zRight = Xsqlite3NameFromToken(tls, db, pValue)
@@ -126699,7 +127268,7 @@ __18:
 	if !(zRight != 0) {
 		goto __64
 	}
-	if !(Xsqlite3_stricmp(tls, zRight, ts+18900) == 0) {
+	if !(Xsqlite3_stricmp(tls, zRight, ts+18916) == 0) {
 		goto __65
 	}
 	b = 2
@@ -126771,7 +127340,7 @@ __72:
 	goto __15
 
 __20:
-	zRet = ts + 18691
+	zRet = ts + 18707
 	eMode = getLockingMode(tls, zRight)
 
 	if !((*Token)(unsafe.Pointer(pId2)).Fn == uint32(0) && eMode == -1) {
@@ -127096,7 +127665,7 @@ __124:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 560)) == 0) {
 		goto __127
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18905, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __127:
@@ -127141,7 +127710,7 @@ __131:
 	if !(rc != SQLITE_OK || *(*int32)(unsafe.Pointer(bp + 564)) == 0) {
 		goto __134
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+18905, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+18921, 0)
 	Xsqlite3_mutex_leave(tls, Xsqlite3MutexAlloc(tls, SQLITE_MUTEX_STATIC_VFS1))
 	goto pragma_out
 __134:
@@ -127174,7 +127743,7 @@ __137:
 		goto __139
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+18930, 0)
+		ts+18946, 0)
 	goto __140
 __139:
 	if !(iDb != 1) {
@@ -127228,7 +127797,7 @@ __146:
 __148:
 	;
 	if !(mask&uint64(SQLITE_WriteSchema) != uint64(0) &&
-		Xsqlite3_stricmp(tls, zRight, ts+18983) == 0) {
+		Xsqlite3_stricmp(tls, zRight, ts+18999) == 0) {
 		goto __149
 	}
 
@@ -127325,9 +127894,9 @@ __162:
 
 	Xsqlite3VdbeMultiLoad(tls, v, 1, func() uintptr {
 		if (*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0 {
-			return ts + 18989
+			return ts + 19005
 		}
-		return ts + 18997
+		return ts + 19013
 	}(),
 		libc.VaList(bp+32, i-nHidden,
 			(*Column)(unsafe.Pointer(pCol)).FzCnName,
@@ -127396,7 +127965,7 @@ __177:
 	if !(int32((*Table)(unsafe.Pointer(pTab1)).FnCol) == 0) {
 		goto __178
 	}
-	zSql = Xsqlite3MPrintf(tls, db, ts+19004, libc.VaList(bp+88, (*Table)(unsafe.Pointer(pTab1)).FzName))
+	zSql = Xsqlite3MPrintf(tls, db, ts+19020, libc.VaList(bp+88, (*Table)(unsafe.Pointer(pTab1)).FzName))
 	if !(zSql != 0) {
 		goto __179
 	}
@@ -127442,29 +128011,29 @@ __184:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VIEW) {
 		goto __185
 	}
-	zType = ts + 11781
+	zType = ts + 11843
 	goto __186
 __185:
 	if !(int32((*Table)(unsafe.Pointer(pTab2)).FeTabType) == TABTYP_VTAB) {
 		goto __187
 	}
-	zType = ts + 14063
+	zType = ts + 14073
 	goto __188
 __187:
 	if !((*Table)(unsafe.Pointer(pTab2)).FtabFlags&U32(TF_Shadow) != 0) {
 		goto __189
 	}
-	zType = ts + 19020
+	zType = ts + 19036
 	goto __190
 __189:
-	zType = ts + 10166
+	zType = ts + 10228
 __190:
 	;
 __188:
 	;
 __186:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19027,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19043,
 		libc.VaList(bp+96, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(ii4)*32)).FzDbSName,
 			Xsqlite3PreferredTableName(tls, (*Table)(unsafe.Pointer(pTab2)).FzName),
 			zType,
@@ -127530,7 +128099,7 @@ __197:
 		goto __199
 	}
 	cnum = *(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i1)*2))
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19034, libc.VaList(bp+144, i1, int32(cnum),
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19050, libc.VaList(bp+144, i1, int32(cnum),
 		func() uintptr {
 			if int32(cnum) < 0 {
 				return uintptr(0)
@@ -127540,7 +128109,7 @@ __197:
 	if !((*PragmaName)(unsafe.Pointer(pPragma)).FiArg != 0) {
 		goto __200
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+19039,
+	Xsqlite3VdbeMultiLoad(tls, v, 4, ts+19055,
 		libc.VaList(bp+168, int32(*(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaSortOrder + uintptr(i1)))),
 			*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FazColl + uintptr(i1)*8)),
 			libc.Bool32(i1 < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol))))
@@ -127577,8 +128146,8 @@ __203:
 	if !(pIdx1 != 0) {
 		goto __205
 	}
-	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 19044, ts + 19046, ts + 17497}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19048,
+	*(*[3]uintptr)(unsafe.Pointer(bp + 576)) = [3]uintptr{ts + 19060, ts + 19062, ts + 17513}
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19064,
 		libc.VaList(bp+192, i2,
 			(*Index)(unsafe.Pointer(pIdx1)).FzName,
 			libc.Bool32(int32((*Index)(unsafe.Pointer(pIdx1)).FonError) != OE_None),
@@ -127611,7 +128180,7 @@ __206:
 	goto __207
 __209:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19054,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19070,
 		libc.VaList(bp+232, i3,
 			(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FzDbSName,
 			Xsqlite3BtreeGetFilename(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i3)*32)).FpBt)))
@@ -127633,7 +128202,7 @@ __210:
 		goto __212
 	}
 	pColl = (*HashElem)(unsafe.Pointer(p)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19058, libc.VaList(bp+256, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19074, libc.VaList(bp+256, libc.PostIncInt32(&i4, 1), (*CollSeq)(unsafe.Pointer(pColl)).FzName))
 	goto __211
 __211:
 	p = (*HashElem)(unsafe.Pointer(p)).Fnext
@@ -127697,7 +128266,7 @@ __222:
 		goto __224
 	}
 	pMod = (*HashElem)(unsafe.Pointer(j1)).Fdata
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8820, libc.VaList(bp+272, (*Module)(unsafe.Pointer(pMod)).FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8880, libc.VaList(bp+272, (*Module)(unsafe.Pointer(pMod)).FzName))
 	goto __223
 __223:
 	j1 = (*HashElem)(unsafe.Pointer(j1)).Fnext
@@ -127713,7 +128282,7 @@ __225:
 	if !(i6 < int32(uint64(unsafe.Sizeof(aPragmaName))/uint64(unsafe.Sizeof(PragmaName{})))) {
 		goto __227
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8820, libc.VaList(bp+280, aPragmaName[i6].FzName))
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+8880, libc.VaList(bp+280, aPragmaName[i6].FzName))
 	goto __226
 __226:
 	i6++
@@ -127748,7 +128317,7 @@ __233:
 	if !(j2 < (*FKey)(unsafe.Pointer(pFK)).FnCol) {
 		goto __235
 	}
-	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19061,
+	Xsqlite3VdbeMultiLoad(tls, v, 1, ts+19077,
 		libc.VaList(bp+288, i7,
 			j2,
 			(*FKey)(unsafe.Pointer(pFK)).FzTo,
@@ -127756,7 +128325,7 @@ __233:
 			(*sColMap)(unsafe.Pointer(pFK+64+uintptr(j2)*16)).FzCol,
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45 + 1))),
 			actionName(tls, *(*U8)(unsafe.Pointer(pFK + 45))),
-			ts+19070))
+			ts+19086))
 	goto __234
 __234:
 	j2++
@@ -127945,7 +128514,7 @@ __263:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Null, 0, regResult+1)
 __264:
 	;
-	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+19075, libc.VaList(bp+352, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
+	Xsqlite3VdbeMultiLoad(tls, v, regResult+2, ts+19091, libc.VaList(bp+352, (*FKey)(unsafe.Pointer(pFK1)).FzTo, i8-1))
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, regResult, 4)
 	Xsqlite3VdbeResolveLabel(tls, v, addrOk)
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 608)))
@@ -128162,7 +128731,7 @@ __291:
 	Xsqlite3VdbeChangeP5(tls, v, uint16(U8(i9)))
 	addr1 = Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, 2)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0,
-		Xsqlite3MPrintf(tls, db, ts+19079, libc.VaList(bp+368, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
+		Xsqlite3MPrintf(tls, db, ts+19095, libc.VaList(bp+368, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(i9)*32)).FzDbSName)),
 		-6)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 2, 3, 3)
 	integrityCheckResultRow(tls, v)
@@ -128223,262 +128792,284 @@ __306:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, *(*int32)(unsafe.Pointer(bp + 620)), 0)
 	loopTop = Xsqlite3VdbeAddOp2(tls, v, OP_AddImm, 7, 1)
 
-	mxCol = int32((*Table)(unsafe.Pointer(pTab9)).FnCol) - 1
-__307:
-	if !(mxCol >= 0 &&
-		(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(mxCol)*24)).FcolFlags)&COLFLAG_VIRTUAL != 0 ||
-			int32((*Table)(unsafe.Pointer(pTab9)).FiPKey) == mxCol)) {
-		goto __308
+	if !((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
+		goto __307
+	}
+	mxCol = -1
+	j4 = 0
+__309:
+	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
+		goto __311
+	}
+	if !(int32((*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FcolFlags)&COLFLAG_VIRTUAL == 0) {
+		goto __312
+	}
+	mxCol++
+__312:
+	;
+	goto __310
+__310:
+	j4++
+	goto __309
+	goto __311
+__311:
+	;
+	if !(mxCol == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
+		goto __313
 	}
 	mxCol--
-	goto __307
+__313:
+	;
+	goto __308
+__307:
+	mxCol = int32((*Index)(unsafe.Pointer(Xsqlite3PrimaryKeyIndex(tls, pTab9))).FnColumn) - 1
 __308:
 	;
 	if !(mxCol >= 0) {
-		goto __309
+		goto __314
 	}
-	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), mxCol, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 620)), mxCol, 3)
 	Xsqlite3VdbeTypeofColumn(tls, v, 3)
-__309:
+__314:
 	;
 	if !!(isQuick != 0) {
-		goto __310
+		goto __315
 	}
 	if !(pPk1 != 0) {
-		goto __311
+		goto __316
 	}
 	a1 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 620)), 0, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
 
 	Xsqlite3VdbeAddOp1(tls, v, OP_IsNull, r2)
 	zErr = Xsqlite3MPrintf(tls, db,
-		ts+19103,
+		ts+19119,
 		libc.VaList(bp+376, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, a1)
 	Xsqlite3VdbeJumpHere(tls, v, a1+1)
 	j4 = 0
-__312:
+__317:
 	if !(j4 < int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol)) {
-		goto __314
+		goto __319
 	}
 	Xsqlite3ExprCodeLoadIndexColumn(tls, pParse, pPk1, *(*int32)(unsafe.Pointer(bp + 620)), j4, r2+j4)
-	goto __313
-__313:
+	goto __318
+__318:
 	j4++
-	goto __312
-	goto __314
-__314:
+	goto __317
+	goto __319
+__319:
 	;
-__311:
+__316:
 	;
-__310:
+__315:
 	;
 	bStrict = libc.Bool32((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_Strict) != U32(0))
 	j4 = 0
-__315:
+__320:
 	if !(j4 < int32((*Table)(unsafe.Pointer(pTab9)).FnCol)) {
-		goto __317
+		goto __322
 	}
 	pCol1 = (*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(j4)*24
 
 	if !(j4 == int32((*Table)(unsafe.Pointer(pTab9)).FiPKey)) {
-		goto __318
+		goto __323
 	}
-	goto __316
-__318:
+	goto __321
+__323:
 	;
 	if !(bStrict != 0) {
-		goto __319
+		goto __324
 	}
 	doTypeCheck = libc.Bool32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4) > COLTYPE_ANY)
-	goto __320
-__319:
+	goto __325
+__324:
 	doTypeCheck = libc.Bool32(int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) > SQLITE_AFF_BLOB)
-__320:
+__325:
 	;
 	if !(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0) == 0 && !(doTypeCheck != 0)) {
-		goto __321
+		goto __326
 	}
-	goto __316
-__321:
+	goto __321
+__326:
 	;
 	p4 = SQLITE_NULL
 	if !(int32((*Column)(unsafe.Pointer(pCol1)).FcolFlags)&COLFLAG_VIRTUAL != 0) {
-		goto __322
+		goto __327
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
 	p11 = -1
 	p3 = 3
-	goto __323
-__322:
+	goto __328
+__327:
 	if !((*Column)(unsafe.Pointer(pCol1)).FiDflt != 0) {
-		goto __324
+		goto __329
 	}
 	*(*uintptr)(unsafe.Pointer(bp + 632)) = uintptr(0)
 	Xsqlite3ValueFromExpr(tls, db, Xsqlite3ColumnExpr(tls, pTab9, pCol1), (*Sqlite3)(unsafe.Pointer(db)).Fenc,
 		uint8((*Column)(unsafe.Pointer(pCol1)).Faffinity), bp+632)
 	if !(*(*uintptr)(unsafe.Pointer(bp + 632)) != 0) {
-		goto __325
+		goto __330
 	}
 	p4 = Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(bp + 632)))
 	Xsqlite3ValueFree(tls, *(*uintptr)(unsafe.Pointer(bp + 632)))
-__325:
+__330:
 	;
-__324:
+__329:
 	;
 	p11 = *(*int32)(unsafe.Pointer(bp + 620))
 	if !!((*Table)(unsafe.Pointer(pTab9)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __326
+		goto __331
 	}
 
 	p3 = int32(Xsqlite3TableColumnToIndex(tls, Xsqlite3PrimaryKeyIndex(tls, pTab9), int16(j4)))
-	goto __327
-__326:
+	goto __332
+__331:
 	p3 = int32(Xsqlite3TableColumnToStorage(tls, pTab9, int16(j4)))
 
-__327:
+__332:
 	;
-__323:
+__328:
 	;
 	labelError = Xsqlite3VdbeMakeLabel(tls, pParse)
 	labelOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(uint32(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf>>0)) != 0) {
-		goto __328
+		goto __333
 	}
 
 	jmp2 = Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x0f))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19139, libc.VaList(bp+384, (*Table)(unsafe.Pointer(pTab9)).FzName,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19155, libc.VaList(bp+384, (*Table)(unsafe.Pointer(pTab9)).FzName,
 		(*Column)(unsafe.Pointer(pCol1)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
 	if !(doTypeCheck != 0) {
-		goto __329
+		goto __334
 	}
 	Xsqlite3VdbeGoto(tls, v, labelError)
 	Xsqlite3VdbeJumpHere(tls, v, jmp2)
-	goto __330
-__329:
+	goto __335
+__334:
 	;
-__330:
+__335:
 	;
-__328:
+__333:
 	;
 	if !(bStrict != 0 && doTypeCheck != 0) {
-		goto __331
+		goto __336
 	}
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 
 	Xsqlite3VdbeChangeP5(tls, v, uint16(aStdTypeMask[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28]))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19159,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19175,
 		libc.VaList(bp+400, Xsqlite3StdType[(int32(*(*uint8)(unsafe.Pointer(pCol1 + 8))&0xf0>>4)-1)&0xf<<28>>28],
 			(*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __332
-__331:
+	goto __337
+__336:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) == SQLITE_AFF_TEXT) {
-		goto __333
+		goto __338
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19181,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19197,
 		libc.VaList(bp+424, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-	goto __334
-__333:
+	goto __339
+__338:
 	if !(!(bStrict != 0) && int32((*Column)(unsafe.Pointer(pCol1)).Faffinity) >= SQLITE_AFF_NUMERIC) {
-		goto __335
+		goto __340
 	}
 
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, p11, labelOk, p3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1b))
 
 	if !(p11 >= 0) {
-		goto __336
+		goto __341
 	}
 	Xsqlite3ExprCodeGetColumnOfTable(tls, v, pTab9, *(*int32)(unsafe.Pointer(bp + 620)), j4, 3)
-__336:
+__341:
 	;
-	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+19204, -1)
+	Xsqlite3VdbeAddOp4(tls, v, OP_Affinity, 3, 1, 0, ts+19220, -1)
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_IsType, -1, labelOk, 3, p4)
 	Xsqlite3VdbeChangeP5(tls, v, uint16(0x1c))
 
-	zErr1 = Xsqlite3MPrintf(tls, db, ts+19206,
+	zErr1 = Xsqlite3MPrintf(tls, db, ts+19222,
 		libc.VaList(bp+440, (*Table)(unsafe.Pointer(pTab9)).FzName, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol+uintptr(j4)*24)).FzCnName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr1, -6)
-__335:
+__340:
 	;
-__334:
+__339:
 	;
-__332:
+__337:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, labelError)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, labelOk)
-	goto __316
-__316:
+	goto __321
+__321:
 	j4++
-	goto __315
-	goto __317
-__317:
+	goto __320
+	goto __322
+__322:
 	;
 	if !((*Table)(unsafe.Pointer(pTab9)).FpCheck != 0 && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_IgnoreChecks) == uint64(0)) {
-		goto __337
+		goto __342
 	}
 	pCheck = Xsqlite3ExprListDup(tls, db, (*Table)(unsafe.Pointer(pTab9)).FpCheck, 0)
 	if !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0) {
-		goto __338
+		goto __343
 	}
 	addrCkFault = Xsqlite3VdbeMakeLabel(tls, pParse)
 	addrCkOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = *(*int32)(unsafe.Pointer(bp + 620)) + 1
 	k3 = (*ExprList)(unsafe.Pointer(pCheck)).FnExpr - 1
-__339:
+__344:
 	if !(k3 > 0) {
-		goto __341
+		goto __346
 	}
 	Xsqlite3ExprIfFalse(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8+uintptr(k3)*32)).FpExpr, addrCkFault, 0)
-	goto __340
-__340:
+	goto __345
+__345:
 	k3--
-	goto __339
-	goto __341
-__341:
+	goto __344
+	goto __346
+__346:
 	;
 	Xsqlite3ExprIfTrue(tls, pParse, (*ExprList_item)(unsafe.Pointer(pCheck+8)).FpExpr, addrCkOk,
 		SQLITE_JUMPIFNULL)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkFault)
 	(*Parse)(unsafe.Pointer(pParse)).FiSelfTab = 0
-	zErr2 = Xsqlite3MPrintf(tls, db, ts+19226,
+	zErr2 = Xsqlite3MPrintf(tls, db, ts+19242,
 		libc.VaList(bp+456, (*Table)(unsafe.Pointer(pTab9)).FzName))
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, 3, 0, zErr2, -6)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeResolveLabel(tls, v, addrCkOk)
-__338:
+__343:
 	;
 	Xsqlite3ExprListDelete(tls, db, pCheck)
-__337:
+__342:
 	;
 	if !!(isQuick != 0) {
-		goto __342
+		goto __347
 	}
 
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__343:
+__348:
 	if !(pIdx5 != 0) {
-		goto __345
+		goto __350
 	}
 	ckUniq = Xsqlite3VdbeMakeLabel(tls, pParse)
 	if !(pPk1 == pIdx5) {
-		goto __346
+		goto __351
 	}
-	goto __344
-__346:
+	goto __349
+__351:
 	;
 	r1 = Xsqlite3GenerateIndexKey(tls, pParse, pIdx5, *(*int32)(unsafe.Pointer(bp + 620)), 0, 0, bp+640,
 		pPrior, r1)
@@ -128487,80 +129078,119 @@ __346:
 
 	jmp21 = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, *(*int32)(unsafe.Pointer(bp + 624))+j4, ckUniq, r1,
 		int32((*Index)(unsafe.Pointer(pIdx5)).FnColumn))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+19256)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19272)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
-	Xsqlite3VdbeLoadString(tls, v, 4, ts+19261)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+19277)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp5 = Xsqlite3VdbeLoadString(tls, v, 4, (*Index)(unsafe.Pointer(pIdx5)).FzName)
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 3, 3)
 	jmp4 = integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, jmp21)
 
+	label6 = 0
+	kk = 0
+__352:
+	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
+		goto __354
+	}
+	if !(*(*uintptr)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FazColl + uintptr(kk)*8)) == uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))) {
+		goto __355
+	}
+	goto __353
+__355:
+	;
+	if !(label6 == 0) {
+		goto __356
+	}
+	label6 = Xsqlite3VdbeMakeLabel(tls, pParse)
+__356:
+	;
+	Xsqlite3VdbeAddOp3(tls, v, OP_Column, *(*int32)(unsafe.Pointer(bp + 624))+j4, kk, 3)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Ne, 3, label6, r1+kk)
+	goto __353
+__353:
+	kk++
+	goto __352
+	goto __354
+__354:
+	;
+	if !(label6 != 0) {
+		goto __357
+	}
+	jmp6 = Xsqlite3VdbeAddOp0(tls, v, OP_Goto)
+	Xsqlite3VdbeResolveLabel(tls, v, label6)
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19272)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 7, 3, 3)
+	Xsqlite3VdbeLoadString(tls, v, 4, ts+19298)
+	Xsqlite3VdbeGoto(tls, v, jmp5-1)
+	Xsqlite3VdbeJumpHere(tls, v, jmp6)
+__357:
+	;
 	if !(int32((*Index)(unsafe.Pointer(pIdx5)).FonError) != OE_None) {
-		goto __347
+		goto __358
 	}
 	uniqOk = Xsqlite3VdbeMakeLabel(tls, pParse)
 	kk = 0
-__348:
+__359:
 	if !(kk < int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol)) {
-		goto __350
+		goto __361
 	}
 	iCol1 = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx5)).FaiColumn + uintptr(kk)*2)))
 
 	if !(iCol1 >= 0 && uint32(int32(*(*uint8)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab9)).FaCol + uintptr(iCol1)*24 + 8))&0xf>>0)) != 0) {
-		goto __351
+		goto __362
 	}
-	goto __349
-__351:
+	goto __360
+__362:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_IsNull, r1+kk, uniqOk)
 
+	goto __360
+__360:
+	kk++
+	goto __359
+	goto __361
+__361:
+	;
+	jmp61 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 624))+j4)
+	Xsqlite3VdbeGoto(tls, v, uniqOk)
+	Xsqlite3VdbeJumpHere(tls, v, jmp61)
+	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 624))+j4, uniqOk, r1,
+		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
+	Xsqlite3VdbeLoadString(tls, v, 3, ts+19325)
+	Xsqlite3VdbeGoto(tls, v, jmp5)
+	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
+__358:
+	;
+	Xsqlite3VdbeJumpHere(tls, v, jmp4)
+	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
 	goto __349
 __349:
-	kk++
+	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
+	j4++
 	goto __348
 	goto __350
 __350:
 	;
-	jmp6 = Xsqlite3VdbeAddOp1(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 624))+j4)
-	Xsqlite3VdbeGoto(tls, v, uniqOk)
-	Xsqlite3VdbeJumpHere(tls, v, jmp6)
-	Xsqlite3VdbeAddOp4Int(tls, v, OP_IdxGT, *(*int32)(unsafe.Pointer(bp + 624))+j4, uniqOk, r1,
-		int32((*Index)(unsafe.Pointer(pIdx5)).FnKeyCol))
-	Xsqlite3VdbeLoadString(tls, v, 3, ts+19282)
-	Xsqlite3VdbeGoto(tls, v, jmp5)
-	Xsqlite3VdbeResolveLabel(tls, v, uniqOk)
 __347:
-	;
-	Xsqlite3VdbeJumpHere(tls, v, jmp4)
-	Xsqlite3ResolvePartIdxLabel(tls, pParse, *(*int32)(unsafe.Pointer(bp + 640)))
-	goto __344
-__344:
-	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
-	j4++
-	goto __343
-	goto __345
-__345:
-	;
-__342:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Next, *(*int32)(unsafe.Pointer(bp + 620)), loopTop)
 	Xsqlite3VdbeJumpHere(tls, v, loopTop-1)
 	if !!(isQuick != 0) {
-		goto __352
+		goto __363
 	}
-	Xsqlite3VdbeLoadString(tls, v, 2, ts+19309)
+	Xsqlite3VdbeLoadString(tls, v, 2, ts+19352)
 	j4 = 0
 	pIdx5 = (*Table)(unsafe.Pointer(pTab9)).FpIndex
-__353:
+__364:
 	if !(pIdx5 != 0) {
-		goto __355
+		goto __366
 	}
 	if !(pPk1 == pIdx5) {
-		goto __356
+		goto __367
 	}
-	goto __354
-__356:
+	goto __365
+__367:
 	;
 	Xsqlite3VdbeAddOp2(tls, v, OP_Count, *(*int32)(unsafe.Pointer(bp + 624))+j4, 3)
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_Eq, 8+j4, 0, 3)
@@ -128569,21 +129199,21 @@ __356:
 	Xsqlite3VdbeAddOp3(tls, v, OP_Concat, 4, 2, 3)
 	integrityCheckResultRow(tls, v)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
-	goto __354
-__354:
+	goto __365
+__365:
 	pIdx5 = (*Index)(unsafe.Pointer(pIdx5)).FpNext
 	j4++
-	goto __353
-	goto __355
-__355:
+	goto __364
+	goto __366
+__366:
 	;
 	if !(pPk1 != 0) {
-		goto __357
+		goto __368
 	}
 	Xsqlite3ReleaseTempRange(tls, pParse, r2, int32((*Index)(unsafe.Pointer(pPk1)).FnKeyCol))
-__357:
+__368:
 	;
-__352:
+__363:
 	;
 	goto __298
 __298:
@@ -128601,14 +129231,14 @@ __273:
 	;
 	aOp2 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(endCode))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&endCode)), iLn5)
 	if !(aOp2 != 0) {
-		goto __358
+		goto __369
 	}
 	(*VdbeOp)(unsafe.Pointer(aOp2)).Fp2 = 1 - *(*int32)(unsafe.Pointer(bp + 616))
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 2*24)).Fp4type = int8(-1)
-	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 19338
+	*(*uintptr)(unsafe.Pointer(aOp2 + 2*24 + 16)) = ts + 19381
 	(*VdbeOp)(unsafe.Pointer(aOp2 + 5*24)).Fp4type = int8(-1)
 	*(*uintptr)(unsafe.Pointer(aOp2 + 5*24 + 16)) = Xsqlite3ErrStr(tls, SQLITE_CORRUPT)
-__358:
+__369:
 	;
 	Xsqlite3VdbeChangeP3(tls, v, 0, Xsqlite3VdbeCurrentAddr(tls, v)-2)
 
@@ -128616,27 +129246,27 @@ __358:
 
 __46:
 	if !!(zRight != 0) {
-		goto __359
+		goto __370
 	}
 	if !(Xsqlite3ReadSchema(tls, pParse) != 0) {
-		goto __361
+		goto __372
 	}
 	goto pragma_out
-__361:
+__372:
 	;
 	returnSingleText(tls, v, encnames1[(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Fenc].FzName)
-	goto __360
-__359:
+	goto __371
+__370:
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmDbFlags&U32(DBFLAG_EncodingFixed) == U32(0)) {
-		goto __362
+		goto __373
 	}
 	pEnc = uintptr(unsafe.Pointer(&encnames1))
-__363:
+__374:
 	if !((*EncName)(unsafe.Pointer(pEnc)).FzName != 0) {
-		goto __365
+		goto __376
 	}
 	if !(0 == Xsqlite3StrICmp(tls, zRight, (*EncName)(unsafe.Pointer(pEnc)).FzName)) {
-		goto __366
+		goto __377
 	}
 	if (*EncName)(unsafe.Pointer(pEnc)).Fenc != 0 {
 		enc = (*EncName)(unsafe.Pointer(pEnc)).Fenc
@@ -128645,25 +129275,25 @@ __363:
 	}
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpSchema)).Fenc = enc
 	Xsqlite3SetTextEncoding(tls, db, enc)
-	goto __365
-__366:
+	goto __376
+__377:
 	;
-	goto __364
-__364:
+	goto __375
+__375:
 	pEnc += 16
-	goto __363
-	goto __365
-__365:
+	goto __374
+	goto __376
+__376:
 	;
 	if !!(int32((*EncName)(unsafe.Pointer(pEnc)).FzName) != 0) {
-		goto __367
+		goto __378
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+19341, libc.VaList(bp+464, zRight))
-__367:
+	Xsqlite3ErrorMsg(tls, pParse, ts+19384, libc.VaList(bp+464, zRight))
+__378:
 	;
-__362:
+__373:
 	;
-__360:
+__371:
 	;
 	goto __15
 
@@ -128671,15 +129301,15 @@ __47:
 	iCookie = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiArg)
 	Xsqlite3VdbeUsesBtree(tls, v, iDb)
 	if !(zRight != 0 && int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_ReadOnly == 0) {
-		goto __368
+		goto __379
 	}
 
 	aOp3 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(setCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&setCookie)), 0)
 	if !(0 != 0) {
-		goto __370
+		goto __381
 	}
 	goto __15
-__370:
+__381:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp3)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp1 = iDb
@@ -128687,41 +129317,41 @@ __370:
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp3 = Xsqlite3Atoi(tls, zRight)
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fp5 = U16(1)
 	if !(iCookie == BTREE_SCHEMA_VERSION && (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_Defensive) != uint64(0)) {
-		goto __371
+		goto __382
 	}
 
 	(*VdbeOp)(unsafe.Pointer(aOp3 + 1*24)).Fopcode = U8(OP_Noop)
-__371:
+__382:
 	;
-	goto __369
-__368:
+	goto __380
+__379:
 	;
 	aOp4 = Xsqlite3VdbeAddOpList(tls, v, int32(uint64(unsafe.Sizeof(readCookie))/uint64(unsafe.Sizeof(VdbeOpList{}))), uintptr(unsafe.Pointer(&readCookie)), 0)
 	if !(0 != 0) {
-		goto __372
+		goto __383
 	}
 	goto __15
-__372:
+__383:
 	;
 	(*VdbeOp)(unsafe.Pointer(aOp4)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp1 = iDb
 	(*VdbeOp)(unsafe.Pointer(aOp4 + 1*24)).Fp3 = iCookie
 	Xsqlite3VdbeReusable(tls, v)
-__369:
+__380:
 	;
 	goto __15
 
 __48:
 	i10 = 0
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 1
-__373:
+__384:
 	if !(libc.AssignUintptr(&zOpt, Xsqlite3_compileoption_get(tls, libc.PostIncInt32(&i10, 1))) != uintptr(0)) {
-		goto __374
+		goto __385
 	}
 	Xsqlite3VdbeLoadString(tls, v, 1, zOpt)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, 1, 1)
-	goto __373
-__374:
+	goto __384
+__385:
 	;
 	Xsqlite3VdbeReusable(tls, v)
 
@@ -128736,31 +129366,31 @@ __49:
 	}()
 	eMode2 = SQLITE_CHECKPOINT_PASSIVE
 	if !(zRight != 0) {
-		goto __375
+		goto __386
 	}
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18698) == 0) {
-		goto __376
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18714) == 0) {
+		goto __387
 	}
 	eMode2 = SQLITE_CHECKPOINT_FULL
-	goto __377
-__376:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+19366) == 0) {
-		goto __378
+	goto __388
+__387:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+19409) == 0) {
+		goto __389
 	}
 	eMode2 = SQLITE_CHECKPOINT_RESTART
-	goto __379
-__378:
-	if !(Xsqlite3StrICmp(tls, zRight, ts+18851) == 0) {
-		goto __380
+	goto __390
+__389:
+	if !(Xsqlite3StrICmp(tls, zRight, ts+18867) == 0) {
+		goto __391
 	}
 	eMode2 = SQLITE_CHECKPOINT_TRUNCATE
-__380:
+__391:
 	;
-__379:
+__390:
 	;
-__377:
+__388:
 	;
-__375:
+__386:
 	;
 	(*Parse)(unsafe.Pointer(pParse)).FnMem = 3
 	Xsqlite3VdbeAddOp3(tls, v, OP_Checkpoint, iBt, eMode2, 1)
@@ -128770,10 +129400,10 @@ __375:
 
 __50:
 	if !(zRight != 0) {
-		goto __381
+		goto __392
 	}
 	Xsqlite3_wal_autocheckpoint(tls, db, Xsqlite3Atoi(tls, zRight))
-__381:
+__392:
 	;
 	returnSingleInt(tls, v,
 		func() int64 {
@@ -128793,19 +129423,19 @@ __51:
 
 __52:
 	if !(zRight != 0) {
-		goto __382
+		goto __393
 	}
 	opMask = U32(Xsqlite3Atoi(tls, zRight))
 	if !(opMask&U32(0x02) == U32(0)) {
-		goto __384
+		goto __395
 	}
 	goto __15
-__384:
+__395:
 	;
-	goto __383
-__382:
+	goto __394
+__393:
 	opMask = U32(0xfffe)
-__383:
+__394:
 	;
 	iTabCur = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	iDbLast = func() int32 {
@@ -128814,86 +129444,86 @@ __383:
 		}
 		return (*Sqlite3)(unsafe.Pointer(db)).FnDb - 1
 	}()
-__385:
+__396:
 	if !(iDb <= iDbLast) {
-		goto __387
+		goto __398
 	}
 	if !(iDb == 1) {
-		goto __388
+		goto __399
 	}
-	goto __386
-__388:
+	goto __397
+__399:
 	;
 	Xsqlite3CodeVerifySchema(tls, pParse, iDb)
 	pSchema = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FpSchema
 	k4 = (*Hash)(unsafe.Pointer(pSchema + 8)).Ffirst
-__389:
+__400:
 	if !(k4 != 0) {
-		goto __391
+		goto __402
 	}
 	pTab10 = (*HashElem)(unsafe.Pointer(k4)).Fdata
 
 	if !((*Table)(unsafe.Pointer(pTab10)).FtabFlags&U32(TF_StatsUsed) == U32(0)) {
-		goto __392
+		goto __403
 	}
-	goto __390
-__392:
+	goto __401
+__403:
 	;
 	szThreshold = LogEst(int32((*Table)(unsafe.Pointer(pTab10)).FnRowLogEst) + 46)
 	pIdx6 = (*Table)(unsafe.Pointer(pTab10)).FpIndex
-__393:
+__404:
 	if !(pIdx6 != 0) {
-		goto __395
+		goto __406
 	}
 	if !!(int32(*(*uint16)(unsafe.Pointer(pIdx6 + 100))&0x80>>7) != 0) {
-		goto __396
+		goto __407
 	}
 	szThreshold = int16(0)
-	goto __395
-__396:
+	goto __406
+__407:
 	;
-	goto __394
-__394:
+	goto __405
+__405:
 	pIdx6 = (*Index)(unsafe.Pointer(pIdx6)).FpNext
-	goto __393
-	goto __395
-__395:
+	goto __404
+	goto __406
+__406:
 	;
 	if !(szThreshold != 0) {
-		goto __397
+		goto __408
 	}
 	Xsqlite3OpenTable(tls, pParse, iTabCur, iDb, pTab10, OP_OpenRead)
 	Xsqlite3VdbeAddOp3(tls, v, OP_IfSmaller, iTabCur,
 		int32(U32(Xsqlite3VdbeCurrentAddr(tls, v)+2)+opMask&U32(1)), int32(szThreshold))
 
-__397:
+__408:
 	;
-	zSubSql = Xsqlite3MPrintf(tls, db, ts+19374,
+	zSubSql = Xsqlite3MPrintf(tls, db, ts+19417,
 		libc.VaList(bp+472, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Table)(unsafe.Pointer(pTab10)).FzName))
 	if !(opMask&U32(0x01) != 0) {
-		goto __398
+		goto __409
 	}
 	r11 = Xsqlite3GetTempReg(tls, pParse)
 	Xsqlite3VdbeAddOp4(tls, v, OP_String8, 0, r11, 0, zSubSql, -6)
 	Xsqlite3VdbeAddOp2(tls, v, OP_ResultRow, r11, 1)
-	goto __399
-__398:
+	goto __410
+__409:
 	Xsqlite3VdbeAddOp4(tls, v, OP_SqlExec, 0, 0, 0, zSubSql, -6)
-__399:
+__410:
 	;
-	goto __390
-__390:
+	goto __401
+__401:
 	k4 = (*HashElem)(unsafe.Pointer(k4)).Fnext
-	goto __389
-	goto __391
-__391:
+	goto __400
+	goto __402
+__402:
 	;
-	goto __386
-__386:
+	goto __397
+__397:
 	iDb++
-	goto __385
-	goto __387
-__387:
+	goto __396
+	goto __398
+__398:
 	;
 	Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
 	goto __15
@@ -128901,36 +129531,36 @@ __387:
 __53:
 	;
 	if !(zRight != 0) {
-		goto __400
+		goto __411
 	}
 	Xsqlite3_busy_timeout(tls, db, Xsqlite3Atoi(tls, zRight))
-__400:
+__411:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FbusyTimeout))
 	goto __15
 
 __54:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+648) == SQLITE_OK) {
-		goto __401
+		goto __412
 	}
 	Xsqlite3_soft_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 648)))
-__401:
+__412:
 	;
 	returnSingleInt(tls, v, Xsqlite3_soft_heap_limit64(tls, int64(-1)))
 	goto __15
 
 __55:
 	if !(zRight != 0 && Xsqlite3DecOrHexToI64(tls, zRight, bp+656) == SQLITE_OK) {
-		goto __402
+		goto __413
 	}
 	iPrior = Xsqlite3_hard_heap_limit64(tls, int64(-1))
 	if !(*(*Sqlite3_int64)(unsafe.Pointer(bp + 656)) > int64(0) && (iPrior == int64(0) || iPrior > *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))) {
-		goto __403
+		goto __414
 	}
 	Xsqlite3_hard_heap_limit64(tls, *(*Sqlite3_int64)(unsafe.Pointer(bp + 656)))
-__403:
+__414:
 	;
-__402:
+__413:
 	;
 	returnSingleInt(tls, v, Xsqlite3_hard_heap_limit64(tls, int64(-1)))
 	goto __15
@@ -128939,10 +129569,10 @@ __56:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+664) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 664)) >= int64(0)) {
-		goto __404
+		goto __415
 	}
 	Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 664))&int64(0x7fffffff)))
-__404:
+__415:
 	;
 	returnSingleInt(tls, v, int64(Xsqlite3_limit(tls, db, SQLITE_LIMIT_WORKER_THREADS, -1)))
 	goto __15
@@ -128951,10 +129581,10 @@ __57:
 	if !(zRight != 0 &&
 		Xsqlite3DecOrHexToI64(tls, zRight, bp+672) == SQLITE_OK &&
 		*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) >= int64(0)) {
-		goto __405
+		goto __416
 	}
 	(*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit = int32(*(*Sqlite3_int64)(unsafe.Pointer(bp + 672)) & int64(0x7fffffff))
-__405:
+__416:
 	;
 	returnSingleInt(tls, v, int64((*Sqlite3)(unsafe.Pointer(db)).FnAnalysisLimit))
 	goto __15
@@ -128962,10 +129592,10 @@ __405:
 __15:
 	;
 	if !(int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_NoColumns1 != 0 && zRight != 0) {
-		goto __406
+		goto __417
 	}
 
-__406:
+__417:
 	;
 pragma_out:
 	Xsqlite3DbFree(tls, db, zLeft)
@@ -129017,14 +129647,14 @@ var endCode = [7]VdbeOpList{
 	{Fopcode: U8(OP_Goto), Fp2: int8(3)},
 }
 var encnames1 = [9]EncName{
-	{FzName: ts + 19392, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 19397, Fenc: U8(SQLITE_UTF8)},
-	{FzName: ts + 19403, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 19412, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 19421, Fenc: U8(SQLITE_UTF16LE)},
-	{FzName: ts + 19429, Fenc: U8(SQLITE_UTF16BE)},
-	{FzName: ts + 19437},
-	{FzName: ts + 19444},
+	{FzName: ts + 19435, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 19440, Fenc: U8(SQLITE_UTF8)},
+	{FzName: ts + 19446, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 19455, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 19464, Fenc: U8(SQLITE_UTF16LE)},
+	{FzName: ts + 19472, Fenc: U8(SQLITE_UTF16BE)},
+	{FzName: ts + 19480},
+	{FzName: ts + 19487},
 	{},
 }
 var setCookie = [2]VdbeOpList{
@@ -129076,7 +129706,7 @@ func pragmaVtabConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	_ = argc
 	_ = argv
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), bp+64, int32(unsafe.Sizeof([200]int8{})), 0)
-	Xsqlite3_str_appendall(tls, bp+32, ts+19450)
+	Xsqlite3_str_appendall(tls, bp+32, ts+19493)
 	i = 0
 	j = int32((*PragmaName)(unsafe.Pointer(pPragma)).FiPragCName)
 __1:
@@ -129084,7 +129714,7 @@ __1:
 		goto __3
 	}
 	{
-		Xsqlite3_str_appendf(tls, bp+32, ts+19465, libc.VaList(bp, int32(cSep), pragCName[j]))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19508, libc.VaList(bp, int32(cSep), pragCName[j]))
 		cSep = int8(',')
 
 	}
@@ -129097,16 +129727,16 @@ __2:
 __3:
 	;
 	if i == 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+19472, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19515, libc.VaList(bp+16, (*PragmaName)(unsafe.Pointer(pPragma)).FzName))
 		i++
 	}
 	j = 0
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&PragFlg_Result1 != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+19478)
+		Xsqlite3_str_appendall(tls, bp+32, ts+19521)
 		j++
 	}
 	if int32((*PragmaName)(unsafe.Pointer(pPragma)).FmPragFlg)&(PragFlg_SchemaOpt|PragFlg_SchemaReq) != 0 {
-		Xsqlite3_str_appendall(tls, bp+32, ts+19490)
+		Xsqlite3_str_appendall(tls, bp+32, ts+19533)
 		j++
 	}
 	Xsqlite3_str_append(tls, bp+32, ts+6309, 1)
@@ -129289,13 +129919,13 @@ __2:
 __3:
 	;
 	Xsqlite3StrAccumInit(tls, bp+32, uintptr(0), uintptr(0), 0, *(*int32)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).Fdb + 136 + 1*4)))
-	Xsqlite3_str_appendall(tls, bp+32, ts+19505)
+	Xsqlite3_str_appendall(tls, bp+32, ts+19548)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+19513, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19556, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pCsr + 24 + 1*8))))
 	}
 	Xsqlite3_str_appendall(tls, bp+32, (*PragmaName)(unsafe.Pointer((*PragmaVtab)(unsafe.Pointer(pTab)).FpName)).FzName)
 	if *(*uintptr)(unsafe.Pointer(pCsr + 24)) != 0 {
-		Xsqlite3_str_appendf(tls, bp+32, ts+19517, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
+		Xsqlite3_str_appendf(tls, bp+32, ts+19560, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(pCsr + 24))))
 	}
 	zSql = Xsqlite3StrAccumFinish(tls, bp+32)
 	if zSql == uintptr(0) {
@@ -129372,12 +130002,12 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 	} else if *(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) != uintptr(0) {
 	} else if (*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask) != 0 {
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = Xsqlite3MPrintf(tls, db,
-			ts+19521, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
+			ts+19564, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azObj)), *(*uintptr)(unsafe.Pointer(azObj + 1*8)),
 				azAlterType[(*InitData)(unsafe.Pointer(pData)).FmInitFlags&U32(INITFLAG_AlterMask)-U32(1)],
 				zExtra))
 		(*InitData)(unsafe.Pointer(pData)).Frc = SQLITE_ERROR
 	} else if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_WriteSchema) != 0 {
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136321)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137196)
 	} else {
 		var z uintptr
 		var zObj uintptr
@@ -129386,19 +130016,19 @@ func corruptSchema(tls *libc.TLS, pData uintptr, azObj uintptr, zExtra uintptr)
 		} else {
 			zObj = ts + 6360
 		}
-		z = Xsqlite3MPrintf(tls, db, ts+19549, libc.VaList(bp+32, zObj))
+		z = Xsqlite3MPrintf(tls, db, ts+19592, libc.VaList(bp+32, zObj))
 		if zExtra != 0 && *(*int8)(unsafe.Pointer(zExtra)) != 0 {
-			z = Xsqlite3MPrintf(tls, db, ts+19580, libc.VaList(bp+40, z, zExtra))
+			z = Xsqlite3MPrintf(tls, db, ts+19623, libc.VaList(bp+40, z, zExtra))
 		}
 		*(*uintptr)(unsafe.Pointer((*InitData)(unsafe.Pointer(pData)).FpzErrMsg)) = z
-		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 136328)
+		(*InitData)(unsafe.Pointer(pData)).Frc = Xsqlite3CorruptError(tls, 137203)
 	}
 }
 
 var azAlterType = [3]uintptr{
-	ts + 19588,
-	ts + 19595,
-	ts + 19607,
+	ts + 19631,
+	ts + 19638,
+	ts + 19650,
 }
 
 // Check to see if any sibling index (another index on the same table)
@@ -129458,7 +130088,7 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), db+192) == 0 ||
 			(*Sqlite3)(unsafe.Pointer(db)).Finit.FnewTnum > (*InitData)(unsafe.Pointer(pData)).FmxPage && (*InitData)(unsafe.Pointer(pData)).FmxPage > Pgno(0) {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+15487)
+				corruptSchema(tls, pData, argv, ts+15497)
 			}
 		}
 		libc.SetBitFieldPtr8Uint32(db+192+8, uint32(0), 0, 0x1)
@@ -129490,13 +130120,13 @@ func Xsqlite3InitCallback(tls *libc.TLS, pInit uintptr, argc int32, argv uintptr
 		var pIndex uintptr
 		pIndex = Xsqlite3FindIndex(tls, db, *(*uintptr)(unsafe.Pointer(argv + 1*8)), (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName)
 		if pIndex == uintptr(0) {
-			corruptSchema(tls, pData, argv, ts+19618)
+			corruptSchema(tls, pData, argv, ts+19661)
 		} else if Xsqlite3GetUInt32(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)), pIndex+88) == 0 ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum < Pgno(2) ||
 			(*Index)(unsafe.Pointer(pIndex)).Ftnum > (*InitData)(unsafe.Pointer(pData)).FmxPage ||
 			Xsqlite3IndexHasDuplicateRootPage(tls, pIndex) != 0 {
 			if Xsqlite3Config.FbExtraSchemaChecks != 0 {
-				corruptSchema(tls, pData, argv, ts+15487)
+				corruptSchema(tls, pData, argv, ts+15497)
 			}
 		}
 	}
@@ -129529,16 +130159,16 @@ func Xsqlite3InitOne(tls *libc.TLS, db uintptr, iDb int32, pzErrMsg uintptr, mFl
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(1)
 
-	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 10166
+	*(*uintptr)(unsafe.Pointer(bp + 16)) = ts + 10228
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 1*8)) = libc.AssignUintptr(&zSchemaTabName, func() uintptr {
 		if !(0 != 0) && iDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}())
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 2*8)) = *(*uintptr)(unsafe.Pointer(bp + 16 + 1*8))
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 9230
-	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 19631
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 3*8)) = ts + 9290
+	*(*uintptr)(unsafe.Pointer(bp + 16 + 4*8)) = ts + 19674
 	*(*uintptr)(unsafe.Pointer(bp + 16 + 5*8)) = uintptr(0)
 	(*InitData)(unsafe.Pointer(bp + 64)).Fdb = db
 	(*InitData)(unsafe.Pointer(bp + 64)).FiDb = iDb
@@ -129616,17 +130246,26 @@ __8:
 	encoding = U8(SQLITE_UTF8)
 __12:
 	;
+	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 0 && int32(encoding) != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
+		goto __13
+	}
+	rc = SQLITE_LOCKED
+	goto initone_error_out
+	goto __14
+__13:
 	Xsqlite3SetTextEncoding(tls, db, encoding)
+__14:
+	;
 	goto __11
 __10:
 	if !(*(*int32)(unsafe.Pointer(bp + 104 + 4*4))&3 != int32((*Sqlite3)(unsafe.Pointer(db)).Fenc)) {
-		goto __13
+		goto __15
 	}
 	Xsqlite3SetString(tls, pzErrMsg, db,
-		ts+13065)
+		ts+13127)
 	rc = SQLITE_ERROR
 	goto initone_error_out
-__13:
+__15:
 	;
 __11:
 	;
@@ -129635,44 +130274,44 @@ __9:
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fenc = (*Sqlite3)(unsafe.Pointer(db)).Fenc
 
 	if !((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size == 0) {
-		goto __14
+		goto __16
 	}
 	size = Xsqlite3AbsInt32(tls, *(*int32)(unsafe.Pointer(bp + 104 + 2*4)))
 	if !(size == 0) {
-		goto __15
+		goto __17
 	}
 	size = -2000
-__15:
+__17:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size = size
 	Xsqlite3BtreeSetCacheSize(tls, (*Db)(unsafe.Pointer(pDb)).FpBt, (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Fcache_size)
-__14:
+__16:
 	;
 	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(*(*int32)(unsafe.Pointer(bp + 104 + 1*4)))
 	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) == 0) {
-		goto __16
-	}
-	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
-__16:
-	;
-	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
-		goto __17
-	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+19703)
-	rc = SQLITE_ERROR
-	goto initone_error_out
-__17:
-	;
-	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
 		goto __18
 	}
-	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+	(*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format = U8(1)
 __18:
+	;
+	if !(int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer(pDb)).FpSchema)).Ffile_format) > SQLITE_MAX_FILE_FORMAT) {
+		goto __19
+	}
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+19746)
+	rc = SQLITE_ERROR
+	goto initone_error_out
+__19:
+	;
+	if !(iDb == 0 && *(*int32)(unsafe.Pointer(bp + 104 + 1*4)) >= 4) {
+		goto __20
+	}
+	*(*U64)(unsafe.Pointer(db + 48)) &= libc.CplUint64(uint64(SQLITE_LegacyFileFmt))
+__20:
 	;
 	(*InitData)(unsafe.Pointer(bp + 64)).FmxPage = Xsqlite3BtreeLastPage(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 	zSql = Xsqlite3MPrintf(tls, db,
-		ts+19727,
+		ts+19770,
 		libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zSchemaTabName))
 
 	xAuth = (*Sqlite3)(unsafe.Pointer(db)).FxAuth
@@ -129683,57 +130322,57 @@ __18:
 	(*Sqlite3)(unsafe.Pointer(db)).FxAuth = xAuth
 
 	if !(rc == SQLITE_OK) {
-		goto __19
+		goto __21
 	}
 	rc = (*InitData)(unsafe.Pointer(bp + 64)).Frc
-__19:
+__21:
 	;
 	Xsqlite3DbFree(tls, db, zSql)
 	if !(rc == SQLITE_OK) {
-		goto __20
+		goto __22
 	}
 	Xsqlite3AnalysisLoad(tls, db, iDb)
-__20:
+__22:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __21
+		goto __23
 	}
 	rc = SQLITE_NOMEM
 	Xsqlite3ResetAllSchemasOfConnection(tls, db)
 	pDb = (*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32
-	goto __22
-__21:
+	goto __24
+__23:
 	if !(rc == SQLITE_OK || (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_NoSchemaError) != 0 && rc != SQLITE_NOMEM) {
-		goto __23
+		goto __25
 	}
 
 	*(*U16)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema + 114)) |= U16(DB_SchemaLoaded)
 	rc = SQLITE_OK
-__23:
+__25:
 	;
-__22:
+__24:
 	;
 initone_error_out:
 	if !(openedTransaction != 0) {
-		goto __24
+		goto __26
 	}
 	Xsqlite3BtreeCommit(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
-__24:
+__26:
 	;
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer(pDb)).FpBt)
 
 error_out:
 	if !(rc != 0) {
-		goto __25
+		goto __27
 	}
 	if !(rc == SQLITE_NOMEM || rc == SQLITE_IOERR|int32(12)<<8) {
-		goto __26
+		goto __28
 	}
 	Xsqlite3OomFault(tls, db)
-__26:
+__28:
 	;
 	Xsqlite3ResetOneSchema(tls, db, iDb)
-__25:
+__27:
 	;
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.Fbusy = U8(0)
 	return rc
@@ -129822,8 +130461,10 @@ func schemaIsValid(tls *libc.TLS, pParse uintptr) {
 		Xsqlite3BtreeGetMeta(tls, pBt, BTREE_SCHEMA_VERSION, bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) != (*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).Fschema_cookie {
+			if int32((*Schema)(unsafe.Pointer((*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FpSchema)).FschemaFlags)&DB_SchemaLoaded == DB_SchemaLoaded {
+				(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
+			}
 			Xsqlite3ResetOneSchema(tls, db, iDb)
-			(*Parse)(unsafe.Pointer(pParse)).Frc = SQLITE_SCHEMA
 		}
 
 		if openedTransaction != 0 {
@@ -129936,8 +130577,8 @@ func Xsqlite3ParserAddCleanup(tls *libc.TLS, pParse uintptr, xCleanup uintptr, p
 // Caution:  Do not confuse this routine with sqlite3ParseObjectInit() which
 // is generated by Lemon.
 func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, pParse+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 
 	(*Parse)(unsafe.Pointer(pParse)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = pParse
@@ -129948,8 +130589,8 @@ func Xsqlite3ParseObjectInit(tls *libc.TLS, pParse uintptr, db uintptr) {
 }
 
 func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepFlags U32, pReprepare uintptr, ppStmt uintptr, pzTail uintptr) int32 {
-	bp := tls.Alloc(432)
-	defer tls.Free(432)
+	bp := tls.Alloc(440)
+	defer tls.Free(440)
 
 	var rc int32
 	var i int32
@@ -129961,8 +130602,8 @@ func sqlite3Prepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, prepF
 	var pT uintptr
 	rc = SQLITE_OK
 
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+224)-uint64(uintptr(0)+8))
-	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+280)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+280))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+8)), 0, uint64(uintptr(0)+228)-uint64(uintptr(0)+8))
+	libc.Xmemset(tls, bp+16+uintptr(uint64(uintptr(0)+288)), 0, uint64(unsafe.Sizeof(Parse{}))-uint64(uintptr(0)+288))
 	(*Parse)(unsafe.Pointer(bp + 16)).FpOuterParse = (*Sqlite3)(unsafe.Pointer(db)).FpParse
 	(*Sqlite3)(unsafe.Pointer(db)).FpParse = bp + 16
 	(*Parse)(unsafe.Pointer(bp + 16)).Fdb = db
@@ -130002,7 +130643,7 @@ __4:
 		goto __8
 	}
 	zDb = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(i)*32)).FzDbSName
-	Xsqlite3ErrorWithMsg(tls, db, rc, ts+19761, libc.VaList(bp, zDb))
+	Xsqlite3ErrorWithMsg(tls, db, rc, ts+19804, libc.VaList(bp, zDb))
 
 	goto end_prepare
 __8:
@@ -130032,7 +130673,7 @@ __9:
 	if !(nBytes > mxLen) {
 		goto __12
 	}
-	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+19791, 0)
+	Xsqlite3ErrorWithMsg(tls, db, SQLITE_TOOBIG, ts+19834, 0)
 	rc = Xsqlite3ApiExit(tls, db, SQLITE_TOOBIG)
 	goto end_prepare
 __12:
@@ -130128,7 +130769,7 @@ func sqlite3LockAndPrepare(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137115)
+		return Xsqlite3MisuseError(tls, 137995)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	Xsqlite3BtreeEnterAll(tls, db)
@@ -130227,7 +130868,7 @@ func sqlite3Prepare16(tls *libc.TLS, db uintptr, zSql uintptr, nBytes int32, pre
 
 	*(*uintptr)(unsafe.Pointer(ppStmt)) = uintptr(0)
 	if !(Xsqlite3SafetyCheckOk(tls, db) != 0) || zSql == uintptr(0) {
-		return Xsqlite3MisuseError(tls, 137263)
+		return Xsqlite3MisuseError(tls, 138143)
 	}
 	if nBytes >= 0 {
 		var sz int32
@@ -130545,8 +131186,8 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 		}
 	}
 	if jointype&(JT_INNER|JT_OUTER) == JT_INNER|JT_OUTER || jointype&JT_ERROR != 0 || jointype&(JT_OUTER|JT_LEFT|JT_RIGHT) == JT_OUTER {
-		var zSp1 uintptr = ts + 12210
-		var zSp2 uintptr = ts + 12210
+		var zSp1 uintptr = ts + 12272
+		var zSp2 uintptr = ts + 12272
 		if pB == uintptr(0) {
 			zSp1++
 		}
@@ -130554,13 +131195,13 @@ func Xsqlite3JoinType(tls *libc.TLS, pParse uintptr, pA uintptr, pB uintptr, pC
 			zSp2++
 		}
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+19810, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
+			ts+19853, libc.VaList(bp, pA, zSp1, pB, zSp2, pC))
 		jointype = JT_INNER
 	}
 	return jointype
 }
 
-var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 19840))
+var zKeyText = *(*[34]int8)(unsafe.Pointer(ts + 19883))
 var aKeyword = [7]struct {
 	Fi     U8
 	FnChar U8
@@ -130735,7 +131376,7 @@ __1:
 			var pUsing uintptr = uintptr(0)
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x400>>10)) != 0 || *(*uintptr)(unsafe.Pointer(pRight + 72)) != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+19874, libc.VaList(bp, 0))
+					ts+19917, libc.VaList(bp, 0))
 				return 1
 			}
 			for j = 0; j < int32((*Table)(unsafe.Pointer(pRightTab)).FnCol); j++ {
@@ -130780,7 +131421,7 @@ __1:
 					tableAndColumnIndex(tls, pSrc, 0, i, zName, bp+24, bp+28,
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) == 0 {
 					Xsqlite3ErrorMsg(tls, pParse,
-						ts+19924, libc.VaList(bp+8, zName))
+						ts+19967, libc.VaList(bp+8, zName))
 					return 1
 				}
 				pE1 = Xsqlite3CreateColumnExpr(tls, db, pSrc, *(*int32)(unsafe.Pointer(bp + 24)), *(*int32)(unsafe.Pointer(bp + 28)))
@@ -130791,7 +131432,7 @@ __1:
 						int32(*(*uint16)(unsafe.Pointer(pRight + 60 + 4))&0x1000>>12)) != 0 {
 						if int32(*(*uint16)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 60 + 4))&0x400>>10) == 0 ||
 							Xsqlite3IdListIndex(tls, *(*uintptr)(unsafe.Pointer(pSrc + 8 + uintptr(*(*int32)(unsafe.Pointer(bp + 24)))*104 + 72)), zName) < 0 {
-							Xsqlite3ErrorMsg(tls, pParse, ts+19988,
+							Xsqlite3ErrorMsg(tls, pParse, ts+20031,
 								libc.VaList(bp+16, zName))
 							break
 						}
@@ -130835,7 +131476,7 @@ __3:
 	return 0
 }
 
-var tkCoalesce = Token{Fz: ts + 7878, Fn: uint32(8)}
+var tkCoalesce = Token{Fz: ts + 7938, Fn: uint32(8)}
 
 // An instance of this object holds information (beyond pParse and pSelect)
 // needed to load the next result row that is to be added to the sorter.
@@ -131182,9 +131823,6 @@ func selectInnerLoop(tls *libc.TLS, pParse uintptr, p uintptr, srcTab int32, pSo
 			var r1 int32 = Xsqlite3GetTempRange(tls, pParse, nPrefixReg+1)
 
 			Xsqlite3VdbeAddOp3(tls, v, OP_MakeRecord, regResult, nResultCol, r1+nPrefixReg)
-			if (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst != 0 {
-				Xsqlite3VdbeChangeP4(tls, v, -1, (*SelectDest)(unsafe.Pointer(pDest)).FzAffSdst, nResultCol)
-			}
 			if eDest == SRT_DistFifo {
 				var addr int32 = Xsqlite3VdbeCurrentAddr(tls, v) + 4
 				Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iParm+1, addr, r1, 0)
@@ -131422,16 +132060,16 @@ func Xsqlite3SelectOpName(tls *libc.TLS, id int32) uintptr {
 	var z uintptr
 	switch id {
 	case TK_ALL:
-		z = ts + 20025
+		z = ts + 20068
 		break
 	case TK_INTERSECT:
-		z = ts + 20035
+		z = ts + 20078
 		break
 	case TK_EXCEPT:
-		z = ts + 20045
+		z = ts + 20088
 		break
 	default:
-		z = ts + 20052
+		z = ts + 20095
 		break
 	}
 	return z
@@ -131441,10 +132079,13 @@ func explainTempTable(tls *libc.TLS, pParse uintptr, zUsage uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20058, libc.VaList(bp, zUsage))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20101, libc.VaList(bp, zUsage))
 }
 
 func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, nColumn int32, pDest uintptr) {
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
+
 	var v uintptr = (*Parse)(unsafe.Pointer(pParse)).FpVdbe
 	var addrBreak int32 = (*SortCtx)(unsafe.Pointer(pSort)).FlabelDone
 	var addrContinue int32 = Xsqlite3VdbeMakeLabel(tls, pParse)
@@ -131464,6 +132105,13 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	var nRefKey int32 = 0
 	var aOutEx uintptr = (*Select)(unsafe.Pointer(p)).FpEList + 8
 
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20124, libc.VaList(bp, func() uintptr {
+		if (*SortCtx)(unsafe.Pointer(pSort)).FnOBSat > 0 {
+			return ts + 20155
+		}
+		return ts + 1544
+	}()))
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut != 0 {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Gosub, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn, (*SortCtx)(unsafe.Pointer(pSort)).FlabelBkOut)
 		Xsqlite3VdbeGoto(tls, v, addrBreak)
@@ -131530,6 +132178,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 
 		}
 	}
+
 	switch eDest {
 	case SRT_Table:
 		fallthrough
@@ -131594,6 +132243,7 @@ func generateSortTail(tls *libc.TLS, pParse uintptr, p uintptr, pSort uintptr, n
 	} else {
 		Xsqlite3VdbeAddOp2(tls, v, OP_Next, iTab, addr)
 	}
+
 	if (*SortCtx)(unsafe.Pointer(pSort)).FregReturn != 0 {
 		Xsqlite3VdbeAddOp1(tls, v, OP_Return, (*SortCtx)(unsafe.Pointer(pSort)).FregReturn)
 	}
@@ -131648,7 +132298,7 @@ func columnTypeImpl(tls *libc.TLS, pNC uintptr, pExpr uintptr, pzOrigDb uintptr,
 
 				if iCol < 0 {
 					zType = ts + 1109
-					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 17609
+					*(*uintptr)(unsafe.Pointer(bp + 72)) = ts + 17625
 				} else {
 					*(*uintptr)(unsafe.Pointer(bp + 72)) = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 					zType = Xsqlite3ColumnType(tls, (*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(iCol)*24, uintptr(0))
@@ -131787,13 +132437,13 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 			}
 
 			if iCol < 0 {
-				zCol = ts + 17609
+				zCol = ts + 17625
 			} else {
 				zCol = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 			}
 			if fullName != 0 {
 				var zName uintptr = uintptr(0)
-				zName = Xsqlite3MPrintf(tls, db, ts+13351, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
+				zName = Xsqlite3MPrintf(tls, db, ts+13413, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, zCol))
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zName, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3OomClear})))
 			} else {
 				Xsqlite3VdbeSetColName(tls, v, i, COLNAME_NAME, zCol, libc.UintptrFromInt32(-1))
@@ -131801,7 +132451,7 @@ func Xsqlite3GenerateColumnNames(tls *libc.TLS, pParse uintptr, pSelect uintptr)
 		} else {
 			var z uintptr = (*ExprList_item)(unsafe.Pointer(pEList + 8 + uintptr(i)*32)).FzEName
 			if z == uintptr(0) {
-				z = Xsqlite3MPrintf(tls, db, ts+20081, libc.VaList(bp+16, i+1))
+				z = Xsqlite3MPrintf(tls, db, ts+20170, libc.VaList(bp+16, i+1))
 			} else {
 				z = Xsqlite3DbStrDup(tls, db, z)
 			}
@@ -131866,7 +132516,7 @@ func Xsqlite3ColumnsFromExprList(tls *libc.TLS, pParse uintptr, pEList uintptr,
 	i = 0
 	pCol = aCol
 __1:
-	if !(i < nCol && !(int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) != 0)) {
+	if !(i < nCol && !((*Parse)(unsafe.Pointer(pParse)).FnErr != 0)) {
 		goto __3
 	}
 	{
@@ -131891,7 +132541,7 @@ __1:
 				if iCol >= 0 {
 					zName = (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(iCol)*24)).FzCnName
 				} else {
-					zName = ts + 17609
+					zName = ts + 17625
 				}
 			} else if int32((*Expr)(unsafe.Pointer(pColExpr)).Fop) == TK_ID {
 				zName = *(*uintptr)(unsafe.Pointer(pColExpr + 8))
@@ -131901,7 +132551,7 @@ __1:
 		if zName != 0 && !(Xsqlite3IsTrueOrFalse(tls, zName) != 0) {
 			zName = Xsqlite3DbStrDup(tls, db, zName)
 		} else {
-			zName = Xsqlite3MPrintf(tls, db, ts+20081, libc.VaList(bp, i+1))
+			zName = Xsqlite3MPrintf(tls, db, ts+20170, libc.VaList(bp, i+1))
 		}
 
 		*(*U32)(unsafe.Pointer(bp + 56)) = U32(0)
@@ -131917,7 +132567,8 @@ __1:
 					nName = j
 				}
 			}
-			zName = Xsqlite3MPrintf(tls, db, ts+20090, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			zName = Xsqlite3MPrintf(tls, db, ts+20179, libc.VaList(bp+8, nName, zName, libc.PreIncUint32(&*(*U32)(unsafe.Pointer(bp + 56)), 1)))
+			Xsqlite3ProgressCheck(tls, pParse)
 			if *(*U32)(unsafe.Pointer(bp + 56)) > U32(3) {
 				Xsqlite3_randomness(tls, int32(unsafe.Sizeof(U32(0))), bp+56)
 			}
@@ -131942,45 +132593,48 @@ __2:
 __3:
 	;
 	Xsqlite3HashClear(tls, bp+32)
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		for j = 0; j < i; j++ {
 			Xsqlite3DbFree(tls, db, (*Column)(unsafe.Pointer(aCol+uintptr(j)*24)).FzCnName)
 		}
 		Xsqlite3DbFree(tls, db, aCol)
 		*(*uintptr)(unsafe.Pointer(paCol)) = uintptr(0)
 		*(*I16)(unsafe.Pointer(pnCol)) = int16(0)
-		return SQLITE_NOMEM
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 	return SQLITE_OK
 }
 
-// Add type and collation information to a column list based on
-// a SELECT statement.
+// pTab is a transient Table object that represents a subquery of some
+// kind (maybe a parenthesized subquery in the FROM clause of a larger
+// query, or a VIEW, or a CTE).  This routine computes type information
+// for that Table object based on the Select object that implements the
+// subquery.  For the purposes of this routine, "type infomation" means:
 //
-// The column list presumably came from selectColumnNamesFromExprList().
-// The column list has only names, not types or collations.  This
-// routine goes through and adds the types and collations.
-//
-// This routine requires that all identifiers in the SELECT
-// statement be resolved.
-func Xsqlite3SelectAddColumnTypeAndCollation(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
+//   - The datatype name, as it might appear in a CREATE TABLE statement
+//   - Which collating sequence to use for the column
+//   - The affinity of the column
+func Xsqlite3SubqueryColumnTypes(tls *libc.TLS, pParse uintptr, pTab uintptr, pSelect uintptr, aff int8) {
 	bp := tls.Alloc(56)
 	defer tls.Free(56)
 
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
-
 	var pCol uintptr
 	var pColl uintptr
 	var i int32
+	var j int32
 	var p uintptr
 	var a uintptr
 
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return
 	}
+	for (*Select)(unsafe.Pointer(pSelect)).FpPrior != 0 {
+		pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior
+	}
+	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(NameContext{})))
 	(*NameContext)(unsafe.Pointer(bp)).FpSrcList = (*Select)(unsafe.Pointer(pSelect)).FpSrc
-	a = (*Select)(unsafe.Pointer(pSelect)).FpEList + 8
 	i = 0
 	pCol = (*Table)(unsafe.Pointer(pTab)).FaCol
 __1:
@@ -131990,14 +132644,46 @@ __1:
 	{
 		var zType uintptr
 		var n I64
-		var m I64
 		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(int32((*Column)(unsafe.Pointer(pCol)).FcolFlags) & COLFLAG_NOINSERT)
 		p = (*ExprList_item)(unsafe.Pointer(a + uintptr(i)*32)).FpExpr
-		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
 
 		(*Column)(unsafe.Pointer(pCol)).Faffinity = Xsqlite3ExprAffinity(tls, p)
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
+		} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && int32((*Expr)(unsafe.Pointer(p)).Fop) == TK_CAST {
+			(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_FLEXNUM)
+		}
+		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_TEXT && (*Select)(unsafe.Pointer(pSelect)).FpNext != 0 {
+			var m int32 = 0
+			var pS2 uintptr
+			m = 0
+			pS2 = (*Select)(unsafe.Pointer(pSelect)).FpNext
+			for ; pS2 != 0; pS2 = (*Select)(unsafe.Pointer(pS2)).FpNext {
+				m = m | Xsqlite3ExprDataType(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pS2)).FpEList+8+uintptr(i)*32)).FpExpr)
+			}
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_TEXT && m&0x01 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			} else if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) >= SQLITE_AFF_NUMERIC && m&0x02 != 0 {
+				(*Column)(unsafe.Pointer(pCol)).Faffinity = int8(SQLITE_AFF_BLOB)
+			}
+		}
+		zType = columnTypeImpl(tls, bp, p, uintptr(0), uintptr(0), uintptr(0))
+		if zType == uintptr(0) || int32((*Column)(unsafe.Pointer(pCol)).Faffinity) != int32(Xsqlite3AffinityType(tls, zType, uintptr(0))) {
+			if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_NUMERIC ||
+				int32((*Column)(unsafe.Pointer(pCol)).Faffinity) == SQLITE_AFF_FLEXNUM {
+				zType = ts + 20187
+			} else {
+				zType = uintptr(0)
+				for j = 1; j < SQLITE_N_STDTYPE; j++ {
+					if int32(Xsqlite3StdTypeAffinity[j]) == int32((*Column)(unsafe.Pointer(pCol)).Faffinity) {
+						zType = Xsqlite3StdType[j]
+						break
+					}
+				}
+			}
+		}
 		if zType != 0 {
-			m = I64(Xsqlite3Strlen30(tls, zType))
+			var m I64 = I64(Xsqlite3Strlen30(tls, zType))
 			n = I64(Xsqlite3Strlen30(tls, (*Column)(unsafe.Pointer(pCol)).FzCnName))
 			(*Column)(unsafe.Pointer(pCol)).FzCnName = Xsqlite3DbReallocOrFree(tls, db, (*Column)(unsafe.Pointer(pCol)).FzCnName, uint64(n+m+int64(2)))
 			if (*Column)(unsafe.Pointer(pCol)).FzCnName != 0 {
@@ -132007,9 +132693,6 @@ __1:
 				*(*U16)(unsafe.Pointer(pCol + 16)) &= libc.Uint16FromInt32(libc.CplInt32(COLFLAG_HASTYPE | COLFLAG_HASCOLL))
 			}
 		}
-		if int32((*Column)(unsafe.Pointer(pCol)).Faffinity) <= SQLITE_AFF_NONE {
-			(*Column)(unsafe.Pointer(pCol)).Faffinity = aff
-		}
 		pColl = Xsqlite3ExprCollSeq(tls, pParse, p)
 		if pColl != 0 {
 			Xsqlite3ColumnSetColl(tls, db, pCol, (*CollSeq)(unsafe.Pointer(pColl)).FzName)
@@ -132053,7 +132736,7 @@ func Xsqlite3ResultSetOfSelect(tls *libc.TLS, pParse uintptr, pSelect uintptr, a
 	(*Table)(unsafe.Pointer(pTab)).FzName = uintptr(0)
 	(*Table)(unsafe.Pointer(pTab)).FnRowLogEst = int16(200)
 	Xsqlite3ColumnsFromExprList(tls, pParse, (*Select)(unsafe.Pointer(pSelect)).FpEList, pTab+54, pTab+8)
-	Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSelect, aff)
+	Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSelect, aff)
 	(*Table)(unsafe.Pointer(pTab)).FiPKey = int16(-1)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		Xsqlite3DeleteTable(tls, db, pTab)
@@ -132204,7 +132887,7 @@ func generateWithRecursiveQuery(tls *libc.TLS, pParse uintptr, p uintptr, pDest
 	if !((*Select)(unsafe.Pointer(p)).FpWin != 0) {
 		goto __1
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20098, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20191, 0)
 	return
 __1:
 	;
@@ -132295,7 +132978,7 @@ __12:
 	if !((*Select)(unsafe.Pointer(pFirstRec)).FselFlags&U32(SF_Aggregate) != 0) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+20147, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+20240, 0)
 	goto end_of_recursive_query
 __15:
 	;
@@ -132315,7 +132998,7 @@ __14:
 	;
 	pSetup = (*Select)(unsafe.Pointer(pFirstRec)).FpPrior
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20189, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20282, 0)
 	rc = Xsqlite3Select(tls, pParse, pSetup, bp)
 	(*Select)(unsafe.Pointer(pSetup)).FpNext = p
 	if !(rc != 0) {
@@ -132352,7 +133035,7 @@ __20:
 	Xsqlite3VdbeResolveLabel(tls, v, addrCont)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = uintptr(0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20195, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20288, 0)
 	Xsqlite3Select(tls, pParse, p, bp)
 
 	(*Select)(unsafe.Pointer(pFirstRec)).FpPrior = pSetup
@@ -132386,11 +133069,11 @@ func multiSelectValues(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 		p = (*Select)(unsafe.Pointer(p)).FpPrior
 		nRow = nRow + bShowAll
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20210, libc.VaList(bp, nRow, func() uintptr {
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20303, libc.VaList(bp, nRow, func() uintptr {
 		if nRow == 1 {
 			return ts + 1544
 		}
-		return ts + 20233
+		return ts + 20326
 	}()))
 	for p != 0 {
 		selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0), pDest, 1, 1)
@@ -132491,8 +133174,8 @@ __6:
 	if !((*Select)(unsafe.Pointer(pPrior)).FpPrior == uintptr(0)) {
 		goto __8
 	}
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20235, 0)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20250, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20328, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20343, 0)
 __8:
 	;
 	switch int32((*Select)(unsafe.Pointer(p)).Fop) {
@@ -132539,7 +133222,7 @@ __16:
 	;
 __15:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20025, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20068, 0)
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+16)
 
@@ -132606,7 +133289,7 @@ __23:
 	pLimit = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 64)).FeDest = op
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20269, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20362, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+64)
 
@@ -132668,7 +133351,7 @@ __26:
 	pLimit1 = (*Select)(unsafe.Pointer(p)).FpLimit
 	(*Select)(unsafe.Pointer(p)).FpLimit = uintptr(0)
 	(*SelectDest)(unsafe.Pointer(bp + 104)).FiSDParm = tab2
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20269, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20362, libc.VaList(bp+8, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	rc = Xsqlite3Select(tls, pParse, p, bp+104)
 
@@ -132821,10 +133504,10 @@ func Xsqlite3SelectWrongNumTermsError(tls *libc.TLS, pParse uintptr, p uintptr)
 	defer tls.Free(8)
 
 	if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Values) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+20290, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+20383, 0)
 	} else {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+20336,
+			ts+20429,
 			libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 	}
 }
@@ -133078,8 +133761,8 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	(*Select)(unsafe.Pointer(pPrior)).FpNext = uintptr(0)
 
 	(*Select)(unsafe.Pointer(pPrior)).FpOrderBy = Xsqlite3ExprListDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pOrderBy, 0)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8526)
-	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+8526)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, p, (*Select)(unsafe.Pointer(p)).FpOrderBy, ts+8586)
+	Xsqlite3ResolveOrderGroupBy(tls, pParse, pPrior, (*Select)(unsafe.Pointer(pPrior)).FpOrderBy, ts+8586)
 
 	computeLimitRegisters(tls, pParse, p, labelEnd)
 	if (*Select)(unsafe.Pointer(p)).FiLimit != 0 && op == TK_ALL {
@@ -133106,13 +133789,13 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	Xsqlite3SelectDestInit(tls, bp+8, SRT_Coroutine, regAddrA)
 	Xsqlite3SelectDestInit(tls, bp+48, SRT_Coroutine, regAddrB)
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20418, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20511, libc.VaList(bp, Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(p)).Fop))))
 
 	addrSelectA = Xsqlite3VdbeCurrentAddr(tls, v) + 1
 	addr1 = Xsqlite3VdbeAddOp3(tls, v, OP_InitCoroutine, regAddrA, 0, addrSelectA)
 
 	(*Select)(unsafe.Pointer(pPrior)).FiLimit = regLimitA
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20429, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20522, 0)
 	Xsqlite3Select(tls, pParse, pPrior, bp+8)
 	Xsqlite3VdbeEndCoroutine(tls, v, regAddrA)
 	Xsqlite3VdbeJumpHere(tls, v, addr1)
@@ -133124,7 +133807,7 @@ func multiSelectOrderBy(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr)
 	savedOffset = (*Select)(unsafe.Pointer(p)).FiOffset
 	(*Select)(unsafe.Pointer(p)).FiLimit = regLimitB
 	(*Select)(unsafe.Pointer(p)).FiOffset = 0
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20434, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+20527, 0)
 	Xsqlite3Select(tls, pParse, p, bp+48)
 	(*Select)(unsafe.Pointer(p)).FiLimit = savedLimit
 	(*Select)(unsafe.Pointer(p)).FiOffset = savedOffset
@@ -133539,6 +134222,25 @@ func findLeftmostExprlist(tls *libc.TLS, pSel uintptr) uintptr {
 	return (*Select)(unsafe.Pointer(pSel)).FpEList
 }
 
+func compoundHasDifferentAffinities(tls *libc.TLS, p uintptr) int32 {
+	var ii int32
+	var pList uintptr
+
+	pList = (*Select)(unsafe.Pointer(p)).FpEList
+	for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+		var aff int8
+		var pSub1 uintptr
+
+		aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+		for pSub1 = (*Select)(unsafe.Pointer(p)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
+			if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
+				return 1
+			}
+		}
+	}
+	return 0
+}
+
 func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAgg int32) int32 {
 	bp := tls.Alloc(88)
 	defer tls.Free(88)
@@ -133658,15 +134360,8 @@ func flattenSubquery(tls *libc.TLS, pParse uintptr, p uintptr, iFrom int32, isAg
 			return 0
 		}
 
-		for ii = 0; ii < (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr; ii++ {
-			var aff int8
-
-			aff = Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList+8+uintptr(ii)*32)).FpExpr)
-			for pSub1 = (*Select)(unsafe.Pointer(pSub)).FpPrior; pSub1 != 0; pSub1 = (*Select)(unsafe.Pointer(pSub1)).FpPrior {
-				if int32(Xsqlite3ExprAffinity(tls, (*ExprList_item)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub1)).FpEList+8+uintptr(ii)*32)).FpExpr)) != int32(aff) {
-					return 0
-				}
-			}
+		if compoundHasDifferentAffinities(tls, pSub) != 0 {
+			return 0
 		}
 
 		if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 1 {
@@ -134042,16 +134737,33 @@ func pushDownWhereTerms(tls *libc.TLS, pParse uintptr, pSubq uintptr, pWhere uin
 
 	if (*Select)(unsafe.Pointer(pSubq)).FpPrior != 0 {
 		var pSel uintptr
+		var notUnionAll int32 = 0
 		for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
 			var op U8 = (*Select)(unsafe.Pointer(pSel)).Fop
 
 			if int32(op) != TK_ALL && int32(op) != TK_SELECT {
-				return 0
+				notUnionAll = 1
 			}
 			if (*Select)(unsafe.Pointer(pSel)).FpWin != 0 {
 				return 0
 			}
 		}
+		if compoundHasDifferentAffinities(tls, pSubq) != 0 {
+			return 0
+		}
+		if notUnionAll != 0 {
+			for pSel = pSubq; pSel != 0; pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior {
+				var ii int32
+				var pList uintptr = (*Select)(unsafe.Pointer(pSel)).FpEList
+
+				for ii = 0; ii < (*ExprList)(unsafe.Pointer(pList)).FnExpr; ii++ {
+					var pColl uintptr = Xsqlite3ExprCollSeq(tls, pParse, (*ExprList_item)(unsafe.Pointer(pList+8+uintptr(ii)*32)).FpExpr)
+					if !(Xsqlite3IsBinary(tls, pColl) != 0) {
+						return 0
+					}
+				}
+			}
+		}
 	} else {
 		if (*Select)(unsafe.Pointer(pSubq)).FpWin != 0 && (*Window)(unsafe.Pointer((*Select)(unsafe.Pointer(pSubq)).FpWin)).FpPartition == uintptr(0) {
 			return 0
@@ -134111,12 +134823,12 @@ func minMaxQuery(tls *libc.TLS, db uintptr, pFunc uintptr, ppMinMax uintptr) U8
 	}
 
 	zFunc = *(*uintptr)(unsafe.Pointer(pFunc + 8))
-	if Xsqlite3StrICmp(tls, zFunc, ts+16511) == 0 {
+	if Xsqlite3StrICmp(tls, zFunc, ts+16521) == 0 {
 		eRet = WHERE_ORDERBY_MIN
 		if Xsqlite3ExprCanBeNull(tls, (*ExprList_item)(unsafe.Pointer(pEList+8)).FpExpr) != 0 {
 			sortFlags = U8(KEYINFO_ORDER_BIGNULL)
 		}
-	} else if Xsqlite3StrICmp(tls, zFunc, ts+16515) == 0 {
+	} else if Xsqlite3StrICmp(tls, zFunc, ts+16525) == 0 {
 		eRet = WHERE_ORDERBY_MAX
 		sortFlags = U8(KEYINFO_ORDER_DESC)
 	} else {
@@ -134182,7 +134894,7 @@ func Xsqlite3IndexedByLookup(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	for pIdx = (*Table)(unsafe.Pointer(pTab)).FpIndex; pIdx != 0 && Xsqlite3StrICmp(tls, (*Index)(unsafe.Pointer(pIdx)).FzName, zIndexedBy) != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
 	}
 	if !(pIdx != 0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+20440, libc.VaList(bp, zIndexedBy, 0))
+		Xsqlite3ErrorMsg(tls, pParse, ts+20533, libc.VaList(bp, zIndexedBy, 0))
 		(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 		return SQLITE_ERROR
 	}
@@ -134265,7 +134977,7 @@ func cannotBeFunction(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32 {
 	defer tls.Free(8)
 
 	if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x4>>2)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+20458, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+20551, libc.VaList(bp, (*SrcItem)(unsafe.Pointer(pFrom)).FzName))
 		return 1
 	}
 	return 0
@@ -134394,15 +135106,12 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		*(*U32)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom)).FpSelect + 4)) |= U32(SF_CopyCte)
 
 		if uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x2>>1)) != 0 {
-			Xsqlite3ErrorMsg(tls, pParse, ts+20481, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
+			Xsqlite3ErrorMsg(tls, pParse, ts+20574, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(pFrom + 88))))
 			return 2
 		}
 		libc.SetBitFieldPtr16Uint32(pFrom+60+4, uint32(1), 8, 0x100)
 		*(*uintptr)(unsafe.Pointer(pFrom + 96)) = pCteUse
 		(*CteUse)(unsafe.Pointer(pCteUse)).FnUse++
-		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Any {
-			(*CteUse)(unsafe.Pointer(pCteUse)).FeM10d = U8(M10d_Yes)
-		}
 
 		pRecTerm = libc.AssignUintptr(&pSel, (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect)
 		bMayRecursive = libc.Bool32(int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_ALL || int32((*Select)(unsafe.Pointer(pSel)).Fop) == TK_UNION)
@@ -134420,7 +135129,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 					libc.SetBitFieldPtr16Uint32(pItem+60+4, uint32(1), 6, 0x40)
 					if (*Select)(unsafe.Pointer(pRecTerm)).FselFlags&U32(SF_Recursive) != 0 {
 						Xsqlite3ErrorMsg(tls, pParse,
-							ts+20501, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
+							ts+20594, libc.VaList(bp+16, (*Cte)(unsafe.Pointer(pCte)).FzName))
 						return 2
 					}
 					*(*U32)(unsafe.Pointer(pRecTerm + 4)) |= U32(SF_Recursive)
@@ -134436,7 +135145,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 			pRecTerm = (*Select)(unsafe.Pointer(pRecTerm)).FpPrior
 		}
 
-		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20544
+		(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20637
 		pSavedWith = (*Parse)(unsafe.Pointer(pParse)).FpWith
 		(*Parse)(unsafe.Pointer(pParse)).FpWith = *(*uintptr)(unsafe.Pointer(bp + 48))
 		if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
@@ -134462,7 +135171,7 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		pEList = (*Select)(unsafe.Pointer(pLeft)).FpEList
 		if (*Cte)(unsafe.Pointer(pCte)).FpCols != 0 {
 			if pEList != 0 && (*ExprList)(unsafe.Pointer(pEList)).FnExpr != (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr {
-				Xsqlite3ErrorMsg(tls, pParse, ts+20567,
+				Xsqlite3ErrorMsg(tls, pParse, ts+20660,
 					libc.VaList(bp+24, (*Cte)(unsafe.Pointer(pCte)).FzName, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, (*ExprList)(unsafe.Pointer((*Cte)(unsafe.Pointer(pCte)).FpCols)).FnExpr))
 				(*Parse)(unsafe.Pointer(pParse)).FpWith = pSavedWith
 				return 2
@@ -134473,9 +135182,9 @@ func resolveFromTermToCte(tls *libc.TLS, pParse uintptr, pWalker uintptr, pFrom
 		Xsqlite3ColumnsFromExprList(tls, pParse, pEList, pTab+54, pTab+8)
 		if bMayRecursive != 0 {
 			if (*Select)(unsafe.Pointer(pSel)).FselFlags&U32(SF_Recursive) != 0 {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20605
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20698
 			} else {
-				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20639
+				(*Cte)(unsafe.Pointer(pCte)).FzCteErr = ts + 20732
 			}
 			Xsqlite3WalkSelect(tls, pWalker, pSel)
 		}
@@ -134522,7 +135231,7 @@ func Xsqlite3ExpandSubquery(tls *libc.TLS, pParse uintptr, pFrom uintptr) int32
 	if (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias != 0 {
 		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3DbStrDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*SrcItem)(unsafe.Pointer(pFrom)).FzAlias)
 	} else {
-		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+20677, libc.VaList(bp, pFrom))
+		(*Table)(unsafe.Pointer(pTab)).FzName = Xsqlite3MPrintf(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, ts+20770, libc.VaList(bp, pFrom))
 	}
 	for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
 		pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
@@ -134634,7 +135343,7 @@ __1:
 				return WRC_Abort
 			}
 			if (*Table)(unsafe.Pointer(pTab)).FnTabRef >= U32(0xffff) {
-				Xsqlite3ErrorMsg(tls, pParse, ts+20681,
+				Xsqlite3ErrorMsg(tls, pParse, ts+20774,
 					libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 				(*SrcItem)(unsafe.Pointer(pFrom)).FpTab = uintptr(0)
 				return WRC_Abort
@@ -134653,7 +135362,7 @@ __1:
 				if int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW {
 					if (*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_EnableView) == uint64(0) &&
 						(*Table)(unsafe.Pointer(pTab)).FpSchema != (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+1*32)).FpSchema {
-						Xsqlite3ErrorMsg(tls, pParse, ts+20720,
+						Xsqlite3ErrorMsg(tls, pParse, ts+20813,
 							libc.VaList(bp+8, (*Table)(unsafe.Pointer(pTab)).FzName))
 					}
 					(*SrcItem)(unsafe.Pointer(pFrom)).FpSelect = Xsqlite3SelectDup(tls, db, *(*uintptr)(unsafe.Pointer(pTab + 64)), 0)
@@ -134661,7 +135370,7 @@ __1:
 					uint32(int32(*(*uint16)(unsafe.Pointer(pFrom + 60 + 4))&0x80>>7)) != 0 &&
 					*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)) != uintptr(0) &&
 					int32((*VTable)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 16)))).FeVtabRisk) > libc.Bool32((*Sqlite3)(unsafe.Pointer(db)).Fflags&uint64(SQLITE_TrustedSchema) != uint64(0)) {
-					Xsqlite3ErrorMsg(tls, pParse, ts+16080,
+					Xsqlite3ErrorMsg(tls, pParse, ts+16090,
 						libc.VaList(bp+16, (*Table)(unsafe.Pointer(pTab)).FzName))
 				}
 
@@ -134762,7 +135471,7 @@ __3:
 						if iDb >= 0 {
 							zSchemaName = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 						} else {
-							zSchemaName = ts + 7738
+							zSchemaName = ts + 7798
 						}
 					}
 					if i+1 < (*SrcList)(unsafe.Pointer(pTabList)).FnSrc &&
@@ -134777,7 +135486,7 @@ __3:
 							if pNew != 0 {
 								var pX uintptr = pNew + 8 + uintptr((*ExprList)(unsafe.Pointer(pNew)).FnExpr-1)*32
 
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20751, libc.VaList(bp+24, zUName))
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20844, libc.VaList(bp+24, zUName))
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_TAB), 0, 0x3)
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 7, 0x80)
 							}
@@ -134842,7 +135551,7 @@ __3:
 								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, (*ExprList_item)(unsafe.Pointer(pNestedFrom+8+uintptr(j)*32)).FzEName)
 
 							} else {
-								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20756,
+								(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+20849,
 									libc.VaList(bp+32, zSchemaName, zTabName, zName))
 
 							}
@@ -134854,7 +135563,7 @@ __3:
 								libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(1), 8, 0x100)
 							}
 						} else if longNames != 0 {
-							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+13351, libc.VaList(bp+56, zTabName, zName))
+							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3MPrintf(tls, db, ts+13413, libc.VaList(bp+56, zTabName, zName))
 							libc.SetBitFieldPtr16Uint32(pX+16+4, uint32(ENAME_NAME), 0, 0x3)
 						} else {
 							(*ExprList_item)(unsafe.Pointer(pX)).FzEName = Xsqlite3DbStrDup(tls, db, zName)
@@ -134873,9 +135582,9 @@ __3:
 				;
 				if !(tableSeen != 0) {
 					if zTName != 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+20765, libc.VaList(bp+72, zTName))
+						Xsqlite3ErrorMsg(tls, pParse, ts+20858, libc.VaList(bp+72, zTName))
 					} else {
-						Xsqlite3ErrorMsg(tls, pParse, ts+20783, 0)
+						Xsqlite3ErrorMsg(tls, pParse, ts+20876, 0)
 					}
 				}
 			}
@@ -134885,7 +135594,7 @@ __3:
 	}
 	if (*Select)(unsafe.Pointer(p)).FpEList != 0 {
 		if (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpEList)).FnExpr > *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+20803, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+20896, 0)
 			return WRC_Abort
 		}
 		if elistFlags&U32(EP_HasFunc|EP_Subquery) != U32(0) {
@@ -134944,11 +135653,7 @@ __1:
 		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) != U32(0) {
 			var pSel uintptr = (*SrcItem)(unsafe.Pointer(pFrom)).FpSelect
 			if pSel != 0 {
-				for (*Select)(unsafe.Pointer(pSel)).FpPrior != 0 {
-					pSel = (*Select)(unsafe.Pointer(pSel)).FpPrior
-				}
-				Xsqlite3SelectAddColumnTypeAndCollation(tls, pParse, pTab, pSel,
-					int8(SQLITE_AFF_NONE))
+				Xsqlite3SubqueryColumnTypes(tls, pParse, pTab, pSel, int8(SQLITE_AFF_NONE))
 			}
 		}
 
@@ -135007,6 +135712,81 @@ func Xsqlite3SelectPrep(tls *libc.TLS, pParse uintptr, p uintptr, pOuterNC uintp
 	sqlite3SelectAddTypeInfo(tls, pParse, p)
 }
 
+func analyzeAggFuncArgs(tls *libc.TLS, pAggInfo uintptr, pNC uintptr) {
+	var i int32
+
+	*(*int32)(unsafe.Pointer(pNC + 40)) |= NC_InAggFunc
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		var pExpr uintptr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*24)).FpFExpr
+
+		Xsqlite3ExprAnalyzeAggList(tls, pNC, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
+
+		if (*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0) {
+			Xsqlite3ExprAnalyzeAggregates(tls, pNC, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
+		}
+	}
+	*(*int32)(unsafe.Pointer(pNC + 40)) &= libc.CplInt32(NC_InAggFunc)
+}
+
+func optimizeAggregateUseOfIndexedExpr(tls *libc.TLS, pParse uintptr, pSelect uintptr, pAggInfo uintptr, pNC uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn = (*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator
+	if int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn) > 0 {
+		if (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn == 0 {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(0)
+		} else {
+			(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = U16(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr((*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn-1)*24)).FiSorterColumn) + 1)
+		}
+	}
+	analyzeAggFuncArgs(tls, pAggInfo, pNC)
+	_ = pSelect
+	_ = pParse
+}
+
+func aggregateIdxEprRefToColCallback(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
+	var pAggInfo uintptr
+	var pCol uintptr
+	_ = pWalker
+	if (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION {
+		return WRC_Continue
+	}
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_IF_NULL_ROW {
+		return WRC_Continue
+	}
+	pAggInfo = (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo
+
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr((*Expr)(unsafe.Pointer(pExpr)).FiAgg)*24
+	(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_AGG_COLUMN)
+	(*Expr)(unsafe.Pointer(pExpr)).FiTable = (*AggInfo_col)(unsafe.Pointer(pCol)).FiTable
+	(*Expr)(unsafe.Pointer(pExpr)).FiColumn = (*AggInfo_col)(unsafe.Pointer(pCol)).FiColumn
+	return WRC_Prune
+}
+
+func aggregateConvertIndexedExprRefToColumn(tls *libc.TLS, pAggInfo uintptr) {
+	bp := tls.Alloc(48)
+	defer tls.Free(48)
+
+	var i int32
+
+	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
+	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
+		f func(*libc.TLS, uintptr, uintptr) int32
+	}{aggregateIdxEprRefToColCallback}))
+	for i = 0; i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc; i++ {
+		Xsqlite3WalkExpr(tls, bp, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)
+	}
+}
+
+func assignAggregateRegisters(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
+	*(*int32)(unsafe.Pointer(pParse + 56)) += (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc
+}
+
 func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
@@ -135022,7 +135802,8 @@ func resetAccumulator(tls *libc.TLS, pParse uintptr, pAggInfo uintptr) {
 	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
 		return
 	}
-	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg, (*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg)
+	Xsqlite3VdbeAddOp3(tls, v, OP_Null, 0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg+nReg-1)
 	pFunc = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	i = 0
 __1:
@@ -135035,13 +135816,13 @@ __1:
 
 			if *(*uintptr)(unsafe.Pointer(pE + 32)) == uintptr(0) || (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pE + 32)))).FnExpr != 1 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+20834, 0)
+					ts+20927, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct = -1
 			} else {
 				var pKeyInfo uintptr = Xsqlite3KeyInfoFromExprList(tls, pParse, *(*uintptr)(unsafe.Pointer(pE + 32)), 0, 0)
 				(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistAddr = Xsqlite3VdbeAddOp4(tls, v, OP_OpenEphemeral,
 					(*AggInfo_func)(unsafe.Pointer(pFunc)).FiDistinct, 0, 0, pKeyInfo, -8)
-				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20885, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
+				Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20978, libc.VaList(bp, (*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pFunc)).FpFunc)).FzName))
 			}
 		}
 
@@ -135049,7 +135830,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pFunc += 32
+	pFunc += 24
 	goto __1
 	goto __3
 __3:
@@ -135069,19 +135850,22 @@ __1:
 		var pList uintptr
 
 		pList = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer(pF)).FpFExpr + 32))
-		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem, func() int32 {
-			if pList != 0 {
-				return (*ExprList)(unsafe.Pointer(pList)).FnExpr
-			}
-			return 0
-		}())
+		Xsqlite3VdbeAddOp2(tls, v, OP_AggFinal, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}(),
+			func() int32 {
+				if pList != 0 {
+					return (*ExprList)(unsafe.Pointer(pList)).FnExpr
+				}
+				return 0
+			}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 
 	}
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -135095,6 +135879,9 @@ func updateAccumulator(tls *libc.TLS, pParse uintptr, regAcc int32, pAggInfo uin
 	var pF uintptr
 	var pC uintptr
 
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return
+	}
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
@@ -135169,7 +135956,9 @@ __1:
 			}
 			Xsqlite3VdbeAddOp4(tls, v, OP_CollSeq, regHit, 0, 0, pColl, -2)
 		}
-		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, (*AggInfo_func)(unsafe.Pointer(pF)).FiMem)
+		Xsqlite3VdbeAddOp3(tls, v, OP_AggStep, 0, regAgg, func() int32 {
+			return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + i
+		}())
 		Xsqlite3VdbeAppendP4(tls, v, (*AggInfo_func)(unsafe.Pointer(pF)).FpFunc, -7)
 		Xsqlite3VdbeChangeP5(tls, v, uint16(U8(nArg)))
 		Xsqlite3ReleaseTempRange(tls, pParse, regAgg, nArg)
@@ -135181,7 +135970,7 @@ __1:
 	goto __2
 __2:
 	i++
-	pF += 32
+	pF += 24
 	goto __1
 	goto __3
 __3:
@@ -135199,13 +135988,13 @@ __7:
 		goto __9
 	}
 	{
-		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, (*AggInfo_col)(unsafe.Pointer(pC)).FiMem)
+		Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pC)).FpCExpr, func() int32 { ; return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + i }())
 
 	}
 	goto __8
 __8:
 	i++
-	pC += 32
+	pC += 24
 	goto __7
 	goto __9
 __9:
@@ -135222,11 +136011,11 @@ func explainSimpleCount(tls *libc.TLS, pParse uintptr, pTab uintptr, pIdx uintpt
 
 	if int32((*Parse)(unsafe.Pointer(pParse)).Fexplain) == 2 {
 		var bCover int32 = libc.Bool32(pIdx != uintptr(0) && ((*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0) || !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY)))
-		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+20918,
+		Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+21011,
 			libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName,
 				func() uintptr {
 					if bCover != 0 {
-						return ts + 20930
+						return ts + 21023
 					}
 					return ts + 1544
 				}(),
@@ -135247,7 +136036,7 @@ func havingToWhereExprCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr) int32 {
 			libc.Bool32((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON|EP_IsFalse) == U32(EP_IsFalse)) == 0 &&
 			(*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 			var db uintptr = (*Parse)(unsafe.Pointer((*Walker)(unsafe.Pointer(pWalker)).FpParse)).Fdb
-			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9230)
+			var pNew uintptr = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9290)
 			if pNew != 0 {
 				var pWhere uintptr = (*Select)(unsafe.Pointer(pS)).FpWhere
 				{
@@ -135279,14 +136068,15 @@ func havingToWhere(tls *libc.TLS, pParse uintptr, p uintptr) {
 	Xsqlite3WalkExpr(tls, bp, (*Select)(unsafe.Pointer(p)).FpHaving)
 }
 
-func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr) uintptr {
+func isSelfJoinView(tls *libc.TLS, pTabList uintptr, pThis uintptr, iFirst int32, iEnd int32) uintptr {
 	var pItem uintptr
 
 	if (*Select)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pThis)).FpSelect)).FselFlags&U32(SF_PushDown) != 0 {
 		return uintptr(0)
 	}
-	for pItem = pTabList + 8; pItem < pThis; pItem += 104 {
+	for iFirst < iEnd {
 		var pS1 uintptr
+		pItem = pTabList + 8 + uintptr(libc.PostIncInt32(&iFirst, 1))*104
 		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect == uintptr(0) {
 			continue
 		}
@@ -135340,6 +136130,57 @@ func sameSrcAlias(tls *libc.TLS, p0 uintptr, pSrc uintptr) int32 {
 	return 0
 }
 
+func fromClauseTermCanBeCoroutine(tls *libc.TLS, pParse uintptr, pTabList uintptr, i int32, selFlags int32) int32 {
+	var pItem uintptr = pTabList + 8 + uintptr(i)*104
+	if uint32(int32(*(*uint16)(unsafe.Pointer(pItem + 60 + 4))&0x100>>8)) != 0 {
+		var pCteUse uintptr = *(*uintptr)(unsafe.Pointer(pItem + 96))
+		if int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) == M10d_Yes {
+			return 0
+		}
+		if (*CteUse)(unsafe.Pointer(pCteUse)).FnUse >= 2 && int32((*CteUse)(unsafe.Pointer(pCteUse)).FeM10d) != M10d_No {
+			return 0
+		}
+	}
+	if int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
+		return 0
+	}
+	if (*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Coroutines) != U32(0) {
+		return 0
+	}
+	if isSelfJoinView(tls, pTabList, pItem, i+1, (*SrcList)(unsafe.Pointer(pTabList)).FnSrc) != uintptr(0) {
+		return 0
+	}
+	if i == 0 {
+		if (*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 {
+			return 1
+		}
+		if int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&JT_CROSS != 0 {
+			return 1
+		}
+		if selFlags&SF_UpdateFrom != 0 {
+			return 0
+		}
+		return 1
+	}
+	if selFlags&SF_UpdateFrom != 0 {
+		return 0
+	}
+	for 1 != 0 {
+		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0 {
+			return 0
+		}
+		if i == 0 {
+			break
+		}
+		i--
+		pItem -= 104
+		if (*SrcItem)(unsafe.Pointer(pItem)).FpSelect != uintptr(0) {
+			return 0
+		}
+	}
+	return 1
+}
+
 // Generate code for the SELECT statement given in the p argument.
 //
 // The results are returned according to the SelectDest structure.
@@ -135404,7 +136245,6 @@ func Xsqlite3Select(tls *libc.TLS, pParse uintptr, p uintptr, pDest uintptr) int
 	var k int32
 	var pItem2 uintptr
 	var pExpr uintptr
-	var pExpr1 uintptr
 	var pCol uintptr
 
 	var regBase int32
@@ -135503,7 +136343,7 @@ __5:
 		goto __7
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+20953,
+		ts+21046,
 		libc.VaList(bp, func() uintptr {
 			if (*SrcItem)(unsafe.Pointer(p0)).FzAlias != 0 {
 				return (*SrcItem)(unsafe.Pointer(p0)).FzAlias
@@ -135564,7 +136404,7 @@ __14:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FnCol) != (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr) {
 		goto __15
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21007,
+	Xsqlite3ErrorMsg(tls, pParse, ts+21100,
 		libc.VaList(bp+8, int32((*Table)(unsafe.Pointer(pTab)).FnCol), (*Table)(unsafe.Pointer(pTab)).FzName, (*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer(pSub)).FpEList)).FnExpr))
 	goto select_end
 __15:
@@ -135678,7 +136518,7 @@ __30:
 	goto __28
 __31:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) += Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) += Xsqlite3SelectExprHeight(tls, p)
 
 	if !((*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_PushDown) == U32(0) &&
 		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 ||
@@ -135695,11 +136535,7 @@ __33:
 	zSavedAuthContext = (*Parse)(unsafe.Pointer(pParse)).FzAuthContext
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = (*SrcItem)(unsafe.Pointer(pItem1)).FzName
 
-	if !(i == 0 &&
-		((*SrcList)(unsafe.Pointer(pTabList)).FnSrc == 1 ||
-			int32((*SrcItem)(unsafe.Pointer(pTabList+8+1*104)).Ffg.Fjointype)&(JT_OUTER|JT_CROSS) != 0) &&
-		(int32(*(*uint16)(unsafe.Pointer(pItem1 + 60 + 4))&0x100>>8) == 0 || int32((*CteUse)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pItem1 + 96)))).FeM10d) != M10d_Yes) &&
-		int32((*SrcItem)(unsafe.Pointer(pTabList+8)).Ffg.Fjointype)&JT_LTORJ == 0) {
+	if !(fromClauseTermCanBeCoroutine(tls, pParse, pTabList, i, int32((*Select)(unsafe.Pointer(p)).FselFlags)) != 0) {
 		goto __34
 	}
 
@@ -135710,7 +136546,7 @@ __33:
 
 	(*SrcItem)(unsafe.Pointer(pItem1)).FaddrFillSub = addrTop
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_Coroutine, (*SrcItem)(unsafe.Pointer(pItem1)).FregReturn)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21047, libc.VaList(bp+32, pItem1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21140, libc.VaList(bp+32, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	libc.SetBitFieldPtr16Uint32(pItem1+60+4, uint32(1), 5, 0x20)
@@ -135736,7 +136572,7 @@ __38:
 	(*Select)(unsafe.Pointer(pSub1)).FnSelectRow = (*CteUse)(unsafe.Pointer(pCteUse)).FnRowEst
 	goto __37
 __36:
-	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1)) != uintptr(0)) {
+	if !(libc.AssignUintptr(&pPrior, isSelfJoinView(tls, pTabList, pItem1, 0, i)) != uintptr(0)) {
 		goto __39
 	}
 
@@ -135768,11 +136604,9 @@ __42:
 __43:
 	;
 	Xsqlite3SelectDestInit(tls, bp+96, SRT_EphemTab, (*SrcItem)(unsafe.Pointer(pItem1)).FiCursor)
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21062, libc.VaList(bp+40, pItem1))
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = Xsqlite3TableAffinityStr(tls, db, (*SrcItem)(unsafe.Pointer(pItem1)).FpTab)
+
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+21155, libc.VaList(bp+40, pItem1))
 	Xsqlite3Select(tls, pParse, pSub1, bp+96)
-	Xsqlite3DbFree(tls, db, (*SelectDest)(unsafe.Pointer(bp+96)).FzAffSdst)
-	(*SelectDest)(unsafe.Pointer(bp + 96)).FzAffSdst = uintptr(0)
 	(*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem1)).FpTab)).FnRowLogEst = (*Select)(unsafe.Pointer(pSub1)).FnSelectRow
 	if !(onceAddr != 0) {
 		goto __44
@@ -135806,7 +136640,7 @@ __35:
 	goto select_end
 __46:
 	;
-	*(*int32)(unsafe.Pointer(pParse + 308)) -= Xsqlite3SelectExprHeight(tls, p)
+	*(*int32)(unsafe.Pointer(pParse + 316)) -= Xsqlite3SelectExprHeight(tls, p)
 	(*Parse)(unsafe.Pointer(pParse)).FzAuthContext = zSavedAuthContext
 	goto __28
 __28:
@@ -136115,12 +136949,11 @@ __90:
 	(*NameContext)(unsafe.Pointer(bp + 152)).FpSrcList = pTabList
 	*(*uintptr)(unsafe.Pointer(bp + 152 + 16)) = pAggInfo
 
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmnReg = (*Parse)(unsafe.Pointer(pParse)).FnMem + 1
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() int32 {
+	(*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn = func() uint16 {
 		if pGroupBy != 0 {
-			return (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr
+			return uint16((*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr)
 		}
-		return 0
+		return uint16(0)
 	}()
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FpGroupBy = pGroupBy
 	Xsqlite3ExprAnalyzeAggList(tls, bp+152, pEList)
@@ -136149,39 +136982,15 @@ __93:
 	minMaxFlag = U8(WHERE_ORDERBY_NORMAL)
 __94:
 	;
-	i = 0
-__95:
-	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __97
-	}
-	pExpr = (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc + uintptr(i)*32)).FpFExpr
-
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) |= NC_InAggFunc
-	Xsqlite3ExprAnalyzeAggList(tls, bp+152, *(*uintptr)(unsafe.Pointer(pExpr + 32)))
-
-	if !((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __98
-	}
-	Xsqlite3ExprAnalyzeAggregates(tls, bp+152, (*Window)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 64)))).FpFilter)
-__98:
-	;
-	*(*int32)(unsafe.Pointer(bp + 152 + 40)) &= libc.CplInt32(NC_InAggFunc)
-	goto __96
-__96:
-	i++
-	goto __95
-	goto __97
-__97:
-	;
-	(*AggInfo)(unsafe.Pointer(pAggInfo)).FmxReg = (*Parse)(unsafe.Pointer(pParse)).FnMem
+	analyzeAggFuncArgs(tls, pAggInfo, bp+152)
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
-		goto __99
+		goto __95
 	}
 	goto select_end
-__99:
+__95:
 	;
 	if !(pGroupBy != 0) {
-		goto __100
+		goto __96
 	}
 	pDistinct = uintptr(0)
 	distFlag = U16(0)
@@ -136192,24 +137001,24 @@ __99:
 		(*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr != uintptr(0) &&
 		(*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr)).Fflags&U32(EP_xIsSelect) == U32(0) &&
 		*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) != uintptr(0)) {
-		goto __102
+		goto __98
 	}
-	pExpr1 = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
-	pExpr1 = Xsqlite3ExprDup(tls, db, pExpr1, 0)
+	pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32)) + 8)).FpExpr
+	pExpr = Xsqlite3ExprDup(tls, db, pExpr, 0)
 	pDistinct = Xsqlite3ExprListDup(tls, db, pGroupBy, 0)
-	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr1)
+	pDistinct = Xsqlite3ExprListAppend(tls, pParse, pDistinct, pExpr)
 	if pDistinct != 0 {
 		distFlag = uint16(WHERE_WANT_DISTINCT | WHERE_AGG_DISTINCT)
 	} else {
 		distFlag = uint16(0)
 	}
-__102:
+__98:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx = libc.PostIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnTab, 1)
 	pKeyInfo1 = Xsqlite3KeyInfoFromExprList(tls, pParse, pGroupBy,
 		0, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn)
 	addrSortingIdx = Xsqlite3VdbeAddOp4(tls, v, OP_SorterOpen,
-		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, (*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn,
+		(*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, int32((*AggInfo)(unsafe.Pointer(pAggInfo)).FnSortingColumn),
 		0, pKeyInfo1, -8)
 
 	iUseFlag = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
@@ -136242,27 +137051,34 @@ __102:
 				return 0
 			}()|int32(distFlag)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __103
+		goto __99
 	}
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 	goto select_end
-__103:
+__99:
 	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __100
+	}
+	optimizeAggregateUseOfIndexedExpr(tls, pParse, p, pAggInfo, bp+152)
+__100:
+	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
 	eDist = Xsqlite3WhereIsDistinct(tls, pWInfo)
 
 	if !(Xsqlite3WhereIsOrdered(tls, pWInfo) == (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __104
+		goto __101
 	}
 
 	groupBySort = 0
-	goto __105
-__104:
+	goto __102
+__101:
 	explainTempTable(tls, pParse,
 		func() uintptr {
 			if (*DistinctCtx)(unsafe.Pointer(bp+136)).FisTnct != 0 && (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_Distinct) == U32(0) {
-				return ts + 21078
+				return ts + 21171
 			}
-			return ts + 21087
+			return ts + 21180
 		}())
 
 	groupBySort = 1
@@ -136270,47 +137086,47 @@ __104:
 	nCol = nGroupBy
 	j = nGroupBy
 	i = 0
-__106:
+__103:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __108
+		goto __105
 	}
-	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*32)).FiSorterColumn) >= j) {
-		goto __109
+	if !(int32((*AggInfo_col)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol+uintptr(i)*24)).FiSorterColumn) >= j) {
+		goto __106
 	}
 	nCol++
 	j++
-__109:
+__106:
 	;
-	goto __107
-__107:
+	goto __104
+__104:
 	i++
-	goto __106
-	goto __108
-__108:
+	goto __103
+	goto __105
+__105:
 	;
 	regBase = Xsqlite3GetTempRange(tls, pParse, nCol)
 	Xsqlite3ExprCodeExprList(tls, pParse, pGroupBy, regBase, 0, uint8(0))
 	j = nGroupBy
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	i = 0
-__110:
+__107:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn) {
-		goto __112
+		goto __109
 	}
-	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*32
+	pCol = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaCol + uintptr(i)*24
 	if !(int32((*AggInfo_col)(unsafe.Pointer(pCol)).FiSorterColumn) >= j) {
-		goto __113
+		goto __110
 	}
 	Xsqlite3ExprCode(tls, pParse, (*AggInfo_col)(unsafe.Pointer(pCol)).FpCExpr, j+regBase)
 	j++
-__113:
+__110:
 	;
-	goto __111
-__111:
+	goto __108
+__108:
 	i++
-	goto __110
-	goto __112
-__112:
+	goto __107
+	goto __109
+__109:
 	;
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(0)
 	regRecord = Xsqlite3GetTempReg(tls, pParse)
@@ -136326,45 +137142,51 @@ __112:
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterSort, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrEnd)
 
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FuseSortingIdx = U8(1)
-__105:
+__102:
+	;
+	if !((*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != 0) {
+		goto __111
+	}
+	aggregateConvertIndexedExprRefToColumn(tls, pAggInfo)
+__111:
 	;
 	if !(orderByGrp != 0 && (*Sqlite3)(unsafe.Pointer(db)).FdbOptFlags&U32(SQLITE_GroupByOrder) == U32(0) &&
 		(groupBySort != 0 || Xsqlite3WhereIsSorted(tls, pWInfo) != 0)) {
-		goto __114
+		goto __112
 	}
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3VdbeChangeToNoop(tls, v, (*SortCtx)(unsafe.Pointer(bp+48)).FaddrSortIndex)
-__114:
+__112:
 	;
 	addrTopOfLoop = Xsqlite3VdbeCurrentAddr(tls, v)
 	if !(groupBySort != 0) {
-		goto __115
+		goto __113
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_SorterData, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx,
 		sortOut, sortPTab)
-__115:
+__113:
 	;
 	j = 0
-__116:
+__114:
 	if !(j < (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr) {
-		goto __118
+		goto __116
 	}
 	if !(groupBySort != 0) {
-		goto __119
+		goto __117
 	}
 	Xsqlite3VdbeAddOp3(tls, v, OP_Column, sortPTab, j, iBMem+j)
-	goto __120
-__119:
+	goto __118
+__117:
 	(*AggInfo)(unsafe.Pointer(pAggInfo)).FdirectMode = U8(1)
 	Xsqlite3ExprCode(tls, pParse, (*ExprList_item)(unsafe.Pointer(pGroupBy+8+uintptr(j)*32)).FpExpr, iBMem+j)
-__120:
-	;
-	goto __117
-__117:
-	j++
-	goto __116
-	goto __118
 __118:
+	;
+	goto __115
+__115:
+	j++
+	goto __114
+	goto __116
+__116:
 	;
 	Xsqlite3VdbeAddOp4(tls, v, OP_Compare, iAMem, iBMem, (*ExprList)(unsafe.Pointer(pGroupBy)).FnExpr,
 		Xsqlite3KeyInfoRef(tls, pKeyInfo1), -8)
@@ -136383,16 +137205,16 @@ __118:
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, iUseFlag)
 
 	if !(groupBySort != 0) {
-		goto __121
+		goto __119
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_SorterNext, (*AggInfo)(unsafe.Pointer(pAggInfo)).FsortingIdx, addrTopOfLoop)
 
-	goto __122
-__121:
+	goto __120
+__119:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	Xsqlite3VdbeChangeToNoop(tls, v, addrSortingIdx)
-__122:
+__120:
 	;
 	Xsqlite3ExprListDelete(tls, db, pDistinct)
 
@@ -136423,16 +137245,16 @@ __122:
 	Xsqlite3VdbeAddOp1(tls, v, OP_Return, regReset)
 
 	if !(int32(distFlag) != 0 && eDist != WHERE_DISTINCT_NOOP) {
-		goto __123
+		goto __121
 	}
 	pF = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	fixDistinctOpenEph(tls, pParse, eDist, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF)).FiDistAddr)
-__123:
+__121:
 	;
-	goto __101
-__100:
+	goto __97
+__96:
 	if !(libc.AssignUintptr(&pTab1, isSimpleCount(tls, p, pAggInfo)) != uintptr(0)) {
-		goto __124
+		goto __122
 	}
 
 	iDb = Xsqlite3SchemaToIndex(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, (*Table)(unsafe.Pointer(pTab1)).FpSchema)
@@ -136445,98 +137267,101 @@ __100:
 	Xsqlite3TableLock(tls, pParse, iDb, (*Table)(unsafe.Pointer(pTab1)).Ftnum, uint8(0), (*Table)(unsafe.Pointer(pTab1)).FzName)
 
 	if !!((*Table)(unsafe.Pointer(pTab1)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) {
-		goto __126
+		goto __124
 	}
 	pBest = Xsqlite3PrimaryKeyIndex(tls, pTab1)
-__126:
+__124:
 	;
 	if !!(int32(*(*uint16)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8 + 60 + 4))&0x1>>0) != 0) {
-		goto __127
+		goto __125
 	}
 	pIdx = (*Table)(unsafe.Pointer(pTab1)).FpIndex
-__128:
+__126:
 	if !(pIdx != 0) {
-		goto __130
+		goto __128
 	}
 	if !(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x4>>2) == 0 &&
 		int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Table)(unsafe.Pointer(pTab1)).FszTabRow) &&
 		(*Index)(unsafe.Pointer(pIdx)).FpPartIdxWhere == uintptr(0) &&
 		(!(pBest != 0) || int32((*Index)(unsafe.Pointer(pIdx)).FszIdxRow) < int32((*Index)(unsafe.Pointer(pBest)).FszIdxRow))) {
-		goto __131
+		goto __129
 	}
 	pBest = pIdx
-__131:
-	;
-	goto __129
 __129:
-	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
-	goto __128
-	goto __130
-__130:
 	;
+	goto __127
 __127:
+	pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext
+	goto __126
+	goto __128
+__128:
+	;
+__125:
 	;
 	if !(pBest != 0) {
-		goto __132
+		goto __130
 	}
 	iRoot = (*Index)(unsafe.Pointer(pBest)).Ftnum
 	pKeyInfo2 = Xsqlite3KeyInfoOfIndex(tls, pParse, pBest)
-__132:
+__130:
 	;
 	Xsqlite3VdbeAddOp4Int(tls, v, OP_OpenRead, iCsr, int32(iRoot), iDb, 1)
 	if !(pKeyInfo2 != 0) {
-		goto __133
+		goto __131
 	}
 	Xsqlite3VdbeChangeP4(tls, v, -1, pKeyInfo2, -8)
-__133:
+__131:
 	;
-	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiMem)
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+	Xsqlite3VdbeAddOp2(tls, v, OP_Count, iCsr, func() int32 {
+		return (*AggInfo)(unsafe.Pointer(pAggInfo)).FiFirstReg + (*AggInfo)(unsafe.Pointer(pAggInfo)).FnColumn + 0
+	}())
 	Xsqlite3VdbeAddOp1(tls, v, OP_Close, iCsr)
 	explainSimpleCount(tls, pParse, pTab1, pBest)
-	goto __125
-__124:
+	goto __123
+__122:
 	regAcc = 0
 	pDistinct1 = uintptr(0)
 	distFlag1 = U16(0)
 
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnAccumulator != 0) {
-		goto __134
+		goto __132
 	}
 	i = 0
-__136:
+__134:
 	if !(i < (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
+		goto __136
+	}
+	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
+		goto __137
+	}
+	goto __135
+__137:
+	;
+	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*24)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
 		goto __138
 	}
-	if !((*Expr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFExpr)).Fflags&U32(EP_WinFunc) != U32(0)) {
-		goto __139
-	}
-	goto __137
-__139:
-	;
-	if !((*FuncDef)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc+uintptr(i)*32)).FpFunc)).FfuncFlags&U32(SQLITE_FUNC_NEEDCOLL) != 0) {
-		goto __140
-	}
-	goto __138
-__140:
-	;
-	goto __137
-__137:
-	i++
 	goto __136
-	goto __138
 __138:
+	;
+	goto __135
+__135:
+	i++
+	goto __134
+	goto __136
+__136:
 	;
 	if !(i == (*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc) {
-		goto __141
+		goto __139
 	}
 	regAcc = libc.PreIncInt32(&(*Parse)(unsafe.Pointer(pParse)).FnMem, 1)
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 0, regAcc)
-__141:
+__139:
 	;
-	goto __135
-__134:
+	goto __133
+__132:
 	if !((*AggInfo)(unsafe.Pointer(pAggInfo)).FnFunc == 1 && (*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FiDistinct >= 0) {
-		goto __142
+		goto __140
 	}
 
 	pDistinct1 = *(*uintptr)(unsafe.Pointer((*AggInfo_func)(unsafe.Pointer((*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc)).FpFExpr + 32))
@@ -136545,79 +137370,74 @@ __134:
 	} else {
 		distFlag1 = uint16(0)
 	}
-__142:
+__140:
 	;
-__135:
+__133:
 	;
+	assignAggregateRegisters(tls, pParse, pAggInfo)
+
 	resetAccumulator(tls, pParse, pAggInfo)
 
 	pWInfo = Xsqlite3WhereBegin(tls, pParse, pTabList, pWhere, *(*uintptr)(unsafe.Pointer(bp + 208)),
 		pDistinct1, p, uint16(int32(minMaxFlag)|int32(distFlag1)), 0)
 	if !(pWInfo == uintptr(0)) {
-		goto __143
+		goto __141
 	}
 	goto select_end
-__143:
+__141:
 	;
 	eDist1 = Xsqlite3WhereIsDistinct(tls, pWInfo)
 	updateAccumulator(tls, pParse, regAcc, pAggInfo, eDist1)
 	if !(eDist1 != WHERE_DISTINCT_NOOP) {
-		goto __144
+		goto __142
 	}
 	pF1 = (*AggInfo)(unsafe.Pointer(pAggInfo)).FaFunc
 	if !(pF1 != 0) {
-		goto __145
+		goto __143
 	}
 	fixDistinctOpenEph(tls, pParse, eDist1, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistinct, (*AggInfo_func)(unsafe.Pointer(pF1)).FiDistAddr)
-__145:
+__143:
 	;
-__144:
+__142:
 	;
 	if !(regAcc != 0) {
-		goto __146
+		goto __144
 	}
 	Xsqlite3VdbeAddOp2(tls, v, OP_Integer, 1, regAcc)
-__146:
+__144:
 	;
 	if !(minMaxFlag != 0) {
-		goto __147
+		goto __145
 	}
 	Xsqlite3WhereMinMaxOptEarlyOut(tls, v, pWInfo)
-__147:
+__145:
 	;
 	Xsqlite3WhereEnd(tls, pWInfo)
 	finalizeAggFunctions(tls, pParse, pAggInfo)
-__125:
+__123:
 	;
 	(*SortCtx)(unsafe.Pointer(bp + 48)).FpOrderBy = uintptr(0)
 	Xsqlite3ExprIfFalse(tls, pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL)
 	selectInnerLoop(tls, pParse, p, -1, uintptr(0), uintptr(0),
 		pDest, addrEnd, addrEnd)
-__101:
+__97:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, addrEnd)
 
 __65:
 	;
 	if !(int32((*DistinctCtx)(unsafe.Pointer(bp+136)).FeTnctType) == WHERE_DISTINCT_UNORDERED) {
-		goto __148
+		goto __146
 	}
-	explainTempTable(tls, pParse, ts+21078)
-__148:
+	explainTempTable(tls, pParse, ts+21171)
+__146:
 	;
 	if !((*SortCtx)(unsafe.Pointer(bp+48)).FpOrderBy != 0) {
-		goto __149
+		goto __147
 	}
-	explainTempTable(tls, pParse,
-		func() uintptr {
-			if (*SortCtx)(unsafe.Pointer(bp+48)).FnOBSat > 0 {
-				return ts + 21096
-			}
-			return ts + 21119
-		}())
 
 	generateSortTail(tls, pParse, p, bp+48, (*ExprList)(unsafe.Pointer(pEList)).FnExpr, pDest)
-__149:
+__147:
 	;
 	Xsqlite3VdbeResolveLabel(tls, v, iEnd)
 
@@ -136714,7 +137534,7 @@ __5:
 	}
 	Xsqlite3_free(tls, (*TabResult)(unsafe.Pointer(p)).FzErrMsg)
 	(*TabResult)(unsafe.Pointer(p)).FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+21128, 0)
+		ts+21189, 0)
 	(*TabResult)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 	return 1
 __11:
@@ -136947,7 +137767,7 @@ func Xsqlite3BeginTrigger(tls *libc.TLS, pParse uintptr, pName1 uintptr, pName2
 	if !((*Token)(unsafe.Pointer(pName2)).Fn > uint32(0)) {
 		goto __3
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21193, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21254, 0)
 	goto trigger_cleanup
 __3:
 	;
@@ -136991,7 +137811,7 @@ __7:
 	goto trigger_cleanup
 __8:
 	;
-	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+21239, *(*uintptr)(unsafe.Pointer(bp + 32)))
+	Xsqlite3FixInit(tls, bp+40, pParse, iDb, ts+21300, *(*uintptr)(unsafe.Pointer(bp + 32)))
 	if !(Xsqlite3FixSrcList(tls, bp+40, pTableName) != 0) {
 		goto __9
 	}
@@ -137009,7 +137829,7 @@ __10:
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VTAB) {
 		goto __11
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21247, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21308, 0)
 	goto trigger_orphan_error
 __11:
 	;
@@ -137021,7 +137841,7 @@ __11:
 	goto trigger_cleanup
 __12:
 	;
-	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+21239, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
+	if !(Xsqlite3CheckObjectName(tls, pParse, zName, ts+21300, (*Table)(unsafe.Pointer(pTab)).FzName) != 0) {
 		goto __13
 	}
 	goto trigger_cleanup
@@ -137036,7 +137856,7 @@ __13:
 	if !!(noErr != 0) {
 		goto __16
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21288, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21349, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(bp + 32))))
 	goto __17
 __16:
 	;
@@ -137048,22 +137868,22 @@ __15:
 	;
 __14:
 	;
-	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+9424, 7) == 0) {
+	if !(Xsqlite3_strnicmp(tls, (*Table)(unsafe.Pointer(pTab)).FzName, ts+7733, 7) == 0) {
 		goto __18
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21314, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21375, 0)
 	goto trigger_cleanup
 __18:
 	;
 	if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW && tr_tm != TK_INSTEAD) {
 		goto __19
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21352,
+	Xsqlite3ErrorMsg(tls, pParse, ts+21413,
 		libc.VaList(bp+8, func() uintptr {
 			if tr_tm == TK_BEFORE {
-				return ts + 21389
+				return ts + 21450
 			}
-			return ts + 21396
+			return ts + 21457
 		}(), pTableName+8))
 	goto trigger_orphan_error
 __19:
@@ -137072,7 +137892,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21402, libc.VaList(bp+24, pTableName+8))
+		ts+21463, libc.VaList(bp+24, pTableName+8))
 	goto trigger_orphan_error
 __20:
 	;
@@ -137101,9 +137921,9 @@ __23:
 	;
 	if !(Xsqlite3AuthCheck(tls, pParse, SQLITE_INSERT, func() uintptr {
 		if !(0 != 0) && iTabDb == 1 {
-			return ts + 13438
+			return ts + 7741
 		}
-		return ts + 7245
+		return ts + 7235
 	}(), uintptr(0), zDb) != 0) {
 		goto __24
 	}
@@ -137221,7 +138041,7 @@ __2:
 __3:
 	;
 	Xsqlite3TokenInit(tls, bp+56, (*Trigger)(unsafe.Pointer(pTrig)).FzName)
-	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+21239, bp+56)
+	Xsqlite3FixInit(tls, bp+72, pParse, iDb, ts+21300, bp+56)
 	if !(Xsqlite3FixTriggerStep(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).Fstep_list) != 0 ||
 		Xsqlite3FixExpr(tls, bp+72, (*Trigger)(unsafe.Pointer(pTrig)).FpWhen) != 0) {
 		goto __4
@@ -137254,7 +138074,7 @@ __9:
 		goto __12
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21448,
+		ts+21509,
 		libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrig)).FzName, (*TriggerStep)(unsafe.Pointer(pStep)).FzTarget))
 	goto triggerfinish_cleanup
 __12:
@@ -137279,13 +138099,13 @@ __13:
 	z = Xsqlite3DbStrNDup(tls, db, (*Token)(unsafe.Pointer(pAll)).Fz, uint64((*Token)(unsafe.Pointer(pAll)).Fn))
 
 	Xsqlite3NestedParse(tls, pParse,
-		ts+21496,
+		ts+21557,
 		libc.VaList(bp+16, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, zName,
 			(*Trigger)(unsafe.Pointer(pTrig)).Ftable, z))
 	Xsqlite3DbFree(tls, db, z)
 	Xsqlite3ChangeCookie(tls, pParse, iDb)
 	Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb,
-		Xsqlite3MPrintf(tls, db, ts+21571, libc.VaList(bp+48, zName)), uint16(0))
+		Xsqlite3MPrintf(tls, db, ts+21632, libc.VaList(bp+48, zName)), uint16(0))
 __7:
 	;
 __6:
@@ -137541,7 +138361,7 @@ __5:
 	if !!(noErr != 0) {
 		goto __9
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21600, libc.VaList(bp, pName+8))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21661, libc.VaList(bp, pName+8))
 	goto __10
 __9:
 	Xsqlite3CodeVerifyNamedSchema(tls, pParse, zDb)
@@ -137580,9 +138400,9 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 		var zDb uintptr = (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + uintptr(iDb)*32)).FzDbSName
 		var zTab uintptr = func() uintptr {
 			if !(0 != 0) && iDb == 1 {
-				return ts + 13438
+				return ts + 7741
 			}
-			return ts + 7245
+			return ts + 7235
 		}()
 		if iDb == 1 {
 			code = SQLITE_DROP_TEMP_TRIGGER
@@ -137594,7 +138414,7 @@ func Xsqlite3DropTriggerPtr(tls *libc.TLS, pParse uintptr, pTrigger uintptr) {
 
 	if libc.AssignUintptr(&v, Xsqlite3GetVdbe(tls, pParse)) != uintptr(0) {
 		Xsqlite3NestedParse(tls, pParse,
-			ts+21620,
+			ts+21681,
 			libc.VaList(bp, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName, (*Trigger)(unsafe.Pointer(pTrigger)).FzName))
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 		Xsqlite3VdbeAddOp4(tls, v, OP_DropTrigger, iDb, 0, 0, (*Trigger)(unsafe.Pointer(pTrigger)).FzName, 0)
@@ -137708,12 +138528,12 @@ __9:
 		goto __15
 	}
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21682,
+		ts+21743,
 		libc.VaList(bp, func() uintptr {
 			if op == TK_DELETE {
-				return ts + 21730
+				return ts + 21791
 			}
-			return ts + 21737
+			return ts + 21798
 		}()))
 __15:
 	;
@@ -137827,7 +138647,7 @@ func isAsteriskTerm(tls *libc.TLS, pParse uintptr, pTerm uintptr) int32 {
 	if int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pTerm)).FpRight)).Fop) != TK_ASTERISK {
 		return 0
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+21744, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+21805, 0)
 	return 1
 }
 
@@ -138010,8 +138830,8 @@ func transferParseError(tls *libc.TLS, pTo uintptr, pFrom uintptr) {
 }
 
 func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintptr, orconf int32) uintptr {
-	bp := tls.Alloc(480)
-	defer tls.Free(480)
+	bp := tls.Alloc(488)
+	defer tls.Free(488)
 
 	var pTop uintptr = func() uintptr {
 		if (*Parse)(unsafe.Pointer(pParse)).FpToplevel != 0 {
@@ -138044,8 +138864,8 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	*(*U32)(unsafe.Pointer(pPrg + 28 + 1*4)) = 0xffffffff
 
 	Xsqlite3ParseObjectInit(tls, bp+8, db)
-	libc.Xmemset(tls, bp+424, 0, uint64(unsafe.Sizeof(NameContext{})))
-	(*NameContext)(unsafe.Pointer(bp + 424)).FpParse = bp + 8
+	libc.Xmemset(tls, bp+432, 0, uint64(unsafe.Sizeof(NameContext{})))
+	(*NameContext)(unsafe.Pointer(bp + 432)).FpParse = bp + 8
 	(*Parse)(unsafe.Pointer(bp + 8)).FpTriggerTab = pTab
 	(*Parse)(unsafe.Pointer(bp + 8)).FpToplevel = pTop
 	(*Parse)(unsafe.Pointer(bp + 8)).FzAuthContext = (*Trigger)(unsafe.Pointer(pTrigger)).FzName
@@ -138057,13 +138877,13 @@ func codeRowTrigger(tls *libc.TLS, pParse uintptr, pTrigger uintptr, pTab uintpt
 	if v != 0 {
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FzName != 0 {
 			Xsqlite3VdbeChangeP4(tls, v, -1,
-				Xsqlite3MPrintf(tls, db, ts+21786, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
+				Xsqlite3MPrintf(tls, db, ts+21847, libc.VaList(bp, (*Trigger)(unsafe.Pointer(pTrigger)).FzName)), -6)
 		}
 
 		if (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen != 0 {
 			pWhen = Xsqlite3ExprDup(tls, db, (*Trigger)(unsafe.Pointer(pTrigger)).FpWhen, 0)
 			if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 &&
-				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+424, pWhen) {
+				SQLITE_OK == Xsqlite3ResolveExprNames(tls, bp+432, pWhen) {
 				iEndTrigger = Xsqlite3VdbeMakeLabel(tls, bp+8)
 				Xsqlite3ExprIfFalse(tls, bp+8, pWhen, iEndTrigger, SQLITE_JUMPIFNULL)
 			}
@@ -138379,7 +139199,8 @@ func updateFromSelect(tls *libc.TLS, pParse uintptr, iEph int32, pPk uintptr, pC
 		}
 	}
 	pSelect = Xsqlite3SelectNew(tls, pParse, pList,
-		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2, uint32(SF_UFSrcCheck|SF_IncludeHidden), pLimit2)
+		pSrc, pWhere2, pGrp, uintptr(0), pOrderBy2,
+		uint32(SF_UFSrcCheck|SF_IncludeHidden|SF_UpdateFrom), pLimit2)
 	if pSelect != 0 {
 		*(*U32)(unsafe.Pointer(pSelect + 4)) |= U32(SF_OrderByReqd)
 	}
@@ -138649,7 +139470,7 @@ __25:
 	}
 
 	Xsqlite3ErrorMsg(tls, pParse,
-		ts+21800,
+		ts+21861,
 		libc.VaList(bp, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr(j)*24)).FzCnName))
 	goto update_cleanup
 __27:
@@ -138681,7 +139502,7 @@ __21:
 	iRowidExpr = i
 	goto __30
 __29:
-	Xsqlite3ErrorMsg(tls, pParse, ts+21836, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
+	Xsqlite3ErrorMsg(tls, pParse, ts+21897, libc.VaList(bp+8, (*ExprList_item)(unsafe.Pointer(pChanges+8+uintptr(i)*32)).FzEName))
 	(*Parse)(unsafe.Pointer(pParse)).FcheckSchema = U8(1)
 	goto update_cleanup
 __30:
@@ -138691,7 +139512,7 @@ __28:
 	rc = Xsqlite3AuthCheck(tls, pParse, SQLITE_UPDATE, (*Table)(unsafe.Pointer(pTab)).FzName,
 		func() uintptr {
 			if j < 0 {
-				return ts + 9005
+				return ts + 9065
 			}
 			return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol + uintptr(j)*24)).FzCnName
 		}(),
@@ -139561,7 +140382,7 @@ __168:
 	if !(regRowCount != 0) {
 		goto __169
 	}
-	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+21855)
+	Xsqlite3CodeChangeCount(tls, v, regRowCount, ts+21916)
 __169:
 	;
 update_cleanup:
@@ -139867,10 +140688,10 @@ __1:
 			if nClause == 0 && (*Upsert)(unsafe.Pointer(pUpsert)).FpNextUpsert == uintptr(0) {
 				*(*int8)(unsafe.Pointer(bp + 216)) = int8(0)
 			} else {
-				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+21868, libc.VaList(bp, nClause+1))
+				Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([16]int8{})), bp+216, ts+21929, libc.VaList(bp, nClause+1))
 			}
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+21872, libc.VaList(bp+8, bp+216))
+				ts+21933, libc.VaList(bp+8, bp+216))
 			return SQLITE_ERROR
 		}
 
@@ -139961,7 +140782,7 @@ func Xsqlite3UpsertDoUpdate(tls *libc.TLS, pParse uintptr, pUpsert uintptr, pTab
 			i = Xsqlite3VdbeAddOp4Int(tls, v, OP_Found, iDataCur, 0, iPk, nPk)
 
 			Xsqlite3VdbeAddOp4(tls, v, OP_Halt, SQLITE_CORRUPT, OE_Abort, 0,
-				ts+13492, -1)
+				ts+13502, -1)
 			Xsqlite3MayAbort(tls, pParse)
 			Xsqlite3VdbeJumpHere(tls, v, i)
 		}
@@ -139993,7 +140814,7 @@ func execSql(tls *libc.TLS, db uintptr, pzErrMsg uintptr, zSql uintptr) int32 {
 		var zSubSql uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
 
 		if zSubSql != 0 &&
-			(libc.Xstrncmp(tls, zSubSql, ts+21945, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+21949, uint64(3)) == 0) {
+			(libc.Xstrncmp(tls, zSubSql, ts+22006, uint64(3)) == 0 || libc.Xstrncmp(tls, zSubSql, ts+22010, uint64(3)) == 0) {
 			rc = execSql(tls, db, pzErrMsg, zSubSql)
 			if rc != SQLITE_OK {
 				break
@@ -140141,14 +140962,14 @@ func Xsqlite3RunVacuum(tls *libc.TLS, pzErrMsg uintptr, db uintptr, iDb int32, p
 	if !!(int32((*Sqlite3)(unsafe.Pointer(db)).FautoCommit) != 0) {
 		goto __1
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21953)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22014)
 	return SQLITE_ERROR
 __1:
 	;
 	if !((*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive > 1) {
 		goto __2
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+21993)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22054)
 	return SQLITE_ERROR
 __2:
 	;
@@ -140159,7 +140980,7 @@ __2:
 	if !(Xsqlite3_value_type(tls, pOut) != SQLITE_TEXT) {
 		goto __5
 	}
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+22036)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22097)
 	return SQLITE_ERROR
 __5:
 	;
@@ -140187,7 +141008,7 @@ __4:
 	isMemDb = Xsqlite3PagerIsMemdb(tls, Xsqlite3BtreePager(tls, pMain))
 
 	nDb = (*Sqlite3)(unsafe.Pointer(db)).FnDb
-	rc = execSqlF(tls, db, pzErrMsg, ts+22054, libc.VaList(bp, zOut))
+	rc = execSqlF(tls, db, pzErrMsg, ts+22115, libc.VaList(bp, zOut))
 	(*Sqlite3)(unsafe.Pointer(db)).FopenFlags = saved_openFlags
 	if !(rc != SQLITE_OK) {
 		goto __6
@@ -140207,7 +141028,7 @@ __6:
 		goto __8
 	}
 	rc = SQLITE_ERROR
-	Xsqlite3SetString(tls, pzErrMsg, db, ts+22077)
+	Xsqlite3SetString(tls, pzErrMsg, db, ts+22138)
 	goto end_of_vacuum
 __8:
 	;
@@ -140222,7 +141043,7 @@ __7:
 	Xsqlite3BtreeSetSpillSize(tls, pTemp, Xsqlite3BtreeSetSpillSize(tls, pMain, 0))
 	Xsqlite3BtreeSetPagerFlags(tls, pTemp, pgflags|U32(PAGER_CACHESPILL))
 
-	rc = execSql(tls, db, pzErrMsg, ts+15850)
+	rc = execSql(tls, db, pzErrMsg, ts+15860)
 	if !(rc != SQLITE_OK) {
 		goto __9
 	}
@@ -140267,7 +141088,7 @@ __12:
 
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(nDb)
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22104,
+		ts+22165,
 		libc.VaList(bp+8, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __13
@@ -140276,7 +141097,7 @@ __12:
 __13:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22212,
+		ts+22273,
 		libc.VaList(bp+16, zDbMain))
 	if !(rc != SQLITE_OK) {
 		goto __14
@@ -140287,7 +141108,7 @@ __14:
 	(*Sqlite3)(unsafe.Pointer(db)).Finit.FiDb = U8(0)
 
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22266,
+		ts+22327,
 		libc.VaList(bp+24, zDbMain))
 
 	*(*U32)(unsafe.Pointer(db + 44)) &= libc.Uint32FromInt32(libc.CplInt32(DBFLAG_Vacuum))
@@ -140298,7 +141119,7 @@ __14:
 __15:
 	;
 	rc = execSqlF(tls, db, pzErrMsg,
-		ts+22417,
+		ts+22478,
 		libc.VaList(bp+32, zDbMain))
 	if !(rc != 0) {
 		goto __16
@@ -140520,12 +141341,12 @@ func Xsqlite3VtabUnlock(tls *libc.TLS, pVTab uintptr) {
 	(*VTable)(unsafe.Pointer(pVTab)).FnRef--
 	if (*VTable)(unsafe.Pointer(pVTab)).FnRef == 0 {
 		var p uintptr = (*VTable)(unsafe.Pointer(pVTab)).FpVtab
-		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		if p != 0 {
 			(*struct {
 				f func(*libc.TLS, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_module)(unsafe.Pointer((*Sqlite3_vtab)(unsafe.Pointer(p)).FpModule)).FxDisconnect})).f(tls, p)
 		}
+		Xsqlite3VtabModuleUnref(tls, (*VTable)(unsafe.Pointer(pVTab)).Fdb, (*VTable)(unsafe.Pointer(pVTab)).FpMod)
 		Xsqlite3DbFree(tls, db, pVTab)
 	}
 }
@@ -140643,7 +141464,7 @@ func addModuleArgument(tls *libc.TLS, pParse uintptr, pTable uintptr, zArg uintp
 
 	nBytes = Sqlite3_int64(uint64(unsafe.Sizeof(uintptr(0))) * uint64(2+*(*int32)(unsafe.Pointer(pTable + 64))))
 	if *(*int32)(unsafe.Pointer(pTable + 64))+3 >= *(*int32)(unsafe.Pointer(db + 136 + 2*4)) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+13719, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+13729, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName))
 	}
 	azModuleArg = Xsqlite3DbRealloc(tls, db, *(*uintptr)(unsafe.Pointer(pTable + 64 + 8)), uint64(nBytes))
 	if azModuleArg == uintptr(0) {
@@ -140727,11 +141548,11 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		if pEnd != 0 {
 			(*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fn = uint32(int32((int64((*Token)(unsafe.Pointer(pEnd)).Fz)-int64((*Parse)(unsafe.Pointer(pParse)).FsNameToken.Fz))/1)) + (*Token)(unsafe.Pointer(pEnd)).Fn
 		}
-		zStmt = Xsqlite3MPrintf(tls, db, ts+22547, libc.VaList(bp, pParse+264))
+		zStmt = Xsqlite3MPrintf(tls, db, ts+22608, libc.VaList(bp, pParse+272))
 
 		iDb = Xsqlite3SchemaToIndex(tls, db, (*Table)(unsafe.Pointer(pTab)).FpSchema)
 		Xsqlite3NestedParse(tls, pParse,
-			ts+22571,
+			ts+22632,
 			libc.VaList(bp+8, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb+uintptr(iDb)*32)).FzDbSName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
 				(*Table)(unsafe.Pointer(pTab)).FzName,
@@ -140741,7 +141562,7 @@ func Xsqlite3VtabFinishParse(tls *libc.TLS, pParse uintptr, pEnd uintptr) {
 		Xsqlite3ChangeCookie(tls, pParse, iDb)
 
 		Xsqlite3VdbeAddOp0(tls, v, OP_Expire)
-		zWhere = Xsqlite3MPrintf(tls, db, ts+22670, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
+		zWhere = Xsqlite3MPrintf(tls, db, ts+22731, libc.VaList(bp+48, (*Table)(unsafe.Pointer(pTab)).FzName, zStmt))
 		Xsqlite3VdbeAddParseSchemaOp(tls, v, iDb, zWhere, uint16(0))
 		Xsqlite3DbFree(tls, db, zStmt)
 
@@ -140775,7 +141596,7 @@ func Xsqlite3VtabArgInit(tls *libc.TLS, pParse uintptr) {
 // The parser calls this routine for each token after the first token
 // in an argument to the module name in a CREATE VIRTUAL TABLE statement.
 func Xsqlite3VtabArgExtend(tls *libc.TLS, pParse uintptr, p uintptr) {
-	var pArg uintptr = pParse + 376
+	var pArg uintptr = pParse + 384
 	if (*Token)(unsafe.Pointer(pArg)).Fz == uintptr(0) {
 		(*Token)(unsafe.Pointer(pArg)).Fz = (*Token)(unsafe.Pointer(p)).Fz
 		(*Token)(unsafe.Pointer(pArg)).Fn = (*Token)(unsafe.Pointer(p)).Fn
@@ -140802,7 +141623,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 	for pCtx = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx; pCtx != 0; pCtx = (*VtabCtx)(unsafe.Pointer(pCtx)).FpPrior {
 		if (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab == pTab {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db,
-				ts+22689, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
+				ts+22750, libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName))
 			return SQLITE_LOCKED
 		}
 	}
@@ -140840,7 +141661,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 
 	if SQLITE_OK != rc {
 		if *(*uintptr)(unsafe.Pointer(bp + 64)) == uintptr(0) {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22731, libc.VaList(bp+8, zModuleName))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22792, libc.VaList(bp+8, zModuleName))
 		} else {
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+4493, libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 64))))
 			Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
@@ -140852,7 +141673,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 		(*Module)(unsafe.Pointer(pMod)).FnRefModule++
 		(*VTable)(unsafe.Pointer(pVTable)).FnRef = 1
 		if (*VtabCtx)(unsafe.Pointer(bp+32)).FbDeclared == 0 {
-			var zFormat uintptr = ts + 22761
+			var zFormat uintptr = ts + 22822
 			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, zFormat, libc.VaList(bp+24, (*Table)(unsafe.Pointer(pTab)).FzName))
 			Xsqlite3VtabUnlock(tls, pVTable)
 			rc = SQLITE_ERROR
@@ -140869,7 +141690,7 @@ func vtabCallConstructor(tls *libc.TLS, db uintptr, pTab uintptr, pMod uintptr,
 				var i int32 = 0
 				nType = Xsqlite3Strlen30(tls, zType)
 				for i = 0; i < nType; i++ {
-					if 0 == Xsqlite3_strnicmp(tls, ts+17500, zType+uintptr(i), 6) &&
+					if 0 == Xsqlite3_strnicmp(tls, ts+17516, zType+uintptr(i), 6) &&
 						(i == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i-1)))) == ' ') &&
 						(int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == 0 || int32(*(*int8)(unsafe.Pointer(zType + uintptr(i+6)))) == ' ') {
 						break
@@ -140926,7 +141747,7 @@ func Xsqlite3VtabCallConnect(tls *libc.TLS, pParse uintptr, pTab uintptr) int32
 
 	if !(pMod != 0) {
 		var zModule uintptr = *(*uintptr)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pTab + 64 + 8))))
-		Xsqlite3ErrorMsg(tls, pParse, ts+22807, libc.VaList(bp, zModule))
+		Xsqlite3ErrorMsg(tls, pParse, ts+22868, libc.VaList(bp, zModule))
 		rc = SQLITE_ERROR
 	} else {
 		*(*uintptr)(unsafe.Pointer(bp + 16)) = uintptr(0)
@@ -140984,7 +141805,7 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 	pMod = Xsqlite3HashFind(tls, db+576, zMod)
 
 	if pMod == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate == uintptr(0) || (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxDestroy == uintptr(0) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22807, libc.VaList(bp, zMod))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3MPrintf(tls, db, ts+22868, libc.VaList(bp, zMod))
 		rc = SQLITE_ERROR
 	} else {
 		rc = vtabCallConstructor(tls, db, pTab, pMod, (*Sqlite3_module)(unsafe.Pointer((*Module)(unsafe.Pointer(pMod)).FpModule)).FxCreate, pzErr)
@@ -141004,8 +141825,8 @@ func Xsqlite3VtabCallCreate(tls *libc.TLS, db uintptr, iDb int32, zTab uintptr,
 // valid to call this function from within the xCreate() or xConnect() of a
 // virtual table module.
 func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int32 {
-	bp := tls.Alloc(424)
-	defer tls.Free(424)
+	bp := tls.Alloc(432)
+	defer tls.Free(432)
 
 	var pCtx uintptr
 	var rc int32 = SQLITE_OK
@@ -141018,7 +141839,7 @@ func Xsqlite3_declare_vtab(tls *libc.TLS, db uintptr, zCreateTable uintptr) int3
 	if !(pCtx != 0) || (*VtabCtx)(unsafe.Pointer(pCtx)).FbDeclared != 0 {
 		Xsqlite3Error(tls, db, SQLITE_MISUSE)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
-		return Xsqlite3MisuseError(tls, 149843)
+		return Xsqlite3MisuseError(tls, 151030)
 	}
 	pTab = (*VtabCtx)(unsafe.Pointer(pCtx)).FpTab
 
@@ -141471,7 +142292,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	p = (*Sqlite3)(unsafe.Pointer(db)).FpVtabCtx
 	if !(p != 0) {
-		rc = Xsqlite3MisuseError(tls, 150334)
+		rc = Xsqlite3MisuseError(tls, 151521)
 	} else {
 		ap = va
 		switch op {
@@ -141498,7 +142319,7 @@ func Xsqlite3_vtab_config(tls *libc.TLS, db uintptr, op int32, va uintptr) int32
 			fallthrough
 		default:
 			{
-				rc = Xsqlite3MisuseError(tls, 150352)
+				rc = Xsqlite3MisuseError(tls, 151539)
 				break
 
 			}
@@ -141729,10 +142550,10 @@ type InLoop = struct {
 func explainIndexColumnName(tls *libc.TLS, pIdx uintptr, i int32) uintptr {
 	i = int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2)))
 	if i == -2 {
-		return ts + 22826
+		return ts + 22887
 	}
 	if i == -1 {
-		return ts + 17609
+		return ts + 17625
 	}
 	return (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FpTable)).FaCol + uintptr(i)*24)).FzCnName
 }
@@ -141741,15 +142562,15 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	var i int32
 
 	if bAnd != 0 {
-		Xsqlite3_str_append(tls, pStr, ts+22833, 5)
+		Xsqlite3_str_append(tls, pStr, ts+22894, 5)
 	}
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+22839, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22900, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+14109, 1)
+			Xsqlite3_str_append(tls, pStr, ts+14119, 1)
 		}
 		Xsqlite3_str_appendall(tls, pStr, explainIndexColumnName(tls, pIdx, iTerm+i))
 	}
@@ -141760,11 +142581,11 @@ func explainAppendTerm(tls *libc.TLS, pStr uintptr, pIdx uintptr, nTerm int32, i
 	Xsqlite3_str_append(tls, pStr, zOp, 1)
 
 	if nTerm > 1 {
-		Xsqlite3_str_append(tls, pStr, ts+22839, 1)
+		Xsqlite3_str_append(tls, pStr, ts+22900, 1)
 	}
 	for i = 0; i < nTerm; i++ {
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+14109, 1)
+			Xsqlite3_str_append(tls, pStr, ts+14119, 1)
 		}
 		Xsqlite3_str_append(tls, pStr, ts+6360, 1)
 	}
@@ -141786,27 +142607,27 @@ func explainIndexRange(tls *libc.TLS, pStr uintptr, pLoop uintptr) {
 	if int32(nEq) == 0 && (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT) == U32(0) {
 		return
 	}
-	Xsqlite3_str_append(tls, pStr, ts+22841, 2)
+	Xsqlite3_str_append(tls, pStr, ts+22902, 2)
 	for i = 0; i < int32(nEq); i++ {
 		var z uintptr = explainIndexColumnName(tls, pIndex, i)
 		if i != 0 {
-			Xsqlite3_str_append(tls, pStr, ts+22833, 5)
+			Xsqlite3_str_append(tls, pStr, ts+22894, 5)
 		}
 		Xsqlite3_str_appendf(tls, pStr, func() uintptr {
 			if i >= int32(nSkip) {
-				return ts + 22844
+				return ts + 22905
 			}
-			return ts + 22849
+			return ts + 22910
 		}(), libc.VaList(bp, z))
 	}
 
 	j = i
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+22857)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2))), j, i, ts+22918)
 		i = 1
 	}
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_TOP_LIMIT) != 0 {
-		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+22859)
+		explainAppendTerm(tls, pStr, pIndex, int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4))), j, i, ts+22920)
 	}
 	Xsqlite3_str_append(tls, pStr, ts+6309, 1)
 }
@@ -141849,11 +142670,11 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 		Xsqlite3StrAccumInit(tls, bp+64, db, bp+96, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 		(*StrAccum)(unsafe.Pointer(bp + 64)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-		Xsqlite3_str_appendf(tls, bp+64, ts+22861, libc.VaList(bp, func() uintptr {
+		Xsqlite3_str_appendf(tls, bp+64, ts+22922, libc.VaList(bp, func() uintptr {
 			if isSearch != 0 {
-				return ts + 22867
+				return ts + 22928
 			}
-			return ts + 22874
+			return ts + 22935
 		}(), pItem))
 		if flags&U32(WHERE_IPK|WHERE_VIRTUALTABLE) == U32(0) {
 			var zFmt uintptr = uintptr(0)
@@ -141863,43 +142684,43 @@ func Xsqlite3WhereExplainOneScan(tls *libc.TLS, pParse uintptr, pTabList uintptr
 
 			if !((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pItem)).FpTab)).FtabFlags&U32(TF_WithoutRowid) == U32(0)) && int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x3>>0) == SQLITE_IDXTYPE_PRIMARYKEY {
 				if isSearch != 0 {
-					zFmt = ts + 12266
+					zFmt = ts + 12328
 				}
 			} else if flags&U32(WHERE_PARTIALIDX) != 0 {
-				zFmt = ts + 22879
+				zFmt = ts + 22940
 			} else if flags&U32(WHERE_AUTO_INDEX) != 0 {
-				zFmt = ts + 22912
+				zFmt = ts + 22973
 			} else if flags&U32(WHERE_IDX_ONLY) != 0 {
-				zFmt = ts + 22937
+				zFmt = ts + 22998
 			} else {
-				zFmt = ts + 22955
+				zFmt = ts + 23016
 			}
 			if zFmt != 0 {
-				Xsqlite3_str_append(tls, bp+64, ts+22964, 7)
+				Xsqlite3_str_append(tls, bp+64, ts+23025, 7)
 				Xsqlite3_str_appendf(tls, bp+64, zFmt, libc.VaList(bp+16, (*Index)(unsafe.Pointer(pIdx)).FzName))
 				explainIndexRange(tls, bp+64, pLoop)
 			}
 		} else if flags&U32(WHERE_IPK) != U32(0) && flags&U32(WHERE_CONSTRAINT) != U32(0) {
 			var cRangeOp int8
-			var zRowid uintptr = ts + 17609
-			Xsqlite3_str_appendf(tls, bp+64, ts+22972, libc.VaList(bp+24, zRowid))
+			var zRowid uintptr = ts + 17625
+			Xsqlite3_str_appendf(tls, bp+64, ts+23033, libc.VaList(bp+24, zRowid))
 			if flags&U32(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) != 0 {
 				cRangeOp = int8('=')
 			} else if flags&U32(WHERE_BOTH_LIMIT) == U32(WHERE_BOTH_LIMIT) {
-				Xsqlite3_str_appendf(tls, bp+64, ts+23003, libc.VaList(bp+32, zRowid))
+				Xsqlite3_str_appendf(tls, bp+64, ts+23064, libc.VaList(bp+32, zRowid))
 				cRangeOp = int8('<')
 			} else if flags&U32(WHERE_BTM_LIMIT) != 0 {
 				cRangeOp = int8('>')
 			} else {
 				cRangeOp = int8('<')
 			}
-			Xsqlite3_str_appendf(tls, bp+64, ts+23013, libc.VaList(bp+40, int32(cRangeOp)))
+			Xsqlite3_str_appendf(tls, bp+64, ts+23074, libc.VaList(bp+40, int32(cRangeOp)))
 		} else if flags&U32(WHERE_VIRTUALTABLE) != U32(0) {
-			Xsqlite3_str_appendf(tls, bp+64, ts+23018,
+			Xsqlite3_str_appendf(tls, bp+64, ts+23079,
 				libc.VaList(bp+48, *(*int32)(unsafe.Pointer(pLoop + 24)), *(*uintptr)(unsafe.Pointer(pLoop + 24 + 16))))
 		}
 		if int32((*SrcItem)(unsafe.Pointer(pItem)).Ffg.Fjointype)&JT_LEFT != 0 {
-			Xsqlite3_str_appendf(tls, bp+64, ts+23045, 0)
+			Xsqlite3_str_appendf(tls, bp+64, ts+23106, 0)
 		}
 		zMsg = Xsqlite3StrAccumFinish(tls, bp+64)
 
@@ -141931,28 +142752,29 @@ func Xsqlite3WhereExplainBloomFilter(tls *libc.TLS, pParse uintptr, pWInfo uintp
 
 	Xsqlite3StrAccumInit(tls, bp+24, db, bp+56, int32(unsafe.Sizeof([100]int8{})), SQLITE_MAX_LENGTH)
 	(*StrAccum)(unsafe.Pointer(bp + 24)).FprintfFlags = U8(SQLITE_PRINTF_INTERNAL)
-	Xsqlite3_str_appendf(tls, bp+24, ts+23056, libc.VaList(bp, pItem))
+	Xsqlite3_str_appendf(tls, bp+24, ts+23117, libc.VaList(bp, pItem))
 	pLoop = (*WhereLevel)(unsafe.Pointer(pLevel)).FpWLoop
 	if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK) != 0 {
 		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
 		if int32((*Table)(unsafe.Pointer(pTab)).FiPKey) >= 0 {
-			Xsqlite3_str_appendf(tls, bp+24, ts+22844, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
+			Xsqlite3_str_appendf(tls, bp+24, ts+22905, libc.VaList(bp+8, (*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTab)).FaCol+uintptr((*Table)(unsafe.Pointer(pTab)).FiPKey)*24)).FzCnName))
 		} else {
-			Xsqlite3_str_appendf(tls, bp+24, ts+23077, 0)
+			Xsqlite3_str_appendf(tls, bp+24, ts+23138, 0)
 		}
 	} else {
 		for i = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip); i < int32(*(*U16)(unsafe.Pointer(pLoop + 24))); i++ {
 			var z uintptr = explainIndexColumnName(tls, *(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)), i)
 			if i > int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnSkip) {
-				Xsqlite3_str_append(tls, bp+24, ts+22833, 5)
+				Xsqlite3_str_append(tls, bp+24, ts+22894, 5)
 			}
-			Xsqlite3_str_appendf(tls, bp+24, ts+22844, libc.VaList(bp+16, z))
+			Xsqlite3_str_appendf(tls, bp+24, ts+22905, libc.VaList(bp+16, z))
 		}
 	}
 	Xsqlite3_str_append(tls, bp+24, ts+6309, 1)
 	zMsg = Xsqlite3StrAccumFinish(tls, bp+24)
 	ret = Xsqlite3VdbeAddOp4(tls, v, OP_Explain, Xsqlite3VdbeCurrentAddr(tls, v),
 		(*Parse)(unsafe.Pointer(pParse)).FaddrExplain, 0, zMsg, -6)
+
 	return ret
 }
 
@@ -142013,52 +142835,58 @@ func updateRangeAffinityStr(tls *libc.TLS, pRight uintptr, n int32, zAff uintptr
 
 func removeUnindexableInClauseTerms(tls *libc.TLS, pParse uintptr, iEq int32, pLoop uintptr, pX uintptr) uintptr {
 	var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
+	var pSelect uintptr
 	var pNew uintptr
 	pNew = Xsqlite3ExprDup(tls, db, pX, 0)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed) == 0 {
-		var pOrigRhs uintptr
-		var pOrigLhs uintptr
-		var pRhs uintptr = uintptr(0)
-		var pLhs uintptr = uintptr(0)
-		var i int32
-		var pSelect uintptr
+		for pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32)); pSelect != 0; pSelect = (*Select)(unsafe.Pointer(pSelect)).FpPrior {
+			var pOrigRhs uintptr
+			var pOrigLhs uintptr = uintptr(0)
+			var pRhs uintptr = uintptr(0)
+			var pLhs uintptr = uintptr(0)
+			var i int32
 
-		pOrigRhs = (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList
+			pOrigRhs = (*Select)(unsafe.Pointer(pSelect)).FpEList
 
-		pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
-		for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
-			if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
-				var iField int32
+			if pSelect == *(*uintptr)(unsafe.Pointer(pNew + 32)) {
+				pOrigLhs = *(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32))
+			}
+			for i = iEq; i < int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnLTerm); i++ {
+				if (*WhereTerm)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)))).FpExpr == pX {
+					var iField int32
 
-				iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
-				if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
-					continue
+					iField = *(*int32)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pLoop)).FaLTerm + uintptr(i)*8)) + 32 + 4)) - 1
+					if (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr == uintptr(0) {
+						continue
+					}
+					pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
+					(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					if pOrigLhs != 0 {
+						pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
+						(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
+					}
 				}
-				pRhs = Xsqlite3ExprListAppend(tls, pParse, pRhs, (*ExprList_item)(unsafe.Pointer(pOrigRhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigRhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
-
-				pLhs = Xsqlite3ExprListAppend(tls, pParse, pLhs, (*ExprList_item)(unsafe.Pointer(pOrigLhs+8+uintptr(iField)*32)).FpExpr)
-				(*ExprList_item)(unsafe.Pointer(pOrigLhs + 8 + uintptr(iField)*32)).FpExpr = uintptr(0)
 			}
-		}
-		Xsqlite3ExprListDelete(tls, db, pOrigRhs)
-		Xsqlite3ExprListDelete(tls, db, pOrigLhs)
-		*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pNew + 32)))).FpEList = pRhs
-		if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
-			var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
-			(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
-			Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
-			(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
-		}
-		pSelect = *(*uintptr)(unsafe.Pointer(pNew + 32))
-		if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
-			var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
-			for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
-				*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+			Xsqlite3ExprListDelete(tls, db, pOrigRhs)
+			if pOrigLhs != 0 {
+				Xsqlite3ExprListDelete(tls, db, pOrigLhs)
+				*(*uintptr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pNew)).FpLeft + 32)) = pLhs
+			}
+			(*Select)(unsafe.Pointer(pSelect)).FpEList = pRhs
+			if pLhs != 0 && (*ExprList)(unsafe.Pointer(pLhs)).FnExpr == 1 {
+				var p uintptr = (*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr
+				(*ExprList_item)(unsafe.Pointer(pLhs + 8)).FpExpr = uintptr(0)
+				Xsqlite3ExprDelete(tls, db, (*Expr)(unsafe.Pointer(pNew)).FpLeft)
+				(*Expr)(unsafe.Pointer(pNew)).FpLeft = p
+			}
+			if (*Select)(unsafe.Pointer(pSelect)).FpOrderBy != 0 {
+				var pOrderBy uintptr = (*Select)(unsafe.Pointer(pSelect)).FpOrderBy
+				for i = 0; i < (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr; i++ {
+					*(*U16)(unsafe.Pointer(pOrderBy + 8 + uintptr(i)*32 + 24)) = U16(0)
+				}
 			}
-		}
 
+		}
 	}
 	return pNew
 }
@@ -143536,7 +144364,7 @@ __134:
 	;
 __126:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23085, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23146, 0)
 	ii = 0
 __135:
 	if !(ii < (*WhereClause)(unsafe.Pointer(pOrWc)).FnTerm) {
@@ -143564,7 +144392,7 @@ __139:
 	pOrExpr = pAndExpr
 __140:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23100, libc.VaList(bp, ii+1))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23161, libc.VaList(bp, ii+1))
 
 	pSubWInfo = Xsqlite3WhereBegin(tls, pParse, pOrTab, pOrExpr, uintptr(0), uintptr(0), uintptr(0),
 		uint16(WHERE_OR_SUBCLAUSE), iCovCur)
@@ -144082,7 +144910,7 @@ func Xsqlite3WhereRightJoinLoop(tls *libc.TLS, pWInfo uintptr, iLevel int32, pLe
 	var mAll Bitmask = uint64(0)
 	var k int32
 
-	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23109, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
+	Xsqlite3VdbeExplain(tls, pParse, uint8(1), ts+23170, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pTabItem)).FpTab)).FzName))
 
 	for k = 0; k < iLevel; k++ {
 		var iIdxCur int32
@@ -144440,10 +145268,10 @@ type Op2 = struct {
 }
 
 var aOp = [4]Op2{
-	{FzOp: ts + 17458, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
-	{FzOp: ts + 16788, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
-	{FzOp: ts + 16314, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
-	{FzOp: ts + 23123, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
+	{FzOp: ts + 17474, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_MATCH)},
+	{FzOp: ts + 16804, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_GLOB)},
+	{FzOp: ts + 16324, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_LIKE)},
+	{FzOp: ts + 23184, FeOp2: uint8(SQLITE_INDEX_CONSTRAINT_REGEXP)},
 }
 
 func transferJoinMarkings(tls *libc.TLS, pDerived uintptr, pBase uintptr) {
@@ -144820,49 +145648,38 @@ func exprSelectUsage(tls *libc.TLS, pMaskSet uintptr, pS uintptr) Bitmask {
 	return mask
 }
 
-func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr) int32 {
+func exprMightBeIndexed2(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, j int32) int32 {
 	var pIdx uintptr
 	var i int32
 	var iCur int32
-	i = 0
-__1:
-	if !(mPrereq > uint64(1)) {
-		goto __3
-	}
-	{
-	}
-	goto __2
-__2:
-	i++
-	mPrereq >>= 1
-	goto __1
-	goto __3
-__3:
-	;
-	iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FiCursor
-	for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
-		if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
-			continue
-		}
-		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
-			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+	for __ccgo := true; __ccgo; __ccgo = libc.PreIncInt32(&j, 1) < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc {
+		iCur = (*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FiCursor
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(j)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr == uintptr(0) {
 				continue
 			}
+			for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnKeyCol); i++ {
+				if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) != -2 {
+					continue
+				}
 
-			if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 {
-				*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
-				*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
-				return 1
+				if Xsqlite3ExprCompareSkip(tls, pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iCur) == 0 &&
+					int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_STRING {
+					*(*int32)(unsafe.Pointer(aiCurCol)) = iCur
+					*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = -2
+					return 1
+				}
 			}
 		}
 	}
 	return 0
 }
 
-func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, aiCurCol uintptr, pExpr uintptr, op int32) int32 {
+	var i int32
+
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_VECTOR && (op >= TK_GT && op <= TK_GE) {
 		pExpr = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)) + 8)).FpExpr
-
 	}
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN {
@@ -144870,13 +145687,16 @@ func exprMightBeIndexed(tls *libc.TLS, pFrom uintptr, mPrereq Bitmask, aiCurCol
 		*(*int32)(unsafe.Pointer(aiCurCol + 1*4)) = int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn)
 		return 1
 	}
-	if mPrereq == uint64(0) {
-		return 0
+
+	for i = 0; i < (*SrcList)(unsafe.Pointer(pFrom)).FnSrc; i++ {
+		var pIdx uintptr
+		for pIdx = (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pFrom + 8 + uintptr(i)*104)).FpTab)).FpIndex; pIdx != 0; pIdx = (*Index)(unsafe.Pointer(pIdx)).FpNext {
+			if (*Index)(unsafe.Pointer(pIdx)).FaColExpr != 0 {
+				return exprMightBeIndexed2(tls, pFrom, aiCurCol, pExpr, i)
+			}
+		}
 	}
-	if mPrereq&(mPrereq-uint64(1)) != uint64(0) {
-		return 0
-	}
-	return exprMightBeIndexed2(tls, pFrom, mPrereq, aiCurCol, pExpr)
+	return 0
 }
 
 func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
@@ -144941,12 +145761,12 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			extraRight = x - uint64(1)
 
 			if prereqAll>>1 >= x {
-				Xsqlite3ErrorMsg(tls, pParse, ts+23130, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+23191, 0)
 				return
 			}
 		} else if prereqAll>>1 >= x {
 			if (*SrcList)(unsafe.Pointer(pSrc)).FnSrc > 0 && int32((*SrcItem)(unsafe.Pointer(pSrc+8)).Ffg.Fjointype)&JT_LTORJ != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+23130, 0)
+				Xsqlite3ErrorMsg(tls, pParse, ts+23191, 0)
 				return
 			}
 			*(*U32)(unsafe.Pointer(pExpr + 4)) &= libc.Uint32FromInt32(libc.CplInt32(EP_InnerON))
@@ -144970,7 +145790,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			pLeft = (*ExprList_item)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pLeft + 32)) + 8 + uintptr(*(*int32)(unsafe.Pointer(pTerm + 32 + 4))-1)*32)).FpExpr
 		}
 
-		if exprMightBeIndexed(tls, pSrc, prereqLeft, bp, pLeft, op) != 0 {
+		if exprMightBeIndexed(tls, pSrc, bp, pLeft, op) != 0 {
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FleftCursor = *(*int32)(unsafe.Pointer(bp))
 
 			*(*int32)(unsafe.Pointer(pTerm + 32)) = *(*int32)(unsafe.Pointer(bp + 1*4))
@@ -144980,7 +145800,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_IS)
 		}
 		if pRight != 0 &&
-			exprMightBeIndexed(tls, pSrc, (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqRight, bp, pRight, op) != 0 &&
+			exprMightBeIndexed(tls, pSrc, bp, pRight, op) != 0 &&
 			!((*Expr)(unsafe.Pointer(pRight)).Fflags&U32(EP_FixedCol) != U32(0)) {
 			var pNew uintptr
 			var pDup uintptr
@@ -145025,7 +145845,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 			!((*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_OuterON) != U32(0)) &&
 			0 == Xsqlite3ExprCanBeNull(tls, pLeft) {
 			(*Expr)(unsafe.Pointer(pExpr)).Fop = U8(TK_TRUEFALSE)
-			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8061
+			*(*uintptr)(unsafe.Pointer(pExpr + 8)) = ts + 8121
 			*(*U32)(unsafe.Pointer(pExpr + 4)) |= U32(EP_IsFalse)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll = uint64(0)
 			(*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator = U16(0)
@@ -145119,7 +145939,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		}
 		zCollSeqName = func() uintptr {
 			if *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
-				return ts + 23171
+				return ts + 23232
 			}
 			return uintptr(unsafe.Pointer(&Xsqlite3StrBINARY))
 		}()
@@ -145130,7 +145950,6 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr1, pExpr)
 		idxNew1 = whereClauseInsert(tls, pWC, pNewExpr1, wtFlags)
 
-		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		pNewExpr2 = Xsqlite3ExprDup(tls, db, pLeft, 0)
 		pNewExpr2 = Xsqlite3PExpr(tls, pParse, TK_LT,
 			Xsqlite3ExprAddCollateString(tls, pParse, pNewExpr2, zCollSeqName),
@@ -145138,6 +145957,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		transferJoinMarkings(tls, pNewExpr2, pExpr)
 		idxNew2 = whereClauseInsert(tls, pWC, pNewExpr2, wtFlags)
 
+		exprAnalyze(tls, pSrc, pWC, idxNew1)
 		exprAnalyze(tls, pSrc, pWC, idxNew2)
 		pTerm = (*WhereClause)(unsafe.Pointer(pWC)).Fa + uintptr(idxTerm)*56
 		if *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
@@ -145171,7 +145991,7 @@ func exprAnalyze(tls *libc.TLS, pSrc uintptr, pWC uintptr, idxTerm int32) {
 		*(*int32)(unsafe.Pointer(pTerm + 32 + 4)) == 0 &&
 		int32((*Expr)(unsafe.Pointer((*Expr)(unsafe.Pointer(pExpr)).FpLeft)).Fop) == TK_VECTOR &&
 		(*Expr)(unsafe.Pointer(pExpr)).Fflags&U32(EP_xIsSelect) != U32(0) &&
-		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) &&
+		((*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpPrior == uintptr(0) || (*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FselFlags&U32(SF_Values) != 0) &&
 		(*Select)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pExpr + 32)))).FpWin == uintptr(0) &&
 		int32((*WhereClause)(unsafe.Pointer(pWC)).Fop) == TK_AND {
 		var i int32
@@ -145324,6 +146144,9 @@ func Xsqlite3WhereAddLimit(tls *libc.TLS, pWC uintptr, p uintptr) {
 			if int32((*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FwtFlags)&TERM_CODED != 0 {
 				continue
 			}
+			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FnChild != 0 {
+				continue
+			}
 			if (*WhereTerm)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).Fa+uintptr(ii)*56)).FleftCursor != iCsr {
 				return
 			}
@@ -145492,7 +146315,7 @@ func Xsqlite3WhereTabFuncArgs(tls *libc.TLS, pParse uintptr, pItem uintptr, pWC
 			k++
 		}
 		if k >= int32((*Table)(unsafe.Pointer(pTab)).FnCol) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+23178,
+			Xsqlite3ErrorMsg(tls, pParse, ts+23239,
 				libc.VaList(bp, (*Table)(unsafe.Pointer(pTab)).FzName, j))
 			return
 		}
@@ -146226,7 +147049,7 @@ __4:
 		goto __6
 	}
 	Xsqlite3_log(tls, SQLITE_WARNING|int32(1)<<8,
-		ts+23214, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
+		ts+23275, libc.VaList(bp, (*Table)(unsafe.Pointer(pTable)).FzName,
 			(*Column)(unsafe.Pointer((*Table)(unsafe.Pointer(pTable)).FaCol+uintptr(iCol)*24)).FzCnName))
 	sentWarning = U8(1)
 __6:
@@ -146297,7 +147120,7 @@ __13:
 __14:
 	;
 	*(*uintptr)(unsafe.Pointer(pLoop + 24 + 8)) = pIdx
-	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 23240
+	(*Index)(unsafe.Pointer(pIdx)).FzName = ts + 23301
 	(*Index)(unsafe.Pointer(pIdx)).FpTable = pTable
 	n = 0
 	idxCols = uint64(0)
@@ -146804,7 +147627,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	var iTest int32
 	var res int32
 	var nField int32
-	var iLower TRowcnt = TRowcnt(0)
+	var iLower TRowcnt = uint64(0)
 
 	_ = pParse
 
@@ -146824,7 +147647,7 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		iSamp = iTest / nField
 		if iSamp > 0 {
 			for n = iTest%nField + 1; n < nField; n++ {
-				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*4)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) {
+				if *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp-1)*40)).FanLt + uintptr(n-1)*8)) != *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) {
 					break
 				}
 			}
@@ -146835,10 +147658,10 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 		(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(n)
 		res = Xsqlite3VdbeRecordCompare(tls, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fn, (*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).Fp, pRec)
 		if res < 0 {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8)) + *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanEq + uintptr(n-1)*8))
 			iMin = iTest + 1
 		} else if res == 0 && n < nField {
-			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*4))
+			iLower = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(iSamp)*40)).FanLt + uintptr(n-1)*8))
 			iMin = iTest + 1
 			res = -1
 		} else {
@@ -146849,29 +147672,29 @@ func whereKeyStats(tls *libc.TLS, pParse uintptr, pIdx uintptr, pRec uintptr, ro
 	i = iSample / nField
 
 	if res == 0 {
-		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanEq + uintptr(iCol)*8))
 	} else {
 		var iUpper TRowcnt
 		var iGap TRowcnt
 		if i >= (*Index)(unsafe.Pointer(pIdx)).FnSample {
 			iUpper = (*Index)(unsafe.Pointer(pIdx)).FnRowEst0
 		} else {
-			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*4))
+			iUpper = *(*TRowcnt)(unsafe.Pointer((*IndexSample)(unsafe.Pointer(aSample+uintptr(i)*40)).FanLt + uintptr(iCol)*8))
 		}
 
 		if iLower >= iUpper {
-			iGap = TRowcnt(0)
+			iGap = uint64(0)
 		} else {
 			iGap = iUpper - iLower
 		}
 		if roundUp != 0 {
-			iGap = iGap * TRowcnt(2) / TRowcnt(3)
+			iGap = iGap * uint64(2) / uint64(3)
 		} else {
-			iGap = iGap / TRowcnt(3)
+			iGap = iGap / uint64(3)
 		}
 		*(*TRowcnt)(unsafe.Pointer(aStat)) = iLower + iGap
-		*(*TRowcnt)(unsafe.Pointer(aStat + 1*4)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*4))
+		*(*TRowcnt)(unsafe.Pointer(aStat + 1*8)) = *(*TRowcnt)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaAvgEq + uintptr(nField-1)*8))
 	}
 
 	(*UnpackedRecord)(unsafe.Pointer(pRec)).FnField = U16(nField)
@@ -146973,8 +147796,8 @@ func whereRangeSkipScanEst(tls *libc.TLS, pParse uintptr, pLower uintptr, pUpper
 }
 
 func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower uintptr, pUpper uintptr, pLoop uintptr) int32 {
-	bp := tls.Alloc(28)
-	defer tls.Free(28)
+	bp := tls.Alloc(36)
+	defer tls.Free(36)
 
 	var rc int32 = SQLITE_OK
 	var nOut int32 = int32((*WhereLoop)(unsafe.Pointer(pLoop)).FnOut)
@@ -146986,7 +147809,7 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 	if (*Index)(unsafe.Pointer(p)).FnSample > 0 && nEq < (*Index)(unsafe.Pointer(p)).FnSampleCol &&
 		(*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).FdbOptFlags&U32(SQLITE_Stat4) == U32(0) {
 		if nEq == (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid {
-			*(*uintptr)(unsafe.Pointer(bp + 8)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
+			*(*uintptr)(unsafe.Pointer(bp + 16)) = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec
 
 			var nBtm int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 2)))
 			var nTop int32 = int32(*(*U16)(unsafe.Pointer(pLoop + 24 + 4)))
@@ -146996,17 +147819,17 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 			var iLwrIdx int32 = -2
 			var iUprIdx int32 = -1
 
-			if *(*uintptr)(unsafe.Pointer(bp + 8)) != 0 {
-				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
+			if *(*uintptr)(unsafe.Pointer(bp + 16)) != 0 {
+				(*UnpackedRecord)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 16)))).FnField = U16((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid)
 			}
 
 			if nEq == 0 {
-				iLower = TRowcnt(0)
+				iLower = uint64(0)
 				iUpper = (*Index)(unsafe.Pointer(p)).FnRowEst0
 			} else {
-				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
+				whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
 				iLower = *(*TRowcnt)(unsafe.Pointer(bp))
-				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+				iUpper = *(*TRowcnt)(unsafe.Pointer(bp)) + *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 			}
 
 			if *(*U8)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaSortOrder + uintptr(nEq))) != 0 {
@@ -147026,19 +147849,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pLower != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pLower)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nBtm, nEq, bp+16)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 16)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nBtm, nEq, bp+24)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 16)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 24)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 0, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iLwrIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 0, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pLower)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew > iLower {
 						iLower = iNew
@@ -147050,19 +147873,19 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			if pUpper != 0 {
 				var pExpr uintptr = (*Expr)(unsafe.Pointer((*WhereTerm)(unsafe.Pointer(pUpper)).FpExpr)).FpRight
-				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+8, pExpr, nTop, nEq, bp+20)
-				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 20)) != 0 {
+				rc = Xsqlite3Stat4ProbeSetValue(tls, pParse, p, bp+16, pExpr, nTop, nEq, bp+28)
+				if rc == SQLITE_OK && *(*int32)(unsafe.Pointer(bp + 28)) != 0 {
 					var iNew TRowcnt
 					var mask U16 = U16(int32(WO_EQ)<<(TK_GT-TK_EQ) | int32(WO_EQ)<<(TK_LE-TK_EQ))
-					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 20)) {
+					if Xsqlite3ExprVectorSize(tls, pExpr) > *(*int32)(unsafe.Pointer(bp + 28)) {
 						mask = U16(int32(WO_EQ)<<(TK_LE-TK_EQ) | int32(WO_EQ)<<(TK_LT-TK_EQ))
 					}
-					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 8)), 1, bp)
-					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint32 {
+					iUprIdx = whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp + 16)), 1, bp)
+					iNew = *(*TRowcnt)(unsafe.Pointer(bp)) + func() uint64 {
 						if int32((*WhereTerm)(unsafe.Pointer(pUpper)).FeOperator)&int32(mask) != 0 {
-							return *(*TRowcnt)(unsafe.Pointer(bp + 1*4))
+							return *(*TRowcnt)(unsafe.Pointer(bp + 1*8))
 						}
-						return uint32(0)
+						return uint64(0)
 					}()
 					if iNew < iUpper {
 						iUpper = iNew
@@ -147072,10 +147895,10 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 				}
 			}
 
-			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 8))
+			(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpRec = *(*uintptr)(unsafe.Pointer(bp + 16))
 			if rc == SQLITE_OK {
 				if iUpper > iLower {
-					nNew = Xsqlite3LogEst(tls, uint64(iUpper-iLower))
+					nNew = Xsqlite3LogEst(tls, iUpper-iLower)
 
 					if iLwrIdx == iUprIdx {
 						nNew = int16(int32(nNew) - 20)
@@ -147089,9 +147912,9 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 
 			}
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 24)) = 0
-			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+24)
-			if *(*int32)(unsafe.Pointer(bp + 24)) != 0 {
+			*(*int32)(unsafe.Pointer(bp + 32)) = 0
+			rc = whereRangeSkipScanEst(tls, pParse, pLower, pUpper, pLoop, bp+32)
+			if *(*int32)(unsafe.Pointer(bp + 32)) != 0 {
 				return rc
 			}
 		}
@@ -147116,8 +147939,8 @@ func whereRangeScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pLower u
 }
 
 func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(20)
-	defer tls.Free(20)
+	bp := tls.Alloc(32)
+	defer tls.Free(32)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nEq int32 = int32(*(*U16)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24)))
@@ -147129,7 +147952,7 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 
 	if nEq >= int32((*Index)(unsafe.Pointer(p)).FnColumn) {
-		*(*TRowcnt)(unsafe.Pointer(pnRow)) = TRowcnt(1)
+		*(*TRowcnt)(unsafe.Pointer(pnRow)) = uint64(1)
 		return SQLITE_OK
 	}
 
@@ -147143,23 +147966,23 @@ func whereEqualScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pExpr ui
 	}
 	(*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid = nEq
 
-	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+12)
+	whereKeyStats(tls, pParse, p, *(*uintptr)(unsafe.Pointer(bp)), 0, bp+16)
 
-	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 12 + 1*4))
+	*(*TRowcnt)(unsafe.Pointer(pnRow)) = *(*TRowcnt)(unsafe.Pointer(bp + 16 + 1*8))
 
 	return rc
 }
 
 func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintptr, pnRow uintptr) int32 {
-	bp := tls.Alloc(4)
-	defer tls.Free(4)
+	bp := tls.Alloc(8)
+	defer tls.Free(8)
 
 	var p uintptr = *(*uintptr)(unsafe.Pointer((*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew + 24 + 8))
 	var nRow0 I64 = I64(Xsqlite3LogEstToInt(tls, *(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(p)).FaiRowLogEst))))
 	var nRecValid int32 = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FnRecValid
 	var rc int32 = SQLITE_OK
 
-	var nRowEst TRowcnt = TRowcnt(0)
+	var nRowEst TRowcnt = uint64(0)
 	var i int32
 
 	for i = 0; rc == SQLITE_OK && i < (*ExprList)(unsafe.Pointer(pList)).FnExpr; i++ {
@@ -147170,7 +147993,7 @@ func whereInScanEst(tls *libc.TLS, pParse uintptr, pBuilder uintptr, pList uintp
 	}
 
 	if rc == SQLITE_OK {
-		if I64(nRowEst) > nRow0 {
+		if nRowEst > TRowcnt(nRow0) {
 			nRowEst = TRowcnt(nRow0)
 		}
 		*(*TRowcnt)(unsafe.Pointer(pnRow)) = nRowEst
@@ -147492,6 +148315,7 @@ __1:
 			}
 		}
 		if j < 0 {
+			Xsqlite3ProgressCheck(tls, (*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpParse)
 			if (*WhereLoop)(unsafe.Pointer(pLoop)).FmaskSelf == (*WhereTerm)(unsafe.Pointer(pTerm)).FprereqAll {
 				if int32((*WhereTerm)(unsafe.Pointer(pTerm)).FeOperator)&0x3f != 0 ||
 					int32((*SrcItem)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer((*WhereClause)(unsafe.Pointer(pWC)).FpWInfo)).FpTabList+8+uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104)).Ffg.Fjointype)&
@@ -147585,8 +148409,8 @@ func whereRangeVectorLen(tls *libc.TLS, pParse uintptr, iCur int32, pIdx uintptr
 }
 
 func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProbe uintptr, nInMul LogEst) int32 {
-	bp := tls.Alloc(116)
-	defer tls.Free(116)
+	bp := tls.Alloc(120)
+	defer tls.Free(120)
 
 	var pWInfo uintptr = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpWInfo
 	var pParse uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpParse
@@ -147610,8 +148434,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 	var pBtm uintptr = uintptr(0)
 
 	pNew = (*WhereLoopBuilder)(unsafe.Pointer(pBuilder)).FpNew
-	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
-		return SQLITE_NOMEM
+
+	if (*Parse)(unsafe.Pointer(pParse)).FnErr != 0 {
+		return (*Parse)(unsafe.Pointer(pParse)).Frc
 	}
 
 	if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_BTM_LIMIT) != 0 {
@@ -147763,7 +148588,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32((*WhereTerm)(unsafe.Pointer(pTerm)).FtruthProb))
 				*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 			} else {
-				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = TRowcnt(0)
+				*(*TRowcnt)(unsafe.Pointer(bp + 112)) = uint64(0)
 				if int32(nInMul) == 0 &&
 					(*Index)(unsafe.Pointer(pProbe)).FnSample != 0 &&
 					int32(*(*U16)(unsafe.Pointer(pNew + 24))) <= (*Index)(unsafe.Pointer(pProbe)).FnSampleCol &&
@@ -147782,7 +148607,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						break
 					}
 					if *(*TRowcnt)(unsafe.Pointer(bp + 112)) != 0 {
-						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, uint64(*(*TRowcnt)(unsafe.Pointer(bp + 112))))
+						(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = Xsqlite3LogEst(tls, *(*TRowcnt)(unsafe.Pointer(bp + 112)))
 						if nEq == 1 &&
 							int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+10 > int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst))) {
 							*(*U16)(unsafe.Pointer(pTerm + 18)) |= U16(TERM_HIGHTRUTH)
@@ -147796,7 +148621,7 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) -= LogEst(nIn)
 					}
 				}
-				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == TRowcnt(0) {
+				if *(*TRowcnt)(unsafe.Pointer(bp + 112)) == uint64(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 22)) += LogEst(int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq)*2))) - int32(*(*LogEst)(unsafe.Pointer((*Index)(unsafe.Pointer(pProbe)).FaiRowLogEst + uintptr(nEq-1)*2))))
 					if int32(eOp)&WO_ISNULL != 0 {
 						*(*LogEst)(unsafe.Pointer(pNew + 22)) += int16(10)
@@ -147805,9 +148630,13 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 			}
 		}
 
-		rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		if int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) == SQLITE_IDXTYPE_IPK {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 16)
+		} else {
+			rCostIdx = LogEst(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut) + 1 + 15*int32((*Index)(unsafe.Pointer(pProbe)).FszIdxRow)/int32((*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FszTabRow))
+		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, rLogSize, rCostIdx)
-		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK) == U32(0) {
+		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_IDX_ONLY|WHERE_IPK|WHERE_EXPRIDX) == U32(0) {
 			(*WhereLoop)(unsafe.Pointer(pNew)).FrRun = Xsqlite3LogEstAdd(tls, (*WhereLoop)(unsafe.Pointer(pNew)).FrRun, int16(int32((*WhereLoop)(unsafe.Pointer(pNew)).FnOut)+16))
 		}
 
@@ -147826,6 +148655,9 @@ func whereLoopAddBtreeIndex(tls *libc.TLS, pBuilder uintptr, pSrc uintptr, pProb
 		if (*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags&U32(WHERE_TOP_LIMIT) == U32(0) &&
 			int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnColumn) &&
 			(int32(*(*U16)(unsafe.Pointer(pNew + 24))) < int32((*Index)(unsafe.Pointer(pProbe)).FnKeyCol) || int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x3>>0) != SQLITE_IDXTYPE_PRIMARYKEY) {
+			if int32(*(*U16)(unsafe.Pointer(pNew + 24))) > 3 {
+				Xsqlite3ProgressCheck(tls, pParse)
+			}
 			whereLoopAddBtreeIndex(tls, pBuilder, pSrc, pProbe, int16(int32(nInMul)+nIn))
 		}
 		(*WhereLoop)(unsafe.Pointer(pNew)).FnOut = saved_nOut
@@ -147953,30 +148785,49 @@ __3:
 	return 0
 }
 
+func exprIsCoveredByIndex(tls *libc.TLS, pExpr uintptr, pIdx uintptr, iTabCur int32) int32 {
+	var i int32
+	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) == -2 &&
+			Xsqlite3ExprCompare(tls, uintptr(0), pExpr, (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaColExpr+8+uintptr(i)*32)).FpExpr, iTabCur) == 0 {
+			return 1
+		}
+	}
+	return 0
+}
+
+// Structure passed to the whereIsCoveringIndex Walker callback.
+type CoveringIndexCheck = CoveringIndexCheck1
+
 func whereIsCoveringIndexWalkCallback(tls *libc.TLS, pWalk uintptr, pExpr uintptr) int32 {
 	var i int32
 	var pIdx uintptr
 	var aiColumn uintptr
 	var nColumn U16
-	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_COLUMN && int32((*Expr)(unsafe.Pointer(pExpr)).Fop) != TK_AGG_COLUMN {
-		return WRC_Continue
-	}
-	if int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) < int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-		return WRC_Continue
-	}
-	if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur {
-		return WRC_Continue
-	}
-	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
-	aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
-	nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
-	for i = 0; i < int32(nColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+	var pCk uintptr
+
+	pCk = *(*uintptr)(unsafe.Pointer(pWalk + 40))
+	pIdx = (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FpIdx
+	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_COLUMN || int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_COLUMN {
+		if (*Expr)(unsafe.Pointer(pExpr)).FiTable != (*CoveringIndexCheck)(unsafe.Pointer(pCk)).FiTabCur {
 			return WRC_Continue
 		}
+		pIdx = (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FpIdx
+		aiColumn = (*Index)(unsafe.Pointer(pIdx)).FaiColumn
+		nColumn = (*Index)(unsafe.Pointer(pIdx)).FnColumn
+		for i = 0; i < int32(nColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer(aiColumn + uintptr(i)*2))) == int32((*Expr)(unsafe.Pointer(pExpr)).FiColumn) {
+				return WRC_Continue
+			}
+		}
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbUnidx = U8(1)
+		return WRC_Abort
+	} else if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 &&
+		exprIsCoveredByIndex(tls, pExpr, pIdx, (*CoveringIndexCheck1)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(pWalk + 40)))).FiTabCur) != 0 {
+		(*CoveringIndexCheck)(unsafe.Pointer(pCk)).FbExpr = U8(1)
+		return WRC_Prune
 	}
-	(*Walker)(unsafe.Pointer(pWalk)).FeCode = U16(1)
-	return WRC_Abort
+	return WRC_Continue
 }
 
 func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur int32) U32 {
@@ -147984,20 +148835,25 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 	defer tls.Free(64)
 
 	var i int32
+	var rc int32
 
 	if (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect == uintptr(0) {
-		return U32(1)
+		return U32(0)
 	}
-	for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
-		if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
-			break
+	if int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11) == 0 {
+		for i = 0; i < int32((*Index)(unsafe.Pointer(pIdx)).FnColumn); i++ {
+			if int32(*(*I16)(unsafe.Pointer((*Index)(unsafe.Pointer(pIdx)).FaiColumn + uintptr(i)*2))) >= int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1 {
+				break
+			}
+		}
+		if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
+			return U32(0)
 		}
 	}
-	if i >= int32((*Index)(unsafe.Pointer(pIdx)).FnColumn) {
-		return U32(1)
-	}
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
-	(*CoveringIndexCheck)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FpIdx = pIdx
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FiTabCur = iTabCur
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbExpr = U8(0)
+	(*CoveringIndexCheck1)(unsafe.Pointer(bp + 48)).FbUnidx = U8(0)
 	libc.Xmemset(tls, bp, 0, uint64(unsafe.Sizeof(Walker{})))
 	(*Walker)(unsafe.Pointer(bp)).FxExprCallback = *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, uintptr) int32
@@ -148006,9 +148862,15 @@ func whereIsCoveringIndex(tls *libc.TLS, pWInfo uintptr, pIdx uintptr, iTabCur i
 		f func(*libc.TLS, uintptr, uintptr) int32
 	}{Xsqlite3SelectWalkNoop}))
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = bp + 48
-	(*Walker)(unsafe.Pointer(bp)).FeCode = U16(0)
 	Xsqlite3WalkSelect(tls, bp, (*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)
-	return U32((*Walker)(unsafe.Pointer(bp)).FeCode)
+	if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbUnidx != 0 {
+		rc = 0
+	} else if (*CoveringIndexCheck1)(unsafe.Pointer(bp+48)).FbExpr != 0 {
+		rc = WHERE_EXPRIDX
+	} else {
+		rc = WHERE_IDX_ONLY
+	}
+	return U32(rc)
 }
 
 func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
@@ -148049,7 +148911,7 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 		(*Index)(unsafe.Pointer(bp)).FaiRowLogEst = bp + 154
 		(*Index)(unsafe.Pointer(bp)).FonError = U8(OE_Replace)
 		(*Index)(unsafe.Pointer(bp)).FpTable = pTab
-		(*Index)(unsafe.Pointer(bp)).FszIdxRow = (*Table)(unsafe.Pointer(pTab)).FszTabRow
+		(*Index)(unsafe.Pointer(bp)).FszIdxRow = int16(3)
 		libc.SetBitFieldPtr16Uint32(bp+100, uint32(SQLITE_IDXTYPE_IPK), 0, 0x3)
 		*(*LogEst)(unsafe.Pointer(bp + 154)) = (*Table)(unsafe.Pointer(pTab)).FnRowLogEst
 		*(*LogEst)(unsafe.Pointer(bp + 154 + 1*2)) = int16(0)
@@ -148089,7 +148951,8 @@ func whereLoopAddBtree(tls *libc.TLS, pBuilder uintptr, mPrereq Bitmask) int32 {
 				if !(int32((*Table)(unsafe.Pointer(pTab)).FeTabType) == TABTYP_VIEW) && (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_Ephemeral) == U32(0) {
 					*(*LogEst)(unsafe.Pointer(pNew + 18)) += int16(28)
 				} else {
-					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(10)
+					*(*LogEst)(unsafe.Pointer(pNew + 18)) -= int16(25)
+
 				}
 
 				if int32((*WhereLoop)(unsafe.Pointer(pNew)).FrSetup) < 0 {
@@ -148155,19 +149018,24 @@ __1:
 		} else {
 			var m Bitmask
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x20>>5)) != 0 {
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 				m = uint64(0)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
 			} else {
 				m = (*SrcItem)(unsafe.Pointer(pSrc)).FcolUsed & (*Index)(unsafe.Pointer(pProbe)).FcolNotIdxed
-				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) {
-					m = Bitmask(whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor))
-				}
-				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = func() uint32 {
-					if m == uint64(0) {
-						return uint32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_INDEXED)
+				if m == uint64(1)<<(int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))-1) || uint32(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x800>>11)) != 0 && !(int32(*(*uint16)(unsafe.Pointer(pProbe + 100))&0x400>>10) != 0) && m != uint64(0) {
+					var isCov U32 = whereIsCoveringIndex(tls, pWInfo, pProbe, (*SrcItem)(unsafe.Pointer(pSrc)).FiCursor)
+					if isCov == U32(0) {
+					} else {
+						m = uint64(0)
+						*(*U32)(unsafe.Pointer(pNew + 56)) |= isCov
+						if isCov&U32(WHERE_IDX_ONLY) != 0 {
+						} else {
+						}
 					}
-					return uint32(WHERE_INDEXED)
-				}()
+				} else if m == uint64(0) {
+					(*WhereLoop)(unsafe.Pointer(pNew)).FwsFlags = U32(WHERE_IDX_ONLY | WHERE_INDEXED)
+				}
 			}
 
 			if b != 0 ||
@@ -148348,7 +149216,7 @@ __4:
 				j >= (*WhereClause)(unsafe.Pointer(pWC)).FnTerm ||
 				*(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(iTerm)*8)) != uintptr(0) ||
 				int32((*sqlite3_index_constraint)(unsafe.Pointer(pIdxCons)).Fusable) == 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+23251, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+				Xsqlite3ErrorMsg(tls, pParse, ts+23312, libc.VaList(bp, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 				return SQLITE_ERROR
 			}
@@ -148406,7 +149274,7 @@ __6:
 	(*WhereLoop)(unsafe.Pointer(pNew)).FnLTerm = U16(mxTerm + 1)
 	for i = 0; i <= mxTerm; i++ {
 		if *(*uintptr)(unsafe.Pointer((*WhereLoop)(unsafe.Pointer(pNew)).FaLTerm + uintptr(i)*8)) == uintptr(0) {
-			Xsqlite3ErrorMsg(tls, pParse, ts+23251, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
+			Xsqlite3ErrorMsg(tls, pParse, ts+23312, libc.VaList(bp+8, (*Table)(unsafe.Pointer((*SrcItem)(unsafe.Pointer(pSrc)).FpTab)).FzName))
 
 			return SQLITE_ERROR
 		}
@@ -148804,7 +149672,7 @@ __1:
 		mPrior = mPrior | (*WhereLoop)(unsafe.Pointer(pNew)).FmaskSelf
 		if rc != 0 || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 			if rc == SQLITE_DONE {
-				Xsqlite3_log(tls, SQLITE_WARNING, ts+23277, 0)
+				Xsqlite3_log(tls, SQLITE_WARNING, ts+23338, 0)
 				rc = SQLITE_OK
 			} else {
 				goto __3
@@ -149015,8 +149883,8 @@ func wherePathSatisfiesOrderBy(tls *libc.TLS, pWInfo uintptr, pOrderBy uintptr,
 							continue
 						}
 					} else {
-						var pIdxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
-						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIdxExpr, iCur) != 0 {
+						var pIxExpr uintptr = (*ExprList_item)(unsafe.Pointer((*Index)(unsafe.Pointer(pIndex)).FaColExpr + 8 + uintptr(j)*32)).FpExpr
+						if Xsqlite3ExprCompareSkip(tls, pOBExpr, pIxExpr, iCur) != 0 {
 							continue
 						}
 					}
@@ -149135,14 +150003,23 @@ func Xsqlite3WhereIsSorted(tls *libc.TLS, pWInfo uintptr) int32 {
 }
 
 func whereSortingCost(tls *libc.TLS, pWInfo uintptr, nRow LogEst, nOrderBy int32, nSorted int32) LogEst {
-	var rScale LogEst
 	var rSortCost LogEst
+	var nCol LogEst
 
-	rScale = LogEst(int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66)
-	rSortCost = LogEst(int32(nRow) + int32(rScale) + 16)
+	nCol = Xsqlite3LogEst(tls, uint64(((*ExprList)(unsafe.Pointer((*Select)(unsafe.Pointer((*WhereInfo)(unsafe.Pointer(pWInfo)).FpSelect)).FpEList)).FnExpr+59)/30))
+	rSortCost = LogEst(int32(nRow) + int32(nCol))
+	if nSorted > 0 {
+		rSortCost = LogEst(int32(rSortCost) + (int32(Xsqlite3LogEst(tls, uint64((nOrderBy-nSorted)*100/nOrderBy))) - 66))
+	}
 
-	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 && int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
-		nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+	if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_USE_LIMIT != 0 {
+		rSortCost = int16(int32(rSortCost) + 10)
+		if nSorted != 0 {
+			rSortCost = int16(int32(rSortCost) + 6)
+		}
+		if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit) < int32(nRow) {
+			nRow = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiLimit
+		}
 	} else if int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FwctrlFlags)&WHERE_WANT_DISTINCT != 0 {
 		if int32(nRow) > 10 {
 			nRow = int16(int32(nRow) - 10)
@@ -149294,7 +150171,7 @@ __3:
 							pWInfo, nRowEst, nOrderBy, int32(isOrdered))
 					}
 
-					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 5)
+					rCost = LogEst(int32(Xsqlite3LogEstAdd(tls, rUnsorted, *(*LogEst)(unsafe.Pointer(aSortCost + uintptr(isOrdered)*2)))) + 3)
 
 				} else {
 					rCost = rUnsorted
@@ -149402,7 +150279,7 @@ __3:
 	}
 
 	if nFrom == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23312, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+23373, 0)
 		Xsqlite3DbFreeNN(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pSpace)
 		return SQLITE_ERROR
 	}
@@ -149664,19 +150541,21 @@ func whereOmitNoopJoin(tls *libc.TLS, pWInfo uintptr, notReady Bitmask) Bitmask
 
 func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 	var i int32
-	var nSearch LogEst
+	var nSearch LogEst = int16(0)
 
-	nSearch = (*WhereLoop1)(unsafe.Pointer((*WhereLevel)(unsafe.Pointer(pWInfo + 856)).FpWLoop)).FnOut
-	for i = 1; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
+	for i = 0; i < int32((*WhereInfo)(unsafe.Pointer(pWInfo)).FnLevel); i++ {
 		var pLoop uintptr = (*WhereLevel)(unsafe.Pointer(pWInfo + 856 + uintptr(i)*104)).FpWLoop
 		var reqFlags uint32 = uint32(WHERE_SELFCULL | WHERE_COLUMN_EQ)
-		if (*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
+		var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
+		var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
+		if (*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) == U32(0) {
+			break
+		}
+		*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
+		if i >= 1 &&
+			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&reqFlags == reqFlags &&
 			(*WhereLoop)(unsafe.Pointer(pLoop)).FwsFlags&U32(WHERE_IPK|WHERE_INDEXED) != U32(0) {
-			var pItem uintptr = (*WhereInfo)(unsafe.Pointer(pWInfo)).FpTabList + 8 + uintptr((*WhereLoop)(unsafe.Pointer(pLoop)).FiTab)*104
-			var pTab uintptr = (*SrcItem)(unsafe.Pointer(pItem)).FpTab
-			*(*U32)(unsafe.Pointer(pTab + 48)) |= U32(TF_StatsUsed)
-			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) &&
-				(*Table)(unsafe.Pointer(pTab)).FtabFlags&U32(TF_HasStat1) != U32(0) {
+			if int32(nSearch) > int32((*Table)(unsafe.Pointer(pTab)).FnRowLogEst) {
 				*(*U32)(unsafe.Pointer(pLoop + 56)) |= U32(WHERE_BLOOMFILTER)
 				*(*U32)(unsafe.Pointer(pLoop + 56)) &= libc.Uint32FromInt32(libc.CplInt32(WHERE_IDX_ONLY))
 
@@ -149688,9 +150567,9 @@ func whereCheckIfBloomFilterIsUseful(tls *libc.TLS, pWInfo uintptr) {
 
 func whereIndexedExprCleanup(tls *libc.TLS, db uintptr, pObject uintptr) {
 	var pParse uintptr = pObject
-	for (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr != uintptr(0) {
-		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
+	for (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr != uintptr(0) {
+		var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = (*IndexedExpr)(unsafe.Pointer(p)).FpIENext
 		Xsqlite3ExprDelete(tls, db, (*IndexedExpr)(unsafe.Pointer(p)).FpExpr)
 		Xsqlite3DbFreeNN(tls, db, p)
 	}
@@ -149723,13 +150602,13 @@ func whereAddIndexedExpr(tls *libc.TLS, pParse uintptr, pIdx uintptr, iIdxCur in
 		if p == uintptr(0) {
 			break
 		}
-		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+		(*IndexedExpr)(unsafe.Pointer(p)).FpIENext = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 		(*IndexedExpr)(unsafe.Pointer(p)).FpExpr = Xsqlite3ExprDup(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pExpr, 0)
 		(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = (*SrcItem)(unsafe.Pointer(pTabItem)).FiCursor
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur = iIdxCur
 		(*IndexedExpr)(unsafe.Pointer(p)).FiIdxCol = i
 		(*IndexedExpr)(unsafe.Pointer(p)).FbMaybeNullRow = U8(bMaybeNullRow)
-		(*Parse)(unsafe.Pointer(pParse)).FpIdxExpr = p
+		(*Parse)(unsafe.Pointer(pParse)).FpIdxEpr = p
 		if (*IndexedExpr)(unsafe.Pointer(p)).FpIENext == uintptr(0) {
 			Xsqlite3ParserAddCleanup(tls, pParse, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, uintptr)
@@ -149881,7 +150760,7 @@ __1:
 	if !((*SrcList)(unsafe.Pointer(pTabList)).FnSrc > int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+23330, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
+	Xsqlite3ErrorMsg(tls, pParse, ts+23391, libc.VaList(bp, int32(uint64(unsafe.Sizeof(Bitmask(0)))*uint64(8))))
 	return uintptr(0)
 __2:
 	;
@@ -149945,7 +150824,7 @@ __6:
 	(*WhereInfo)(unsafe.Pointer(pWInfo)).FeDistinct = U8(WHERE_DISTINCT_UNIQUE)
 __7:
 	;
-	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+23358, 0)
+	Xsqlite3VdbeExplain(tls, pParse, uint8(0), ts+23419, 0)
 	goto __5
 __4:
 	ii = 0
@@ -150646,7 +151525,7 @@ __4:
 				last = (*WhereInfo)(unsafe.Pointer(pWInfo)).FiEndWhere
 			}
 			if uint32(int32(*(*uint16)(unsafe.Pointer(pIdx + 100))&0x800>>11)) != 0 {
-				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxExpr
+				var p uintptr = (*Parse)(unsafe.Pointer(pParse)).FpIdxEpr
 				for p != 0 {
 					if (*IndexedExpr)(unsafe.Pointer(p)).FiIdxCur == (*WhereLevel)(unsafe.Pointer(pLevel)).FiIdxCur {
 						(*IndexedExpr)(unsafe.Pointer(p)).FiDataCur = -1
@@ -150827,7 +151706,7 @@ __1:
 
 error_out:
 	Xsqlite3_result_error(tls,
-		pCtx, ts+23376, -1)
+		pCtx, ts+23437, -1)
 }
 
 func nth_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
@@ -150960,7 +151839,7 @@ func ntileStepFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 			(*NtileCtx)(unsafe.Pointer(p)).FnParam = Xsqlite3_value_int64(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 			if (*NtileCtx)(unsafe.Pointer(p)).FnParam <= int64(0) {
 				Xsqlite3_result_error(tls,
-					pCtx, ts+23432, -1)
+					pCtx, ts+23493, -1)
 			}
 		}
 		(*NtileCtx)(unsafe.Pointer(p)).FnTotal++
@@ -151050,17 +151929,17 @@ func last_valueFinalizeFunc(tls *libc.TLS, pCtx uintptr) {
 	}
 }
 
-var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 23477))
-var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 23488))
-var rankName = *(*[5]int8)(unsafe.Pointer(ts + 23499))
-var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 23504))
-var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 23517))
-var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 23527))
-var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 23533))
-var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 23544))
-var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 23554))
-var leadName = *(*[5]int8)(unsafe.Pointer(ts + 23566))
-var lagName = *(*[4]int8)(unsafe.Pointer(ts + 23571))
+var row_numberName = *(*[11]int8)(unsafe.Pointer(ts + 23538))
+var dense_rankName = *(*[11]int8)(unsafe.Pointer(ts + 23549))
+var rankName = *(*[5]int8)(unsafe.Pointer(ts + 23560))
+var percent_rankName = *(*[13]int8)(unsafe.Pointer(ts + 23565))
+var cume_distName = *(*[10]int8)(unsafe.Pointer(ts + 23578))
+var ntileName = *(*[6]int8)(unsafe.Pointer(ts + 23588))
+var last_valueName = *(*[11]int8)(unsafe.Pointer(ts + 23594))
+var nth_valueName = *(*[10]int8)(unsafe.Pointer(ts + 23605))
+var first_valueName = *(*[12]int8)(unsafe.Pointer(ts + 23615))
+var leadName = *(*[5]int8)(unsafe.Pointer(ts + 23627))
+var lagName = *(*[4]int8)(unsafe.Pointer(ts + 23632))
 
 func noopStepFunc(tls *libc.TLS, p uintptr, n int32, a uintptr) {
 	_ = p
@@ -151106,7 +151985,7 @@ func windowFind(tls *libc.TLS, pParse uintptr, pList uintptr, zName uintptr) uin
 		}
 	}
 	if p == uintptr(0) {
-		Xsqlite3ErrorMsg(tls, pParse, ts+23575, libc.VaList(bp, zName))
+		Xsqlite3ErrorMsg(tls, pParse, ts+23636, libc.VaList(bp, zName))
 	}
 	return p
 }
@@ -151150,12 +152029,12 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 		((*Window)(unsafe.Pointer(pWin)).FpStart != 0 || (*Window)(unsafe.Pointer(pWin)).FpEnd != 0) &&
 		((*Window)(unsafe.Pointer(pWin)).FpOrderBy == uintptr(0) || (*ExprList)(unsafe.Pointer((*Window)(unsafe.Pointer(pWin)).FpOrderBy)).FnExpr != 1) {
 		Xsqlite3ErrorMsg(tls, pParse,
-			ts+23594, 0)
+			ts+23655, 0)
 	} else if (*FuncDef)(unsafe.Pointer(pFunc)).FfuncFlags&U32(SQLITE_FUNC_WINDOW) != 0 {
 		var db uintptr = (*Parse)(unsafe.Pointer(pParse)).Fdb
 		if (*Window)(unsafe.Pointer(pWin)).FpFilter != 0 {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+23665, 0)
+				ts+23726, 0)
 		} else {
 			*(*[8]WindowUpdate)(unsafe.Pointer(bp)) = [8]WindowUpdate{
 				{FzFunc: uintptr(unsafe.Pointer(&row_numberName)), FeFrmType: TK_ROWS, FeStart: TK_UNBOUNDED, FeEnd: TK_CURRENT},
@@ -151178,7 +152057,7 @@ func Xsqlite3WindowUpdate(tls *libc.TLS, pParse uintptr, pList uintptr, pWin uin
 					(*Window)(unsafe.Pointer(pWin)).FeEnd = U8((*WindowUpdate)(unsafe.Pointer(bp + uintptr(i)*24)).FeEnd)
 					(*Window)(unsafe.Pointer(pWin)).FeExclude = U8(0)
 					if int32((*Window)(unsafe.Pointer(pWin)).FeStart) == TK_FOLLOWING {
-						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9230)
+						(*Window)(unsafe.Pointer(pWin)).FpStart = Xsqlite3Expr(tls, db, TK_INTEGER, ts+9290)
 					}
 					break
 				}
@@ -151384,7 +152263,7 @@ func disallowAggregatesInOrderByCb(tls *libc.TLS, pWalker uintptr, pExpr uintptr
 
 	if int32((*Expr)(unsafe.Pointer(pExpr)).Fop) == TK_AGG_FUNCTION && (*Expr)(unsafe.Pointer(pExpr)).FpAggInfo == uintptr(0) {
 		Xsqlite3ErrorMsg(tls, (*Walker)(unsafe.Pointer(pWalker)).FpParse,
-			ts+23728, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
+			ts+23789, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(pExpr + 8))))
 	}
 	return WRC_Continue
 }
@@ -151500,7 +152379,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 
 		if *(*uintptr)(unsafe.Pointer(bp + 48)) == uintptr(0) {
 			*(*uintptr)(unsafe.Pointer(bp + 48)) = Xsqlite3ExprListAppend(tls, pParse, uintptr(0),
-				Xsqlite3Expr(tls, db, TK_INTEGER, ts+8822))
+				Xsqlite3Expr(tls, db, TK_INTEGER, ts+8882))
 		}
 
 		pSub = Xsqlite3SelectNew(tls,
@@ -151511,6 +152390,7 @@ func Xsqlite3WindowRewrite(tls *libc.TLS, pParse uintptr, p uintptr) int32 {
 		if (*Select)(unsafe.Pointer(p)).FpSrc != 0 {
 			var pTab2 uintptr
 			(*SrcItem)(unsafe.Pointer((*Select)(unsafe.Pointer(p)).FpSrc + 8)).FpSelect = pSub
+			libc.SetBitFieldPtr16Uint32((*Select)(unsafe.Pointer(p)).FpSrc+8+60+4, uint32(1), 3, 0x8)
 			Xsqlite3SrcListAssignCursors(tls, pParse, (*Select)(unsafe.Pointer(p)).FpSrc)
 			*(*U32)(unsafe.Pointer(pSub + 4)) |= U32(SF_Expanded | SF_OrderByReqd)
 			pTab2 = Xsqlite3ResultSetOfSelect(tls, pParse, pSub, int8(SQLITE_AFF_NONE))
@@ -151614,7 +152494,7 @@ __1:
 		eStart == TK_FOLLOWING && (eEnd == TK_PRECEDING || eEnd == TK_CURRENT)) {
 		goto __2
 	}
-	Xsqlite3ErrorMsg(tls, pParse, ts+23754, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+23815, 0)
 	goto windowAllocErr
 __2:
 	;
@@ -151679,15 +152559,15 @@ func Xsqlite3WindowChain(tls *libc.TLS, pParse uintptr, pWin uintptr, pList uint
 			var zErr uintptr = uintptr(0)
 
 			if (*Window)(unsafe.Pointer(pWin)).FpPartition != 0 {
-				zErr = ts + 23786
+				zErr = ts + 23847
 			} else if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 && (*Window)(unsafe.Pointer(pWin)).FpOrderBy != 0 {
-				zErr = ts + 23803
+				zErr = ts + 23864
 			} else if int32((*Window)(unsafe.Pointer(pExist)).FbImplicitFrame) == 0 {
-				zErr = ts + 23819
+				zErr = ts + 23880
 			}
 			if zErr != 0 {
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+23839, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
+					ts+23900, libc.VaList(bp, zErr, (*Window)(unsafe.Pointer(pWin)).FzBase))
 			} else {
 				(*Window)(unsafe.Pointer(pWin)).FpPartition = Xsqlite3ExprListDup(tls, db, (*Window)(unsafe.Pointer(pExist)).FpPartition, 0)
 				if (*Window)(unsafe.Pointer(pExist)).FpOrderBy != 0 {
@@ -151708,7 +152588,7 @@ func Xsqlite3WindowAttach(tls *libc.TLS, pParse uintptr, p uintptr, pWin uintptr
 		(*Window)(unsafe.Pointer(pWin)).FpOwner = p
 		if (*Expr)(unsafe.Pointer(p)).Fflags&U32(EP_Distinct) != 0 && int32((*Window)(unsafe.Pointer(pWin)).FeFrmType) != TK_FILTER {
 			Xsqlite3ErrorMsg(tls, pParse,
-				ts+23872, 0)
+				ts+23933, 0)
 		}
 	} else {
 		Xsqlite3WindowDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, pWin)
@@ -151864,11 +152744,11 @@ func windowCheckValue(tls *libc.TLS, pParse uintptr, reg int32, eCond int32) {
 }
 
 var azErr = [5]uintptr{
-	ts + 23919,
-	ts + 23972,
-	ts + 23376,
-	ts + 24023,
-	ts + 24075,
+	ts + 23980,
+	ts + 24033,
+	ts + 23437,
+	ts + 24084,
+	ts + 24136,
 }
 var aOp1 = [5]int32{OP_Ge, OP_Ge, OP_Gt, OP_Ge, OP_Ge}
 
@@ -153065,8 +153945,7 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 		var addrGe int32 = Xsqlite3VdbeAddOp3(tls, v, op, regStart, 0, regEnd)
 
 		windowAggFinal(tls, bp, 0)
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		windowReturnOneRow(tls, bp)
 		Xsqlite3VdbeAddOp1(tls, v, OP_ResetSorter, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
 		Xsqlite3VdbeAddOp2(tls, v, OP_Goto, 0, lblWhereEnd)
@@ -153077,13 +153956,10 @@ func Xsqlite3WindowCodeStep(tls *libc.TLS, pParse uintptr, p uintptr, pWInfo uin
 	}
 
 	if int32((*Window)(unsafe.Pointer(pMWin)).FeStart) != TK_UNBOUNDED {
-		Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr, 1)
-
+		Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Fcsr)
 	}
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr, 1)
-
-	Xsqlite3VdbeAddOp2(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr, 1)
-
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fcurrent.Fcsr)
+	Xsqlite3VdbeAddOp1(tls, v, OP_Rewind, (*WindowCodeArg)(unsafe.Pointer(bp)).Fend.Fcsr)
 	if regPeer != 0 && pOrderBy != 0 {
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regNewPeer, regPeer, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
 		Xsqlite3VdbeAddOp3(tls, v, OP_Copy, regPeer, (*WindowCodeArg)(unsafe.Pointer(bp)).Fstart.Freg, (*ExprList)(unsafe.Pointer(pOrderBy)).FnExpr-1)
@@ -153267,19 +154143,19 @@ func parserDoubleLinkSelect(tls *libc.TLS, pParse uintptr, p uintptr) {
 			}
 			cnt++
 			if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != 0 || (*Select)(unsafe.Pointer(pLoop)).FpLimit != 0 {
-				Xsqlite3ErrorMsg(tls, pParse, ts+24125,
+				Xsqlite3ErrorMsg(tls, pParse, ts+24186,
 					libc.VaList(bp, func() uintptr {
 						if (*Select)(unsafe.Pointer(pLoop)).FpOrderBy != uintptr(0) {
-							return ts + 21119
+							return ts + 24228
 						}
-						return ts + 24167
+						return ts + 24237
 					}(),
 						Xsqlite3SelectOpName(tls, int32((*Select)(unsafe.Pointer(pNext)).Fop))))
 				break
 			}
 		}
 		if (*Select)(unsafe.Pointer(p)).FselFlags&U32(SF_MultiValue) == U32(0) && libc.AssignInt32(&mxSelect, *(*int32)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb + 136 + 4*4))) > 0 && cnt > mxSelect {
-			Xsqlite3ErrorMsg(tls, pParse, ts+24173, 0)
+			Xsqlite3ErrorMsg(tls, pParse, ts+24243, 0)
 		}
 	}
 
@@ -153347,7 +154223,7 @@ func parserAddExprIdListTerm(tls *libc.TLS, pParse uintptr, pPrior uintptr, pIdT
 	var p uintptr = Xsqlite3ExprListAppend(tls, pParse, pPrior, uintptr(0))
 	if (hasCollate != 0 || sortOrder != -1) &&
 		int32((*Sqlite3)(unsafe.Pointer((*Parse)(unsafe.Pointer(pParse)).Fdb)).Finit.Fbusy) == 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+24207,
+		Xsqlite3ErrorMsg(tls, pParse, ts+24277,
 			libc.VaList(bp, (*Token)(unsafe.Pointer(pIdToken)).Fn, (*Token)(unsafe.Pointer(pIdToken)).Fz))
 	}
 	Xsqlite3ExprListSetName(tls, pParse, p, pIdToken, 1)
@@ -154444,7 +155320,7 @@ func yyStackOverflow(tls *libc.TLS, yypParser uintptr) {
 		yy_pop_parser_stack(tls, yypParser)
 	}
 
-	Xsqlite3ErrorMsg(tls, pParse, ts+24245, 0)
+	Xsqlite3ErrorMsg(tls, pParse, ts+24315, 0)
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
 }
@@ -155419,21 +156295,21 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			break
 		case uint32(23):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17609, 5) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(5) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17625, 5) == 0 {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(TF_WithoutRowid | TF_NoVisibleRowid)
 				} else {
 					*(*U32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+24267, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+24337, libc.VaList(bp, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			break
 		case uint32(24):
 			{
-				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17522, 6) == 0 {
+				if (*Token)(unsafe.Pointer(yymsp+8)).Fn == uint32(6) && Xsqlite3_strnicmp(tls, (*Token)(unsafe.Pointer(yymsp+8)).Fz, ts+17538, 6) == 0 {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(TF_Strict)
 				} else {
 					*(*U32)(unsafe.Pointer(bp + 40)) = U32(0)
-					Xsqlite3ErrorMsg(tls, pParse, ts+24267, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
+					Xsqlite3ErrorMsg(tls, pParse, ts+24337, libc.VaList(bp+16, (*Token)(unsafe.Pointer(yymsp+8)).Fn, (*Token)(unsafe.Pointer(yymsp+8)).Fz))
 				}
 			}
 			*(*U32)(unsafe.Pointer(yymsp + 8)) = *(*U32)(unsafe.Pointer(bp + 40))
@@ -156176,7 +157052,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 		case uint32(157):
 			{
 				Xsqlite3SrcListIndexedBy(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-5)*24 + 8)), yymsp+libc.UintptrFromInt32(-4)*24+8)
-				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+24294)
+				Xsqlite3ExprListCheckLength(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)), ts+24364)
 				if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)) != 0 {
 					var pFromClause uintptr = *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8))
 					if (*SrcList)(unsafe.Pointer(pFromClause)).FnSrc > 1 {
@@ -156340,7 +157216,7 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					*(*Token)(unsafe.Pointer(bp + 128)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 
 					if int32((*Parse)(unsafe.Pointer(pParse)).Fnested) == 0 {
-						Xsqlite3ErrorMsg(tls, pParse, ts+24303, libc.VaList(bp+32, bp+128))
+						Xsqlite3ErrorMsg(tls, pParse, ts+24373, libc.VaList(bp+32, bp+128))
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = uintptr(0)
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + 8)) = Xsqlite3PExpr(tls, pParse, TK_REGISTER, uintptr(0), uintptr(0))
@@ -156557,9 +157433,9 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 					Xsqlite3ExprUnmapAndDelete(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
 					*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3Expr(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, TK_STRING, func() uintptr {
 						if *(*int32)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-3)*24 + 8)) != 0 {
-							return ts + 8056
+							return ts + 8116
 						}
-						return ts + 8061
+						return ts + 8121
 					}())
 					if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) != 0 {
 						Xsqlite3ExprIdToTrueFalse(tls, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)))
@@ -156571,6 +157447,11 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 						pRHS = Xsqlite3PExpr(tls, pParse, TK_UPLUS, pRHS, uintptr(0))
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_EQ, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), pRHS)
+					} else if (*ExprList)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))).FnExpr == 1 && int32((*Expr)(unsafe.Pointer(pRHS)).Fop) == TK_SELECT {
+						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
+						Xsqlite3PExprAddSelect(tls, pParse, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), *(*uintptr)(unsafe.Pointer(pRHS + 32)))
+						*(*uintptr)(unsafe.Pointer(pRHS + 32)) = uintptr(0)
+						Xsqlite3ExprListDelete(tls, (*Parse)(unsafe.Pointer(pParse)).Fdb, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-1)*24 + 8)))
 					} else {
 						*(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) = Xsqlite3PExpr(tls, pParse, TK_IN, *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)), uintptr(0))
 						if *(*uintptr)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-4)*24 + 8)) == uintptr(0) {
@@ -156838,19 +157719,19 @@ func yy_reduce(tls *libc.TLS, yypParser uintptr, yyruleno uint32, yyLookahead in
 			{
 				*(*Token)(unsafe.Pointer(yymsp + libc.UintptrFromInt32(-2)*24 + 8)) = *(*Token)(unsafe.Pointer(yymsp + 8))
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+24327, 0)
+					ts+24397, 0)
 			}
 			break
 		case uint32(271):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+24422, 0)
+					ts+24492, 0)
 			}
 			break
 		case uint32(272):
 			{
 				Xsqlite3ErrorMsg(tls, pParse,
-					ts+24506, 0)
+					ts+24576, 0)
 			}
 			break
 		case uint32(273):
@@ -157229,9 +158110,9 @@ func yy_syntax_error(tls *libc.TLS, yypParser uintptr, yymajor int32, yyminor To
 
 	_ = yymajor
 	if *(*int8)(unsafe.Pointer((*Token)(unsafe.Pointer(bp + 8)).Fz)) != 0 {
-		Xsqlite3ErrorMsg(tls, pParse, ts+24303, libc.VaList(bp, bp+8))
+		Xsqlite3ErrorMsg(tls, pParse, ts+24373, libc.VaList(bp, bp+8))
 	} else {
-		Xsqlite3ErrorMsg(tls, pParse, ts+24591, 0)
+		Xsqlite3ErrorMsg(tls, pParse, ts+24661, 0)
 	}
 
 	(*YyParser)(unsafe.Pointer(yypParser)).FpParse = pParse
@@ -157999,7 +158880,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 			} else {
 				(*Token)(unsafe.Pointer(bp + 2464)).Fz = zSql
 				(*Token)(unsafe.Pointer(bp + 2464)).Fn = uint32(n)
-				Xsqlite3ErrorMsg(tls, pParse, ts+24608, libc.VaList(bp, bp+2464))
+				Xsqlite3ErrorMsg(tls, pParse, ts+24678, libc.VaList(bp, bp+2464))
 				break
 			}
 		}
@@ -158022,7 +158903,7 @@ func Xsqlite3RunParser(tls *libc.TLS, pParse uintptr, zSql uintptr) int32 {
 		if (*Parse)(unsafe.Pointer(pParse)).FzErrMsg == uintptr(0) {
 			(*Parse)(unsafe.Pointer(pParse)).FzErrMsg = Xsqlite3MPrintf(tls, db, ts+4493, libc.VaList(bp+8, Xsqlite3ErrStr(tls, (*Parse)(unsafe.Pointer(pParse)).Frc)))
 		}
-		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+24633, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
+		Xsqlite3_log(tls, (*Parse)(unsafe.Pointer(pParse)).Frc, ts+24703, libc.VaList(bp+16, (*Parse)(unsafe.Pointer(pParse)).FzErrMsg, (*Parse)(unsafe.Pointer(pParse)).FzTail))
 		nErr++
 	}
 	(*Parse)(unsafe.Pointer(pParse)).FzTail = zSql
@@ -158195,7 +159076,7 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'C':
 						{
-							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+24644, 6) == 0 {
+							if nId == 6 && Xsqlite3_strnicmp(tls, zSql, ts+24714, 6) == 0 {
 								token = U8(TkCREATE)
 							} else {
 								token = U8(TkOTHER)
@@ -158208,11 +159089,11 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'T':
 						{
-							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+21239, 7) == 0 {
+							if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+21300, 7) == 0 {
 								token = U8(TkTRIGGER)
-							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+24651, 4) == 0 {
+							} else if nId == 4 && Xsqlite3_strnicmp(tls, zSql, ts+24721, 4) == 0 {
 								token = U8(TkTEMP)
-							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+24656, 9) == 0 {
+							} else if nId == 9 && Xsqlite3_strnicmp(tls, zSql, ts+24726, 9) == 0 {
 								token = U8(TkTEMP)
 							} else {
 								token = U8(TkOTHER)
@@ -158225,9 +159106,9 @@ func Xsqlite3_complete(tls *libc.TLS, zSql uintptr) int32 {
 						fallthrough
 					case 'E':
 						{
-							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+24666, 3) == 0 {
+							if nId == 3 && Xsqlite3_strnicmp(tls, zSql, ts+24736, 3) == 0 {
 								token = U8(TkEND)
-							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+24670, 7) == 0 {
+							} else if nId == 7 && Xsqlite3_strnicmp(tls, zSql, ts+24740, 7) == 0 {
 								token = U8(TkEXPLAIN)
 							} else {
 								token = U8(TkOTHER)
@@ -158461,7 +159342,7 @@ func Xsqlite3_config(tls *libc.TLS, op int32, va uintptr) int32 {
 	var rc int32 = SQLITE_OK
 
 	if Xsqlite3Config.FisInit != 0 {
-		return Xsqlite3MisuseError(tls, 172925)
+		return Xsqlite3MisuseError(tls, 174337)
 	}
 
 	ap = va
@@ -159036,7 +159917,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 		return SQLITE_OK
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 173699)
+		return Xsqlite3MisuseError(tls, 175111)
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if int32((*Sqlite3)(unsafe.Pointer(db)).FmTrace)&SQLITE_TRACE_CLOSE != 0 {
@@ -159051,7 +159932,7 @@ func sqlite3Close(tls *libc.TLS, db uintptr, forceZombie int32) int32 {
 
 	if !(forceZombie != 0) && connectionIsBusy(tls, db) != 0 {
 		Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-			ts+24678, 0)
+			ts+24748, 0)
 		Xsqlite3_mutex_leave(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 		return SQLITE_BUSY
 	}
@@ -159242,23 +160123,23 @@ func Xsqlite3RollbackAll(tls *libc.TLS, db uintptr, tripCode int32) {
 // Return a static string that describes the kind of error specified in the
 // argument.
 func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
-	var zErr uintptr = ts + 24746
+	var zErr uintptr = ts + 24816
 	switch rc {
 	case SQLITE_ABORT | int32(2)<<8:
 		{
-			zErr = ts + 24760
+			zErr = ts + 24830
 			break
 
 		}
 	case SQLITE_ROW:
 		{
-			zErr = ts + 24782
+			zErr = ts + 24852
 			break
 
 		}
 	case SQLITE_DONE:
 		{
-			zErr = ts + 24804
+			zErr = ts + 24874
 			break
 
 		}
@@ -159276,35 +160157,35 @@ func Xsqlite3ErrStr(tls *libc.TLS, rc int32) uintptr {
 }
 
 var aMsg = [29]uintptr{
-	ts + 24827,
-	ts + 24840,
+	ts + 24897,
+	ts + 24910,
 	uintptr(0),
-	ts + 24856,
-	ts + 24881,
-	ts + 24895,
-	ts + 24914,
+	ts + 24926,
+	ts + 24951,
+	ts + 24965,
+	ts + 24984,
 	ts + 1480,
-	ts + 24939,
-	ts + 24976,
-	ts + 24988,
-	ts + 25003,
-	ts + 25036,
-	ts + 25054,
-	ts + 25079,
-	ts + 25108,
+	ts + 25009,
+	ts + 25046,
+	ts + 25058,
+	ts + 25073,
+	ts + 25106,
+	ts + 25124,
+	ts + 25149,
+	ts + 25178,
 	uintptr(0),
-	ts + 7200,
+	ts + 7190,
 	ts + 6686,
-	ts + 25125,
-	ts + 25143,
-	ts + 25161,
-	uintptr(0),
 	ts + 25195,
+	ts + 25213,
+	ts + 25231,
 	uintptr(0),
-	ts + 25216,
-	ts + 25242,
 	ts + 25265,
+	uintptr(0),
 	ts + 25286,
+	ts + 25312,
+	ts + 25335,
+	ts + 25356,
 }
 
 func sqliteDefaultBusyCallback(tls *libc.TLS, ptr uintptr, count int32) int32 {
@@ -159405,6 +160286,12 @@ func Xsqlite3_interrupt(tls *libc.TLS, db uintptr) {
 	libc.AtomicStoreNInt32(db+432, int32(1), 0)
 }
 
+// Return true or false depending on whether or not an interrupt is
+// pending on connection db.
+func Xsqlite3_is_interrupted(tls *libc.TLS, db uintptr) int32 {
+	return libc.Bool32(libc.AtomicLoadNInt32(db+432, 0) != 0)
+}
+
 // This function is exactly the same as sqlite3_create_function(), except
 // that it is designed to be called by internal code. The difference is
 // that if a malloc() fails in sqlite3_create_function(), an error code
@@ -159419,7 +160306,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 		libc.Bool32(xValue == uintptr(0)) != libc.Bool32(xInverse == uintptr(0)) ||
 		(nArg < -1 || nArg > SQLITE_MAX_FUNCTION_ARG) ||
 		255 < Xsqlite3Strlen30(tls, zFunctionName) {
-		return Xsqlite3MisuseError(tls, 174328)
+		return Xsqlite3MisuseError(tls, 175758)
 	}
 
 	extraFlags = enc & (SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY | SQLITE_SUBTYPE | SQLITE_INNOCUOUS)
@@ -159464,7 +160351,7 @@ func Xsqlite3CreateFunc(tls *libc.TLS, db uintptr, zFunctionName uintptr, nArg i
 	if p != 0 && (*FuncDef)(unsafe.Pointer(p)).FfuncFlags&U32(SQLITE_FUNC_ENCMASK) == U32(enc) && int32((*FuncDef)(unsafe.Pointer(p)).FnArg) == nArg {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+25302, 0)
+				ts+25372, 0)
 
 			return SQLITE_BUSY
 		} else {
@@ -159581,7 +160468,7 @@ func sqlite3InvalidFunction(tls *libc.TLS, context uintptr, NotUsed int32, NotUs
 	_ = NotUsed
 	_ = NotUsed2
 	zErr = Xsqlite3_mprintf(tls,
-		ts+25365, libc.VaList(bp, zName))
+		ts+25435, libc.VaList(bp, zName))
 	Xsqlite3_result_error(tls, context, zErr, -1)
 	Xsqlite3_free(tls, zErr)
 }
@@ -159817,7 +160704,7 @@ func Xsqlite3_wal_checkpoint_v2(tls *libc.TLS, db uintptr, zDb uintptr, eMode in
 	}
 	if iDb < 0 {
 		rc = SQLITE_ERROR
-		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+25416, libc.VaList(bp, zDb))
+		Xsqlite3ErrorWithMsg(tls, db, SQLITE_ERROR, ts+25486, libc.VaList(bp, zDb))
 	} else {
 		(*Sqlite3)(unsafe.Pointer(db)).FbusyHandler.FnBusy = 0
 		rc = Xsqlite3Checkpoint(tls, db, iDb, eMode, pnLog, pnCkpt)
@@ -159910,7 +160797,7 @@ func Xsqlite3_errmsg(tls *libc.TLS, db uintptr) uintptr {
 		return Xsqlite3ErrStr(tls, SQLITE_NOMEM)
 	}
 	if !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 175073))
+		return Xsqlite3ErrStr(tls, Xsqlite3MisuseError(tls, 176503))
 	}
 	Xsqlite3_mutex_enter(tls, (*Sqlite3)(unsafe.Pointer(db)).Fmutex)
 	if (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
@@ -159980,7 +160867,7 @@ var misuse = [34]U16{
 // passed to this function, we assume a malloc() failed during sqlite3_open().
 func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175152)
+		return Xsqlite3MisuseError(tls, 176582)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -159990,7 +160877,7 @@ func Xsqlite3_errcode(tls *libc.TLS, db uintptr) int32 {
 
 func Xsqlite3_extended_errcode(tls *libc.TLS, db uintptr) int32 {
 	if db != 0 && !(Xsqlite3SafetyCheckSickOrOk(tls, db) != 0) {
-		return Xsqlite3MisuseError(tls, 175161)
+		return Xsqlite3MisuseError(tls, 176591)
 	}
 	if !(db != 0) || (*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0 {
 		return SQLITE_NOMEM
@@ -160022,14 +160909,14 @@ func createCollation(tls *libc.TLS, db uintptr, zName uintptr, enc U8, pCtx uint
 		enc2 = SQLITE_UTF16LE
 	}
 	if enc2 < SQLITE_UTF8 || enc2 > SQLITE_UTF16BE {
-		return Xsqlite3MisuseError(tls, 175209)
+		return Xsqlite3MisuseError(tls, 176639)
 	}
 
 	pColl = Xsqlite3FindCollSeq(tls, db, U8(enc2), zName, 0)
 	if pColl != 0 && (*CollSeq)(unsafe.Pointer(pColl)).FxCmp != 0 {
 		if (*Sqlite3)(unsafe.Pointer(db)).FnVdbeActive != 0 {
 			Xsqlite3ErrorWithMsg(tls, db, SQLITE_BUSY,
-				ts+25437, 0)
+				ts+25507, 0)
 			return SQLITE_BUSY
 		}
 		Xsqlite3ExpirePreparedStatements(tls, db, 0)
@@ -160159,7 +161046,7 @@ func Xsqlite3ParseUri(tls *libc.TLS, zDefaultVfs uintptr, zUri uintptr, pFlags u
 
 	if !((flags&uint32(SQLITE_OPEN_URI) != 0 ||
 		Xsqlite3Config.FbOpenUri != 0) &&
-		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+25505, uint64(5)) == 0) {
+		nUri >= 5 && libc.Xmemcmp(tls, zUri, ts+25575, uint64(5)) == 0) {
 		goto __1
 	}
 	iOut = 0
@@ -160204,10 +161091,10 @@ __8:
 	goto __8
 __9:
 	;
-	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+25511, zUri+7, uint64(9)) != 0)) {
+	if !(iIn != 7 && (iIn != 16 || libc.Xmemcmp(tls, ts+25581, zUri+7, uint64(9)) != 0)) {
 		goto __10
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25521,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25591,
 		libc.VaList(bp, iIn-7, zUri+7))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
@@ -160312,7 +161199,7 @@ __27:
 	zVal = zOpt + uintptr(nOpt+1)
 	nVal = Xsqlite3Strlen30(tls, zVal)
 
-	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+25549, zOpt, uint64(3)) == 0) {
+	if !(nOpt == 3 && libc.Xmemcmp(tls, ts+25619, zOpt, uint64(3)) == 0) {
 		goto __29
 	}
 	zVfs = zVal
@@ -160323,17 +161210,17 @@ __29:
 	mask = 0
 	limit = 0
 
-	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+25553, zOpt, uint64(5)) == 0) {
+	if !(nOpt == 5 && libc.Xmemcmp(tls, ts+25623, zOpt, uint64(5)) == 0) {
 		goto __31
 	}
 
 	mask = SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_PRIVATECACHE
 	aMode = uintptr(unsafe.Pointer(&aCacheMode))
 	limit = mask
-	zModeType = ts + 25553
+	zModeType = ts + 25623
 __31:
 	;
-	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+25559, zOpt, uint64(4)) == 0) {
+	if !(nOpt == 4 && libc.Xmemcmp(tls, ts+25629, zOpt, uint64(4)) == 0) {
 		goto __32
 	}
 
@@ -160341,7 +161228,7 @@ __31:
 		SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY
 	aMode = uintptr(unsafe.Pointer(&aOpenMode))
 	limit = int32(uint32(mask) & flags)
-	zModeType = ts + 25564
+	zModeType = ts + 25634
 __32:
 	;
 	if !(aMode != 0) {
@@ -160371,7 +161258,7 @@ __36:
 	if !(mode == 0) {
 		goto __38
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25571, libc.VaList(bp+16, zModeType, zVal))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25641, libc.VaList(bp+16, zModeType, zVal))
 	rc = SQLITE_ERROR
 	goto parse_uri_out
 __38:
@@ -160379,7 +161266,7 @@ __38:
 	if !(mode&libc.CplInt32(SQLITE_OPEN_MEMORY) > limit) {
 		goto __39
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25591,
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25661,
 		libc.VaList(bp+32, zModeType, zVal))
 	rc = SQLITE_PERM
 	goto parse_uri_out
@@ -160419,7 +161306,7 @@ __2:
 	if !(*(*uintptr)(unsafe.Pointer(ppVfs)) == uintptr(0)) {
 		goto __42
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25615, libc.VaList(bp+48, zVfs))
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+25685, libc.VaList(bp+48, zVfs))
 	rc = SQLITE_ERROR
 __42:
 	;
@@ -160443,15 +161330,15 @@ type OpenMode = struct {
 }
 
 var aCacheMode = [3]OpenMode{
-	{Fz: ts + 25631, Fmode: SQLITE_OPEN_SHAREDCACHE},
-	{Fz: ts + 25638, Fmode: SQLITE_OPEN_PRIVATECACHE},
+	{Fz: ts + 25701, Fmode: SQLITE_OPEN_SHAREDCACHE},
+	{Fz: ts + 25708, Fmode: SQLITE_OPEN_PRIVATECACHE},
 	{},
 }
 var aOpenMode = [5]OpenMode{
-	{Fz: ts + 25646, Fmode: SQLITE_OPEN_READONLY},
-	{Fz: ts + 25649, Fmode: SQLITE_OPEN_READWRITE},
-	{Fz: ts + 25652, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
-	{Fz: ts + 18715, Fmode: SQLITE_OPEN_MEMORY},
+	{Fz: ts + 25716, Fmode: SQLITE_OPEN_READONLY},
+	{Fz: ts + 25719, Fmode: SQLITE_OPEN_READWRITE},
+	{Fz: ts + 25722, Fmode: SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE},
+	{Fz: ts + 18731, Fmode: SQLITE_OPEN_MEMORY},
 	{},
 }
 
@@ -160597,10 +161484,10 @@ __12:
 	createCollation(tls, db, uintptr(unsafe.Pointer(&Xsqlite3StrBINARY)), uint8(SQLITE_UTF16LE), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{binCollFunc})), uintptr(0))
-	createCollation(tls, db, ts+23171, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+23232, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{nocaseCollatingFunc})), uintptr(0))
-	createCollation(tls, db, ts+25656, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	createCollation(tls, db, ts+25726, uint8(SQLITE_UTF8), uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr, int32, uintptr) int32
 	}{rtrimCollFunc})), uintptr(0))
 	if !((*Sqlite3)(unsafe.Pointer(db)).FmallocFailed != 0) {
@@ -160614,7 +161501,7 @@ __15:
 	if !(int32(1)<<(*(*uint32)(unsafe.Pointer(bp + 8))&uint32(7))&0x46 == 0) {
 		goto __16
 	}
-	rc = Xsqlite3MisuseError(tls, 175878)
+	rc = Xsqlite3MisuseError(tls, 177308)
 	goto __17
 __16:
 	rc = Xsqlite3ParseUri(tls, zVfs, zFilename, bp+8, db, bp+16, bp+24)
@@ -160665,9 +161552,9 @@ __22:
 	Xsqlite3BtreeLeave(tls, (*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FpBt)
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FpSchema = Xsqlite3SchemaGet(tls, db, uintptr(0))
 
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 7733
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).FzDbSName = ts + 7793
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb)).Fsafety_level = U8(SQLITE_DEFAULT_SYNCHRONOUS + 1)
-	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 24651
+	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).FzDbSName = ts + 24721
 	(*Db)(unsafe.Pointer((*Sqlite3)(unsafe.Pointer(db)).FaDb + 1*32)).Fsafety_level = U8(PAGER_SYNCHRONOUS_OFF)
 
 	(*Sqlite3)(unsafe.Pointer(db)).FeOpenState = U8(SQLITE_STATE_OPEN)
@@ -160772,7 +161659,7 @@ func Xsqlite3_open16(tls *libc.TLS, zFilename uintptr, ppDb uintptr) int32 {
 		return rc
 	}
 	if zFilename == uintptr(0) {
-		zFilename = ts + 25662
+		zFilename = ts + 25732
 	}
 	pVal = Xsqlite3ValueNew(tls, uintptr(0))
 	Xsqlite3ValueSetStr(tls, pVal, -1, zFilename, uint8(SQLITE_UTF16LE), uintptr(0))
@@ -160875,21 +161762,21 @@ func Xsqlite3ReportError(tls *libc.TLS, iErr int32, lineno int32, zType uintptr)
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	Xsqlite3_log(tls, iErr, ts+25665,
+	Xsqlite3_log(tls, iErr, ts+25735,
 		libc.VaList(bp, zType, lineno, uintptr(20)+Xsqlite3_sourceid(tls)))
 	return iErr
 }
 
 func Xsqlite3CorruptError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+25690)
+	return Xsqlite3ReportError(tls, SQLITE_CORRUPT, lineno, ts+25760)
 }
 
 func Xsqlite3MisuseError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+25710)
+	return Xsqlite3ReportError(tls, SQLITE_MISUSE, lineno, ts+25780)
 }
 
 func Xsqlite3CantopenError(tls *libc.TLS, lineno int32) int32 {
-	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+25717)
+	return Xsqlite3ReportError(tls, SQLITE_CANTOPEN, lineno, ts+25787)
 }
 
 // This is a convenience routine that makes sure that all thread-specific
@@ -161047,7 +161934,7 @@ __19:
 		goto __20
 	}
 	Xsqlite3DbFree(tls, db, *(*uintptr)(unsafe.Pointer(bp + 24)))
-	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+25734, libc.VaList(bp, zTableName,
+	*(*uintptr)(unsafe.Pointer(bp + 24)) = Xsqlite3MPrintf(tls, db, ts+25804, libc.VaList(bp, zTableName,
 		zColumnName))
 	rc = SQLITE_ERROR
 __20:
@@ -161703,7 +162590,7 @@ func Xsqlite3_compileoption_used(tls *libc.TLS, zOptName uintptr) int32 {
 
 	azCompileOpt = Xsqlite3CompileOptions(tls, bp)
 
-	if Xsqlite3_strnicmp(tls, zOptName, ts+25762, 7) == 0 {
+	if Xsqlite3_strnicmp(tls, zOptName, ts+25832, 7) == 0 {
 		zOptName += uintptr(7)
 	}
 	n = Xsqlite3Strlen30(tls, zOptName)
@@ -161821,7 +162708,7 @@ func Xsqlite3_unlock_notify(tls *libc.TLS, db uintptr, xNotify uintptr, pArg uin
 
 	Xsqlite3ErrorWithMsg(tls, db, rc, func() uintptr {
 		if rc != 0 {
-			return ts + 25770
+			return ts + 25840
 		}
 		return uintptr(0)
 	}(), 0)
@@ -161999,7 +162886,7 @@ type JsonParse1 = struct {
 type JsonParse = JsonParse1
 
 var jsonType = [8]uintptr{
-	ts + 7533, ts + 8056, ts + 8061, ts + 7543, ts + 7538, ts + 9297, ts + 25793, ts + 25799,
+	ts + 7533, ts + 8116, ts + 8121, ts + 7543, ts + 7538, ts + 9357, ts + 25863, ts + 25869,
 }
 
 func jsonZero(tls *libc.TLS, p uintptr) {
@@ -162152,7 +163039,7 @@ __10:
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0')
 	*(*int8)(unsafe.Pointer((*JsonString)(unsafe.Pointer(p)).FzBuf + uintptr(libc.PostIncUint64(&(*JsonString)(unsafe.Pointer(p)).FnUsed, 1)))) = int8('0' + int32(c)>>4)
-	c = uint8(*(*int8)(unsafe.Pointer(ts + 25806 + uintptr(int32(c)&0xf))))
+	c = uint8(*(*int8)(unsafe.Pointer(ts + 25876 + uintptr(int32(c)&0xf))))
 __8:
 	;
 __6:
@@ -162207,7 +163094,7 @@ func jsonAppendValue(tls *libc.TLS, p uintptr, pValue uintptr) {
 	default:
 		{
 			if int32((*JsonString)(unsafe.Pointer(p)).FbErr) == 0 {
-				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+25823, -1)
+				Xsqlite3_result_error(tls, (*JsonString)(unsafe.Pointer(p)).FpCtx, ts+25893, -1)
 				(*JsonString)(unsafe.Pointer(p)).FbErr = U8(2)
 				jsonReset(tls, p)
 			}
@@ -162271,13 +163158,13 @@ func jsonRenderNode(tls *libc.TLS, pNode uintptr, pOut uintptr, aReplace uintptr
 		}
 	case JSON_TRUE:
 		{
-			jsonAppendRaw(tls, pOut, ts+8056, uint32(4))
+			jsonAppendRaw(tls, pOut, ts+8116, uint32(4))
 			break
 
 		}
 	case JSON_FALSE:
 		{
-			jsonAppendRaw(tls, pOut, ts+8061, uint32(5))
+			jsonAppendRaw(tls, pOut, ts+8121, uint32(5))
 			break
 
 		}
@@ -162827,12 +163714,12 @@ func jsonParseValue(tls *libc.TLS, pParse uintptr, i U32) int32 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_NULL), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 't' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+8056, uint64(4)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+8116, uint64(4)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(4)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_TRUE), uint32(0), uintptr(0))
 		return int32(i + U32(4))
 	} else if int32(c) == 'f' &&
-		libc.Xstrncmp(tls, z+uintptr(i), ts+8061, uint64(5)) == 0 &&
+		libc.Xstrncmp(tls, z+uintptr(i), ts+8121, uint64(5)) == 0 &&
 		!(int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(z + uintptr(i+U32(5)))))])&0x06 != 0) {
 		jsonParseAddNode(tls, pParse, uint32(JSON_FALSE), uint32(0), uintptr(0))
 		return int32(i + U32(5))
@@ -162933,7 +163820,7 @@ func jsonParse(tls *libc.TLS, pParse uintptr, pCtx uintptr, zJson uintptr) int32
 			if (*JsonParse)(unsafe.Pointer(pParse)).Foom != 0 {
 				Xsqlite3_result_error_nomem(tls, pCtx)
 			} else {
-				Xsqlite3_result_error(tls, pCtx, ts+25852, -1)
+				Xsqlite3_result_error(tls, pCtx, ts+25922, -1)
 			}
 		}
 		jsonParseReset(tls, pParse)
@@ -163239,7 +164126,7 @@ func jsonLookupAppend(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintpt
 	}
 	if int32(*(*int8)(unsafe.Pointer(zPath))) == '.' {
 		jsonParseAddNode(tls, pParse, uint32(JSON_OBJECT), uint32(0), uintptr(0))
-	} else if libc.Xstrncmp(tls, zPath, ts+25867, uint64(3)) == 0 {
+	} else if libc.Xstrncmp(tls, zPath, ts+25937, uint64(3)) == 0 {
 		jsonParseAddNode(tls, pParse, uint32(JSON_ARRAY), uint32(0), uintptr(0))
 	} else {
 		return uintptr(0)
@@ -163254,7 +164141,7 @@ func jsonPathSyntaxError(tls *libc.TLS, zErr uintptr) uintptr {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	return Xsqlite3_mprintf(tls, ts+25871, libc.VaList(bp, zErr))
+	return Xsqlite3_mprintf(tls, ts+25941, libc.VaList(bp, zErr))
 }
 
 func jsonLookup(tls *libc.TLS, pParse uintptr, zPath uintptr, pApnd uintptr, pCtx uintptr) uintptr {
@@ -163308,7 +164195,7 @@ func jsonWrongNumArgs(tls *libc.TLS, pCtx uintptr, zFuncName uintptr) {
 	bp := tls.Alloc(8)
 	defer tls.Free(8)
 
-	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+25897,
+	var zMsg uintptr = Xsqlite3_mprintf(tls, ts+25967,
 		libc.VaList(bp, zFuncName))
 	Xsqlite3_result_error(tls, pCtx, zMsg, -1)
 	Xsqlite3_free(tls, zMsg)
@@ -163413,11 +164300,11 @@ func jsonExtractFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 			if int32(*(*int8)(unsafe.Pointer(zPath))) != '$' {
 				jsonInit(tls, bp, ctx)
 				if int32(Xsqlite3CtypeMap[uint8(*(*int8)(unsafe.Pointer(zPath)))])&0x04 != 0 {
-					jsonAppendRaw(tls, bp, ts+25940, uint32(2))
+					jsonAppendRaw(tls, bp, ts+26010, uint32(2))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendRaw(tls, bp, ts+6350, uint32(2))
 				} else {
-					jsonAppendRaw(tls, bp, ts+25943, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
+					jsonAppendRaw(tls, bp, ts+26013, uint32(1+libc.Bool32(int32(*(*int8)(unsafe.Pointer(zPath))) != '[')))
 					jsonAppendRaw(tls, bp, zPath, uint32(int32(libc.Xstrlen(tls, zPath))))
 					jsonAppendChar(tls, bp, int8(0))
 				}
@@ -163574,14 +164461,14 @@ func jsonObjectFunc(tls *libc.TLS, ctx uintptr, argc int32, argv uintptr) {
 
 	if argc&1 != 0 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+25946, -1)
+			ts+26016, -1)
 		return
 	}
 	jsonInit(tls, bp, ctx)
 	jsonAppendChar(tls, bp, int8('{'))
 	for i = 0; i < argc; i = i + 2 {
 		if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8))) != SQLITE_TEXT {
-			Xsqlite3_result_error(tls, ctx, ts+25997, -1)
+			Xsqlite3_result_error(tls, ctx, ts+26067, -1)
 			jsonReset(tls, bp)
 			return
 		}
@@ -163676,7 +164563,7 @@ __1:
 	if !(argc&1 == 0) {
 		goto __2
 	}
-	jsonWrongNumArgs(tls, ctx, ts+16721)
+	jsonWrongNumArgs(tls, ctx, ts+16737)
 	return
 __2:
 	;
@@ -163751,9 +164638,9 @@ __1:
 	}
 	jsonWrongNumArgs(tls, ctx, func() uintptr {
 		if bIsSet != 0 {
-			return ts + 26031
+			return ts + 26101
 		}
-		return ts + 26035
+		return ts + 26105
 	}())
 	return
 __2:
@@ -163886,7 +164773,7 @@ func jsonArrayCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+26042, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+26112, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -163983,7 +164870,7 @@ func jsonObjectCompute(tls *libc.TLS, ctx uintptr, isFinal int32) {
 			(*JsonString)(unsafe.Pointer(pStr)).FnUsed--
 		}
 	} else {
-		Xsqlite3_result_text(tls, ctx, ts+26045, 2, uintptr(0))
+		Xsqlite3_result_text(tls, ctx, ts+26115, 2, uintptr(0))
 	}
 	Xsqlite3_result_subtype(tls, ctx, uint32(JSON_SUBTYPE))
 }
@@ -164027,7 +164914,7 @@ func jsonEachConnect(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv u
 	_ = argc
 	_ = pAux
 	rc = Xsqlite3_declare_vtab(tls, db,
-		ts+26048)
+		ts+26118)
 	if rc == SQLITE_OK {
 		pNew = libc.AssignPtrUintptr(ppVtab, Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Sqlite3_vtab{}))))
 		if pNew == uintptr(0) {
@@ -164158,7 +165045,7 @@ func jsonAppendObjectPathElement(tls *libc.TLS, pStr uintptr, pNode uintptr) {
 			nn = nn - 2
 		}
 	}
-	jsonPrintf(tls, nn+2, pStr, ts+26131, libc.VaList(bp, nn, z))
+	jsonPrintf(tls, nn+2, pStr, ts+26201, libc.VaList(bp, nn, z))
 }
 
 func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
@@ -164177,7 +165064,7 @@ func jsonEachComputePath(tls *libc.TLS, p uintptr, pStr uintptr, i U32) {
 	pNode = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(i)*16
 	pUp = (*JsonEachCursor)(unsafe.Pointer(p)).FsParse.FaNode + uintptr(iUp)*16
 	if int32((*JsonNode)(unsafe.Pointer(pUp)).FeType) == JSON_ARRAY {
-		jsonPrintf(tls, 30, pStr, ts+26137, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
+		jsonPrintf(tls, 30, pStr, ts+26207, libc.VaList(bp, *(*U32)(unsafe.Pointer(pUp + 8))))
 	} else {
 		if int32((*JsonNode)(unsafe.Pointer(pNode)).FjnFlags)&JNODE_LABEL == 0 {
 			pNode -= 16
@@ -164273,7 +165160,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 					jsonAppendChar(tls, bp+8, int8('$'))
 				}
 				if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_ARRAY {
-					jsonPrintf(tls, 30, bp+8, ts+26137, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
+					jsonPrintf(tls, 30, bp+8, ts+26207, libc.VaList(bp, (*JsonEachCursor)(unsafe.Pointer(p)).FiRowid))
 				} else if int32((*JsonEachCursor)(unsafe.Pointer(p)).FeType) == JSON_OBJECT {
 					jsonAppendObjectPathElement(tls, bp+8, pThis)
 				}
@@ -164297,7 +165184,7 @@ func jsonEachColumn(tls *libc.TLS, cur uintptr, ctx uintptr, i int32) int32 {
 		{
 			var zRoot uintptr = (*JsonEachCursor)(unsafe.Pointer(p)).FzRoot
 			if zRoot == uintptr(0) {
-				zRoot = ts + 26142
+				zRoot = ts + 26212
 			}
 			Xsqlite3_result_text(tls, ctx, zRoot, -1, uintptr(0))
 			break
@@ -164362,6 +165249,12 @@ __2:
 	goto __3
 __3:
 	;
+	if (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnOrderBy > 0 &&
+		(*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).FiColumn < 0 &&
+		int32((*sqlite3_index_orderby)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaOrderBy)).Fdesc) == 0 {
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).ForderByConsumed = 1
+	}
+
 	if unusableMask & ^idxMask != 0 {
 		return SQLITE_CONSTRAINT
 	}
@@ -164413,7 +165306,7 @@ func jsonEachFilter(tls *libc.TLS, cur uintptr, idxNum int32, idxStr uintptr, ar
 		var rc int32 = SQLITE_NOMEM
 		if int32((*JsonEachCursor)(unsafe.Pointer(p)).FsParse.Foom) == 0 {
 			Xsqlite3_free(tls, (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg)
-			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+25852, 0)
+			(*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+25922, 0)
 			if (*Sqlite3_vtab)(unsafe.Pointer((*Sqlite3_vtab_cursor)(unsafe.Pointer(cur)).FpVtab)).FzErrMsg != 0 {
 				rc = SQLITE_ERROR
 			}
@@ -164508,25 +165401,25 @@ func Xsqlite3RegisterJsonFunctions(tls *libc.TLS) {
 }
 
 var aJsonFunc = [19]FuncDef{
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26144},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26149},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26160},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26160},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26178},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 26191},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 26194},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26198},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26210},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26222},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26233},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26244},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26256},
-	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 26269},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26278},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26278},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26288},
-	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 26299},
-	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 26316}}
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26214},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26219},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26230},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26230},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26248},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_JSON)), FxSFunc: 0, FzName: ts + 26261},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_SQL)), FxSFunc: 0, FzName: ts + 26264},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26268},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26280},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26292},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26303},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26314},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26326},
+	{FnArg: int8(-1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FpUserData: uintptr(int64(JSON_ISSET)), FxSFunc: 0, FzName: ts + 26339},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26348},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26348},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_DETERMINISTIC | SQLITE_FUNC_CONSTANT | SQLITE_UTF8), FxSFunc: 0, FzName: ts + 26358},
+	{FnArg: int8(1), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 26369},
+	{FnArg: int8(2), FfuncFlags: U32(SQLITE_FUNC_BUILTIN | SQLITE_UTF8 | 0*SQLITE_FUNC_NEEDCOLL | SQLITE_SUBTYPE | SQLITE_UTF8 | SQLITE_DETERMINISTIC), FxSFunc: 0, FxFinalize: 0, FxValue: 0, FxInverse: 0, FzName: ts + 26386}}
 
 // Register the JSON table-valued functions
 func Xsqlite3JsonTableFunctions(tls *libc.TLS, db uintptr) int32 {
@@ -164545,8 +165438,8 @@ var aMod = [2]struct {
 	FzName   uintptr
 	FpModule uintptr
 }{
-	{FzName: ts + 26334, FpModule: 0},
-	{FzName: ts + 26344, FpModule: 0},
+	{FzName: ts + 26404, FpModule: 0},
+	{FzName: ts + 26414, FpModule: 0},
 }
 
 type Rtree1 = struct {
@@ -164806,11 +165699,11 @@ func nodeAcquire(tls *libc.TLS, pRtree uintptr, iNode I64, pParent uintptr, ppNo
 		}
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FpNodeBlob == uintptr(0) {
-		var zTab uintptr = Xsqlite3_mprintf(tls, ts+26354, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+		var zTab uintptr = Xsqlite3_mprintf(tls, ts+26424, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		if zTab == uintptr(0) {
 			return SQLITE_NOMEM
 		}
-		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+26362, iNode, 0,
+		rc = Xsqlite3_blob_open(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, zTab, ts+26432, iNode, 0,
 			pRtree+112)
 		Xsqlite3_free(tls, zTab)
 	}
@@ -165021,7 +165914,7 @@ func rtreeDestroy(tls *libc.TLS, pVtab uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32
 	var zCreate uintptr = Xsqlite3_mprintf(tls,
-		ts+26367,
+		ts+26437,
 		libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName,
 			(*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
@@ -165719,7 +166612,7 @@ func deserializeGeometry(tls *libc.TLS, pValue uintptr, pCons uintptr) int32 {
 	var pSrc uintptr
 	var pInfo uintptr
 
-	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+26449)
+	pSrc = Xsqlite3_value_pointer(tls, pValue, ts+26519)
 	if pSrc == uintptr(0) {
 		return SQLITE_ERROR
 	}
@@ -167060,7 +167953,7 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+26463, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
+	zSql = Xsqlite3_mprintf(tls, ts+26533, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 	if zSql != 0 {
 		rc = Xsqlite3_prepare_v2(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, -1, bp+56, uintptr(0))
 	} else {
@@ -167072,12 +167965,12 @@ func rtreeConstraintError(tls *libc.TLS, pRtree uintptr, iCol int32) int32 {
 		if iCol == 0 {
 			var zCol uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 0)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+26483, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
+				ts+26553, libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol))
 		} else {
 			var zCol1 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol)
 			var zCol2 uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), iCol+1)
 			(*Rtree)(unsafe.Pointer(pRtree)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+26515, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
+				ts+26585, libc.VaList(bp+32, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zCol1, zCol2))
 		}
 	}
 
@@ -167303,7 +168196,7 @@ func rtreeRename(tls *libc.TLS, pVtab uintptr, zNewName uintptr) int32 {
 	var pRtree uintptr = pVtab
 	var rc int32 = SQLITE_NOMEM
 	var zSql uintptr = Xsqlite3_mprintf(tls,
-		ts+26552, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
+		ts+26622, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName, zNewName))
 	if zSql != 0 {
 		nodeBlobReset(tls, pRtree)
 		rc = Xsqlite3_exec(tls, (*Rtree)(unsafe.Pointer(pRtree)).Fdb, zSql, uintptr(0), uintptr(0), uintptr(0))
@@ -167326,14 +168219,14 @@ func rtreeQueryStat1(tls *libc.TLS, db uintptr, pRtree uintptr) int32 {
 	bp := tls.Alloc(24)
 	defer tls.Free(24)
 
-	var zFmt uintptr = ts + 26697
+	var zFmt uintptr = ts + 26767
 	var zSql uintptr
 
 	var rc int32
 	var nRow I64 = int64(RTREE_MIN_ROWEST)
 
 	rc = Xsqlite3_table_column_metadata(tls,
-		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+12638, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
+		db, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, ts+12700, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 	if rc != SQLITE_OK {
 		(*Rtree)(unsafe.Pointer(pRtree)).FnRowEst = int64(RTREE_DEFAULT_ROWEST)
 		if rc == SQLITE_ERROR {
@@ -167374,7 +168267,7 @@ func rtreeShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName1 = [3]uintptr{
-	ts + 26753, ts + 6412, ts + 17609,
+	ts + 26823, ts + 6412, ts + 17625,
 }
 
 var rtreeModule = Sqlite3_module{
@@ -167417,19 +168310,19 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		var p uintptr = Xsqlite3_str_new(tls, db)
 		var ii int32
 		Xsqlite3_str_appendf(tls, p,
-			ts+26758,
+			ts+26828,
 			libc.VaList(bp, zDb, zPrefix))
 		for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
-			Xsqlite3_str_appendf(tls, p, ts+26820, libc.VaList(bp+16, ii))
+			Xsqlite3_str_appendf(tls, p, ts+26890, libc.VaList(bp+16, ii))
 		}
 		Xsqlite3_str_appendf(tls, p,
-			ts+26825,
+			ts+26895,
 			libc.VaList(bp+24, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26889,
+			ts+26959,
 			libc.VaList(bp+40, zDb, zPrefix))
 		Xsqlite3_str_appendf(tls, p,
-			ts+26959,
+			ts+27029,
 			libc.VaList(bp+56, zDb, zPrefix, (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize))
 		zCreate = Xsqlite3_str_finish(tls, p)
 		if !(zCreate != 0) {
@@ -167458,7 +168351,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 		if i != 3 || int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) == 0 {
 			zFormat = azSql[i]
 		} else {
-			zFormat = ts + 27008
+			zFormat = ts + 27078
 		}
 		zSql = Xsqlite3_mprintf(tls, zFormat, libc.VaList(bp+80, zDb, zPrefix))
 		if zSql != 0 {
@@ -167470,7 +168363,7 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 	}
 	if (*Rtree)(unsafe.Pointer(pRtree)).FnAux != 0 {
 		(*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql = Xsqlite3_mprintf(tls,
-			ts+27116,
+			ts+27186,
 			libc.VaList(bp+96, zDb, zPrefix))
 		if (*Rtree)(unsafe.Pointer(pRtree)).FzReadAuxSql == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -167478,18 +168371,18 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 			var p uintptr = Xsqlite3_str_new(tls, db)
 			var ii int32
 			var zSql uintptr
-			Xsqlite3_str_appendf(tls, p, ts+27161, libc.VaList(bp+112, zDb, zPrefix))
+			Xsqlite3_str_appendf(tls, p, ts+27231, libc.VaList(bp+112, zDb, zPrefix))
 			for ii = 0; ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux); ii++ {
 				if ii != 0 {
-					Xsqlite3_str_append(tls, p, ts+14109, 1)
+					Xsqlite3_str_append(tls, p, ts+14119, 1)
 				}
 				if ii < int32((*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull) {
-					Xsqlite3_str_appendf(tls, p, ts+27188, libc.VaList(bp+128, ii, ii+2, ii))
+					Xsqlite3_str_appendf(tls, p, ts+27258, libc.VaList(bp+128, ii, ii+2, ii))
 				} else {
-					Xsqlite3_str_appendf(tls, p, ts+27210, libc.VaList(bp+152, ii, ii+2))
+					Xsqlite3_str_appendf(tls, p, ts+27280, libc.VaList(bp+152, ii, ii+2))
 				}
 			}
-			Xsqlite3_str_appendf(tls, p, ts+27218, 0)
+			Xsqlite3_str_appendf(tls, p, ts+27288, 0)
 			zSql = Xsqlite3_str_finish(tls, p)
 			if zSql == uintptr(0) {
 				rc = SQLITE_NOMEM
@@ -167504,14 +168397,14 @@ func rtreeSqlInit(tls *libc.TLS, pRtree uintptr, db uintptr, zDb uintptr, zPrefi
 }
 
 var azSql = [8]uintptr{
-	ts + 27234,
-	ts + 27287,
-	ts + 27332,
-	ts + 27384,
-	ts + 27438,
-	ts + 27483,
-	ts + 27541,
-	ts + 27596,
+	ts + 27304,
+	ts + 27357,
+	ts + 27402,
+	ts + 27454,
+	ts + 27508,
+	ts + 27553,
+	ts + 27611,
+	ts + 27666,
 }
 
 func getIntFromStmt(tls *libc.TLS, db uintptr, zSql uintptr, piVal uintptr) int32 {
@@ -167540,7 +168433,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 	var zSql uintptr
 	if isCreate != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = 0
-		zSql = Xsqlite3_mprintf(tls, ts+27643, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
+		zSql = Xsqlite3_mprintf(tls, ts+27713, libc.VaList(bp, (*Rtree)(unsafe.Pointer(pRtree)).FzDb))
 		rc = getIntFromStmt(tls, db, zSql, bp+48)
 		if rc == SQLITE_OK {
 			(*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize = *(*int32)(unsafe.Pointer(bp + 48)) - 64
@@ -167552,7 +168445,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		}
 	} else {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+27663,
+			ts+27733,
 			libc.VaList(bp+16, (*Rtree)(unsafe.Pointer(pRtree)).FzDb, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		rc = getIntFromStmt(tls, db, zSql, pRtree+32)
 		if rc != SQLITE_OK {
@@ -167560,7 +168453,7 @@ func getNodeSize(tls *libc.TLS, db uintptr, pRtree uintptr, isCreate int32, pzEr
 		} else if (*Rtree)(unsafe.Pointer(pRtree)).FiNodeSize < 512-64 {
 			rc = SQLITE_CORRUPT | int32(1)<<8
 
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+27720,
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+27790,
 				libc.VaList(bp+40, (*Rtree)(unsafe.Pointer(pRtree)).FzName))
 		}
 	}
@@ -167602,10 +168495,10 @@ func rtreeInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr
 	ii = 4
 	*(*[5]uintptr)(unsafe.Pointer(bp + 96)) = [5]uintptr{
 		uintptr(0),
-		ts + 27755,
-		ts + 27798,
-		ts + 27833,
-		ts + 27869,
+		ts + 27825,
+		ts + 27868,
+		ts + 27903,
+		ts + 27939,
 	}
 
 	if !(argc < 6 || argc > RTREE_MAX_AUX_COLUMN+3) {
@@ -167636,7 +168529,7 @@ __2:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+27906,
+	Xsqlite3_str_appendf(tls, pSql, ts+27976,
 		libc.VaList(bp+16, rtreeTokenLength(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8))), *(*uintptr)(unsafe.Pointer(argv + 3*8))))
 	ii = 4
 __3:
@@ -167648,7 +168541,7 @@ __3:
 		goto __6
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+27930, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
+	Xsqlite3_str_appendf(tls, pSql, ts+28000, libc.VaList(bp+32, rtreeTokenLength(tls, zArg+uintptr(1)), zArg+uintptr(1)))
 	goto __7
 __6:
 	if !(int32((*Rtree)(unsafe.Pointer(pRtree)).FnAux) > 0) {
@@ -167671,7 +168564,7 @@ __4:
 	goto __5
 __5:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27936, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28006, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __10
@@ -167767,7 +168660,7 @@ __25:
 	return rc
 }
 
-var azFormat = [2]uintptr{ts + 27939, ts + 27950}
+var azFormat = [2]uintptr{ts + 28009, ts + 28020}
 
 func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	bp := tls.Alloc(1072)
@@ -167805,13 +168698,13 @@ func rtreenode(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 		nodeGetCell(tls, bp+56, bp+16, ii, bp+1024)
 		if ii > 0 {
-			Xsqlite3_str_append(tls, pOut, ts+12210, 1)
+			Xsqlite3_str_append(tls, pOut, ts+12272, 1)
 		}
-		Xsqlite3_str_appendf(tls, pOut, ts+27960, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
+		Xsqlite3_str_appendf(tls, pOut, ts+28030, libc.VaList(bp, (*RtreeCell)(unsafe.Pointer(bp+1024)).FiRowid))
 		for jj = 0; jj < int32((*Rtree)(unsafe.Pointer(bp+56)).FnDim2); jj++ {
-			Xsqlite3_str_appendf(tls, pOut, ts+27966, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
+			Xsqlite3_str_appendf(tls, pOut, ts+28036, libc.VaList(bp+8, float64(*(*RtreeValue)(unsafe.Pointer(bp + 1024 + 8 + uintptr(jj)*4)))))
 		}
-		Xsqlite3_str_append(tls, pOut, ts+27970, 1)
+		Xsqlite3_str_append(tls, pOut, ts+28040, 1)
 	}
 	errCode = Xsqlite3_str_errcode(tls, pOut)
 	Xsqlite3_result_text(tls, ctx, Xsqlite3_str_finish(tls, pOut), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
@@ -167822,7 +168715,7 @@ func rtreedepth(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 	_ = nArg
 	if Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apArg))) != SQLITE_BLOB ||
 		Xsqlite3_value_bytes(tls, *(*uintptr)(unsafe.Pointer(apArg))) < 2 {
-		Xsqlite3_result_error(tls, ctx, ts+27972, -1)
+		Xsqlite3_result_error(tls, ctx, ts+28042, -1)
 	} else {
 		var zBlob uintptr = Xsqlite3_value_blob(tls, *(*uintptr)(unsafe.Pointer(apArg)))
 		if zBlob != 0 {
@@ -167900,7 +168793,7 @@ func rtreeCheckAppendMsg(tls *libc.TLS, pCheck uintptr, zFmt uintptr, va uintptr
 		if z == uintptr(0) {
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = SQLITE_NOMEM
 		} else {
-			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+28005,
+			(*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport = Xsqlite3_mprintf(tls, ts+28075,
 				libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport, func() uintptr {
 					if (*RtreeCheck)(unsafe.Pointer(pCheck)).FzReport != 0 {
 						return ts + 5414
@@ -167924,7 +168817,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode == uintptr(0) {
 		(*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode = rtreeCheckPrepare(tls, pCheck,
-			ts+28012,
+			ts+28082,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab))
 	}
 
@@ -167943,7 +168836,7 @@ func rtreeCheckGetNode(tls *libc.TLS, pCheck uintptr, iNode I64, pnNode uintptr)
 		}
 		rtreeCheckReset(tls, pCheck, (*RtreeCheck)(unsafe.Pointer(pCheck)).FpGetNode)
 		if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK && pRet == uintptr(0) {
-			rtreeCheckAppendMsg(tls, pCheck, ts+28057, libc.VaList(bp+16, iNode))
+			rtreeCheckAppendMsg(tls, pCheck, ts+28127, libc.VaList(bp+16, iNode))
 		}
 	}
 
@@ -167957,8 +168850,8 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	var rc int32
 	var pStmt uintptr
 	*(*[2]uintptr)(unsafe.Pointer(bp + 80)) = [2]uintptr{
-		ts + 28089,
-		ts + 28143,
+		ts + 28159,
+		ts + 28213,
 	}
 
 	if *(*uintptr)(unsafe.Pointer(pCheck + 40 + uintptr(bLeaf)*8)) == uintptr(0) {
@@ -167973,23 +168866,23 @@ func rtreeCheckMapping(tls *libc.TLS, pCheck uintptr, bLeaf int32, iKey I64, iVa
 	Xsqlite3_bind_int64(tls, pStmt, 1, iKey)
 	rc = Xsqlite3_step(tls, pStmt)
 	if rc == SQLITE_DONE {
-		rtreeCheckAppendMsg(tls, pCheck, ts+28191,
+		rtreeCheckAppendMsg(tls, pCheck, ts+28261,
 			libc.VaList(bp+16, iKey, iVal, func() uintptr {
 				if bLeaf != 0 {
-					return ts + 28236
+					return ts + 28306
 				}
-				return ts + 28244
+				return ts + 28314
 			}()))
 	} else if rc == SQLITE_ROW {
 		var ii I64 = Xsqlite3_column_int64(tls, pStmt, 0)
 		if ii != iVal {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+28253,
+				ts+28323,
 				libc.VaList(bp+40, iKey, ii, func() uintptr {
 					if bLeaf != 0 {
-						return ts + 28236
+						return ts + 28306
 					}
-					return ts + 28244
+					return ts + 28314
 				}(), iKey, iVal))
 		}
 	}
@@ -168013,7 +168906,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 			return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 48)) > *(*RtreeValue)(unsafe.Pointer(bp + 52)))
 		}() != 0 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+28311, libc.VaList(bp, i, iCell, iNode))
+				ts+28381, libc.VaList(bp, i, iCell, iNode))
 		}
 
 		if pParent != 0 {
@@ -168033,7 +168926,7 @@ func rtreeCheckCellCoord(tls *libc.TLS, pCheck uintptr, iNode I64, iCell int32,
 					return libc.Bool32(*(*RtreeValue)(unsafe.Pointer(bp + 52)) > *(*RtreeValue)(unsafe.Pointer(bp + 60)))
 				}() != 0 {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+28359, libc.VaList(bp+24, i, iCell, iNode))
+					ts+28429, libc.VaList(bp+24, i, iCell, iNode))
 			}
 		}
 	}
@@ -168050,14 +168943,14 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 	if aNode != 0 {
 		if *(*int32)(unsafe.Pointer(bp + 48)) < 4 {
 			rtreeCheckAppendMsg(tls, pCheck,
-				ts+28426, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
+				ts+28496, libc.VaList(bp, iNode, *(*int32)(unsafe.Pointer(bp + 48))))
 		} else {
 			var nCell int32
 			var i int32
 			if aParent == uintptr(0) {
 				iDepth = readInt16(tls, aNode)
 				if iDepth > RTREE_MAX_DEPTH {
-					rtreeCheckAppendMsg(tls, pCheck, ts+28460, libc.VaList(bp+16, iDepth))
+					rtreeCheckAppendMsg(tls, pCheck, ts+28530, libc.VaList(bp+16, iDepth))
 					Xsqlite3_free(tls, aNode)
 					return
 				}
@@ -168065,7 +168958,7 @@ func rtreeCheckNode(tls *libc.TLS, pCheck uintptr, iDepth int32, aParent uintptr
 			nCell = readInt16(tls, aNode+2)
 			if 4+nCell*(8+(*RtreeCheck)(unsafe.Pointer(pCheck)).FnDim*2*4) > *(*int32)(unsafe.Pointer(bp + 48)) {
 				rtreeCheckAppendMsg(tls, pCheck,
-					ts+28490,
+					ts+28560,
 					libc.VaList(bp+24, iNode, nCell, *(*int32)(unsafe.Pointer(bp + 48))))
 			} else {
 				for i = 0; i < nCell; i++ {
@@ -168094,14 +168987,14 @@ func rtreeCheckCount(tls *libc.TLS, pCheck uintptr, zTbl uintptr, nExpect I64) {
 
 	if (*RtreeCheck)(unsafe.Pointer(pCheck)).Frc == SQLITE_OK {
 		var pCount uintptr
-		pCount = rtreeCheckPrepare(tls, pCheck, ts+28545,
+		pCount = rtreeCheckPrepare(tls, pCheck, ts+28615,
 			libc.VaList(bp, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzDb, (*RtreeCheck)(unsafe.Pointer(pCheck)).FzTab, zTbl))
 		if pCount != 0 {
 			if Xsqlite3_step(tls, pCount) == SQLITE_ROW {
 				var nActual I64 = Xsqlite3_column_int64(tls, pCount, 0)
 				if nActual != nExpect {
 					rtreeCheckAppendMsg(tls, pCheck,
-						ts+28576, libc.VaList(bp+24, zTbl, nExpect, nActual))
+						ts+28646, libc.VaList(bp+24, zTbl, nExpect, nActual))
 				}
 			}
 			(*RtreeCheck)(unsafe.Pointer(pCheck)).Frc = Xsqlite3_finalize(tls, pCount)
@@ -168123,12 +169016,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	(*RtreeCheck)(unsafe.Pointer(bp + 32)).FzTab = zTab
 
 	if Xsqlite3_get_autocommit(tls, db) != 0 {
-		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+15850, uintptr(0), uintptr(0), uintptr(0))
+		(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = Xsqlite3_exec(tls, db, ts+15860, uintptr(0), uintptr(0), uintptr(0))
 		bEnd = 1
 	}
 
 	if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
-		pStmt = rtreeCheckPrepare(tls, bp+32, ts+28643, libc.VaList(bp, zDb, zTab))
+		pStmt = rtreeCheckPrepare(tls, bp+32, ts+28713, libc.VaList(bp, zDb, zTab))
 		if pStmt != 0 {
 			nAux = Xsqlite3_column_count(tls, pStmt) - 2
 			Xsqlite3_finalize(tls, pStmt)
@@ -168137,12 +169030,12 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		}
 	}
 
-	pStmt = rtreeCheckPrepare(tls, bp+32, ts+26463, libc.VaList(bp+16, zDb, zTab))
+	pStmt = rtreeCheckPrepare(tls, bp+32, ts+26533, libc.VaList(bp+16, zDb, zTab))
 	if pStmt != 0 {
 		var rc int32
 		(*RtreeCheck)(unsafe.Pointer(bp + 32)).FnDim = (Xsqlite3_column_count(tls, pStmt) - 1 - nAux) / 2
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).FnDim < 1 {
-			rtreeCheckAppendMsg(tls, bp+32, ts+28671, 0)
+			rtreeCheckAppendMsg(tls, bp+32, ts+28741, 0)
 		} else if SQLITE_ROW == Xsqlite3_step(tls, pStmt) {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).FbInt = libc.Bool32(Xsqlite3_column_type(tls, pStmt, 1) == SQLITE_INTEGER)
 		}
@@ -168156,8 +169049,8 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			rtreeCheckNode(tls, bp+32, 0, uintptr(0), int64(1))
 		}
-		rtreeCheckCount(tls, bp+32, ts+28702, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
-		rtreeCheckCount(tls, bp+32, ts+28709, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
+		rtreeCheckCount(tls, bp+32, ts+28772, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnLeaf))
+		rtreeCheckCount(tls, bp+32, ts+28779, int64((*RtreeCheck)(unsafe.Pointer(bp+32)).FnNonLeaf))
 	}
 
 	Xsqlite3_finalize(tls, (*RtreeCheck)(unsafe.Pointer(bp+32)).FpGetNode)
@@ -168165,7 +169058,7 @@ func rtreeCheckTable(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, pzRep
 	Xsqlite3_finalize(tls, *(*uintptr)(unsafe.Pointer(bp + 32 + 40 + 1*8)))
 
 	if bEnd != 0 {
-		var rc int32 = Xsqlite3_exec(tls, db, ts+28717, uintptr(0), uintptr(0), uintptr(0))
+		var rc int32 = Xsqlite3_exec(tls, db, ts+28787, uintptr(0), uintptr(0), uintptr(0))
 		if (*RtreeCheck)(unsafe.Pointer(bp+32)).Frc == SQLITE_OK {
 			(*RtreeCheck)(unsafe.Pointer(bp + 32)).Frc = rc
 		}
@@ -168180,7 +169073,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 
 	if nArg != 1 && nArg != 2 {
 		Xsqlite3_result_error(tls, ctx,
-			ts+28721, -1)
+			ts+28791, -1)
 	} else {
 		var rc int32
 		*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
@@ -168188,7 +169081,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 		var zTab uintptr
 		if nArg == 1 {
 			zTab = zDb
-			zDb = ts + 7733
+			zDb = ts + 7793
 		} else {
 			zTab = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apArg + 1*8)))
 		}
@@ -168198,7 +169091,7 @@ func rtreecheck(tls *libc.TLS, ctx uintptr, nArg int32, apArg uintptr) {
 				if *(*uintptr)(unsafe.Pointer(bp)) != 0 {
 					return *(*uintptr)(unsafe.Pointer(bp))
 				}
-				return ts + 19338
+				return ts + 19381
 			}(), -1, libc.UintptrFromInt32(-1))
 		} else {
 			Xsqlite3_result_error_code(tls, ctx, rc)
@@ -168493,7 +169386,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 	var nByte int32
 
 	if Xsqlite3_value_type(tls, pVal) == SQLITE_BLOB &&
-		uint64(libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal))) >= uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0))) {
+		libc.AssignInt32(&nByte, Xsqlite3_value_bytes(tls, pVal)) >= int32(uint64(4)+uint64(6)*uint64(unsafe.Sizeof(GeoCoord(0)))) {
 		var a uintptr = Xsqlite3_value_blob(tls, pVal)
 		var nVertex int32
 		if a == uintptr(0) {
@@ -168551,6 +169444,7 @@ func geopolyFuncParam(tls *libc.TLS, pCtx uintptr, pVal uintptr, pRc uintptr) ui
 
 func geopolyBlobFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -168563,15 +169457,16 @@ func geopolyJsonFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(32)
 
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		var db uintptr = Xsqlite3_context_db_handle(tls, context)
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
-		Xsqlite3_str_append(tls, x, ts+28772, 1)
+		Xsqlite3_str_append(tls, x, ts+28842, 1)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+28774, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+28844, libc.VaList(bp, float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 		}
-		Xsqlite3_str_appendf(tls, x, ts+28785, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+28855, libc.VaList(bp+16, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -168591,19 +169486,19 @@ func geopolySvgFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 		var x uintptr = Xsqlite3_str_new(tls, db)
 		var i int32
 		var cSep int8 = int8('\'')
-		Xsqlite3_str_appendf(tls, x, ts+28796, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28866, 0)
 		for i = 0; i < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; i++ {
-			Xsqlite3_str_appendf(tls, x, ts+28814, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
+			Xsqlite3_str_appendf(tls, x, ts+28884, libc.VaList(bp, int32(cSep), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2)*4))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(i*2+1)*4)))))
 			cSep = int8(' ')
 		}
-		Xsqlite3_str_appendf(tls, x, ts+28822, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
+		Xsqlite3_str_appendf(tls, x, ts+28892, libc.VaList(bp+24, float64(*(*GeoCoord)(unsafe.Pointer(p + 8))), float64(*(*GeoCoord)(unsafe.Pointer(p + 8 + 1*4)))))
 		for i = 1; i < argc; i++ {
 			var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(argv + uintptr(i)*8)))
 			if z != 0 && *(*int8)(unsafe.Pointer(z)) != 0 {
-				Xsqlite3_str_appendf(tls, x, ts+28830, libc.VaList(bp+40, z))
+				Xsqlite3_str_appendf(tls, x, ts+28900, libc.VaList(bp+40, z))
 			}
 		}
-		Xsqlite3_str_appendf(tls, x, ts+28834, 0)
+		Xsqlite3_str_appendf(tls, x, ts+28904, 0)
 		Xsqlite3_result_text(tls, context, Xsqlite3_str_finish(tls, x), -1, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		Xsqlite3_free(tls, p)
 	}
@@ -168622,6 +169517,7 @@ func geopolyXformFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr)
 	var x0 GeoCoord
 	var y0 GeoCoord
 	var ii int32
+	_ = argc
 	if p != 0 {
 		for ii = 0; ii < (*GeoPoly)(unsafe.Pointer(p)).FnVertex; ii++ {
 			x0 = *(*GeoCoord)(unsafe.Pointer(p + 8 + uintptr(ii*2)*4))
@@ -168653,6 +169549,7 @@ func geopolyArea(tls *libc.TLS, p uintptr) float64 {
 
 func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_double(tls, context, geopolyArea(tls, p))
 		Xsqlite3_free(tls, p)
@@ -168661,6 +169558,7 @@ func geopolyAreaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 func geopolyCcwFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
+	_ = argc
 	if p != 0 {
 		if geopolyArea(tls, p) < 0.0 {
 			var ii int32
@@ -168719,6 +169617,7 @@ func geopolyRegularFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 	var n int32 = Xsqlite3_value_int(tls, *(*uintptr)(unsafe.Pointer(argv + 3*8)))
 
 	var p uintptr
+	_ = argc
 
 	if n < 3 || r <= 0.0 {
 		return
@@ -168887,6 +169786,7 @@ __4:
 
 func geopolyBBoxFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p uintptr = geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0), uintptr(0))
+	_ = argc
 	if p != 0 {
 		Xsqlite3_result_blob(tls, context, p+4,
 			4+8*(*GeoPoly)(unsafe.Pointer(p)).FnVertex, libc.UintptrFromInt32(-1))
@@ -168908,6 +169808,7 @@ func geopolyBBoxStep(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	defer tls.Free(20)
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
+	_ = argc
 	geopolyBBox(tls, context, *(*uintptr)(unsafe.Pointer(argv)), bp, bp+16)
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		var pBBox uintptr
@@ -168992,6 +169893,8 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 	var v int32 = 0
 	var cnt int32 = 0
 	var ii int32
+	_ = argc
+
 	if p1 == uintptr(0) {
 		return
 	}
@@ -169020,6 +169923,7 @@ func geopolyContainsPointFunc(tls *libc.TLS, context uintptr, argc int32, argv u
 func geopolyWithinFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -169458,6 +170362,7 @@ geopolyOverlapDone:
 func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 	var p1 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv)), uintptr(0))
 	var p2 uintptr = geopolyFuncParam(tls, context, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uintptr(0))
+	_ = argc
 	if p1 != 0 && p2 != 0 {
 		var x int32 = geopolyOverlap(tls, p1, p2)
 		if x < 0 {
@@ -169471,6 +170376,9 @@ func geopolyOverlapFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 }
 
 func geopolyDebugFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
+	_ = context
+	_ = argc
+	_ = argv
 }
 
 func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintptr, ppVtab uintptr, pzErr uintptr, isCreate int32) int32 {
@@ -169485,6 +170393,7 @@ func geopolyInit(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv uintp
 	var zSql uintptr
 	var ii int32
 	rc = SQLITE_OK
+	_ = pAux
 
 	Xsqlite3_vtab_config(tls, db, SQLITE_VTAB_CONSTRAINT_SUPPORT, libc.VaList(bp, 1))
 
@@ -169509,7 +170418,7 @@ __1:
 	libc.Xmemcpy(tls, (*Rtree)(unsafe.Pointer(pRtree)).FzName, *(*uintptr)(unsafe.Pointer(argv + 2*8)), uint64(nName))
 
 	pSql = Xsqlite3_str_new(tls, db)
-	Xsqlite3_str_appendf(tls, pSql, ts+28847, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28917, 0)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux = U8(1)
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAuxNotNull = U8(1)
 	ii = 3
@@ -169518,7 +170427,7 @@ __2:
 		goto __4
 	}
 	(*Rtree)(unsafe.Pointer(pRtree)).FnAux++
-	Xsqlite3_str_appendf(tls, pSql, ts+28869, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
+	Xsqlite3_str_appendf(tls, pSql, ts+28939, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(argv + uintptr(ii)*8))))
 	goto __3
 __3:
 	ii++
@@ -169526,7 +170435,7 @@ __3:
 	goto __4
 __4:
 	;
-	Xsqlite3_str_appendf(tls, pSql, ts+27936, 0)
+	Xsqlite3_str_appendf(tls, pSql, ts+28006, 0)
 	zSql = Xsqlite3_str_finish(tls, pSql)
 	if !!(zSql != 0) {
 		goto __5
@@ -169605,6 +170514,7 @@ func geopolyFilter(tls *libc.TLS, pVtabCursor uintptr, idxNum int32, idxStr uint
 	*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp + 16)) = 0
+	_ = idxStr
 
 	rtreeReference(tls, pRtree)
 
@@ -169733,6 +170643,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	var iRowidTerm int32 = -1
 	var iFuncTerm int32 = -1
 	var idxNum int32 = 0
+	_ = tab
 
 	for ii = 0; ii < (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FnConstraint; ii++ {
 		var p uintptr = (*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraint + uintptr(ii)*12
@@ -169751,7 +170662,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 
 	if iRowidTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 1
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 17609
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 17625
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iRowidTerm)*8)).Fomit = uint8(1)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 30.0
@@ -169761,7 +170672,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 	}
 	if iFuncTerm >= 0 {
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = idxNum
-		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28873
+		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28943
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).FargvIndex = 1
 		(*sqlite3_index_constraint_usage)(unsafe.Pointer((*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FaConstraintUsage + uintptr(iFuncTerm)*8)).Fomit = uint8(0)
 		(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 300.0
@@ -169769,7 +170680,7 @@ func geopolyBestIndex(tls *libc.TLS, tab uintptr, pIdxInfo uintptr) int32 {
 		return SQLITE_OK
 	}
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxNum = 4
-	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28879
+	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FidxStr = ts + 28949
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedCost = 3000000.0
 	(*Sqlite3_index_info)(unsafe.Pointer(pIdxInfo)).FestimatedRows = int64(100000)
 	return SQLITE_OK
@@ -169881,7 +170792,7 @@ __1:
 	if !(*(*int32)(unsafe.Pointer(bp + 48)) == SQLITE_ERROR) {
 		goto __4
 	}
-	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28888, 0)
+	(*Sqlite3_vtab)(unsafe.Pointer(pVtab)).FzErrMsg = Xsqlite3_mprintf(tls, ts+28958, 0)
 __4:
 	;
 	goto geopoly_update_end
@@ -170011,14 +170922,16 @@ geopoly_update_end:
 }
 
 func geopolyFindFunction(tls *libc.TLS, pVtab uintptr, nArg int32, zName uintptr, pxFunc uintptr, ppArg uintptr) int32 {
-	if Xsqlite3_stricmp(tls, zName, ts+28928) == 0 {
+	_ = pVtab
+	_ = nArg
+	if Xsqlite3_stricmp(tls, zName, ts+28998) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyOverlapFunc}))
 		*(*uintptr)(unsafe.Pointer(ppArg)) = uintptr(0)
 		return SQLITE_INDEX_CONSTRAINT_FUNCTION
 	}
-	if Xsqlite3_stricmp(tls, zName, ts+28944) == 0 {
+	if Xsqlite3_stricmp(tls, zName, ts+29014) == 0 {
 		*(*uintptr)(unsafe.Pointer(pxFunc)) = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{geopolyWithinFunc}))
@@ -170055,8 +170968,8 @@ var geopolyModule = Sqlite3_module{
 
 func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 	var rc int32 = SQLITE_OK
-	var i int32
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
+	var i uint32
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aFunc))/uint64(unsafe.Sizeof(struct {
 		FxFunc       uintptr
 		FnArg        int8
 		FbPure       uint8
@@ -170073,7 +170986,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			enc, uintptr(0),
 			aFunc[i].FxFunc, uintptr(0), uintptr(0))
 	}
-	for i = 0; uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
+	for i = uint32(0); uint64(i) < uint64(unsafe.Sizeof(aAgg))/uint64(unsafe.Sizeof(struct {
 		FxStep  uintptr
 		FxFinal uintptr
 		FzName  uintptr
@@ -170083,7 +170996,7 @@ func sqlite3_geopoly_init(tls *libc.TLS, db uintptr) int32 {
 			uintptr(0), aAgg[i].FxStep, aAgg[i].FxFinal)
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_module_v2(tls, db, ts+28959, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+29029, uintptr(unsafe.Pointer(&geopolyModule)), uintptr(0), uintptr(0))
 	}
 	return rc
 }
@@ -170095,25 +171008,25 @@ var aFunc = [12]struct {
 	F__ccgo_pad1 [6]byte
 	FzName       uintptr
 }{
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28967},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28980},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 28993},
-	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 29006},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28944},
-	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 29018},
-	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28928},
-	{FxFunc: 0, FnArg: int8(1), FzName: ts + 29041},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29055},
-	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 29068},
-	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 29082},
-	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29098},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29037},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29050},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29063},
+	{FxFunc: 0, FnArg: int8(-1), FbPure: uint8(1), FzName: ts + 29076},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 29014},
+	{FxFunc: 0, FnArg: int8(3), FbPure: uint8(1), FzName: ts + 29088},
+	{FxFunc: 0, FnArg: int8(2), FbPure: uint8(1), FzName: ts + 28998},
+	{FxFunc: 0, FnArg: int8(1), FzName: ts + 29111},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29125},
+	{FxFunc: 0, FnArg: int8(7), FbPure: uint8(1), FzName: ts + 29138},
+	{FxFunc: 0, FnArg: int8(4), FbPure: uint8(1), FzName: ts + 29152},
+	{FxFunc: 0, FnArg: int8(1), FbPure: uint8(1), FzName: ts + 29168},
 }
 var aAgg = [1]struct {
 	FxStep  uintptr
 	FxFinal uintptr
 	FzName  uintptr
 }{
-	{FxStep: 0, FxFinal: 0, FzName: ts + 29110},
+	{FxStep: 0, FxFinal: 0, FzName: ts + 29180},
 }
 
 // Register the r-tree module with database handle db. This creates the
@@ -170123,26 +171036,26 @@ func Xsqlite3RtreeInit(tls *libc.TLS, db uintptr) int32 {
 	var utf8 int32 = SQLITE_UTF8
 	var rc int32
 
-	rc = Xsqlite3_create_function(tls, db, ts+29129, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+	rc = Xsqlite3_create_function(tls, db, ts+29199, 2, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 		f func(*libc.TLS, uintptr, int32, uintptr)
 	}{rtreenode})), uintptr(0), uintptr(0))
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+29139, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+29209, 1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreedepth})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_create_function(tls, db, ts+29150, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+		rc = Xsqlite3_create_function(tls, db, ts+29220, -1, utf8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, int32, uintptr)
 		}{rtreecheck})), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_REAL32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+28873, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+28943, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		var c uintptr = uintptr(RTREE_COORD_INT32)
-		rc = Xsqlite3_create_module_v2(tls, db, ts+29161, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+29231, uintptr(unsafe.Pointer(&rtreeModule)), c, uintptr(0))
 	}
 	if rc == SQLITE_OK {
 		rc = sqlite3_geopoly_init(tls, db)
@@ -170196,7 +171109,7 @@ func geomCallback(tls *libc.TLS, ctx uintptr, nArg int32, aArg uintptr) {
 			Xsqlite3_result_error_nomem(tls, ctx)
 			rtreeMatchArgFree(tls, pBlob)
 		} else {
-			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+26449, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
+			Xsqlite3_result_pointer(tls, ctx, pBlob, ts+26519, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{rtreeMatchArgFree})))
 		}
 	}
 }
@@ -170523,7 +171436,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 
 	nOut = rbuDeltaOutputSize(tls, aDelta, nDelta)
 	if nOut < 0 {
-		Xsqlite3_result_error(tls, context, ts+29171, -1)
+		Xsqlite3_result_error(tls, context, ts+29241, -1)
 		return
 	}
 
@@ -170534,7 +171447,7 @@ func rbuFossilDeltaFunc(tls *libc.TLS, context uintptr, argc int32, argv uintptr
 		nOut2 = rbuDeltaApply(tls, aOrig, nOrig, aDelta, nDelta, aOut)
 		if nOut2 != nOut {
 			Xsqlite3_free(tls, aOut)
-			Xsqlite3_result_error(tls, context, ts+29171, -1)
+			Xsqlite3_result_error(tls, context, ts+29241, -1)
 		} else {
 			Xsqlite3_result_blob(tls, context, aOut, nOut, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{Xsqlite3_free})))
 		}
@@ -170635,7 +171548,7 @@ func rbuObjIterNext(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuObjIterClearStatements(tls, pIter)
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) {
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+29192, uintptr(0), uintptr(0), p+64)
+				ts+29262, uintptr(0), uintptr(0), p+64)
 		}
 
 		if rc == SQLITE_OK {
@@ -170699,7 +171612,7 @@ func rbuTargetNameFunc(tls *libc.TLS, pCtx uintptr, argc int32, argv uintptr) {
 				Xsqlite3_result_text(tls, pCtx, zIn, -1, uintptr(0))
 			}
 		} else {
-			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+26362, zIn, uint64(4)) == 0 {
+			if libc.Xstrlen(tls, zIn) > uint64(4) && libc.Xmemcmp(tls, ts+26432, zIn, uint64(4)) == 0 {
 				var i int32
 				for i = 4; int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) >= '0' && int32(*(*int8)(unsafe.Pointer(zIn + uintptr(i)))) <= '9'; i++ {
 				}
@@ -170720,16 +171633,16 @@ func rbuObjIterFirst(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 
 	rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+29363, libc.VaList(bp, func() uintptr {
+			ts+29433, libc.VaList(bp, func() uintptr {
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					return ts + 29513
+					return ts + 29583
 				}
 				return ts + 1544
 			}())))
 
 	if rc == SQLITE_OK {
 		rc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+8, p+64,
-			ts+29554)
+			ts+29624)
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup = 1
@@ -170845,7 +171758,7 @@ func rbuTableType(tls *libc.TLS, p uintptr, zTab uintptr, peType uintptr, piTnum
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+29679, libc.VaList(bp, zTab)))
+			ts+29749, libc.VaList(bp, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK || Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 32))) != SQLITE_ROW) {
 		goto __1
 	}
@@ -170863,7 +171776,7 @@ __2:
 	*(*int32)(unsafe.Pointer(piTnum)) = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 32)), 1)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+1*8, p+64,
-		Xsqlite3_mprintf(tls, ts+29798, libc.VaList(bp+8, zTab)))
+		Xsqlite3_mprintf(tls, ts+29868, libc.VaList(bp+8, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0) {
 		goto __3
 	}
@@ -170881,7 +171794,7 @@ __4:
 	}
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+2*8, p+64,
 		Xsqlite3_mprintf(tls,
-			ts+29819, libc.VaList(bp+16, zIdx)))
+			ts+29889, libc.VaList(bp+16, zIdx)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __7
 	}
@@ -170904,7 +171817,7 @@ __6:
 __5:
 	;
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+32+3*8, p+64,
-		Xsqlite3_mprintf(tls, ts+29870, libc.VaList(bp+24, zTab)))
+		Xsqlite3_mprintf(tls, ts+29940, libc.VaList(bp+24, zTab)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK) {
 		goto __10
 	}
@@ -170950,7 +171863,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		libc.Xmemcpy(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, (*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+16, p+64,
-			Xsqlite3_mprintf(tls, ts+29891, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29961, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 	}
 
 	(*RbuObjIter)(unsafe.Pointer(pIter)).FnIndex = 0
@@ -170965,7 +171878,7 @@ func rbuObjIterCacheIndexedCols(tls *libc.TLS, p uintptr, pIter uintptr) {
 			libc.Xmemset(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed, 0x01, uint64(unsafe.Sizeof(U8(0)))*uint64((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol))
 		}
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+29919, libc.VaList(bp+8, zIdx)))
+			Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp+8, zIdx)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
 			var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 1)
 			if iCid >= 0 {
@@ -171005,7 +171918,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		rbuTableType(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, pIter+72, bp+56, pIter+108)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NOTABLE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+20765, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+20858, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != 0 {
 			return (*Sqlite3rbu)(unsafe.Pointer(p)).Frc
@@ -171015,18 +171928,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 		}
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+64, p+64,
-			Xsqlite3_mprintf(tls, ts+29948, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
+			Xsqlite3_mprintf(tls, ts+30018, libc.VaList(bp+8, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			nCol = Xsqlite3_column_count(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 			rbuAllocateIterArrays(tls, p, pIter, nCol)
 		}
 		for i = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && i < nCol; i++ {
 			var zName uintptr = Xsqlite3_column_name(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), i)
-			if Xsqlite3_strnicmp(tls, ts+29967, zName, 4) != 0 {
+			if Xsqlite3_strnicmp(tls, ts+30037, zName, 4) != 0 {
 				var zCopy uintptr = rbuStrndup(tls, zName, p+56)
 				*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr((*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol)*4)) = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
 				*(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(libc.PostIncInt32(&(*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol, 1))*8)) = zCopy
-			} else if 0 == Xsqlite3_stricmp(tls, ts+29972, zName) {
+			} else if 0 == Xsqlite3_stricmp(tls, ts+30042, zName) {
 				bRbuRowid = 1
 			}
 		}
@@ -171038,18 +171951,18 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			bRbuRowid != libc.Bool32((*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE) {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls,
-				ts+29982, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
+				ts+30052, libc.VaList(bp+16, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 					func() uintptr {
 						if bRbuRowid != 0 {
-							return ts + 30011
+							return ts + 30081
 						}
-						return ts + 30024
+						return ts + 30094
 					}()))
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-				Xsqlite3_mprintf(tls, ts+30033, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				Xsqlite3_mprintf(tls, ts+30103, libc.VaList(bp+32, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		}
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 64))) {
 			var zName uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 1)
@@ -171063,7 +171976,7 @@ func rbuObjIterCacheTableInfo(tls *libc.TLS, p uintptr, pIter uintptr) int32 {
 			}
 			if i == (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30055,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30125,
 					libc.VaList(bp+40, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zName))
 			} else {
 				var iPk int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 5)
@@ -171110,8 +172023,8 @@ func rbuObjIterGetCollist(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var i int32
 	for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 		var z uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-		zList = rbuMPrintf(tls, p, ts+30082, libc.VaList(bp, zList, zSep, z))
-		zSep = ts + 15961
+		zList = rbuMPrintf(tls, p, ts+30152, libc.VaList(bp, zList, zSep, z))
+		zSep = ts + 15971
 	}
 	return zList
 }
@@ -171128,7 +172041,7 @@ func rbuObjIterGetPkList(tls *libc.TLS, p uintptr, pIter uintptr, zPre uintptr,
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if int32(*(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i)))) == iPk {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zRet = rbuMPrintf(tls, p, ts+30091, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
+				zRet = rbuMPrintf(tls, p, ts+30161, libc.VaList(bp, zRet, zSep, zPre, zCol, zPost))
 				zSep = zSeparator
 				break
 			}
@@ -171150,25 +172063,25 @@ func rbuVacuumTableStart(tls *libc.TLS, p uintptr, pIter uintptr, bRowid int32,
 	if bRowid != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+30104, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+				ts+30174, libc.VaList(bp, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 			var iMax Sqlite3_int64 = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-			zRet = rbuMPrintf(tls, p, ts+30136, libc.VaList(bp+16, iMax))
+			zRet = rbuMPrintf(tls, p, ts+30206, libc.VaList(bp+16, iMax))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 	} else {
-		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15961, ts+30159)
-		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+30165, ts+30172, ts+6309)
-		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15961, ts+1544)
+		var zOrder uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15971, ts+30229)
+		var zSelect uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+30235, ts+30242, ts+6309)
+		var zList uintptr = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15971, ts+1544)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+72, p+64,
 				Xsqlite3_mprintf(tls,
-					ts+30180,
+					ts+30250,
 					libc.VaList(bp+24, zSelect, zWrite, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 72))) {
 				var zVal uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 72)), 0)
-				zRet = rbuMPrintf(tls, p, ts+30222, libc.VaList(bp+56, zList, zVal))
+				zRet = rbuMPrintf(tls, p, ts+30292, libc.VaList(bp+56, zList, zVal))
 			}
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 72)))
 		}
@@ -171210,7 +172123,7 @@ func rbuVacuumIndexStart(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	*(*uintptr)(unsafe.Pointer(bp + 176)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-		Xsqlite3_mprintf(tls, ts+29919, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+		Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 __1:
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 176)))) {
 		goto __2
@@ -171245,7 +172158,7 @@ __10:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 	goto __7
 __6:
-	zCol = ts + 30242
+	zCol = ts + 30312
 __7:
 	;
 	goto __5
@@ -171253,13 +172166,13 @@ __4:
 	zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 __5:
 	;
-	zLhs = rbuMPrintf(tls, p, ts+30250,
+	zLhs = rbuMPrintf(tls, p, ts+30320,
 		libc.VaList(bp+8, zLhs, zSep, zCol, zCollate))
-	zOrder = rbuMPrintf(tls, p, ts+30271,
+	zOrder = rbuMPrintf(tls, p, ts+30341,
 		libc.VaList(bp+40, zOrder, zSep, iCol, zCol, zCollate))
-	zSelect = rbuMPrintf(tls, p, ts+30307,
+	zSelect = rbuMPrintf(tls, p, ts+30377,
 		libc.VaList(bp+80, zSelect, zSep, iCol, zCol))
-	zSep = ts + 15961
+	zSep = ts + 15971
 	iCol++
 	goto __1
 __2:
@@ -171277,7 +172190,7 @@ __11:
 	*(*uintptr)(unsafe.Pointer(bp + 184)) = uintptr(0)
 
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+184, p+64,
-		Xsqlite3_mprintf(tls, ts+30334,
+		Xsqlite3_mprintf(tls, ts+30404,
 			libc.VaList(bp+112, zSelect, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zOrder)))
 	if !((*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 184)))) {
 		goto __13
@@ -171304,8 +172217,8 @@ __19:
 	;
 __18:
 	;
-	zVector = rbuMPrintf(tls, p, ts+30382, libc.VaList(bp+136, zVector, zSep, zQuoted))
-	zSep = ts + 15961
+	zVector = rbuMPrintf(tls, p, ts+30452, libc.VaList(bp+136, zVector, zSep, zQuoted))
+	zSep = ts + 15971
 	goto __15
 __15:
 	iCol++
@@ -171316,7 +172229,7 @@ __16:
 	if !!(bFailed != 0) {
 		goto __20
 	}
-	zRet = rbuMPrintf(tls, p, ts+30389, libc.VaList(bp+160, zLhs, zVector))
+	zRet = rbuMPrintf(tls, p, ts+30459, libc.VaList(bp+160, zLhs, zVector))
 __20:
 	;
 __13:
@@ -171349,7 +172262,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 	if rc == SQLITE_OK {
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+200, p+64,
-			Xsqlite3_mprintf(tls, ts+29919, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
+			Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx)))
 	}
 
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 200))) {
@@ -171361,7 +172274,7 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 		if iCid == -2 {
 			var iSeq int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 0)
-			zRet = Xsqlite3_mprintf(tls, ts+30401, libc.VaList(bp+8, zRet, zCom,
+			zRet = Xsqlite3_mprintf(tls, ts+30471, libc.VaList(bp+8, zRet, zCom,
 				(*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FnSpan, (*RbuSpan)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaIdxCol+uintptr(iSeq)*16)).FzSpan, zCollate))
 			zType = ts + 1544
 		} else {
@@ -171373,37 +172286,37 @@ func rbuObjIterGetIndexCols(tls *libc.TLS, p uintptr, pIter uintptr, pzImposterC
 
 					zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
 				} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-					zCol = ts + 30242
+					zCol = ts + 30312
 				} else {
-					zCol = ts + 29972
+					zCol = ts + 30042
 				}
 				zType = ts + 1109
 			} else {
 				zCol = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(iCid)*8))
 				zType = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8))
 			}
-			zRet = Xsqlite3_mprintf(tls, ts+30423, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
+			zRet = Xsqlite3_mprintf(tls, ts+30493, libc.VaList(bp+48, zRet, zCom, zCol, zCollate))
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FbUnique == 0 || Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), 5) != 0 {
 			var zOrder uintptr = func() uintptr {
 				if bDesc != 0 {
-					return ts + 30159
+					return ts + 30229
 				}
 				return ts + 1544
 			}()
-			zImpPK = Xsqlite3_mprintf(tls, ts+30443,
+			zImpPK = Xsqlite3_mprintf(tls, ts+30513,
 				libc.VaList(bp+80, zImpPK, zCom, nBind, zCol, zOrder))
 		}
-		zImpCols = Xsqlite3_mprintf(tls, ts+30464,
+		zImpCols = Xsqlite3_mprintf(tls, ts+30534,
 			libc.VaList(bp+120, zImpCols, zCom, nBind, zCol, zType, zCollate))
 		zWhere = Xsqlite3_mprintf(tls,
-			ts+30497, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
+			ts+30567, libc.VaList(bp+168, zWhere, zAnd, nBind, zCol))
 		if zRet == uintptr(0) || zImpPK == uintptr(0) || zImpCols == uintptr(0) || zWhere == uintptr(0) {
 			rc = SQLITE_NOMEM
 		}
-		zCom = ts + 15961
-		zAnd = ts + 22833
+		zCom = ts + 15971
+		zAnd = ts + 22894
 		nBind++
 	}
 
@@ -171442,11 +172355,11 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = Xsqlite3_mprintf(tls, ts+30521, libc.VaList(bp, zList, zS, zObj, zCol))
+				zList = Xsqlite3_mprintf(tls, ts+30591, libc.VaList(bp, zList, zS, zObj, zCol))
 			} else {
-				zList = Xsqlite3_mprintf(tls, ts+30533, libc.VaList(bp+32, zList, zS))
+				zList = Xsqlite3_mprintf(tls, ts+30603, libc.VaList(bp+32, zList, zS))
 			}
-			zS = ts + 15961
+			zS = ts + 15971
 			if zList == uintptr(0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 				break
@@ -171454,7 +172367,7 @@ func rbuObjIterGetOldlist(tls *libc.TLS, p uintptr, pIter uintptr, zObj uintptr)
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-			zList = rbuMPrintf(tls, p, ts+30542, libc.VaList(bp+48, zList, zObj))
+			zList = rbuMPrintf(tls, p, ts+30612, libc.VaList(bp+48, zList, zObj))
 		}
 	}
 	return zList
@@ -171466,18 +172379,18 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	var zList uintptr = uintptr(0)
 	if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-		zList = rbuMPrintf(tls, p, ts+30557, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
+		zList = rbuMPrintf(tls, p, ts+30627, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+1))
 	} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
 		var zSep uintptr = ts + 1544
 		var i int32
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
-				zList = rbuMPrintf(tls, p, ts+30571, libc.VaList(bp+8, zList, zSep, i, i+1))
-				zSep = ts + 22833
+				zList = rbuMPrintf(tls, p, ts+30641, libc.VaList(bp+8, zList, zSep, i, i+1))
+				zSep = ts + 22894
 			}
 		}
 		zList = rbuMPrintf(tls, p,
-			ts+30583, libc.VaList(bp+40, zList))
+			ts+30653, libc.VaList(bp+40, zList))
 
 	} else {
 		var zSep uintptr = ts + 1544
@@ -171485,8 +172398,8 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 		for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 			if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 {
 				var zCol uintptr = *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8))
-				zList = rbuMPrintf(tls, p, ts+30633, libc.VaList(bp+48, zList, zSep, zCol, i+1))
-				zSep = ts + 22833
+				zList = rbuMPrintf(tls, p, ts+30703, libc.VaList(bp+48, zList, zSep, zCol, i+1))
+				zSep = ts + 22894
 			}
 		}
 	}
@@ -171495,7 +172408,7 @@ func rbuObjIterGetWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 func rbuBadControlError(tls *libc.TLS, p uintptr) {
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30646, 0)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+30716, 0)
 }
 
 func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr) uintptr {
@@ -171513,17 +172426,17 @@ func rbuObjIterGetSetlist(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr
 			for i = 0; i < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; i++ {
 				var c int8 = *(*int8)(unsafe.Pointer(zMask + uintptr(*(*int32)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FaiSrcOrder + uintptr(i)*4)))))
 				if int32(c) == 'x' {
-					zList = rbuMPrintf(tls, p, ts+30633,
+					zList = rbuMPrintf(tls, p, ts+30703,
 						libc.VaList(bp, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15961
+					zSep = ts + 15971
 				} else if int32(c) == 'd' {
-					zList = rbuMPrintf(tls, p, ts+30672,
+					zList = rbuMPrintf(tls, p, ts+30742,
 						libc.VaList(bp+32, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15961
+					zSep = ts + 15971
 				} else if int32(c) == 'f' {
-					zList = rbuMPrintf(tls, p, ts+30702,
+					zList = rbuMPrintf(tls, p, ts+30772,
 						libc.VaList(bp+72, zList, zSep, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblCol + uintptr(i)*8)), i+1))
-					zSep = ts + 15961
+					zSep = ts + 15971
 				}
 			}
 		}
@@ -171558,19 +172471,19 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 	var z uintptr = uintptr(0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		var zSep uintptr = ts + 30739
+		var zSep uintptr = ts + 30809
 		*(*uintptr)(unsafe.Pointer(bp + 56)) = uintptr(0)
 		*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+56, p+64,
-			Xsqlite3_mprintf(tls, ts+29891, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
+			Xsqlite3_mprintf(tls, ts+29961, libc.VaList(bp, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl)))
 		for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 56))) {
 			var zOrig uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 3)
-			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+17497) == 0 {
+			if zOrig != 0 && libc.Xstrcmp(tls, zOrig, ts+17513) == 0 {
 				var zIdx uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 56)), 1)
 				if zIdx != 0 {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+64, p+64,
-						Xsqlite3_mprintf(tls, ts+29919, libc.VaList(bp+8, zIdx)))
+						Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp+8, zIdx)))
 				}
 				break
 			}
@@ -171582,15 +172495,15 @@ func rbuWithoutRowidPK(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 				var zCol uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 2)
 				var zDesc uintptr
 				if Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 64)), 3) != 0 {
-					zDesc = ts + 30159
+					zDesc = ts + 30229
 				} else {
 					zDesc = ts + 1544
 				}
-				z = rbuMPrintf(tls, p, ts+30752, libc.VaList(bp+16, z, zSep, zCol, zDesc))
-				zSep = ts + 15961
+				z = rbuMPrintf(tls, p, ts+30822, libc.VaList(bp+16, z, zSep, zCol, zDesc))
+				zSep = ts + 15971
 			}
 		}
-		z = rbuMPrintf(tls, p, ts+30763, libc.VaList(bp+48, z))
+		z = rbuMPrintf(tls, p, ts+30833, libc.VaList(bp+48, z))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
 	return z
@@ -171610,7 +172523,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zPk uintptr = uintptr(0)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+168, p+64,
-			ts+30767)
+			ts+30837)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			Xsqlite3_bind_int(tls, *(*uintptr)(unsafe.Pointer(bp + 168)), 1, tnum)
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 168))) {
@@ -171619,7 +172532,7 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 		}
 		if zIdx != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+176, p+64,
-				Xsqlite3_mprintf(tls, ts+29919, libc.VaList(bp, zIdx)))
+				Xsqlite3_mprintf(tls, ts+29989, libc.VaList(bp, zIdx)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 168)))
 
@@ -171629,25 +172542,25 @@ func rbuCreateImposterTable2(tls *libc.TLS, p uintptr, pIter uintptr) {
 				var iCid int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 1)
 				var bDesc int32 = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 3)
 				var zCollate uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 176)), 4)
-				zCols = rbuMPrintf(tls, p, ts+30817, libc.VaList(bp+8, zCols, zComma,
+				zCols = rbuMPrintf(tls, p, ts+30887, libc.VaList(bp+8, zCols, zComma,
 					iCid, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCid)*8)), zCollate))
-				zPk = rbuMPrintf(tls, p, ts+30839, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
+				zPk = rbuMPrintf(tls, p, ts+30909, libc.VaList(bp+48, zPk, zComma, iCid, func() uintptr {
 					if bDesc != 0 {
-						return ts + 30159
+						return ts + 30229
 					}
 					return ts + 1544
 				}()))
-				zComma = ts + 15961
+				zComma = ts + 15971
 			}
 		}
-		zCols = rbuMPrintf(tls, p, ts+30849, libc.VaList(bp+80, zCols))
+		zCols = rbuMPrintf(tls, p, ts+30919, libc.VaList(bp+80, zCols))
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 176)))
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 1, tnum))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+88, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 1, tnum))
 		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+30864,
+			ts+30934,
 			libc.VaList(bp+120, zCols, zPk))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+136, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 0))
 	}
 }
 
@@ -171660,7 +172573,7 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 		var zComma uintptr = ts + 1544
 		var zSql uintptr = uintptr(0)
 		var iCol int32
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 0, 1))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 1))
 
 		for iCol = 0; (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && iCol < (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol; iCol++ {
 			var zPk uintptr = ts + 1544
@@ -171668,39 +172581,39 @@ func rbuCreateImposterTable(tls *libc.TLS, p uintptr, pIter uintptr) {
 			*(*uintptr)(unsafe.Pointer(bp + 192)) = uintptr(0)
 
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_table_column_metadata(tls,
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zCol, uintptr(0), bp+192, uintptr(0), uintptr(0), uintptr(0))
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(iCol))) != 0 {
-				zPk = ts + 30926
+				zPk = ts + 30996
 			}
-			zSql = rbuMPrintf(tls, p, ts+30939,
+			zSql = rbuMPrintf(tls, p, ts+31009,
 				libc.VaList(bp+32, zSql, zComma, zCol, *(*uintptr)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FazTblType + uintptr(iCol)*8)), zPk, *(*uintptr)(unsafe.Pointer(bp + 192)),
 					func() uintptr {
 						if *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabNotNull + uintptr(iCol))) != 0 {
-							return ts + 30966
+							return ts + 31036
 						}
 						return ts + 1544
 					}()))
-			zComma = ts + 15961
+			zComma = ts + 15971
 		}
 
 		if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
 			var zPk uintptr = rbuWithoutRowidPK(tls, p, pIter)
 			if zPk != 0 {
-				zSql = rbuMPrintf(tls, p, ts+30976, libc.VaList(bp+88, zSql, zPk))
+				zSql = rbuMPrintf(tls, p, ts+31046, libc.VaList(bp+88, zSql, zPk))
 			}
 		}
 
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 1, tnum))
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+30983,
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+104, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 1, tnum))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+31053,
 			libc.VaList(bp+136, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSql,
 				func() uintptr {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_WITHOUT_ROWID {
-						return ts + 31015
+						return ts + 31085
 					}
 					return ts + 1544
 				}()))
-		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 0, 0))
+		Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+160, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 0))
 	}
 }
 
@@ -171713,7 +172626,7 @@ func rbuObjIterPrepareTmpInsert(tls *libc.TLS, p uintptr, pIter uintptr, zCollis
 	if zBind != 0 {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 			(*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+152, p+64, Xsqlite3_mprintf(tls,
-				ts+31030,
+				ts+31100,
 				libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zCollist, zRbuRowid, zBind)))
 	}
 }
@@ -171750,7 +172663,7 @@ func rbuObjIterGetIndexWhere(tls *libc.TLS, p uintptr, pIter uintptr) uintptr {
 
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(bp + 8)) = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp, p+64,
-			ts+31087)
+			ts+31157)
 	}
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		var rc2 int32
@@ -171855,7 +172768,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 		var zLimit uintptr = uintptr(0)
 
 		if nOffset != 0 {
-			zLimit = Xsqlite3_mprintf(tls, ts+31153, libc.VaList(bp, nOffset))
+			zLimit = Xsqlite3_mprintf(tls, ts+31223, libc.VaList(bp, nOffset))
 			if !(zLimit != 0) {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
 			}
@@ -171875,24 +172788,24 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				p, pIter, bp+600, bp+608, bp+616, bp+624)
 			zBind = rbuObjIterGetBindlist(tls, p, *(*int32)(unsafe.Pointer(bp + 624)))
 
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 0, 1))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 1, tnum))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+8, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 1))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+40, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 1, tnum))
 			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-				ts+31173,
+				ts+31243,
 				libc.VaList(bp+72, zTbl, *(*uintptr)(unsafe.Pointer(bp + 600)), *(*uintptr)(unsafe.Pointer(bp + 608))))
-			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, 0, 0))
+			Xsqlite3_test_control(tls, SQLITE_TESTCTRL_IMPOSTER, libc.VaList(bp+96, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, 0, 0))
 
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = *(*int32)(unsafe.Pointer(bp + 624))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, p+64,
-					Xsqlite3_mprintf(tls, ts+31238, libc.VaList(bp+128, zTbl, zBind)))
+					Xsqlite3_mprintf(tls, ts+31308, libc.VaList(bp+128, zTbl, zBind)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, p+64,
-					Xsqlite3_mprintf(tls, ts+31274, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
+					Xsqlite3_mprintf(tls, ts+31344, libc.VaList(bp+144, zTbl, *(*uintptr)(unsafe.Pointer(bp + 616)))))
 			}
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -171908,7 +172821,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					}
 
 					zSql = Xsqlite3_mprintf(tls,
-						ts+31308,
+						ts+31378,
 						libc.VaList(bp+160, zCollist,
 							(*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
@@ -171916,9 +172829,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								if zStart != 0 {
 									return func() uintptr {
 										if zPart != 0 {
-											return ts + 31369
+											return ts + 31439
 										}
-										return ts + 31373
+										return ts + 31443
 									}()
 								}
 								return ts + 1544
@@ -171927,20 +172840,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 					Xsqlite3_free(tls, zStart)
 				} else if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+31379,
+						ts+31449,
 						libc.VaList(bp+216, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart, zCollist, zLimit))
 				} else {
 					zSql = Xsqlite3_mprintf(tls,
-						ts+31440,
+						ts+31510,
 						libc.VaList(bp+264, zCollist, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, zPart,
 							zCollist, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl,
 							zPart,
 							func() uintptr {
 								if zPart != 0 {
-									return ts + 31369
+									return ts + 31439
 								}
-								return ts + 31373
+								return ts + 31443
 							}(),
 							zCollist, zLimit))
 				}
@@ -171965,8 +172878,8 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 
 			var zBindings uintptr = rbuObjIterGetBindlist(tls, p, (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol+bRbuRowid)
 			var zWhere uintptr = rbuObjIterGetWhere(tls, p, pIter)
-			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7744)
-			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7740)
+			var zOldlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7804)
+			var zNewlist uintptr = rbuObjIterGetOldlist(tls, p, pIter, ts+7800)
 
 			zCollist = rbuObjIterGetCollist(tls, p, pIter)
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FnCol = (*RbuObjIter)(unsafe.Pointer(pIter)).FnTblCol
@@ -171977,16 +172890,16 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_VTAB {
 					return ts + 1544
 				}
-				return ts + 31599
+				return ts + 31669
 			}()
 
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+136, pz,
 					Xsqlite3_mprintf(tls,
-						ts+31608,
+						ts+31678,
 						libc.VaList(bp+344, zWrite, zTbl, zCollist, func() uintptr {
 							if bRbuRowid != 0 {
-								return ts + 31644
+								return ts + 31714
 							}
 							return ts + 1544
 						}(), zBindings)))
@@ -171995,32 +172908,32 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pIter+144, pz,
 					Xsqlite3_mprintf(tls,
-						ts+31654, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
+						ts+31724, libc.VaList(bp+384, zWrite, zTbl, zWhere)))
 			}
 
 			if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 				var zRbuRowid uintptr = ts + 1544
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
-					zRbuRowid = ts + 31682
+					zRbuRowid = ts + 31752
 				}
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-					ts+31694, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
+					ts+31764, libc.VaList(bp+408, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl, func() uintptr {
 						if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL {
-							return ts + 31770
+							return ts + 31840
 						}
 						return ts + 1544
 					}(), (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 
 				rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-					ts+31787,
+					ts+31857,
 					libc.VaList(bp+440, zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zOldlist,
 						zWrite, zTbl, zNewlist))
 
 				if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_EXTERNAL || (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_NONE {
 					rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-						ts+32086,
+						ts+32156,
 						libc.VaList(bp+512, zWrite, zTbl, zNewlist))
 				}
 
@@ -172033,9 +172946,9 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 				var zOrder uintptr = uintptr(0)
 				if bRbuRowid != 0 {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						zRbuRowid = ts + 32185
+						zRbuRowid = ts + 32255
 					} else {
-						zRbuRowid = ts + 32195
+						zRbuRowid = ts + 32265
 					}
 				}
 
@@ -172048,20 +172961,20 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 						}
 					}
 					if bRbuRowid != 0 {
-						zOrder = rbuMPrintf(tls, p, ts+30242, 0)
+						zOrder = rbuMPrintf(tls, p, ts+30312, 0)
 					} else {
-						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15961, ts+1544)
+						zOrder = rbuObjIterGetPkList(tls, p, pIter, ts+1544, ts+15971, ts+1544)
 					}
 				}
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, pIter+128, pz,
 						Xsqlite3_mprintf(tls,
-							ts+32206,
+							ts+32276,
 							libc.VaList(bp+536, zCollist,
 								func() uintptr {
 									if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-										return ts + 32254
+										return ts + 32324
 									}
 									return ts + 1544
 								}(),
@@ -172074,7 +172987,7 @@ func rbuObjIterPrepareAll(tls *libc.TLS, p uintptr, pIter uintptr, nOffset int32
 								}(),
 								func() uintptr {
 									if zOrder != 0 {
-										return ts + 21119
+										return ts + 24228
 									}
 									return ts + 1544
 								}(), zOrder,
@@ -172142,9 +173055,9 @@ func rbuGetUpdateStmt(tls *libc.TLS, p uintptr, pIter uintptr, zMask uintptr, pp
 			var zPrefix uintptr = ts + 1544
 
 			if (*RbuObjIter)(unsafe.Pointer(pIter)).FeType != RBU_PK_VTAB {
-				zPrefix = ts + 31599
+				zPrefix = ts + 31669
 			}
-			zUpdate = Xsqlite3_mprintf(tls, ts+32260,
+			zUpdate = Xsqlite3_mprintf(tls, ts+32330,
 				libc.VaList(bp, zPrefix, (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl, zSet, zWhere))
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls,
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, pUp+8, p+64, zUpdate)
@@ -172203,7 +173116,7 @@ func rbuLoadState(tls *libc.TLS, p uintptr) uintptr {
 	}
 
 	*(*int32)(unsafe.Pointer(bp + 16)) = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+8, p+64,
-		Xsqlite3_mprintf(tls, ts+32290, libc.VaList(bp, p+48)))
+		Xsqlite3_mprintf(tls, ts+32360, libc.VaList(bp, p+48)))
 	for *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 		switch Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0) {
 		case RBU_STATE_STAGE:
@@ -172273,28 +173186,28 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 	(*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain = dbMain
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7733, SQLITE_FCNTL_RBUCNT, p)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793, SQLITE_FCNTL_RBUCNT, p)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState == uintptr(0) {
-			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7733)
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+32320, libc.VaList(bp, zFile, zFile))
+			var zFile uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzState = rbuMPrintf(tls, p, ts+32390, libc.VaList(bp, zFile, zFile))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzState != 0 {
-		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32348, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
-		libc.Xmemcpy(tls, p+48, ts+14819, uint64(4))
+		rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32418, libc.VaList(bp+16, (*Sqlite3rbu)(unsafe.Pointer(p)).FzState))
+		libc.Xmemcpy(tls, p+48, ts+14829, uint64(4))
 	} else {
-		libc.Xmemcpy(tls, p+48, ts+7733, uint64(4))
+		libc.Xmemcpy(tls, p+48, ts+7793, uint64(4))
 	}
 
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32366, libc.VaList(bp+24, p+48))
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+32436, libc.VaList(bp+24, p+48))
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
 		var bOpen int32 = 0
 		var rc int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnRbu = 0
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FpRbuFd = uintptr(0)
-		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7733, SQLITE_FCNTL_RBUCNT, p)
+		rc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793, SQLITE_FCNTL_RBUCNT, p)
 		if rc != SQLITE_NOTFOUND {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc
 		}
@@ -172327,11 +173240,11 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				return
 			}
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32432, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32502, 0)
 		} else {
 			var zTarget uintptr
 			var zExtra uintptr = uintptr(0)
-			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+25505, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
+			if libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu) >= uint64(5) && 0 == libc.Xmemcmp(tls, ts+25575, (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu, uint64(5)) {
 				zExtra = (*Sqlite3rbu)(unsafe.Pointer(p)).FzRbu + 5
 				for *(*int8)(unsafe.Pointer(zExtra)) != 0 {
 					if int32(*(*int8)(unsafe.Pointer(libc.PostIncUintptr(&zExtra, 1)))) == '?' {
@@ -172343,13 +173256,13 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 				}
 			}
 
-			zTarget = Xsqlite3_mprintf(tls, ts+32464,
-				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7733),
+			zTarget = Xsqlite3_mprintf(tls, ts+32534,
+				libc.VaList(bp+32, Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793),
 					func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1544
 						}
-						return ts + 32496
+						return ts + 32566
 					}(), func() uintptr {
 						if zExtra == uintptr(0) {
 							return ts + 1544
@@ -172368,37 +173281,37 @@ func rbuOpenDatabase(tls *libc.TLS, p uintptr, dbMain uintptr, pbRetry uintptr)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+32498, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32568, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTmpInsertFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain,
-			ts+32513, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32583, 2, SQLITE_UTF8, uintptr(0), *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuFossilDeltaFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+32530, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+32600, -1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuTargetNameFunc})), uintptr(0), uintptr(0))
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, SQLITE_FCNTL_RBU, p)
 	}
-	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32546, 0)
+	rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32616, 0)
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733, SQLITE_FCNTL_RBU, p)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, SQLITE_FCNTL_RBU, p)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_NOTFOUND {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32574, 0)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+32644, 0)
 	}
 }
 
@@ -172427,15 +173340,15 @@ func rbuSetupCheckpoint(tls *libc.TLS, p uintptr, pState uintptr) {
 	if pState == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = 0
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32546, uintptr(0), uintptr(0), uintptr(0))
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32616, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var rc2 int32
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CAPTURE
-		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32592, uintptr(0), uintptr(0), uintptr(0))
-		if rc2 != SQLITE_INTERNAL {
+		rc2 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32662, uintptr(0), uintptr(0), uintptr(0))
+		if rc2 != SQLITE_NOTICE {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 		}
 	}
@@ -172483,7 +173396,7 @@ func rbuCaptureWalRead(tls *libc.TLS, pRbu uintptr, iOff I64, iAmt int32) int32
 
 	if (*Sqlite3rbu)(unsafe.Pointer(pRbu)).FmLock != mReq {
 		(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Frc = SQLITE_BUSY
-		return SQLITE_INTERNAL
+		return SQLITE_NOTICE | int32(3)<<8
 	}
 
 	(*Sqlite3rbu)(unsafe.Pointer(pRbu)).Fpgsz = iAmt
@@ -172543,7 +173456,7 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 	var rc int32 = SQLITE_OK
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	Xsqlite3_file_control(tls, db, ts+7733, SQLITE_FCNTL_FILE_POINTER, bp)
+	Xsqlite3_file_control(tls, db, ts+7793, SQLITE_FCNTL_FILE_POINTER, bp)
 
 	if (*Sqlite3_file)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FpMethods != 0 {
 		rc = (*struct {
@@ -172560,23 +173473,23 @@ func rbuLockDatabase(tls *libc.TLS, db uintptr) int32 {
 
 func rbuExclusiveCheckpoint(tls *libc.TLS, db uintptr) int32 {
 	var zUri uintptr = Xsqlite3_db_filename(tls, db, uintptr(0))
-	return Xsqlite3_uri_boolean(tls, zUri, ts+32627, 0)
+	return Xsqlite3_uri_boolean(tls, zUri, ts+32697, 0)
 }
 
 func rbuMoveOalFile(tls *libc.TLS, p uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7733)
+	var zBase uintptr = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793)
 	var zMove uintptr = zBase
 	var zOal uintptr
 	var zWal uintptr
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7733)
+		zMove = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+7793)
 	}
-	zOal = Xsqlite3_mprintf(tls, ts+32652, libc.VaList(bp, zMove))
-	zWal = Xsqlite3_mprintf(tls, ts+32659, libc.VaList(bp+8, zMove))
+	zOal = Xsqlite3_mprintf(tls, ts+32722, libc.VaList(bp, zMove))
+	zWal = Xsqlite3_mprintf(tls, ts+32729, libc.VaList(bp+8, zMove))
 
 	if zWal == uintptr(0) || zOal == uintptr(0) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_NOMEM
@@ -172693,7 +173606,7 @@ func rbuStepOneOp(tls *libc.TLS, p uintptr, eType int32) {
 			(*RbuObjIter)(unsafe.Pointer(pIter)).FzIdx == uintptr(0) && (*RbuObjIter)(unsafe.Pointer(pIter)).FeType == RBU_PK_IPK && *(*U8)(unsafe.Pointer((*RbuObjIter)(unsafe.Pointer(pIter)).FabTblPk + uintptr(i))) != 0 &&
 			Xsqlite3_column_type(tls, (*RbuObjIter)(unsafe.Pointer(pIter)).FpSelect, i) == SQLITE_NULL {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_MISMATCH
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+25143, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+25213, 0)
 			return
 		}
 
@@ -172786,7 +173699,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 		var iCookie int32 = 1000000
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, dbread, bp+8, p+64,
-			ts+32666)
+			ts+32736)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 8))) {
 				iCookie = Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), 0)
@@ -172794,7 +173707,7 @@ func rbuIncrSchemaCookie(tls *libc.TLS, p uintptr) {
 			rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 8)))
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32688, libc.VaList(bp, iCookie+1))
+			rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32758, libc.VaList(bp, iCookie+1))
 		}
 	}
 }
@@ -172815,7 +173728,7 @@ func rbuSaveState(tls *libc.TLS, p uintptr, eStage int32) {
 
 		rc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+168, p+64,
 			Xsqlite3_mprintf(tls,
-				ts+32715,
+				ts+32785,
 				libc.VaList(bp, p+48,
 					RBU_STATE_STAGE, eStage,
 					RBU_STATE_TBL, (*Sqlite3rbu)(unsafe.Pointer(p)).Fobjiter.FzTbl,
@@ -172845,9 +173758,9 @@ func rbuCopyPragma(tls *libc.TLS, p uintptr, zPragma uintptr) {
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareFreeAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp+24, p+64,
-			Xsqlite3_mprintf(tls, ts+32873, libc.VaList(bp, zPragma)))
+			Xsqlite3_mprintf(tls, ts+32943, libc.VaList(bp, zPragma)))
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32888,
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32958,
 				libc.VaList(bp+8, zPragma, Xsqlite3_column_int(tls, *(*uintptr)(unsafe.Pointer(bp + 24)), 0)))
 		}
 		rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp + 24)))
@@ -172861,10 +173774,10 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
 	*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
 
-	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32908, uintptr(0), uintptr(0), p+64)
+	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+32978, uintptr(0), uintptr(0), p+64)
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+32933)
+			ts+33003)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -172878,12 +173791,12 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-			ts+33041)
+			ts+33111)
 	}
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, bp+8, p+64,
-			ts+33106)
+			ts+33176)
 	}
 
 	for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) == SQLITE_ROW {
@@ -172895,7 +173808,7 @@ func rbuCreateTargetSchema(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_reset(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
 	}
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33150, uintptr(0), uintptr(0), p+64)
+		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33220, uintptr(0), uintptr(0), p+64)
 	}
 
 	rbuFinalize(tls, p, *(*uintptr)(unsafe.Pointer(bp)))
@@ -172915,15 +173828,15 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).FnProgress == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					rbuCreateTargetSchema(tls, p)
-					rbuCopyPragma(tls, p, ts+18603)
-					rbuCopyPragma(tls, p, ts+17693)
+					rbuCopyPragma(tls, p, ts+18619)
+					rbuCopyPragma(tls, p, ts+17709)
 				}
 
 				for (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl != 0 {
 					if (*RbuObjIter)(unsafe.Pointer(pIter)).FbCleanup != 0 {
 						if libc.Bool32((*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0)) == 0 && (*RbuObjIter)(unsafe.Pointer(pIter)).FabIndexed != 0 {
 							rbuMPrintfExec(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-								ts+33175, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
+								ts+33245, libc.VaList(bp, p+48, (*RbuObjIter)(unsafe.Pointer(pIter)).FzDataTbl))
 						}
 					} else {
 						rbuObjIterPrepareAll(tls, p, pIter, 0)
@@ -172947,10 +173860,10 @@ func Xsqlite3rbu_step(tls *libc.TLS, p uintptr) int32 {
 					rbuSaveState(tls, p, RBU_STAGE_MOVE)
 					rbuIncrSchemaCookie(tls, p)
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15865, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15875, uintptr(0), uintptr(0), p+64)
 					}
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15865, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15875, uintptr(0), uintptr(0), p+64)
 					}
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_MOVE
 				}
@@ -173045,7 +173958,7 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 
 		if rc == SQLITE_OK && !(int32((*RbuObjIter)(unsafe.Pointer(pIter)).FzTbl) != 0) {
 			rc = SQLITE_ERROR
-			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33203, 0)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33273, 0)
 		}
 
 		if rc == SQLITE_OK {
@@ -173058,16 +173971,17 @@ func rbuSetupOal(tls *libc.TLS, p uintptr, pState uintptr) {
 }
 
 func rbuDeleteOalFile(tls *libc.TLS, p uintptr) {
-	bp := tls.Alloc(8)
-	defer tls.Free(8)
+	bp := tls.Alloc(16)
+	defer tls.Free(16)
 
-	var zOal uintptr = rbuMPrintf(tls, p, ts+32652, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
+	var zOal uintptr = rbuMPrintf(tls, p, ts+32722, libc.VaList(bp, (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget))
 	if zOal != 0 {
-		var pVfs uintptr = Xsqlite3_vfs_find(tls, uintptr(0))
+		*(*uintptr)(unsafe.Pointer(bp + 8)) = uintptr(0)
+		Xsqlite3_file_control(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+7793, SQLITE_FCNTL_VFS_POINTER, bp+8)
 
 		(*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pVfs)).FxDelete})).f(tls, pVfs, zOal, 0)
+		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp + 8)))).FxDelete})).f(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), zOal, 0)
 		Xsqlite3_free(tls, zOal)
 	}
 }
@@ -173077,7 +173991,7 @@ func rbuCreateVfs(tls *libc.TLS, p uintptr) {
 	defer tls.Free(76)
 
 	Xsqlite3_randomness(tls, int32(unsafe.Sizeof(int32(0))), bp+8)
-	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+33228, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
+	Xsqlite3_snprintf(tls, int32(unsafe.Sizeof([64]int8{})), bp+12, ts+33298, libc.VaList(bp, *(*int32)(unsafe.Pointer(bp + 8))))
 	(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3rbu_create_vfs(tls, bp+12, uintptr(0))
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		var pVfs uintptr = Xsqlite3_vfs_find(tls, bp+12)
@@ -173111,7 +174025,7 @@ func rbuIndexCntFunc(tls *libc.TLS, pCtx uintptr, nVal int32, apVal uintptr) {
 
 	rc = prepareFreeAndCollectError(tls, db, bp+8, bp+16,
 		Xsqlite3_mprintf(tls,
-			ts+33239, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
+			ts+33309, libc.VaList(bp, Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal))))))
 	if rc != SQLITE_OK {
 		Xsqlite3_result_error(tls, pCtx, *(*uintptr)(unsafe.Pointer(bp + 16)), -1)
 	} else {
@@ -173141,13 +174055,13 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 		(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = int64(-1)
 
 		(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_create_function(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu,
-			ts+33311, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+			ts+33381, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 				f func(*libc.TLS, uintptr, int32, uintptr)
 			}{rbuIndexCntFunc})), uintptr(0), uintptr(0))
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+33325)
+				ts+33395)
 		}
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
@@ -173158,7 +174072,7 @@ func rbuInitPhaseOneSteps(tls *libc.TLS, p uintptr) {
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && bExists != 0 {
 			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = prepareAndCollectError(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, bp, p+64,
-				ts+33382)
+				ts+33452)
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 				if SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp))) {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FnPhaseOneStep = Xsqlite3_column_int64(tls, *(*uintptr)(unsafe.Pointer(bp)), 0)
@@ -173232,7 +174146,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Rbu_file)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FpTargetFd)).FpWalFd != 0 {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33456, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33526, 0)
 			} else if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_MOVE {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_CKPT
 				(*Sqlite3rbu)(unsafe.Pointer(p)).FnStep = 0
@@ -173250,12 +174164,12 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 			}()
 			if (*Rbu_file)(unsafe.Pointer(pFd)).FiCookie != (*RbuState)(unsafe.Pointer(pState)).FiCookie {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = SQLITE_BUSY
-				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33488,
+				(*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33558,
 					libc.VaList(bp+8, func() uintptr {
 						if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-							return ts + 33520
+							return ts + 33590
 						}
-						return ts + 33527
+						return ts + 33597
 					}()))
 			}
 		}
@@ -173263,7 +174177,7 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 				var db uintptr = (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain
-				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15850, uintptr(0), uintptr(0), p+64)
+				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15860, uintptr(0), uintptr(0), p+64)
 
 				if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 					(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rbuObjIterFirst(tls, p, p+80)
@@ -173274,19 +174188,19 @@ func openRbuHandle(tls *libc.TLS, zTarget uintptr, zRbu uintptr, zState uintptr)
 					(*Sqlite3rbu)(unsafe.Pointer(p)).FeStage = RBU_STAGE_DONE
 				} else {
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*RbuState)(unsafe.Pointer(pState)).FeStage == 0 && (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-						rbuCopyPragma(tls, p, ts+18317)
-						rbuCopyPragma(tls, p, ts+17708)
+						rbuCopyPragma(tls, p, ts+18333)
+						rbuCopyPragma(tls, p, ts+17724)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+33534, uintptr(0), uintptr(0), p+64)
+						(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, db, ts+33604, uintptr(0), uintptr(0), p+64)
 					}
 
 					if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK {
-						var frc int32 = Xsqlite3_file_control(tls, db, ts+7733, SQLITE_FCNTL_ZIPVFS, uintptr(0))
+						var frc int32 = Xsqlite3_file_control(tls, db, ts+7793, SQLITE_FCNTL_ZIPVFS, uintptr(0))
 						if frc == SQLITE_OK {
 							(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls,
-								db, ts+33550, uintptr(0), uintptr(0), p+64)
+								db, ts+33620, uintptr(0), uintptr(0), p+64)
 						}
 					}
 
@@ -173340,7 +174254,7 @@ func Xsqlite3rbu_vacuum(tls *libc.TLS, zTarget uintptr, zState uintptr) uintptr
 	}
 	if zState != 0 {
 		var n int32 = int32(libc.Xstrlen(tls, zState))
-		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+33574, zState+uintptr(n-7), uint64(7)) {
+		if n >= 7 && 0 == libc.Xmemcmp(tls, ts+33644, zState+uintptr(n-7), uint64(7)) {
 			return rbuMisuseError(tls)
 		}
 	}
@@ -173367,7 +174281,7 @@ func rbuEditErrmsg(tls *libc.TLS, p uintptr) {
 		var i uint32
 		var nErrmsg Size_t = libc.Xstrlen(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg)
 		for i = uint32(0); Size_t(i) < nErrmsg-uint64(8); i++ {
-			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+31599, uint64(8)) == 0 {
+			if libc.Xmemcmp(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg+uintptr(i), ts+31669, uint64(8)) == 0 {
 				var nDel int32 = 8
 				for int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) >= '0' && int32(*(*int8)(unsafe.Pointer((*Sqlite3rbu)(unsafe.Pointer(p)).FzErrmsg + uintptr(i+uint32(nDel))))) <= '9' {
 					nDel++
@@ -173384,7 +174298,7 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 	var rc int32
 	if p != 0 {
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15865, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15875, uintptr(0), uintptr(0), p+64)
 		}
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_CKPT {
@@ -173397,13 +174311,13 @@ func Xsqlite3rbu_close(tls *libc.TLS, p uintptr, pzErrmsg uintptr) int32 {
 		rbuSaveState(tls, p, (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
-			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15865, uintptr(0), uintptr(0), p+64)
+			(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15875, uintptr(0), uintptr(0), p+64)
 		}
 
 		rbuObjIterFinalize(tls, p+80)
 
 		if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) && (*Sqlite3rbu)(unsafe.Pointer(p)).Frc != SQLITE_OK && (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu != 0 {
-			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+33582, uintptr(0), uintptr(0), uintptr(0))
+			var rc2 int32 = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+33652, uintptr(0), uintptr(0), uintptr(0))
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).Frc == SQLITE_DONE && rc2 != SQLITE_OK {
 				(*Sqlite3rbu)(unsafe.Pointer(p)).Frc = rc2
 			}
@@ -173498,7 +174412,7 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15865, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+15875, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -173515,19 +174429,19 @@ func Xsqlite3rbu_savestate(tls *libc.TLS, p uintptr) int32 {
 
 	if (*Sqlite3rbu)(unsafe.Pointer(p)).FeStage == RBU_STAGE_OAL {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15865, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, ts+15875, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			var zBegin uintptr
 			if (*Sqlite3rbu)(unsafe.Pointer(p)).FzTarget == uintptr(0) {
-				zBegin = ts + 15850
+				zBegin = ts + 15860
 			} else {
-				zBegin = ts + 33534
+				zBegin = ts + 33604
 			}
 			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbRbu, zBegin, uintptr(0), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33534, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, (*Sqlite3rbu)(unsafe.Pointer(p)).FdbMain, ts+33604, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -173650,11 +174564,14 @@ func rbuVfsClose(tls *libc.TLS, pFile uintptr) int32 {
 	Xsqlite3_free(tls, (*Rbu_file)(unsafe.Pointer(p)).FzDel)
 
 	if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods
 		rbuMainlistRemove(tls, p)
 		rbuUnlockShm(tls, p)
-		(*struct {
-			f func(*libc.TLS, uintptr, int32) int32
-		})(unsafe.Pointer(&struct{ uintptr }{(*sqlite3_io_methods)(unsafe.Pointer((*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpReal)).FpMethods)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion > 1 && (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap != 0 {
+			(*struct {
+				f func(*libc.TLS, uintptr, int32) int32
+			})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmUnmap})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, 0)
+		}
 	} else if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_DELETEONCLOSE != 0 && (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 {
 		rbuUpdateTempSize(tls, p, int64(0))
 	}
@@ -173793,7 +174710,7 @@ func rbuVfsSync(tls *libc.TLS, pFile uintptr, flags int32) int32 {
 	var p uintptr = pFile
 	if (*Rbu_file)(unsafe.Pointer(p)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(p)).FpRbu)).FeStage == RBU_STAGE_CAPTURE {
 		if (*Rbu_file)(unsafe.Pointer(p)).FopenFlags&SQLITE_OPEN_MAIN_DB != 0 {
-			return SQLITE_INTERNAL
+			return SQLITE_NOTICE | int32(3)<<8
 		}
 		return SQLITE_OK
 	}
@@ -173870,7 +174787,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 			})(unsafe.Pointer(&struct{ uintptr }{xControl})).f(tls, (*Rbu_file)(unsafe.Pointer(p)).FpReal, SQLITE_FCNTL_ZIPVFS, bp+16)
 			if rc == SQLITE_OK {
 				rc = SQLITE_ERROR
-				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33609, 0)
+				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FzErrmsg = Xsqlite3_mprintf(tls, ts+33679, 0)
 			} else if rc == SQLITE_NOTFOUND {
 				(*Sqlite3rbu)(unsafe.Pointer(pRbu)).FpTargetFd = p
 				(*Rbu_file)(unsafe.Pointer(p)).FpRbu = pRbu
@@ -173895,7 +174812,7 @@ func rbuVfsFileControl(tls *libc.TLS, pFile uintptr, op int32, pArg uintptr) int
 	if rc == SQLITE_OK && op == SQLITE_FCNTL_VFSNAME {
 		var pRbuVfs uintptr = (*Rbu_file)(unsafe.Pointer(p)).FpRbuVfs
 		var zIn uintptr = *(*uintptr)(unsafe.Pointer(pArg))
-		var zOut uintptr = Xsqlite3_mprintf(tls, ts+33632, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
+		var zOut uintptr = Xsqlite3_mprintf(tls, ts+33702, libc.VaList(bp, (*Rbu_vfs)(unsafe.Pointer(pRbuVfs)).Fbase.FzName, zIn))
 		*(*uintptr)(unsafe.Pointer(pArg)) = zOut
 		if zOut == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -174040,7 +174957,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 				if (*Rbu_file)(unsafe.Pointer(pDb)).FpRbu != 0 && (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FeStage == RBU_STAGE_OAL {
 					var nOpen Size_t
 					if (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FzTarget == uintptr(0) {
-						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+7733)
+						zOpen = Xsqlite3_db_filename(tls, (*Sqlite3rbu)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pDb)).FpRbu)).FdbRbu, ts+7793)
 						zOpen = Xsqlite3_filename_wal(tls, zOpen)
 					}
 					nOpen = libc.Xstrlen(tls, zOpen)
@@ -174055,7 +174972,7 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 	}
 
 	if oflags&SQLITE_OPEN_MAIN_DB != 0 &&
-		Xsqlite3_uri_boolean(tls, zName, ts+33643, 0) != 0 {
+		Xsqlite3_uri_boolean(tls, zName, ts+33713, 0) != 0 {
 		oflags = SQLITE_OPEN_TEMP_DB | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE | SQLITE_OPEN_DELETEONCLOSE
 		zOpen = uintptr(0)
 	}
@@ -174066,7 +174983,13 @@ func rbuVfsOpen(tls *libc.TLS, pVfs uintptr, zName uintptr, pFile uintptr, flags
 		})(unsafe.Pointer(&struct{ uintptr }{(*Sqlite3_vfs)(unsafe.Pointer(pRealVfs)).FxOpen})).f(tls, pRealVfs, zOpen, (*Rbu_file)(unsafe.Pointer(pFd)).FpReal, oflags, pOutFlags)
 	}
 	if (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods != 0 {
-		(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		var pMeth uintptr = (*Sqlite3_file)(unsafe.Pointer((*Rbu_file)(unsafe.Pointer(pFd)).FpReal)).FpMethods
+
+		if (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FiVersion < 2 || (*Sqlite3_io_methods)(unsafe.Pointer(pMeth)).FxShmLock == uintptr(0) {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods1))
+		} else {
+			(*Sqlite3_file)(unsafe.Pointer(pFile)).FpMethods = uintptr(unsafe.Pointer(&rbuvfs_io_methods))
+		}
 		if flags&SQLITE_OPEN_MAIN_DB != 0 {
 			rbuMainlistAdd(tls, pFd)
 		}
@@ -174096,6 +175019,21 @@ var rbuvfs_io_methods = Sqlite3_io_methods{
 	FxShmBarrier:            0,
 	FxShmUnmap:              0,
 }
+var rbuvfs_io_methods1 = Sqlite3_io_methods{
+	FiVersion:               1,
+	FxClose:                 0,
+	FxRead:                  0,
+	FxWrite:                 0,
+	FxTruncate:              0,
+	FxSync:                  0,
+	FxFileSize:              0,
+	FxLock:                  0,
+	FxUnlock:                0,
+	FxCheckReservedLock:     0,
+	FxFileControl:           0,
+	FxSectorSize:            0,
+	FxDeviceCharacteristics: 0,
+}
 
 func rbuVfsDelete(tls *libc.TLS, pVfs uintptr, zPath uintptr, dirSync int32) int32 {
 	var pRealVfs uintptr = (*Rbu_vfs)(unsafe.Pointer(pVfs)).FpRealVfs
@@ -174859,11 +175797,11 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 	var abPK uintptr = uintptr(0)
 
 	nThis = Xsqlite3Strlen30(tls, zThis)
-	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+12638, zThis) {
+	if nThis == 12 && 0 == Xsqlite3_stricmp(tls, ts+12700, zThis) {
 		rc = Xsqlite3_table_column_metadata(tls, db, zDb, zThis, uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0), uintptr(0))
 		if rc == SQLITE_OK {
 			zPragma = Xsqlite3_mprintf(tls,
-				ts+33654, 0)
+				ts+33724, 0)
 		} else if rc == SQLITE_ERROR {
 			zPragma = Xsqlite3_mprintf(tls, ts+1544, 0)
 		} else {
@@ -174876,7 +175814,7 @@ func sessionTableInfo(tls *libc.TLS, pSession uintptr, db uintptr, zDb uintptr,
 			return rc
 		}
 	} else {
-		zPragma = Xsqlite3_mprintf(tls, ts+33775, libc.VaList(bp, zDb, zThis))
+		zPragma = Xsqlite3_mprintf(tls, ts+33845, libc.VaList(bp, zDb, zThis))
 	}
 	if !(zPragma != 0) {
 		*(*uintptr)(unsafe.Pointer(pazCol)) = uintptr(0)
@@ -174974,7 +175912,7 @@ func sessionInitTable(tls *libc.TLS, pSession uintptr, pTab uintptr) int32 {
 					break
 				}
 			}
-			if 0 == Xsqlite3_stricmp(tls, ts+12638, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
+			if 0 == Xsqlite3_stricmp(tls, ts+12700, (*SessionTable)(unsafe.Pointer(pTab)).FzName) {
 				(*SessionTable)(unsafe.Pointer(pTab)).FbStat1 = 1
 			}
 
@@ -175441,6 +176379,9 @@ func xPreUpdate(tls *libc.TLS, pCtx uintptr, db uintptr, op int32, zDb uintptr,
 	var pSession uintptr
 	var nDb int32 = Xsqlite3Strlen30(tls, zDb)
 
+	_ = iKey1
+	_ = iKey2
+
 	for pSession = pCtx; pSession != 0; pSession = (*Sqlite3_session)(unsafe.Pointer(pSession)).FpNext {
 		if (*Sqlite3_session)(unsafe.Pointer(pSession)).FbEnable == 0 {
 			continue
@@ -175523,6 +176464,7 @@ func sessionDiffCount(tls *libc.TLS, pCtx uintptr) int32 {
 }
 
 func sessionDiffDepth(tls *libc.TLS, pCtx uintptr) int32 {
+	_ = pCtx
 	return 0
 }
 
@@ -175552,9 +176494,9 @@ func sessionExprComparePK(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr,
 
 	for i = 0; i < nCol; i++ {
 		if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
-			zRet = Xsqlite3_mprintf(tls, ts+33804,
+			zRet = Xsqlite3_mprintf(tls, ts+33874,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 22833
+			zSep = ts + 22894
 			if zRet == uintptr(0) {
 				break
 			}
@@ -175577,9 +176519,9 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 		if int32(*(*U8)(unsafe.Pointer(abPK + uintptr(i)))) == 0 {
 			bHave = 1
 			zRet = Xsqlite3_mprintf(tls,
-				ts+33838,
+				ts+33908,
 				libc.VaList(bp, zRet, zSep, zDb1, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), zDb2, zTab, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8))))
-			zSep = ts + 33879
+			zSep = ts + 33949
 			if zRet == uintptr(0) {
 				break
 			}
@@ -175587,18 +176529,18 @@ func sessionExprCompareOther(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintp
 	}
 
 	if bHave == 0 {
-		zRet = Xsqlite3_mprintf(tls, ts+8822, 0)
+		zRet = Xsqlite3_mprintf(tls, ts+8882, 0)
 	}
 
 	return zRet
 }
 
-func sessionSelectFindNew(tls *libc.TLS, nCol int32, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
+func sessionSelectFindNew(tls *libc.TLS, zDb1 uintptr, zDb2 uintptr, zTbl uintptr, zExpr uintptr) uintptr {
 	bp := tls.Alloc(40)
 	defer tls.Free(40)
 
 	var zRet uintptr = Xsqlite3_mprintf(tls,
-		ts+33884,
+		ts+33954,
 		libc.VaList(bp, zDb1, zTbl, zDb2, zTbl, zExpr))
 	return zRet
 }
@@ -175608,7 +176550,7 @@ func sessionDiffFindNew(tls *libc.TLS, op int32, pSession uintptr, pTab uintptr,
 	defer tls.Free(8)
 
 	var rc int32 = SQLITE_OK
-	var zStmt uintptr = sessionSelectFindNew(tls, (*SessionTable)(unsafe.Pointer(pTab)).FnCol, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
+	var zStmt uintptr = sessionSelectFindNew(tls, zDb1, zDb2, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr)
 
 	if zStmt == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -175641,7 +176583,7 @@ func sessionDiffFindModified(tls *libc.TLS, pSession uintptr, pTab uintptr, zFro
 		rc = SQLITE_NOMEM
 	} else {
 		var zStmt uintptr = Xsqlite3_mprintf(tls,
-			ts+33962,
+			ts+34032,
 			libc.VaList(bp, (*Sqlite3_session)(unsafe.Pointer(pSession)).FzDb, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zFrom, (*SessionTable)(unsafe.Pointer(pTab)).FzName, zExpr, zExpr2))
 		if zStmt == uintptr(0) {
 			rc = SQLITE_NOMEM
@@ -175768,7 +176710,7 @@ __6:
 	if !(pzErrMsg != 0) {
 		goto __16
 	}
-	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+34015, 0)
+	*(*uintptr)(unsafe.Pointer(pzErrMsg)) = Xsqlite3_mprintf(tls, ts+34085, 0)
 __16:
 	;
 	rc = SQLITE_SCHEMA
@@ -176242,9 +177184,9 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 	var zSql uintptr = uintptr(0)
 	var nSql int32 = -1
 
-	if 0 == Xsqlite3_stricmp(tls, ts+12638, zTab) {
+	if 0 == Xsqlite3_stricmp(tls, ts+12700, zTab) {
 		zSql = Xsqlite3_mprintf(tls,
-			ts+34042, libc.VaList(bp, zDb))
+			ts+34112, libc.VaList(bp, zDb))
 		if zSql == uintptr(0) {
 			*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_NOMEM
 		}
@@ -176253,18 +177195,18 @@ func sessionSelectStmt(tls *libc.TLS, db uintptr, zDb uintptr, zTab uintptr, nCo
 		var zSep uintptr = ts + 1544
 		*(*SessionBuffer)(unsafe.Pointer(bp + 8)) = SessionBuffer{}
 
-		sessionAppendStr(tls, bp+8, ts+34152, bp+24)
+		sessionAppendStr(tls, bp+8, ts+34222, bp+24)
 		sessionAppendIdent(tls, bp+8, zDb, bp+24)
 		sessionAppendStr(tls, bp+8, ts+1557, bp+24)
 		sessionAppendIdent(tls, bp+8, zTab, bp+24)
-		sessionAppendStr(tls, bp+8, ts+34167, bp+24)
+		sessionAppendStr(tls, bp+8, ts+34237, bp+24)
 		for i = 0; i < nCol; i++ {
 			if *(*U8)(unsafe.Pointer(abPK + uintptr(i))) != 0 {
 				sessionAppendStr(tls, bp+8, zSep, bp+24)
 				sessionAppendIdent(tls, bp+8, *(*uintptr)(unsafe.Pointer(azCol + uintptr(i)*8)), bp+24)
-				sessionAppendStr(tls, bp+8, ts+34175, bp+24)
+				sessionAppendStr(tls, bp+8, ts+34245, bp+24)
 				sessionAppendInteger(tls, bp+8, i+1, bp+24)
-				zSep = ts + 22833
+				zSep = ts + 22894
 			}
 		}
 		zSql = (*SessionBuffer)(unsafe.Pointer(bp + 8)).FaBuf
@@ -176373,7 +177315,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	if (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc != 0 {
 		return (*Sqlite3_session)(unsafe.Pointer(pSession)).Frc
 	}
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+34181, uintptr(0), uintptr(0), uintptr(0))
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3_exec(tls, (*Sqlite3_session)(unsafe.Pointer(pSession)).Fdb, ts+34251, uintptr(0), uintptr(0), uintptr(0))
 	if *(*int32)(unsafe.Pointer(bp + 40)) != SQLITE_OK {
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
@@ -176465,7 +177407,7 @@ func sessionGenerateChangeset(tls *libc.TLS, pSession uintptr, bPatchset int32,
 	}
 
 	Xsqlite3_free(tls, (*SessionBuffer)(unsafe.Pointer(bp+24)).FaBuf)
-	Xsqlite3_exec(tls, db, ts+34201, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34271, uintptr(0), uintptr(0), uintptr(0))
 	Xsqlite3_mutex_leave(tls, Xsqlite3_db_mutex(tls, db))
 	return *(*int32)(unsafe.Pointer(bp + 40))
 }
@@ -176728,7 +177670,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 		rc = sessionInputBuffer(tls, pIn, 9)
 		if rc == SQLITE_OK {
 			if (*SessionInput)(unsafe.Pointer(pIn)).FiNext >= (*SessionInput)(unsafe.Pointer(pIn)).FnData {
-				rc = Xsqlite3CorruptError(tls, 217555)
+				rc = Xsqlite3CorruptError(tls, 219078)
 			} else {
 				eType = int32(*(*U8)(unsafe.Pointer((*SessionInput)(unsafe.Pointer(pIn)).FaData + uintptr(libc.PostIncInt32(&(*SessionInput)(unsafe.Pointer(pIn)).FiNext, 1)))))
 
@@ -176751,7 +177693,7 @@ func sessionReadRecord(tls *libc.TLS, pIn uintptr, nCol int32, abPK uintptr, apO
 				rc = sessionInputBuffer(tls, pIn, *(*int32)(unsafe.Pointer(bp)))
 				if rc == SQLITE_OK {
 					if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > (*SessionInput)(unsafe.Pointer(pIn)).FnData-(*SessionInput)(unsafe.Pointer(pIn)).FiNext {
-						rc = Xsqlite3CorruptError(tls, 217575)
+						rc = Xsqlite3CorruptError(tls, 219098)
 					} else {
 						var enc U8 = func() uint8 {
 							if eType == SQLITE_TEXT {
@@ -176793,7 +177735,7 @@ func sessionChangesetBufferTblhdr(tls *libc.TLS, pIn uintptr, pnByte uintptr) in
 		nRead = nRead + sessionVarintGet(tls, (*SessionInput)(unsafe.Pointer(pIn)).FaData+uintptr((*SessionInput)(unsafe.Pointer(pIn)).FiNext+nRead), bp)
 
 		if *(*int32)(unsafe.Pointer(bp)) < 0 || *(*int32)(unsafe.Pointer(bp)) > 65536 {
-			rc = Xsqlite3CorruptError(tls, 217629)
+			rc = Xsqlite3CorruptError(tls, 219152)
 		} else {
 			rc = sessionInputBuffer(tls, pIn, nRead+*(*int32)(unsafe.Pointer(bp))+100)
 			nRead = nRead + *(*int32)(unsafe.Pointer(bp))
@@ -176854,7 +177796,7 @@ func sessionChangesetReadTblhdr(tls *libc.TLS, p uintptr) int32 {
 			(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Ftblhdr.FnBuf = 0
 			sessionBufferGrow(tls, p+72, int64(nByte), bp+4)
 		} else {
-			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 217717)
+			*(*int32)(unsafe.Pointer(bp + 4)) = Xsqlite3CorruptError(tls, 219240)
 		}
 	}
 
@@ -176928,13 +177870,13 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 	}
 
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FzTab == uintptr(0) || (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbPatchset != 0 && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbInvert != 0 {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217803))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219326))
 	}
 
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop = int32(op)
 	(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FbIndirect = int32(*(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FaData + uintptr(libc.PostIncInt32(&(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fin.FiNext, 1)))))
 	if (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_UPDATE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_DELETE && (*Sqlite3_changeset_iter)(unsafe.Pointer(p)).Fop != SQLITE_INSERT {
-		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217809))
+		return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219332))
 	}
 
 	if paRec != 0 {
@@ -176996,7 +177938,7 @@ func sessionChangesetNextOne(tls *libc.TLS, p uintptr, paRec uintptr, pnRec uint
 				if *(*U8)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) = *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8))
 					if *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i)*8)) == uintptr(0) {
-						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 217853))
+						return libc.AssignPtrInt32(p+100, Xsqlite3CorruptError(tls, 219376))
 					}
 					*(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FapValue + uintptr(i+(*Sqlite3_changeset_iter)(unsafe.Pointer(p)).FnCol)*8)) = uintptr(0)
 				}
@@ -177369,7 +178311,7 @@ __27:
 	goto __6
 
 __11:
-	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 218218)
+	*(*int32)(unsafe.Pointer(bp + 40)) = Xsqlite3CorruptError(tls, 219741)
 	goto finished_invert
 __6:
 	;
@@ -177537,7 +178479,7 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 
 		if pUp == uintptr(0) {
 			var nByte int32 = int32(uint64(unsafe.Sizeof(SessionUpdate{})) * uint64(nU32) * uint64(unsafe.Sizeof(U32(0))))
-			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+12638) == 0)
+			var bStat1 int32 = libc.Bool32(Xsqlite3_stricmp(tls, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, ts+12700) == 0)
 			pUp = Xsqlite3_malloc(tls, nByte)
 			if pUp == uintptr(0) {
 				*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_NOMEM
@@ -177548,34 +178490,34 @@ func sessionUpdateFind(tls *libc.TLS, pIter uintptr, p uintptr, bPatchset int32,
 				(*SessionUpdate)(unsafe.Pointer(pUp)).FaMask = pUp + 1*24
 				libc.Xmemcpy(tls, (*SessionUpdate)(unsafe.Pointer(pUp)).FaMask, (*SessionApplyCtx)(unsafe.Pointer(p)).FaUpdateMask, uint64(nU32)*uint64(unsafe.Sizeof(U32(0))))
 
-				sessionAppendStr(tls, bp, ts+34219, bp+16)
+				sessionAppendStr(tls, bp, ts+34289, bp+16)
 				sessionAppendIdent(tls, bp, (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FzTab, bp+16)
-				sessionAppendStr(tls, bp, ts+34232, bp+16)
+				sessionAppendStr(tls, bp, ts+34302, bp+16)
 
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii)))) == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol+ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-						sessionAppendStr(tls, bp, ts+34238, bp+16)
+						sessionAppendStr(tls, bp, ts+34308, bp+16)
 						sessionAppendInteger(tls, bp, ii*2+1, bp+16)
-						zSep = ts + 15961
+						zSep = ts + 15971
 					}
 				}
 
 				zSep = ts + 1544
-				sessionAppendStr(tls, bp, ts+34167, bp+16)
+				sessionAppendStr(tls, bp, ts+34237, bp+16)
 				for ii = 0; ii < (*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FnCol; ii++ {
 					if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(ii))) != 0 || bPatchset == 0 && *(*uintptr)(unsafe.Pointer((*Sqlite3_changeset_iter)(unsafe.Pointer(pIter)).FapValue + uintptr(ii)*8)) != 0 {
 						sessionAppendStr(tls, bp, zSep, bp+16)
 						if bStat1 != 0 && ii == 1 {
 							sessionAppendStr(tls, bp,
-								ts+34243, bp+16)
+								ts+34313, bp+16)
 						} else {
 							sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(ii)*8)), bp+16)
-							sessionAppendStr(tls, bp, ts+34175, bp+16)
+							sessionAppendStr(tls, bp, ts+34245, bp+16)
 							sessionAppendInteger(tls, bp, ii*2+2, bp+16)
 						}
-						zSep = ts + 22833
+						zSep = ts + 22894
 					}
 				}
 
@@ -177627,34 +178569,34 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 	var nPk int32 = 0
 
-	sessionAppendStr(tls, bp, ts+34318, bp+16)
+	sessionAppendStr(tls, bp, ts+34388, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+34167, bp+16)
+	sessionAppendStr(tls, bp, ts+34237, bp+16)
 
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if *(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i))) != 0 {
 			nPk++
 			sessionAppendStr(tls, bp, zSep, bp+16)
 			sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-			sessionAppendStr(tls, bp, ts+34238, bp+16)
+			sessionAppendStr(tls, bp, ts+34308, bp+16)
 			sessionAppendInteger(tls, bp, i+1, bp+16)
-			zSep = ts + 22833
+			zSep = ts + 22894
 		}
 	}
 
 	if nPk < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol {
-		sessionAppendStr(tls, bp, ts+34336, bp+16)
+		sessionAppendStr(tls, bp, ts+34406, bp+16)
 		sessionAppendInteger(tls, bp, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol+1, bp+16)
-		sessionAppendStr(tls, bp, ts+33879, bp+16)
+		sessionAppendStr(tls, bp, ts+33949, bp+16)
 
 		zSep = ts + 1544
 		for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 			if !(int32(*(*U8)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FabPK + uintptr(i)))) != 0) {
 				sessionAppendStr(tls, bp, zSep, bp+16)
 				sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
-				sessionAppendStr(tls, bp, ts+34175, bp+16)
+				sessionAppendStr(tls, bp, ts+34245, bp+16)
 				sessionAppendInteger(tls, bp, i+1, bp+16)
-				zSep = ts + 34344
+				zSep = ts + 34414
 			}
 		}
 		sessionAppendStr(tls, bp, ts+6309, bp+16)
@@ -177670,7 +178612,7 @@ func sessionDeleteRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 
 func sessionSelectRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
 	return sessionSelectStmt(tls,
-		db, ts+7733, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
+		db, ts+7793, zTab, (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FazCol, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, p+24)
 }
 
 func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32 {
@@ -177681,19 +178623,19 @@ func sessionInsertRow(tls *libc.TLS, db uintptr, zTab uintptr, p uintptr) int32
 	var i int32
 	*(*SessionBuffer)(unsafe.Pointer(bp)) = SessionBuffer{}
 
-	sessionAppendStr(tls, bp, ts+34349, bp+16)
+	sessionAppendStr(tls, bp, ts+34419, bp+16)
 	sessionAppendIdent(tls, bp, zTab, bp+16)
-	sessionAppendStr(tls, bp, ts+22839, bp+16)
+	sessionAppendStr(tls, bp, ts+22900, bp+16)
 	for i = 0; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
 		if i != 0 {
-			sessionAppendStr(tls, bp, ts+15961, bp+16)
+			sessionAppendStr(tls, bp, ts+15971, bp+16)
 		}
 		sessionAppendIdent(tls, bp, *(*uintptr)(unsafe.Pointer((*SessionApplyCtx)(unsafe.Pointer(p)).FazCol + uintptr(i)*8)), bp+16)
 	}
 
-	sessionAppendStr(tls, bp, ts+34367, bp+16)
+	sessionAppendStr(tls, bp, ts+34437, bp+16)
 	for i = 1; i < (*SessionApplyCtx)(unsafe.Pointer(p)).FnCol; i++ {
-		sessionAppendStr(tls, bp, ts+34378, bp+16)
+		sessionAppendStr(tls, bp, ts+34448, bp+16)
 	}
 	sessionAppendStr(tls, bp, ts+6309, bp+16)
 
@@ -177709,14 +178651,14 @@ func sessionPrepare(tls *libc.TLS, db uintptr, pp uintptr, zSql uintptr) int32 {
 }
 
 func sessionStat1Sql(tls *libc.TLS, db uintptr, p uintptr) int32 {
-	var rc int32 = sessionSelectRow(tls, db, ts+12638, p)
+	var rc int32 = sessionSelectRow(tls, db, ts+12700, p)
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+16,
-			ts+34382)
+			ts+34452)
 	}
 	if rc == SQLITE_OK {
 		rc = sessionPrepare(tls, db, p+8,
-			ts+34495)
+			ts+34565)
 	}
 	return rc
 }
@@ -177744,7 +178686,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 				f func(*libc.TLS, uintptr, int32, uintptr) int32
 			})(unsafe.Pointer(&struct{ uintptr }{xValue})).f(tls, pIter, i, bp)
 			if *(*uintptr)(unsafe.Pointer(bp)) == uintptr(0) {
-				rc = Xsqlite3CorruptError(tls, 218696)
+				rc = Xsqlite3CorruptError(tls, 220219)
 			} else {
 				rc = sessionBindValue(tls, pStmt, i+1, *(*uintptr)(unsafe.Pointer(bp)))
 			}
@@ -177753,7 +178695,7 @@ func sessionBindRow(tls *libc.TLS, pIter uintptr, xValue uintptr, nCol int32, ab
 	return rc
 }
 
-func sessionSeekToRow(tls *libc.TLS, db uintptr, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
+func sessionSeekToRow(tls *libc.TLS, pIter uintptr, abPK uintptr, pSelect uintptr) int32 {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
@@ -177830,7 +178772,7 @@ func sessionConflictHandler(tls *libc.TLS, eType int32, p uintptr, pIter uintptr
 	Xsqlite3changeset_op(tls, pIter, bp, bp+8, bp+12, uintptr(0))
 
 	if pbReplace != 0 {
-		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+		*(*int32)(unsafe.Pointer(bp + 16)) = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 	} else {
 		*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_OK
 	}
@@ -177956,7 +178898,7 @@ func sessionApplyOneOp(tls *libc.TLS, pIter uintptr, p uintptr, xConflict uintpt
 
 	} else {
 		if (*SessionApplyCtx)(unsafe.Pointer(p)).FbStat1 != 0 {
-			rc = sessionSeekToRow(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).Fdb, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
+			rc = sessionSeekToRow(tls, pIter, (*SessionApplyCtx)(unsafe.Pointer(p)).FabPK, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
 			if rc == SQLITE_ROW {
 				rc = SQLITE_CONSTRAINT
 				Xsqlite3_reset(tls, (*SessionApplyCtx)(unsafe.Pointer(p)).FpSelect)
@@ -177997,7 +178939,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 		if *(*int32)(unsafe.Pointer(bp + 4)) != 0 {
 			rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 		} else if *(*int32)(unsafe.Pointer(bp)) != 0 {
-			rc = Xsqlite3_exec(tls, db, ts+34639, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+34709, uintptr(0), uintptr(0), uintptr(0))
 			if rc == SQLITE_OK {
 				rc = sessionBindRow(tls, pIter,
 					*(*uintptr)(unsafe.Pointer(&struct {
@@ -178013,7 +178955,7 @@ func sessionApplyOneWithRetry(tls *libc.TLS, db uintptr, pIter uintptr, pApply u
 				rc = sessionApplyOneOp(tls, pIter, pApply, xConflict, pCtx, uintptr(0), uintptr(0))
 			}
 			if rc == SQLITE_OK {
-				rc = Xsqlite3_exec(tls, db, ts+34660, uintptr(0), uintptr(0), uintptr(0))
+				rc = Xsqlite3_exec(tls, db, ts+34730, uintptr(0), uintptr(0), uintptr(0))
 			}
 		}
 	}
@@ -178086,10 +179028,10 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 	(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FbInvertConstraints = libc.BoolInt32(!!(flags&SQLITE_CHANGESETAPPLY_INVERT != 0))
 	Xsqlite3_mutex_enter(tls, Xsqlite3_db_mutex(tls, db))
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
-		rc = Xsqlite3_exec(tls, db, ts+34679, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+34749, uintptr(0), uintptr(0), uintptr(0))
 	}
 	if rc == SQLITE_OK {
-		rc = Xsqlite3_exec(tls, db, ts+34705, uintptr(0), uintptr(0), uintptr(0))
+		rc = Xsqlite3_exec(tls, db, ts+34775, uintptr(0), uintptr(0), uintptr(0))
 	}
 	for rc == SQLITE_OK && SQLITE_ROW == Xsqlite3changeset_next(tls, pIter) {
 		Xsqlite3changeset_op(tls, pIter, bp+176, bp+184, bp+188, uintptr(0))
@@ -178135,7 +179077,7 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 
 				Xsqlite3changeset_pk(tls, pIter, bp+192, uintptr(0))
 				rc = sessionTableInfo(tls, uintptr(0),
-					db, ts+7733, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
+					db, ts+7793, *(*uintptr)(unsafe.Pointer(bp + 176)), bp+48+32, bp+200, bp+48+40, bp+48+48)
 				if rc != SQLITE_OK {
 					break
 				}
@@ -178148,19 +179090,19 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 				if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol == 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+34735, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34805, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else if (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol < *(*int32)(unsafe.Pointer(bp + 184)) {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+34779,
+						ts+34849,
 						libc.VaList(bp+16, *(*uintptr)(unsafe.Pointer(bp + 200)), (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FnCol, *(*int32)(unsafe.Pointer(bp + 184))))
 				} else if *(*int32)(unsafe.Pointer(bp + 184)) < nMinCol || libc.Xmemcmp(tls, (*SessionApplyCtx)(unsafe.Pointer(bp+48)).FabPK, *(*uintptr)(unsafe.Pointer(bp + 192)), uint64(*(*int32)(unsafe.Pointer(bp + 184)))) != 0 {
 					schemaMismatch = 1
 					Xsqlite3_log(tls, SQLITE_SCHEMA,
-						ts+34850, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
+						ts+34920, libc.VaList(bp+40, *(*uintptr)(unsafe.Pointer(bp + 200))))
 				} else {
 					(*SessionApplyCtx)(unsafe.Pointer(bp + 48)).FnCol = *(*int32)(unsafe.Pointer(bp + 184))
-					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+12638) {
+					if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(bp + 200)), ts+12700) {
 						if libc.AssignInt32(&rc, sessionStat1Sql(tls, db, bp+48)) != 0 {
 							break
 						}
@@ -178211,14 +179153,14 @@ func sessionChangesetApply(tls *libc.TLS, db uintptr, pIter uintptr, xFilter uin
 			}
 		}
 	}
-	Xsqlite3_exec(tls, db, ts+34910, uintptr(0), uintptr(0), uintptr(0))
+	Xsqlite3_exec(tls, db, ts+34980, uintptr(0), uintptr(0), uintptr(0))
 
 	if flags&SQLITE_CHANGESETAPPLY_NOSAVEPOINT == 0 {
 		if rc == SQLITE_OK {
-			rc = Xsqlite3_exec(tls, db, ts+34940, uintptr(0), uintptr(0), uintptr(0))
+			rc = Xsqlite3_exec(tls, db, ts+35010, uintptr(0), uintptr(0), uintptr(0))
 		} else {
-			Xsqlite3_exec(tls, db, ts+34964, uintptr(0), uintptr(0), uintptr(0))
-			Xsqlite3_exec(tls, db, ts+34940, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+35034, uintptr(0), uintptr(0), uintptr(0))
+			Xsqlite3_exec(tls, db, ts+35010, uintptr(0), uintptr(0), uintptr(0))
 		}
 	}
 
@@ -179466,7 +180408,7 @@ func fts5yyStackOverflow(tls *libc.TLS, fts5yypParser uintptr) {
 		fts5yy_pop_parser_stack(tls, fts5yypParser)
 	}
 
-	sqlite3Fts5ParseError(tls, pParse, ts+34992, 0)
+	sqlite3Fts5ParseError(tls, pParse, ts+35062, 0)
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -179754,7 +180696,7 @@ func fts5yy_syntax_error(tls *libc.TLS, fts5yypParser uintptr, fts5yymajor int32
 
 	_ = fts5yymajor
 	sqlite3Fts5ParseError(tls,
-		pParse, ts+35020, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
+		pParse, ts+35090, libc.VaList(bp, fts5yyminor.Fn, fts5yyminor.Fp))
 
 	(*Fts5yyParser)(unsafe.Pointer(fts5yypParser)).FpParse = pParse
 
@@ -179941,7 +180883,7 @@ func fts5HighlightAppend(tls *libc.TLS, pRc uintptr, p uintptr, z uintptr, n int
 		if n < 0 {
 			n = int32(libc.Xstrlen(tls, z))
 		}
-		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+35051, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
+		(*HighlightContext)(unsafe.Pointer(p)).FzOut = Xsqlite3_mprintf(tls, ts+35121, libc.VaList(bp, (*HighlightContext)(unsafe.Pointer(p)).FzOut, n, z))
 		if (*HighlightContext)(unsafe.Pointer(p)).FzOut == uintptr(0) {
 			*(*int32)(unsafe.Pointer(pRc)) = SQLITE_NOMEM
 		}
@@ -180009,7 +180951,7 @@ func fts5HighlightFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintp
 	var iCol int32
 
 	if nVal != 3 {
-		var zErr uintptr = ts + 35058
+		var zErr uintptr = ts + 35128
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -180191,7 +181133,7 @@ func fts5SnippetFunction(tls *libc.TLS, pApi uintptr, pFts uintptr, pCtx uintptr
 	var nCol int32
 
 	if nVal != 5 {
-		var zErr uintptr = ts + 35108
+		var zErr uintptr = ts + 35178
 		Xsqlite3_result_error(tls, pCtx, zErr, -1)
 		return
 	}
@@ -180515,13 +181457,13 @@ func sqlite3Fts5AuxInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(96)
 
 	*(*[3]Builtin)(unsafe.Pointer(bp)) = [3]Builtin{
-		{FzFunc: ts + 35156, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35226, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5SnippetFunction}))},
-		{FzFunc: ts + 35164, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35234, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5HighlightFunction}))},
-		{FzFunc: ts + 35174, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzFunc: ts + 35244, FxFunc: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, int32, uintptr)
 		}{fts5Bm25Function}))},
 	}
@@ -181072,7 +182014,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_OK
 	var nCmd int32 = int32(libc.Xstrlen(tls, zCmd))
-	if Xsqlite3_strnicmp(tls, ts+35179, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35249, zCmd, nCmd) == 0 {
 		var nByte int32 = int32(uint64(unsafe.Sizeof(int32(0))) * uint64(FTS5_MAX_PREFIX_INDEXES))
 		var p uintptr
 		var bFirst int32 = 1
@@ -181099,14 +182041,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 				break
 			}
 			if int32(*(*int8)(unsafe.Pointer(p))) < '0' || int32(*(*int8)(unsafe.Pointer(p))) > '9' {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35186, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35256, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
 
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FnPrefix == FTS5_MAX_PREFIX_INDEXES {
 				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-					ts+35217, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
+					ts+35287, libc.VaList(bp, FTS5_MAX_PREFIX_INDEXES))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -181117,7 +182059,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 			}
 
 			if nPre <= 0 || nPre >= 1000 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35250, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35320, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				break
 			}
@@ -181130,7 +182072,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35287, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35357, zCmd, nCmd) == 0 {
 		var p uintptr = zArg
 		var nArg Sqlite3_int64 = Sqlite3_int64(libc.Xstrlen(tls, zArg) + uint64(1))
 		var azArg uintptr = sqlite3Fts5MallocZero(tls, bp+40, int64(uint64(unsafe.Sizeof(uintptr(0)))*uint64(nArg)))
@@ -181139,7 +182081,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 		if azArg != 0 && pSpace != 0 {
 			if (*Fts5Config)(unsafe.Pointer(pConfig)).FpTok != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35296, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35366, 0)
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				for nArg = int64(0); p != 0 && *(*int8)(unsafe.Pointer(p)) != 0; nArg++ {
@@ -181158,7 +182100,7 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 					}
 				}
 				if p == uintptr(0) {
-					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35329, 0)
+					*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35399, 0)
 					*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 				} else {
 					*(*int32)(unsafe.Pointer(bp + 40)) = sqlite3Fts5GetTokenizer(tls, pGlobal,
@@ -181173,14 +182115,14 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35363, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35433, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35371, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35441, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			if *(*int8)(unsafe.Pointer(zArg)) != 0 {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_EXTERNAL
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+35403, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzContent = sqlite3Fts5Mprintf(tls, bp+40, ts+35473, libc.VaList(bp+8, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, zArg))
 			} else {
 				(*Fts5Config)(unsafe.Pointer(pConfig)).FeContent = FTS5_CONTENT_NONE
 			}
@@ -181188,9 +182130,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35409, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35479, zCmd, nCmd) == 0 {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35423, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35493, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, zArg, -1)
@@ -181198,9 +182140,9 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	if Xsqlite3_strnicmp(tls, ts+35461, zCmd, nCmd) == 0 {
+	if Xsqlite3_strnicmp(tls, ts+35531, zCmd, nCmd) == 0 {
 		if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || int32(*(*int8)(unsafe.Pointer(zArg + 1))) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35472, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35542, 0)
 			*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize = libc.Bool32(int32(*(*int8)(unsafe.Pointer(zArg))) == '1')
@@ -181210,19 +182152,19 @@ func fts5ConfigParseSpecial(tls *libc.TLS, pGlobal uintptr, pConfig uintptr, zCm
 
 	if Xsqlite3_strnicmp(tls, ts+6427, zCmd, nCmd) == 0 {
 		*(*[4]Fts5Enum)(unsafe.Pointer(bp + 48)) = [4]Fts5Enum{
-			{FzName: ts + 9310, FeVal: FTS5_DETAIL_NONE},
-			{FzName: ts + 18698},
-			{FzName: ts + 35507, FeVal: FTS5_DETAIL_COLUMNS},
+			{FzName: ts + 9378, FeVal: FTS5_DETAIL_NONE},
+			{FzName: ts + 18714},
+			{FzName: ts + 35577, FeVal: FTS5_DETAIL_COLUMNS},
 			{},
 		}
 
 		if libc.AssignPtrInt32(bp+40, fts5ConfigSetEnum(tls, bp+48, zArg, pConfig+92)) != 0 {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35515, 0)
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35585, 0)
 		}
 		return *(*int32)(unsafe.Pointer(bp + 40))
 	}
 
-	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35546, libc.VaList(bp+24, nCmd, zCmd))
+	*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35616, libc.VaList(bp+24, nCmd, zCmd))
 	return SQLITE_ERROR
 }
 
@@ -181269,15 +182211,15 @@ func fts5ConfigParseColumn(tls *libc.TLS, p uintptr, zCol uintptr, zArg uintptr,
 	defer tls.Free(16)
 
 	var rc int32 = SQLITE_OK
-	if 0 == Xsqlite3_stricmp(tls, zCol, ts+23499) ||
-		0 == Xsqlite3_stricmp(tls, zCol, ts+17609) {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35574, libc.VaList(bp, zCol))
+	if 0 == Xsqlite3_stricmp(tls, zCol, ts+23560) ||
+		0 == Xsqlite3_stricmp(tls, zCol, ts+17625) {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35644, libc.VaList(bp, zCol))
 		rc = SQLITE_ERROR
 	} else if zArg != 0 {
-		if 0 == Xsqlite3_stricmp(tls, zArg, ts+35604) {
+		if 0 == Xsqlite3_stricmp(tls, zArg, ts+35674) {
 			*(*U8)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FabUnindexed + uintptr((*Fts5Config)(unsafe.Pointer(p)).FnCol))) = U8(1)
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35614, libc.VaList(bp+8, zArg))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35684, libc.VaList(bp+8, zArg))
 			rc = SQLITE_ERROR
 		}
 	}
@@ -181294,13 +182236,13 @@ func fts5ConfigMakeExprlist(tls *libc.TLS, p uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 24)) = SQLITE_OK
 	*(*Fts5Buffer)(unsafe.Pointer(bp + 32)) = Fts5Buffer{}
 
-	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35645, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
+	sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35715, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(p)).FzContentRowid))
 	if (*Fts5Config)(unsafe.Pointer(p)).FeContent != FTS5_CONTENT_NONE {
 		for i = 0; i < (*Fts5Config)(unsafe.Pointer(p)).FnCol; i++ {
 			if (*Fts5Config)(unsafe.Pointer(p)).FeContent == FTS5_CONTENT_EXTERNAL {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35650, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35720, libc.VaList(bp+8, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(p)).FazCol + uintptr(i)*8))))
 			} else {
-				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35657, libc.VaList(bp+16, i))
+				sqlite3Fts5BufferAppendPrintf(tls, bp+24, bp+32, ts+35727, libc.VaList(bp+16, i))
 			}
 		}
 	}
@@ -181338,8 +182280,8 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 	(*Fts5Config)(unsafe.Pointer(pRet)).FzName = sqlite3Fts5Strndup(tls, bp+40, *(*uintptr)(unsafe.Pointer(azArg + 2*8)), -1)
 	(*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize = 1
 	(*Fts5Config)(unsafe.Pointer(pRet)).FeDetail = FTS5_DETAIL_FULL
-	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+23499) == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35665, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
+	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && Xsqlite3_stricmp(tls, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, ts+23560) == 0 {
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35735, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pRet)).FzName))
 		*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 	}
 
@@ -181371,7 +182313,7 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 
 		if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
 			if z == uintptr(0) {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35694, libc.VaList(bp+8, zOrig))
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+35764, libc.VaList(bp+8, zOrig))
 				*(*int32)(unsafe.Pointer(bp + 40)) = SQLITE_ERROR
 			} else {
 				if bOption != 0 {
@@ -181408,19 +182350,19 @@ func sqlite3Fts5ConfigParse(tls *libc.TLS, pGlobal uintptr, db uintptr, nArg int
 		var zTail uintptr = uintptr(0)
 
 		if (*Fts5Config)(unsafe.Pointer(pRet)).FeContent == FTS5_CONTENT_NORMAL {
-			zTail = ts + 35363
+			zTail = ts + 35433
 		} else if (*Fts5Config)(unsafe.Pointer(pRet)).FbColumnsize != 0 {
-			zTail = ts + 35714
+			zTail = ts + 35784
 		}
 
 		if zTail != 0 {
 			(*Fts5Config)(unsafe.Pointer(pRet)).FzContent = sqlite3Fts5Mprintf(tls,
-				bp+40, ts+35722, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
+				bp+40, ts+35792, libc.VaList(bp+16, (*Fts5Config)(unsafe.Pointer(pRet)).FzDb, (*Fts5Config)(unsafe.Pointer(pRet)).FzName, zTail))
 		}
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid == uintptr(0) {
-		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+17609, -1)
+		(*Fts5Config)(unsafe.Pointer(pRet)).FzContentRowid = sqlite3Fts5Strndup(tls, bp+40, ts+17625, -1)
 	}
 
 	if *(*int32)(unsafe.Pointer(bp + 40)) == SQLITE_OK {
@@ -181464,18 +182406,18 @@ func sqlite3Fts5ConfigDeclareVtab(tls *libc.TLS, pConfig uintptr) int32 {
 	*(*int32)(unsafe.Pointer(bp + 48)) = SQLITE_OK
 	var zSql uintptr
 
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35733, 0)
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35803, 0)
 	for i = 0; zSql != 0 && i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
 		var zSep uintptr = func() uintptr {
 			if i == 0 {
 				return ts + 1544
 			}
-			return ts + 15961
+			return ts + 15971
 		}()
-		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35749, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
+		zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35819, libc.VaList(bp, zSql, zSep, *(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FazCol + uintptr(i)*8))))
 	}
-	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35756,
-		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+23499))
+	zSql = sqlite3Fts5Mprintf(tls, bp+48, ts+35826,
+		libc.VaList(bp+24, zSql, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, ts+23560))
 
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 48)) = Xsqlite3_declare_vtab(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql)
@@ -181585,7 +182527,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 
 	var rc int32 = SQLITE_OK
 
-	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35782) {
+	if 0 == Xsqlite3_stricmp(tls, zKey, ts+35852) {
 		var pgsz int32 = 0
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			pgsz = Xsqlite3_value_int(tls, pVal)
@@ -181595,7 +182537,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).Fpgsz = pgsz
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35787) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35857) {
 		var nHashSize int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nHashSize = Xsqlite3_value_int(tls, pVal)
@@ -181605,7 +182547,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnHashSize = nHashSize
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35796) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35866) {
 		var nAutomerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nAutomerge = Xsqlite3_value_int(tls, pVal)
@@ -181618,7 +182560,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnAutomerge = nAutomerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35806) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35876) {
 		var nUsermerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nUsermerge = Xsqlite3_value_int(tls, pVal)
@@ -181628,7 +182570,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnUsermerge = nUsermerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35816) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+35886) {
 		var nCrisisMerge int32 = -1
 		if SQLITE_INTEGER == Xsqlite3_value_numeric_type(tls, pVal) {
 			nCrisisMerge = Xsqlite3_value_int(tls, pVal)
@@ -181644,7 +182586,7 @@ func sqlite3Fts5ConfigSetValue(tls *libc.TLS, pConfig uintptr, zKey uintptr, pVa
 			}
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FnCrisisMerge = nCrisisMerge
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+23499) {
+	} else if 0 == Xsqlite3_stricmp(tls, zKey, ts+23560) {
 		var zIn uintptr = Xsqlite3_value_text(tls, pVal)
 
 		rc = sqlite3Fts5ConfigParseRank(tls, zIn, bp, bp+8)
@@ -181667,7 +182609,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 	bp := tls.Alloc(52)
 	defer tls.Free(52)
 
-	var zSelect uintptr = ts + 35828
+	var zSelect uintptr = ts + 35898
 	var zSql uintptr
 	*(*uintptr)(unsafe.Pointer(bp + 40)) = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
@@ -181689,7 +182631,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		for SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 40))) {
 			var zK uintptr = Xsqlite3_column_text(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 0)
 			var pVal uintptr = Xsqlite3_column_value(tls, *(*uintptr)(unsafe.Pointer(bp + 40)), 1)
-			if 0 == Xsqlite3_stricmp(tls, zK, ts+35860) {
+			if 0 == Xsqlite3_stricmp(tls, zK, ts+35930) {
 				iVersion = Xsqlite3_value_int(tls, pVal)
 			} else {
 				*(*int32)(unsafe.Pointer(bp + 48)) = 0
@@ -181703,7 +182645,7 @@ func sqlite3Fts5ConfigLoad(tls *libc.TLS, pConfig uintptr, iCookie int32) int32
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg != 0 {
 			*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-				ts+35868,
+				ts+35938,
 				libc.VaList(bp+16, iVersion, FTS5_CURRENT_VERSION))
 		}
 	}
@@ -181801,7 +182743,7 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 					}
 				}
 				if int32(*(*int8)(unsafe.Pointer(z2))) == 0 {
-					sqlite3Fts5ParseError(tls, pParse, ts+35933, 0)
+					sqlite3Fts5ParseError(tls, pParse, ts+36003, 0)
 					return FTS5_EOF
 				}
 			}
@@ -181814,20 +182756,20 @@ func fts5ExprGetToken(tls *libc.TLS, pParse uintptr, pz uintptr, pToken uintptr)
 		{
 			var z2 uintptr
 			if sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z))) == 0 {
-				sqlite3Fts5ParseError(tls, pParse, ts+35953, libc.VaList(bp, z))
+				sqlite3Fts5ParseError(tls, pParse, ts+36023, libc.VaList(bp, z))
 				return FTS5_EOF
 			}
 			tok = FTS5_STRING
 			for z2 = z + 1; sqlite3Fts5IsBareword(tls, *(*int8)(unsafe.Pointer(z2))) != 0; z2++ {
 			}
 			(*Fts5Token)(unsafe.Pointer(pToken)).Fn = int32((int64(z2) - int64(z)) / 1)
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35984, uint64(2)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 2 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+36054, uint64(2)) == 0 {
 				tok = FTS5_OR
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+35987, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+36057, uint64(3)) == 0 {
 				tok = FTS5_NOT
 			}
-			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+31369, uint64(3)) == 0 {
+			if (*Fts5Token)(unsafe.Pointer(pToken)).Fn == 3 && libc.Xmemcmp(tls, (*Fts5Token)(unsafe.Pointer(pToken)).Fp, ts+31439, uint64(3)) == 0 {
 				tok = FTS5_AND
 			}
 			break
@@ -181913,6 +182855,17 @@ func sqlite3Fts5ExprNew(tls *libc.TLS, pConfig uintptr, bPhraseToAnd int32, iCol
 	return (*Fts5Parse)(unsafe.Pointer(bp)).Frc
 }
 
+func fts5ExprCountChar(tls *libc.TLS, z uintptr, nByte int32) int32 {
+	var nRet int32 = 0
+	var ii int32
+	for ii = 0; ii < nByte; ii++ {
+		if int32(*(*int8)(unsafe.Pointer(z + uintptr(ii))))&0xC0 != 0x80 {
+			nRet++
+		}
+	}
+	return nRet
+}
+
 func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol int32, zText uintptr, pp uintptr) int32 {
 	bp := tls.Alloc(3)
 	defer tls.Free(3)
@@ -181941,7 +182894,7 @@ func sqlite3Fts5ExprPattern(tls *libc.TLS, pConfig uintptr, bGlob int32, iCol in
 		for I64(i) <= nText {
 			if I64(i) == nText ||
 				int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 1))) || int32(*(*int8)(unsafe.Pointer(zText + uintptr(i)))) == int32(*(*int8)(unsafe.Pointer(bp + 2))) {
-				if i-iFirst >= 3 {
+				if fts5ExprCountChar(tls, zText+uintptr(iFirst), i-iFirst) >= 3 {
 					var jj int32
 					*(*int8)(unsafe.Pointer(zExpr + uintptr(libc.PostIncInt32(&iOut, 1)))) = int8('"')
 					for jj = iFirst; jj < i; jj++ {
@@ -183594,9 +184547,9 @@ func sqlite3Fts5ParseNear(tls *libc.TLS, pParse uintptr, pTok uintptr) {
 	bp := tls.Alloc(16)
 	defer tls.Free(16)
 
-	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+35991, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
+	if (*Fts5Token)(unsafe.Pointer(pTok)).Fn != 4 || libc.Xmemcmp(tls, ts+36061, (*Fts5Token)(unsafe.Pointer(pTok)).Fp, uint64(4)) != 0 {
 		sqlite3Fts5ParseError(tls,
-			pParse, ts+35020, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
+			pParse, ts+35090, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(pTok)).Fn, (*Fts5Token)(unsafe.Pointer(pTok)).Fp))
 	}
 }
 
@@ -183612,7 +184565,7 @@ func sqlite3Fts5ParseSetDistance(tls *libc.TLS, pParse uintptr, pNear uintptr, p
 				var c int8 = *(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))
 				if int32(c) < '0' || int32(c) > '9' {
 					sqlite3Fts5ParseError(tls,
-						pParse, ts+35996, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
+						pParse, ts+36066, libc.VaList(bp, (*Fts5Token)(unsafe.Pointer(p)).Fn, (*Fts5Token)(unsafe.Pointer(p)).Fp))
 					return
 				}
 				nNear = nNear*10 + (int32(*(*int8)(unsafe.Pointer((*Fts5Token)(unsafe.Pointer(p)).Fp + uintptr(i)))) - '0')
@@ -183699,7 +184652,7 @@ func sqlite3Fts5ParseColset(tls *libc.TLS, pParse uintptr, pColset uintptr, p ui
 			}
 		}
 		if iCol == (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol {
-			sqlite3Fts5ParseError(tls, pParse, ts+21836, libc.VaList(bp, z))
+			sqlite3Fts5ParseError(tls, pParse, ts+21897, libc.VaList(bp, z))
 		} else {
 			pRet = fts5ParseColset(tls, pParse, pColset, iCol)
 		}
@@ -183780,7 +184733,7 @@ func sqlite3Fts5ParseSetColset(tls *libc.TLS, pParse uintptr, pExpr uintptr, pCo
 	*(*uintptr)(unsafe.Pointer(bp)) = pColset
 	if (*Fts5Config)(unsafe.Pointer((*Fts5Parse)(unsafe.Pointer(pParse)).FpConfig)).FeDetail == FTS5_DETAIL_NONE {
 		sqlite3Fts5ParseError(tls, pParse,
-			ts+36025, 0)
+			ts+36095, 0)
 	} else {
 		fts5ParseSetColset(tls, pParse, pExpr, pColset, bp)
 	}
@@ -183950,12 +184903,12 @@ func sqlite3Fts5ParseNode(tls *libc.TLS, pParse uintptr, eType int32, pLeft uint
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 1 ||
 							(*Fts5ExprPhrase)(unsafe.Pointer(pPhrase)).FnTerm > 0 && (*Fts5ExprTerm)(unsafe.Pointer(pPhrase+32)).FbFirst != 0 {
 							sqlite3Fts5ParseError(tls, pParse,
-								ts+36078,
+								ts+36148,
 								libc.VaList(bp, func() uintptr {
 									if (*Fts5ExprNearset)(unsafe.Pointer(pNear)).FnPhrase == 1 {
-										return ts + 36128
+										return ts + 36198
 									}
-									return ts + 35991
+									return ts + 36061
 								}()))
 							Xsqlite3_free(tls, pRet)
 							pRet = uintptr(0)
@@ -184898,7 +185851,7 @@ func fts5DataRead(tls *libc.TLS, p uintptr, iRowid I64) uintptr {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpReader == uintptr(0) && rc == SQLITE_OK {
 			var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 			rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb,
-				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+36135, iRowid, 0, p+56)
+				(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl, ts+36205, iRowid, 0, p+56)
 		}
 
 		if rc == SQLITE_ERROR {
@@ -184977,7 +185930,7 @@ func fts5DataWrite(tls *libc.TLS, p uintptr, iRowid I64, pData uintptr, nData in
 	if (*Fts5Index)(unsafe.Pointer(p)).FpWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+64, Xsqlite3_mprintf(tls,
-			ts+36141,
+			ts+36211,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 		if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 			return
@@ -185002,7 +185955,7 @@ func fts5DataDelete(tls *libc.TLS, p uintptr, iFirst I64, iLast I64) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = Xsqlite3_mprintf(tls,
-			ts+36192,
+			ts+36262,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if fts5IndexPrepareStmt(tls, p, p+72, zSql) != 0 {
 			return
@@ -185025,7 +185978,7 @@ func fts5DataRemoveSegment(tls *libc.TLS, p uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxDeleter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+88, Xsqlite3_mprintf(tls,
-			ts+36241,
+			ts+36311,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
@@ -185264,7 +186217,7 @@ func fts5IndexDataVersion(tls *libc.TLS, p uintptr) I64 {
 	if (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK {
 		if (*Fts5Index)(unsafe.Pointer(p)).FpDataVersion == uintptr(0) {
 			(*Fts5Index)(unsafe.Pointer(p)).Frc = fts5IndexPrepareStmt(tls, p, p+112,
-				Xsqlite3_mprintf(tls, ts+36281, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
+				Xsqlite3_mprintf(tls, ts+36351, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer((*Fts5Index)(unsafe.Pointer(p)).FpConfig)).FzDb)))
 			if (*Fts5Index)(unsafe.Pointer(p)).Frc != 0 {
 				return int64(0)
 			}
@@ -186463,7 +187416,7 @@ func fts5IdxSelectStmt(tls *libc.TLS, p uintptr) uintptr {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+96, Xsqlite3_mprintf(tls,
-			ts+36304,
+			ts+36374,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 	return (*Fts5Index)(unsafe.Pointer(p)).FpIdxSelect
@@ -187929,7 +188882,7 @@ func fts5WriteInit(tls *libc.TLS, p uintptr, pWriter uintptr, iSegid int32) {
 	if (*Fts5Index)(unsafe.Pointer(p)).FpIdxWriter == uintptr(0) {
 		var pConfig uintptr = (*Fts5Index)(unsafe.Pointer(p)).FpConfig
 		fts5IndexPrepareStmt(tls, p, p+80, Xsqlite3_mprintf(tls,
-			ts+36388,
+			ts+36458,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName)))
 	}
 
@@ -188420,10 +189373,15 @@ func fts5IndexOptimizeStruct(tls *libc.TLS, p uintptr, pStruct uintptr) uintptr
 	if pNew != 0 {
 		var pLvl uintptr
 		nByte = Sqlite3_int64(uint64(nSeg) * uint64(unsafe.Sizeof(Fts5StructureSegment{})))
-		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+		(*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel = func() int32 {
+			if (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel+1 < FTS5_MAX_LEVEL {
+				return (*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel + 1
+			}
+			return FTS5_MAX_LEVEL
+		}()
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnRef = 1
 		(*Fts5Structure)(unsafe.Pointer(pNew)).FnWriteCounter = (*Fts5Structure)(unsafe.Pointer(pStruct)).FnWriteCounter
-		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pStruct)).FnLevel)*16
+		pLvl = pNew + 24 + uintptr((*Fts5Structure)(unsafe.Pointer(pNew)).FnLevel-1)*16
 		(*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg = sqlite3Fts5MallocZero(tls, p+52, nByte)
 		if (*Fts5StructureLevel)(unsafe.Pointer(pLvl)).FaSeg != 0 {
 			var iLvl int32
@@ -189006,13 +189964,13 @@ func sqlite3Fts5IndexOpen(tls *libc.TLS, pConfig uintptr, bCreate int32, pp uint
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		(*Fts5Index)(unsafe.Pointer(p)).FpConfig = pConfig
 		(*Fts5Index)(unsafe.Pointer(p)).FnWorkUnit = FTS5_WORK_UNIT
-		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+36445, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		(*Fts5Index)(unsafe.Pointer(p)).FzDataTbl = sqlite3Fts5Mprintf(tls, bp+8, ts+36515, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 		if (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl != 0 && bCreate != 0 {
 			*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+26362, ts+36453, 0, pzErr)
+				pConfig, ts+26432, ts+36523, 0, pzErr)
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
-				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+12778,
-					ts+36488,
+				*(*int32)(unsafe.Pointer(bp + 8)) = sqlite3Fts5CreateTable(tls, pConfig, ts+12840,
+					ts+36558,
 					1, pzErr)
 			}
 			if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
@@ -189265,7 +190223,7 @@ func sqlite3Fts5IndexSetCookie(tls *libc.TLS, p uintptr, iNew int32) int32 {
 	sqlite3Fts5Put32(tls, bp, iNew)
 
 	rc = Xsqlite3_blob_open(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Index)(unsafe.Pointer(p)).FzDataTbl,
-		ts+36135, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
+		ts+36205, int64(FTS5_STRUCTURE_ROWID), 1, bp+8)
 	if rc == SQLITE_OK {
 		Xsqlite3_blob_write(tls, *(*uintptr)(unsafe.Pointer(bp + 8)), bp, 4, 0)
 		rc = Xsqlite3_blob_close(tls, *(*uintptr)(unsafe.Pointer(bp + 8)))
@@ -189379,7 +190337,7 @@ func fts5IndexIntegrityCheckSegment(tls *libc.TLS, p uintptr, pSeg uintptr) {
 	}
 
 	fts5IndexPrepareStmt(tls, p, bp+24, Xsqlite3_mprintf(tls,
-		ts+36532,
+		ts+36602,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, (*Fts5StructureSegment)(unsafe.Pointer(pSeg)).FiSegid)))
 
 	for (*Fts5Index)(unsafe.Pointer(p)).Frc == SQLITE_OK && SQLITE_ROW == Xsqlite3_step(tls, *(*uintptr)(unsafe.Pointer(bp + 24))) {
@@ -189549,7 +190507,7 @@ func sqlite3Fts5IndexIntegrityCheck(tls *libc.TLS, p uintptr, cksum U64, bUseCks
 		} else {
 			(*Fts5Buffer)(unsafe.Pointer(bp + 16)).Fn = 0
 			fts5SegiterPoslist(tls, p, *(*uintptr)(unsafe.Pointer(bp))+96+uintptr((*Fts5CResult)(unsafe.Pointer((*Fts5Iter)(unsafe.Pointer(*(*uintptr)(unsafe.Pointer(bp)))).FaFirst+1*4)).FiFirst)*120, uintptr(0), bp+16)
-			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+36618)
+			sqlite3Fts5BufferAppendBlob(tls, p+52, bp+16, uint32(4), ts+36688)
 			for 0 == sqlite3Fts5PoslistNext64(tls, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fp, (*Fts5Buffer)(unsafe.Pointer(bp+16)).Fn, bp+32, bp+40) {
 				var iCol int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) >> 32)
 				var iTokOff int32 = int32(*(*I64)(unsafe.Pointer(bp + 40)) & int64(0x7FFFFFFF))
@@ -189820,7 +190778,7 @@ func fts5BestIndexMethod(tls *libc.TLS, pVTab uintptr, pInfo uintptr) int32 {
 
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbLock != 0 {
 		(*Fts5Table)(unsafe.Pointer(pTab)).Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+36623, 0)
+			ts+36693, 0)
 		return SQLITE_ERROR
 	}
 
@@ -190244,11 +191202,11 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 	(*Fts5Sorter)(unsafe.Pointer(pSorter)).FnIdx = nPhrase
 
 	rc = fts5PrepareStatement(tls, pSorter, pConfig,
-		ts+36662,
+		ts+36732,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zRank, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			func() uintptr {
 				if zRankArgs != 0 {
-					return ts + 15961
+					return ts + 15971
 				}
 				return ts + 1544
 			}(),
@@ -190260,9 +191218,9 @@ func fts5CursorFirstSorted(tls *libc.TLS, pTab uintptr, pCsr uintptr, bDesc int3
 			}(),
 			func() uintptr {
 				if bDesc != 0 {
-					return ts + 36717
+					return ts + 36787
 				}
-				return ts + 36722
+				return ts + 36792
 			}()))
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FpSorter = pSorter
@@ -190308,12 +191266,12 @@ func fts5SpecialMatch(tls *libc.TLS, pTab uintptr, pCsr uintptr, zQuery uintptr)
 
 	(*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan = FTS5_PLAN_SPECIAL
 
-	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+36726, z, n) {
+	if n == 5 && 0 == Xsqlite3_strnicmp(tls, ts+36796, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = I64(sqlite3Fts5IndexReads(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.FpIndex))
 	} else if n == 2 && 0 == Xsqlite3_strnicmp(tls, ts+6409, z, n) {
 		(*Fts5Cursor)(unsafe.Pointer(pCsr)).FiSpecial = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FiCsrId
 	} else {
-		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36732, libc.VaList(bp, n, z))
+		(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36802, libc.VaList(bp, n, z))
 		rc = SQLITE_ERROR
 	}
 
@@ -190344,7 +191302,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	var zRankArgs uintptr = (*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs
 
 	if zRankArgs != 0 {
-		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36760, libc.VaList(bp, zRankArgs))
+		var zSql uintptr = sqlite3Fts5Mprintf(tls, bp+16, ts+36830, libc.VaList(bp, zRankArgs))
 		if zSql != 0 {
 			*(*uintptr)(unsafe.Pointer(bp + 24)) = uintptr(0)
 			*(*int32)(unsafe.Pointer(bp + 16)) = Xsqlite3_prepare_v3(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, zSql, -1,
@@ -190375,7 +191333,7 @@ func fts5FindRankFunction(tls *libc.TLS, pCsr uintptr) int32 {
 	if *(*int32)(unsafe.Pointer(bp + 16)) == SQLITE_OK {
 		pAux = fts5FindAuxiliary(tls, pTab, zRank)
 		if pAux == uintptr(0) {
-			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36770, libc.VaList(bp+8, zRank))
+			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls, ts+36840, libc.VaList(bp+8, zRank))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		}
 	}
@@ -190407,14 +191365,14 @@ func fts5CursorParseRank(tls *libc.TLS, pConfig uintptr, pCsr uintptr, pRank uin
 			*(*int32)(unsafe.Pointer(pCsr + 80)) |= FTS5CSR_FREE_ZRANK
 		} else if rc == SQLITE_ERROR {
 			(*Sqlite3_vtab)(unsafe.Pointer((*Fts5Cursor)(unsafe.Pointer(pCsr)).Fbase.FpVtab)).FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+36791, libc.VaList(bp, z))
+				ts+36861, libc.VaList(bp, z))
 		}
 	} else {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank != 0 {
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRank
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = (*Fts5Config)(unsafe.Pointer(pConfig)).FzRankArgs
 		} else {
-			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 35174
+			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRank = ts + 35244
 			(*Fts5Cursor)(unsafe.Pointer(pCsr)).FzRankArgs = uintptr(0)
 		}
 	}
@@ -190470,7 +191428,7 @@ func fts5FilterMethod(tls *libc.TLS, pCursor uintptr, idxNum int32, idxStr uintp
 		goto __1
 	}
 	(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-		ts+36623, 0)
+		ts+36693, 0)
 	return SQLITE_ERROR
 __1:
 	;
@@ -190687,7 +191645,7 @@ __35:
 		goto __40
 	}
 	*(*uintptr)(unsafe.Pointer((*Fts5Config)(unsafe.Pointer(pConfig)).FpzErrmsg)) = Xsqlite3_mprintf(tls,
-		ts+36824, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
+		ts+36894, libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	rc = SQLITE_ERROR
 	goto __41
 __40:
@@ -190832,28 +191790,28 @@ func fts5SpecialInsert(tls *libc.TLS, pTab uintptr, zCmd uintptr, pVal uintptr)
 	var rc int32 = SQLITE_OK
 	*(*int32)(unsafe.Pointer(bp)) = 0
 
-	if 0 == Xsqlite3_stricmp(tls, ts+36860, zCmd) {
+	if 0 == Xsqlite3_stricmp(tls, ts+36930, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			fts5SetVtabError(tls, pTab,
-				ts+36871, 0)
+				ts+36941, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageDeleteAll(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+36951, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37021, zCmd) {
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NONE {
 			fts5SetVtabError(tls, pTab,
-				ts+36959, 0)
+				ts+37029, 0)
 			rc = SQLITE_ERROR
 		} else {
 			rc = sqlite3Fts5StorageRebuild(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
 		}
-	} else if 0 == Xsqlite3_stricmp(tls, ts+18297, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+18313, zCmd) {
 		rc = sqlite3Fts5StorageOptimize(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+37015, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37085, zCmd) {
 		var nMerge int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageMerge(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, nMerge)
-	} else if 0 == Xsqlite3_stricmp(tls, ts+37021, zCmd) {
+	} else if 0 == Xsqlite3_stricmp(tls, ts+37091, zCmd) {
 		var iArg int32 = Xsqlite3_value_int(tls, pVal)
 		rc = sqlite3Fts5StorageIntegrity(tls, (*Fts5FullTable)(unsafe.Pointer(pTab)).FpStorage, iArg)
 	} else {
@@ -190911,7 +191869,7 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 		Xsqlite3_value_type(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8))) != SQLITE_NULL {
 		var z uintptr = Xsqlite3_value_text(tls, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol)*8)))
 		if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent != FTS5_CONTENT_NORMAL &&
-			0 == Xsqlite3_stricmp(tls, ts+18832, z) {
+			0 == Xsqlite3_stricmp(tls, ts+18848, z) {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialDelete(tls, pTab, apVal)
 		} else {
 			*(*int32)(unsafe.Pointer(bp + 16)) = fts5SpecialInsert(tls, pTab, z, *(*uintptr)(unsafe.Pointer(apVal + uintptr(2+(*Fts5Config)(unsafe.Pointer(pConfig)).FnCol+1)*8)))
@@ -190924,12 +191882,12 @@ func fts5UpdateMethod(tls *libc.TLS, pVtab uintptr, nArg int32, apVal uintptr, p
 
 		if eType0 == SQLITE_INTEGER && fts5IsContentless(tls, pTab) != 0 {
 			(*Fts5FullTable)(unsafe.Pointer(pTab)).Fp.Fbase.FzErrMsg = Xsqlite3_mprintf(tls,
-				ts+37037,
+				ts+37107,
 				libc.VaList(bp, func() uintptr {
 					if nArg > 1 {
-						return ts + 21737
+						return ts + 21798
 					}
-					return ts + 37074
+					return ts + 37144
 				}(), (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 			*(*int32)(unsafe.Pointer(bp + 16)) = SQLITE_ERROR
 		} else if nArg == 1 {
@@ -191559,7 +192517,7 @@ func fts5ApiCallback(tls *libc.TLS, context uintptr, argc int32, argv uintptr) {
 
 	pCsr = fts5CursorFromCsrid(tls, (*Fts5Auxiliary)(unsafe.Pointer(pAux)).FpGlobal, iCsrId)
 	if pCsr == uintptr(0) || (*Fts5Cursor)(unsafe.Pointer(pCsr)).FePlan == 0 {
-		var zErr uintptr = Xsqlite3_mprintf(tls, ts+37086, libc.VaList(bp, iCsrId))
+		var zErr uintptr = Xsqlite3_mprintf(tls, ts+37156, libc.VaList(bp, iCsrId))
 		Xsqlite3_result_error(tls, context, zErr, -1)
 		Xsqlite3_free(tls, zErr)
 	} else {
@@ -191803,7 +192761,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 	}())
 	if pMod == uintptr(0) {
 		rc = SQLITE_ERROR
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37107, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37177, libc.VaList(bp, *(*uintptr)(unsafe.Pointer(azArg))))
 	} else {
 		rc = (*struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
@@ -191822,7 +192780,7 @@ func sqlite3Fts5GetTokenizer(tls *libc.TLS, pGlobal uintptr, azArg uintptr, nArg
 		(*Fts5Config)(unsafe.Pointer(pConfig)).FpTokApi = pMod + 16
 		if rc != SQLITE_OK {
 			if pzErr != 0 {
-				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37129, 0)
+				*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+37199, 0)
 			}
 		} else {
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FePattern = sqlite3Fts5TokenizerPattern(tls,
@@ -191869,7 +192827,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 	var ppApi uintptr
 	_ = nArg
 
-	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+37160)
+	ppApi = Xsqlite3_value_pointer(tls, *(*uintptr)(unsafe.Pointer(apArg)), ts+37230)
 	if ppApi != 0 {
 		*(*uintptr)(unsafe.Pointer(ppApi)) = pGlobal
 	}
@@ -191878,7 +192836,7 @@ func fts5Fts5Func(tls *libc.TLS, pCtx uintptr, nArg int32, apArg uintptr) {
 func fts5SourceIdFunc(tls *libc.TLS, pCtx uintptr, nArg int32, apUnused uintptr) {
 	_ = nArg
 	_ = apUnused
-	Xsqlite3_result_text(tls, pCtx, ts+37173, -1, libc.UintptrFromInt32(-1))
+	Xsqlite3_result_text(tls, pCtx, ts+37243, -1, libc.UintptrFromInt32(-1))
 }
 
 func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
@@ -191892,7 +192850,7 @@ func fts5ShadowName(tls *libc.TLS, zName uintptr) int32 {
 }
 
 var azName2 = [5]uintptr{
-	ts + 37264, ts + 35363, ts + 26362, ts + 35714, ts + 12778,
+	ts + 37334, ts + 35433, ts + 26432, ts + 35784, ts + 12840,
 }
 
 func fts5Init(tls *libc.TLS, db uintptr) int32 {
@@ -191916,7 +192874,7 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		(*Fts5Global)(unsafe.Pointer(pGlobal)).Fapi.FxFindTokenizer = *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, uintptr, uintptr) int32
 		}{fts5FindTokenizer}))
-		rc = Xsqlite3_create_module_v2(tls, db, ts+37271, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
+		rc = Xsqlite3_create_module_v2(tls, db, ts+37341, uintptr(unsafe.Pointer(&fts5Mod)), p, *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5ModuleDestroy})))
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5IndexInit(tls, db)
 		}
@@ -191934,13 +192892,15 @@ func fts5Init(tls *libc.TLS, db uintptr) int32 {
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+37271, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+37341, 1, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5Fts5Func})), uintptr(0), uintptr(0))
 		}
 		if rc == SQLITE_OK {
 			rc = Xsqlite3_create_function(tls,
-				db, ts+37276, 0, SQLITE_UTF8, p, *(*uintptr)(unsafe.Pointer(&struct {
+				db, ts+37346, 0,
+				SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS,
+				p, *(*uintptr)(unsafe.Pointer(&struct {
 					f func(*libc.TLS, uintptr, int32, uintptr)
 				}{fts5SourceIdFunc})), uintptr(0), uintptr(0))
 		}
@@ -191995,17 +192955,17 @@ func fts5StorageGetStmt(tls *libc.TLS, p uintptr, eStmt int32, ppStmt uintptr, p
 
 	if *(*uintptr)(unsafe.Pointer(p + 40 + uintptr(eStmt)*8)) == uintptr(0) {
 		*(*[11]uintptr)(unsafe.Pointer(bp + 128)) = [11]uintptr{
-			ts + 37291,
-			ts + 37359,
-			ts + 37428,
-			ts + 37461,
-			ts + 37500,
-			ts + 37540,
-			ts + 37579,
-			ts + 37620,
-			ts + 37659,
-			ts + 37701,
-			ts + 37741,
+			ts + 37361,
+			ts + 37429,
+			ts + 37498,
+			ts + 37531,
+			ts + 37570,
+			ts + 37610,
+			ts + 37649,
+			ts + 37690,
+			ts + 37729,
+			ts + 37771,
+			ts + 37811,
 		}
 		var pC uintptr = (*Fts5Storage)(unsafe.Pointer(p)).FpConfig
 		var zSql uintptr = uintptr(0)
@@ -192107,18 +193067,18 @@ func sqlite3Fts5DropAll(tls *libc.TLS, pConfig uintptr) int32 {
 	defer tls.Free(80)
 
 	var rc int32 = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+37764,
+		ts+37834,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+37868,
+			ts+37938,
 			libc.VaList(bp+48, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+37906,
+			ts+37976,
 			libc.VaList(bp+64, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 	return rc
@@ -192130,7 +193090,7 @@ func fts5StorageRenameOne(tls *libc.TLS, pConfig uintptr, pRc uintptr, zTail uin
 
 	if *(*int32)(unsafe.Pointer(pRc)) == SQLITE_OK {
 		*(*int32)(unsafe.Pointer(pRc)) = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+37944,
+			ts+38014,
 			libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zTail, zName, zTail))
 	}
 }
@@ -192142,14 +193102,14 @@ func sqlite3Fts5StorageRename(tls *libc.TLS, pStorage uintptr, zName uintptr) in
 	var pConfig uintptr = (*Fts5Storage)(unsafe.Pointer(pStorage)).FpConfig
 	*(*int32)(unsafe.Pointer(bp)) = sqlite3Fts5StorageSync(tls, pStorage)
 
-	fts5StorageRenameOne(tls, pConfig, bp, ts+26362, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+12778, zName)
-	fts5StorageRenameOne(tls, pConfig, bp, ts+37264, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+26432, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+12840, zName)
+	fts5StorageRenameOne(tls, pConfig, bp, ts+37334, zName)
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+35714, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+35784, zName)
 	}
 	if (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
-		fts5StorageRenameOne(tls, pConfig, bp, ts+35363, zName)
+		fts5StorageRenameOne(tls, pConfig, bp, ts+35433, zName)
 	}
 	return *(*int32)(unsafe.Pointer(bp))
 }
@@ -192161,17 +193121,17 @@ func sqlite3Fts5CreateTable(tls *libc.TLS, pConfig uintptr, zPost uintptr, zDefn
 	var rc int32
 	*(*uintptr)(unsafe.Pointer(bp + 64)) = uintptr(0)
 
-	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+37986,
+	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, bp+64, ts+38056,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, zDefn,
 			func() uintptr {
 				if bWithout != 0 {
-					return ts + 31015
+					return ts + 31085
 				}
 				return ts + 1544
 			}()))
 	if *(*uintptr)(unsafe.Pointer(bp + 64)) != 0 {
 		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls,
-			ts+38016,
+			ts+38086,
 			libc.VaList(bp+40, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zPost, *(*uintptr)(unsafe.Pointer(bp + 64))))
 		Xsqlite3_free(tls, *(*uintptr)(unsafe.Pointer(bp + 64)))
 	}
@@ -192208,27 +193168,27 @@ func sqlite3Fts5StorageOpen(tls *libc.TLS, pConfig uintptr, pIndex uintptr, bCre
 			} else {
 				var i int32
 				var iOff int32
-				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+38060, 0)
+				Xsqlite3_snprintf(tls, nDefn, zDefn, ts+38130, 0)
 				iOff = int32(libc.Xstrlen(tls, zDefn))
 				for i = 0; i < (*Fts5Config)(unsafe.Pointer(pConfig)).FnCol; i++ {
-					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+38083, libc.VaList(bp, i))
+					Xsqlite3_snprintf(tls, nDefn-iOff, zDefn+uintptr(iOff), ts+38153, libc.VaList(bp, i))
 					iOff = iOff + int32(libc.Xstrlen(tls, zDefn+uintptr(iOff)))
 				}
-				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+35363, zDefn, 0, pzErr)
+				rc = sqlite3Fts5CreateTable(tls, pConfig, ts+35433, zDefn, 0, pzErr)
 			}
 			Xsqlite3_free(tls, zDefn)
 		}
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+35714, ts+38089, 0, pzErr)
+				pConfig, ts+35784, ts+38159, 0, pzErr)
 		}
 		if rc == SQLITE_OK {
 			rc = sqlite3Fts5CreateTable(tls,
-				pConfig, ts+37264, ts+38121, 1, pzErr)
+				pConfig, ts+37334, ts+38191, 1, pzErr)
 		}
 		if rc == SQLITE_OK {
-			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35860, uintptr(0), FTS5_CURRENT_VERSION)
+			rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35930, uintptr(0), FTS5_CURRENT_VERSION)
 		}
 	}
 
@@ -192434,12 +193394,12 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 	(*Fts5Storage)(unsafe.Pointer(p)).FbTotalsValid = 0
 
 	rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-		ts+38138,
+		ts+38208,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName,
 			(*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 		rc = fts5ExecPrintf(tls, (*Fts5Config)(unsafe.Pointer(pConfig)).Fdb, uintptr(0),
-			ts+38188,
+			ts+38258,
 			libc.VaList(bp+32, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName))
 	}
 
@@ -192447,7 +193407,7 @@ func sqlite3Fts5StorageDeleteAll(tls *libc.TLS, p uintptr) int32 {
 		rc = sqlite3Fts5IndexReinit(tls, (*Fts5Storage)(unsafe.Pointer(p)).FpIndex)
 	}
 	if rc == SQLITE_OK {
-		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35860, uintptr(0), FTS5_CURRENT_VERSION)
+		rc = sqlite3Fts5StorageConfigValue(tls, p, ts+35930, uintptr(0), FTS5_CURRENT_VERSION)
 	}
 	return rc
 }
@@ -192623,7 +193583,7 @@ func fts5StorageCount(tls *libc.TLS, p uintptr, zSuffix uintptr, pnRow uintptr)
 	var zSql uintptr
 	var rc int32
 
-	zSql = Xsqlite3_mprintf(tls, ts+38217,
+	zSql = Xsqlite3_mprintf(tls, ts+38287,
 		libc.VaList(bp, (*Fts5Config)(unsafe.Pointer(pConfig)).FzDb, (*Fts5Config)(unsafe.Pointer(pConfig)).FzName, zSuffix))
 	if zSql == uintptr(0) {
 		rc = SQLITE_NOMEM
@@ -192805,14 +193765,14 @@ func sqlite3Fts5StorageIntegrity(tls *libc.TLS, p uintptr, iArg int32) int32 {
 
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FeContent == FTS5_CONTENT_NORMAL {
 			*(*I64)(unsafe.Pointer(bp + 48)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+35363, bp+48)
+			rc = fts5StorageCount(tls, p, ts+35433, bp+48)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 48)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
 		}
 		if rc == SQLITE_OK && (*Fts5Config)(unsafe.Pointer(pConfig)).FbColumnsize != 0 {
 			*(*I64)(unsafe.Pointer(bp + 56)) = int64(0)
-			rc = fts5StorageCount(tls, p, ts+35714, bp+56)
+			rc = fts5StorageCount(tls, p, ts+35784, bp+56)
 			if rc == SQLITE_OK && *(*I64)(unsafe.Pointer(bp + 56)) != (*Fts5Storage)(unsafe.Pointer(p)).FnTotalRow {
 				rc = SQLITE_CORRUPT | int32(1)<<8
 			}
@@ -193007,9 +193967,9 @@ func fts5AsciiCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32,
 			libc.Xmemcpy(tls, p, uintptr(unsafe.Pointer(&aAsciiTokenChar)), uint64(unsafe.Sizeof(aAsciiTokenChar)))
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38249) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38319) {
 					fts5AsciiAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38260) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38330) {
 					fts5AsciiAddExceptions(tls, p, zArg, 0)
 				} else {
 					rc = SQLITE_ERROR
@@ -193224,7 +194184,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 	} else {
 		p = Xsqlite3_malloc(tls, int32(unsafe.Sizeof(Unicode61Tokenizer{})))
 		if p != 0 {
-			var zCat uintptr = ts + 38271
+			var zCat uintptr = ts + 38341
 			var i int32
 			libc.Xmemset(tls, p, 0, uint64(unsafe.Sizeof(Unicode61Tokenizer{})))
 
@@ -193236,7 +194196,7 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 			}
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38280) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38350) {
 					zCat = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
 				}
 			}
@@ -193247,18 +194207,18 @@ func fts5UnicodeCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32
 
 			for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 				var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38291) {
+				if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38361) {
 					if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' && int32(*(*int8)(unsafe.Pointer(zArg))) != '2' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 						rc = SQLITE_ERROR
 					} else {
 						(*Unicode61Tokenizer)(unsafe.Pointer(p)).FeRemoveDiacritic = int32(*(*int8)(unsafe.Pointer(zArg))) - '0'
 
 					}
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38249) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38319) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 1)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38260) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38330) {
 					rc = fts5UnicodeAddExceptions(tls, p, zArg, 0)
-				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38280) {
+				} else if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38350) {
 				} else {
 					rc = SQLITE_ERROR
 				}
@@ -193534,7 +194494,7 @@ func fts5PorterCreate(tls *libc.TLS, pCtx uintptr, azArg uintptr, nArg int32, pp
 	var rc int32 = SQLITE_OK
 	var pRet uintptr
 	*(*uintptr)(unsafe.Pointer(bp)) = uintptr(0)
-	var zBase uintptr = ts + 38309
+	var zBase uintptr = ts + 38379
 
 	if nArg > 0 {
 		zBase = *(*uintptr)(unsafe.Pointer(azArg))
@@ -193676,7 +194636,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38319, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38389, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -193684,11 +194644,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38322, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38392, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38327, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38397, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -193696,7 +194656,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'e':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38332, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38402, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -193704,7 +194664,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38335, aBuf+uintptr(nBuf-2), uint64(2)) {
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38405, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -193712,11 +194672,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'l':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38338, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38408, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38343, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38413, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -193724,19 +194684,19 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38348, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38418, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38352, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38422, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38358, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38428, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38363, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38433, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193744,11 +194704,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'o':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38367, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38437, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1_and_S_or_T(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38371, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38441, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 			}
@@ -193756,7 +194716,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 's':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38374, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38444, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193764,11 +194724,11 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38378, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38448, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38382, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38452, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193776,7 +194736,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38386, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38456, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193784,7 +194744,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38390, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38460, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193792,7 +194752,7 @@ func fts5PorterStep4(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38394, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38464, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt1(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -193808,24 +194768,24 @@ func fts5PorterStep1B2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38398, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38378, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38468, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38448, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'b':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38401, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38404, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38471, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38474, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
 		break
 
 	case 'i':
-		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38408, aBuf+uintptr(nBuf-2), uint64(2)) {
-			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38394, uint64(3))
+		if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38478, aBuf+uintptr(nBuf-2), uint64(2)) {
+			libc.Xmemcpy(tls, aBuf+uintptr(nBuf-2), ts+38464, uint64(3))
 			*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2 + 3
 			ret = 1
 		}
@@ -193840,137 +194800,137 @@ func fts5PorterStep2(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38411, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38481, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38378, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38448, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38419, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38489, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38426, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38496, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 4
 			}
 		}
 		break
 
 	case 'c':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38431, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38501, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38327, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38397, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38436, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38506, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38322, uint64(4))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38392, uint64(4))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 4
 			}
 		}
 		break
 
 	case 'e':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38441, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38511, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38394, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38464, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'g':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38446, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38516, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+16821, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+16837, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 'l':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38451, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38521, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38404, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38474, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38455, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38525, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38319, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38389, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38460, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38530, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38363, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38433, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38466, aBuf+uintptr(nBuf-3), uint64(3)) {
+		} else if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38536, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38470, uint64(1))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38540, uint64(1))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 1
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38472, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38542, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38386, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38456, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
 		}
 		break
 
 	case 'o':
-		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38478, aBuf+uintptr(nBuf-7), uint64(7)) {
+		if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38548, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38394, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38464, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38486, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38556, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38378, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38448, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38492, aBuf+uintptr(nBuf-4), uint64(4)) {
+		} else if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38562, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38378, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38448, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 3
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38497, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38567, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38319, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38503, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38573, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38390, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38460, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38511, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38581, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38519, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38589, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
-		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38523, aBuf+uintptr(nBuf-7), uint64(7)) {
+		} else if nBuf > 7 && 0 == libc.Xmemcmp(tls, ts+38593, aBuf+uintptr(nBuf-7), uint64(7)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-7) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38386, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-7), ts+38456, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 7 + 3
 			}
 		}
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38531, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38601, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38319, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38537, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38607, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38390, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38460, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 3
 			}
-		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38543, aBuf+uintptr(nBuf-6), uint64(6)) {
+		} else if nBuf > 6 && 0 == libc.Xmemcmp(tls, ts+38613, aBuf+uintptr(nBuf-6), uint64(6)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-6) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38404, uint64(3))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-6), ts+38474, uint64(3))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 6 + 3
 			}
 		}
@@ -193985,16 +194945,16 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'a':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38550, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38620, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38335, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-4), ts+38405, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4 + 2
 			}
 		}
 		break
 
 	case 's':
-		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38555, aBuf+uintptr(nBuf-4), uint64(4)) {
+		if nBuf > 4 && 0 == libc.Xmemcmp(tls, ts+38625, aBuf+uintptr(nBuf-4), uint64(4)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-4) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 4
 			}
@@ -194002,21 +194962,21 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 't':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38560, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38630, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38335, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38405, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
-		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38566, aBuf+uintptr(nBuf-5), uint64(5)) {
+		} else if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38636, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38335, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38405, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
 		break
 
 	case 'u':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38519, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38589, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 			}
@@ -194024,7 +194984,7 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'v':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38572, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38642, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5
 			}
@@ -194032,9 +194992,9 @@ func fts5PorterStep3(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'z':
-		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38578, aBuf+uintptr(nBuf-5), uint64(5)) {
+		if nBuf > 5 && 0 == libc.Xmemcmp(tls, ts+38648, aBuf+uintptr(nBuf-5), uint64(5)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-5) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38319, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-5), ts+38389, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 5 + 2
 			}
 		}
@@ -194049,12 +195009,12 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 	var nBuf int32 = *(*int32)(unsafe.Pointer(pnBuf))
 	switch int32(*(*int8)(unsafe.Pointer(aBuf + uintptr(nBuf-2)))) {
 	case 'e':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38584, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38654, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_MGt0(tls, aBuf, nBuf-3) != 0 {
-				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38588, uint64(2))
+				libc.Xmemcpy(tls, aBuf+uintptr(nBuf-3), ts+38658, uint64(2))
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3 + 2
 			}
-		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38591, aBuf+uintptr(nBuf-2), uint64(2)) {
+		} else if nBuf > 2 && 0 == libc.Xmemcmp(tls, ts+38661, aBuf+uintptr(nBuf-2), uint64(2)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-2) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 2
 				ret = 1
@@ -194063,7 +195023,7 @@ func fts5PorterStep1B(tls *libc.TLS, aBuf uintptr, pnBuf uintptr) int32 {
 		break
 
 	case 'n':
-		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38594, aBuf+uintptr(nBuf-3), uint64(3)) {
+		if nBuf > 3 && 0 == libc.Xmemcmp(tls, ts+38664, aBuf+uintptr(nBuf-3), uint64(3)) {
 			if fts5Porter_Vowel(tls, aBuf, nBuf-3) != 0 {
 				*(*int32)(unsafe.Pointer(pnBuf)) = nBuf - 3
 				ret = 1
@@ -194219,7 +195179,7 @@ func fts5TriCreate(tls *libc.TLS, pUnused uintptr, azArg uintptr, nArg int32, pp
 		(*TrigramTokenizer)(unsafe.Pointer(pNew)).FbFold = 1
 		for i = 0; rc == SQLITE_OK && i < nArg; i = i + 2 {
 			var zArg uintptr = *(*uintptr)(unsafe.Pointer(azArg + uintptr(i+1)*8))
-			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38598) {
+			if 0 == Xsqlite3_stricmp(tls, *(*uintptr)(unsafe.Pointer(azArg + uintptr(i)*8)), ts+38668) {
 				if int32(*(*int8)(unsafe.Pointer(zArg))) != '0' && int32(*(*int8)(unsafe.Pointer(zArg))) != '1' || *(*int8)(unsafe.Pointer(zArg + 1)) != 0 {
 					rc = SQLITE_ERROR
 				} else {
@@ -194399,22 +195359,22 @@ func sqlite3Fts5TokenizerInit(tls *libc.TLS, pApi uintptr) int32 {
 	defer tls.Free(128)
 
 	*(*[4]BuiltinTokenizer)(unsafe.Pointer(bp)) = [4]BuiltinTokenizer{
-		{FzName: ts + 38309, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38379, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5UnicodeCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5UnicodeDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5UnicodeTokenize}))}},
-		{FzName: ts + 38613, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38683, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5AsciiCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5AsciiDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5AsciiTokenize}))}},
-		{FzName: ts + 38619, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38689, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5PorterCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5PorterDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
 		}{fts5PorterTokenize}))}},
-		{FzName: ts + 38626, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
+		{FzName: ts + 38696, Fx: Fts5_tokenizer{FxCreate: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr) int32
 		}{fts5TriCreate})), FxDelete: *(*uintptr)(unsafe.Pointer(&struct{ f func(*libc.TLS, uintptr) }{fts5TriDelete})), FxTokenize: *(*uintptr)(unsafe.Pointer(&struct {
 			f func(*libc.TLS, uintptr, uintptr, int32, uintptr, int32, uintptr) int32
@@ -195557,14 +196517,14 @@ func fts5VocabTableType(tls *libc.TLS, zType uintptr, pzErr uintptr, peType uint
 	var zCopy uintptr = sqlite3Fts5Strndup(tls, bp+8, zType, -1)
 	if *(*int32)(unsafe.Pointer(bp + 8)) == SQLITE_OK {
 		sqlite3Fts5Dequote(tls, zCopy)
-		if Xsqlite3_stricmp(tls, zCopy, ts+38634) == 0 {
+		if Xsqlite3_stricmp(tls, zCopy, ts+38704) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_COL
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+38638) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+38708) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_ROW
-		} else if Xsqlite3_stricmp(tls, zCopy, ts+38642) == 0 {
+		} else if Xsqlite3_stricmp(tls, zCopy, ts+38712) == 0 {
 			*(*int32)(unsafe.Pointer(peType)) = FTS5_VOCAB_INSTANCE
 		} else {
-			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38651, libc.VaList(bp, zCopy))
+			*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38721, libc.VaList(bp, zCopy))
 			*(*int32)(unsafe.Pointer(bp + 8)) = SQLITE_ERROR
 		}
 		Xsqlite3_free(tls, zCopy)
@@ -195590,19 +196550,19 @@ func fts5VocabInitVtab(tls *libc.TLS, db uintptr, pAux uintptr, argc int32, argv
 	defer tls.Free(36)
 
 	*(*[3]uintptr)(unsafe.Pointer(bp + 8)) = [3]uintptr{
-		ts + 38685,
-		ts + 38725,
-		ts + 38760,
+		ts + 38755,
+		ts + 38795,
+		ts + 38830,
 	}
 
 	var pRet uintptr = uintptr(0)
 	*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_OK
 	var bDb int32
 
-	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+24651, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
+	bDb = libc.Bool32(argc == 6 && libc.Xstrlen(tls, *(*uintptr)(unsafe.Pointer(argv + 1*8))) == uint64(4) && libc.Xmemcmp(tls, ts+24721, *(*uintptr)(unsafe.Pointer(argv + 1*8)), uint64(4)) == 0)
 
 	if argc != 5 && bDb == 0 {
-		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38803, 0)
+		*(*uintptr)(unsafe.Pointer(pzErr)) = Xsqlite3_mprintf(tls, ts+38873, 0)
 		*(*int32)(unsafe.Pointer(bp + 32)) = SQLITE_ERROR
 	} else {
 		var nByte int32
@@ -195735,11 +196695,11 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 
 	if (*Fts5VocabTable)(unsafe.Pointer(pTab)).FbBusy != 0 {
 		(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-			ts+38836, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+			ts+38906, libc.VaList(bp, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 		return SQLITE_ERROR
 	}
 	zSql = sqlite3Fts5Mprintf(tls, bp+64,
-		ts+38867,
+		ts+38937,
 		libc.VaList(bp+16, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 	if zSql != 0 {
 		*(*int32)(unsafe.Pointer(bp + 64)) = Xsqlite3_prepare_v2(tls, (*Fts5VocabTable)(unsafe.Pointer(pTab)).Fdb, zSql, -1, bp+72, uintptr(0))
@@ -195763,7 +196723,7 @@ func fts5VocabOpenMethod(tls *libc.TLS, pVTab uintptr, ppCsr uintptr) int32 {
 			*(*uintptr)(unsafe.Pointer(bp + 72)) = uintptr(0)
 			if *(*int32)(unsafe.Pointer(bp + 64)) == SQLITE_OK {
 				(*Sqlite3_vtab)(unsafe.Pointer(pVTab)).FzErrMsg = Xsqlite3_mprintf(tls,
-					ts+38918, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
+					ts+38988, libc.VaList(bp+48, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Db, (*Fts5VocabTable)(unsafe.Pointer(pTab)).FzFts5Tbl))
 				*(*int32)(unsafe.Pointer(bp + 64)) = SQLITE_ERROR
 			}
 		} else {
@@ -196158,7 +197118,7 @@ func fts5VocabRowidMethod(tls *libc.TLS, pCursor uintptr, pRowid uintptr) int32
 func sqlite3Fts5VocabInit(tls *libc.TLS, pGlobal uintptr, db uintptr) int32 {
 	var p uintptr = pGlobal
 
-	return Xsqlite3_create_module_v2(tls, db, ts+38944, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
+	return Xsqlite3_create_module_v2(tls, db, ts+39014, uintptr(unsafe.Pointer(&fts5Vocab)), p, uintptr(0))
 }
 
 var fts5Vocab = Sqlite3_module{
@@ -196180,7 +197140,7 @@ var fts5Vocab = Sqlite3_module{
 // ************* End of stmt.c ***********************************************
 // Return the source-id for this library
 func Xsqlite3_sourceid(tls *libc.TLS) uintptr {
-	return ts + 38954
+	return ts + 39024
 }
 
 func init() {
@@ -196235,114 +197195,116 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2616)) = upperFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2688)) = lowerFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2760)) = hexFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = randomFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = randomBlob
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = nullifFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = sourceidFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = errlogFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = quoteFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = last_insert_rowid
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = total_changes
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = replaceFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = zeroblobFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2832)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2904)) = unhexFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 2976)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3048)) = randomFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3120)) = randomBlob
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3192)) = nullifFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3264)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3336)) = sourceidFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3408)) = errlogFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3480)) = quoteFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3552)) = last_insert_rowid
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3624)) = changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3696)) = total_changes
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3768)) = replaceFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3840)) = zeroblobFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3912)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 3984)) = substrFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4064)) = sumFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4072)) = sumFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4080)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4136)) = totalFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4144)) = totalFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4152)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4056)) = substrFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4128)) = substrFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4200)) = sumStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = avgFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4208)) = sumFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4216)) = sumFinalize
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4224)) = sumInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = countStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = countFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = countFinalize
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = countInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = groupConcatInverse
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = groupConcatStep
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = groupConcatFinalize
-	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = groupConcatValue
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = groupConcatInverse
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4544)) = uintptr(unsafe.Pointer(&globInfo))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4616)) = uintptr(unsafe.Pointer(&likeInfoNorm))
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = likeFunc
-	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4272)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4280)) = totalFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4288)) = totalFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4296)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4344)) = sumStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4352)) = avgFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4360)) = avgFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4368)) = sumInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4416)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4424)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4432)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4440)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4488)) = countStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4496)) = countFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4504)) = countFinalize
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4512)) = countInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4560)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4568)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4576)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4584)) = groupConcatInverse
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4632)) = groupConcatStep
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4640)) = groupConcatFinalize
+	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4648)) = groupConcatValue
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4656)) = groupConcatInverse
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4688)) = uintptr(unsafe.Pointer(&globInfo))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4704)) = likeFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4904)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4920)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4976)) = xCeil
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4992)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xFloor
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4760)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4776)) = likeFunc
+	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4832)) = uintptr(unsafe.Pointer(&likeInfoNorm))
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 4848)) = likeFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5048)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5064)) = ceilingFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = libc.Xtrunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5120)) = xCeil
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5136)) = ceilingFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = logFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5192)) = xFloor
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5208)) = ceilingFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5264)) = libc.Xtrunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5280)) = ceilingFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5352)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5424)) = logFunc
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5496)) = logFunc
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5552)) = libc.Xexp
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5624)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xpow
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math2Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5568)) = logFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5640)) = logFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5696)) = libc.Xexp
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5712)) = math1Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5768)) = libc.Xpow
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5784)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xacos
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xasin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xatan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5840)) = libc.Xpow
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5856)) = math2Func
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5912)) = libc.Xfmod
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5928)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 5984)) = libc.Xacos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6000)) = math1Func
-	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xatan2
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math2Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xcos
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6056)) = libc.Xasin
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6072)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6128)) = libc.Xatan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6144)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xsin
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xtan
+	*(*func(*libc.TLS, float64, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6200)) = libc.Xatan2
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6216)) = math2Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6272)) = libc.Xcos
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6288)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xcosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6344)) = libc.Xsin
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6360)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xsinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6416)) = libc.Xtan
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6432)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xtanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6488)) = libc.Xcosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6504)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xacosh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6560)) = libc.Xsinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6576)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xasinh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6632)) = libc.Xtanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6648)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xatanh
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6704)) = libc.Xacosh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6720)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xsqrt
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6776)) = libc.Xasinh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6792)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = degToRad
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6848)) = libc.Xatanh
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6864)) = math1Func
-	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = radToDeg
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6920)) = libc.Xsqrt
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6936)) = math1Func
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = piFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = signFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = versionFunc
-	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = versionFunc
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 6992)) = degToRad
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7008)) = math1Func
+	*(*func(*libc.TLS, float64) float64)(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7064)) = radToDeg
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7080)) = math1Func
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7152)) = piFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7224)) = signFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7296)) = versionFunc
+	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aBuiltinFunc)) + 7368)) = versionFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 8)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
 	*(*func(*libc.TLS, uintptr, int32, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 24)) = juliandayFunc
 	*(*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&aDateTimeFuncs)) + 80)) = uintptr(unsafe.Pointer(&Xsqlite3Config))
@@ -196787,6 +197749,18 @@ func init() {
 	*(*func(*libc.TLS, uintptr, int32, int32, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 112)) = rbuVfsShmLock
 	*(*func(*libc.TLS, uintptr))(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 120)) = rbuVfsShmBarrier
 	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods)) + 128)) = rbuVfsShmUnmap
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 8)) = rbuVfsClose
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 16)) = rbuVfsRead
+	*(*func(*libc.TLS, uintptr, uintptr, int32, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 24)) = rbuVfsWrite
+	*(*func(*libc.TLS, uintptr, Sqlite_int64) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 32)) = rbuVfsTruncate
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 40)) = rbuVfsSync
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 48)) = rbuVfsFileSize
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 56)) = rbuVfsLock
+	*(*func(*libc.TLS, uintptr, int32) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 64)) = rbuVfsUnlock
+	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 72)) = rbuVfsCheckReservedLock
+	*(*func(*libc.TLS, uintptr, int32, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 80)) = rbuVfsFileControl
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 88)) = rbuVfsSectorSize
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rbuvfs_io_methods1)) + 96)) = rbuVfsDeviceCharacteristics
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 8)) = rtreeCreate
 	*(*func(*libc.TLS, uintptr, uintptr, int32, uintptr, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 16)) = rtreeConnect
 	*(*func(*libc.TLS, uintptr, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&rtreeModule)) + 24)) = rtreeBestIndex
@@ -197105,6 +198079,7 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr, uintptr, uint32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2104)) = Xsqlite3_serialize
 	*(*func(*libc.TLS, uintptr, int32) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2112)) = Xsqlite3_db_name
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2120)) = Xsqlite3_value_encoding
+	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3Apis)) + 2128)) = Xsqlite3_is_interrupted
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 0)) = Xsqlite3Fts5Init
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 8)) = Xsqlite3RtreeInit
 	*(*func(*libc.TLS, uintptr) int32)(unsafe.Pointer(uintptr(unsafe.Pointer(&sqlite3BuiltinExtensions)) + 16)) = sqlite3TestExtInit
@@ -197232,5 +198207,5 @@ func init() {
 	*(*func(*libc.TLS, uintptr, uintptr) uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(&winVfs)) + 160)) = winNextSystemCall
 }
 
-var ts1 = "3.40.1\x00ATOMIC_INTRINSICS=1\x00COMPILER=msvc-1900\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00AreFileApisANSI\x00CharLowerW\x00CharUpperW\x00CloseHandle\x00CreateFileA\x00CreateFileW\x00CreateFileMappingA\x00CreateFileMappingW\x00CreateMutexW\x00DeleteFileA\x00DeleteFileW\x00FileTimeToLocalFileTime\x00FileTimeToSystemTime\x00FlushFileBuffers\x00FormatMessageA\x00FormatMessageW\x00FreeLibrary\x00GetCurrentProcessId\x00GetDiskFreeSpaceA\x00GetDiskFreeSpaceW\x00GetFileAttributesA\x00GetFileAttributesW\x00GetFileAttributesExW\x00GetFileSize\x00GetFullPathNameA\x00GetFullPathNameW\x00GetLastError\x00GetProcAddressA\x00GetSystemInfo\x00GetSystemTime\x00GetSystemTimeAsFileTime\x00GetTempPathA\x00GetTempPathW\x00GetTickCount\x00GetVersionExA\x00GetVersionExW\x00HeapAlloc\x00HeapCreate\x00HeapDestroy\x00HeapFree\x00HeapReAlloc\x00HeapSize\x00HeapValidate\x00HeapCompact\x00LoadLibraryA\x00LoadLibraryW\x00LocalFree\x00LockFile\x00LockFileEx\x00MapViewOfFile\x00MultiByteToWideChar\x00QueryPerformanceCounter\x00ReadFile\x00SetEndOfFile\x00SetFilePointer\x00Sleep\x00SystemTimeToFileTime\x00UnlockFile\x00UnlockFileEx\x00UnmapViewOfFile\x00WideCharToMultiByte\x00WriteFile\x00CreateEventExW\x00WaitForSingleObject\x00WaitForSingleObjectEx\x00SetFilePointerEx\x00GetFileInformationByHandleEx\x00MapViewOfFileFromApp\x00CreateFile2\x00LoadPackagedLibrary\x00GetTickCount64\x00GetNativeSystemInfo\x00OutputDebugStringA\x00OutputDebugStringW\x00GetProcessHeap\x00CreateFileMappingFromApp\x00InterlockedCompareExchange\x00UuidCreate\x00UuidCreateSequential\x00FlushViewOfFile\x00%s\x00OsError 0x%lx (%lu)\x00os_win.c:%d: (%lu) %s(%s) - %s\x00delayed %dms for lock/sharing conflict at line %d\x00winSeekFile\x00winClose\x00winRead\x00winWrite1\x00winWrite2\x00winTruncate1\x00winTruncate2\x00winSync1\x00winSync2\x00winFileSize\x00winUnlockReadLock\x00winUnlock\x00winLockSharedMemory\x00%s-shm\x00readonly_shm\x00winOpenShm\x00winShmMap1\x00winShmMap2\x00winShmMap3\x00winUnmapfile1\x00winUnmapfile2\x00winMapfile1\x00winMapfile2\x00etilqs_\x00winGetTempname1\x00winGetTempname2\x00winGetTempname3\x00winGetTempname4\x00winGetTempname5\x00abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x00exclusive\x00winOpen\x00psow\x00winDelete\x00winAccess\x00%s%c%s\x00winFullPathname1\x00winFullPathname2\x00winFullPathname3\x00winFullPathname4\x00win32\x00win32-longpath\x00win32-none\x00win32-longpath-none\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00ValueList\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00sqlite_\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00sqlite_temp_schema\x00sqlite_schema\x00sqlite_temp_master\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00stat\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00dll\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_store_directory\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00column%d\x00%.*z:%u\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00RIGHT PART OF ORDER BY\x00ORDER BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00access\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002022-12-28 14:03:47 df5c253c0b3dd24916e4ec7cf77d3db5294cc9fd45ae7b9c5e82ad8197f38a24\x00"
+var ts1 = "3.41.0\x00ATOMIC_INTRINSICS=1\x00COMPILER=msvc-1900\x00DEFAULT_AUTOVACUUM\x00DEFAULT_CACHE_SIZE=-2000\x00DEFAULT_FILE_FORMAT=4\x00DEFAULT_JOURNAL_SIZE_LIMIT=-1\x00DEFAULT_MEMSTATUS=0\x00DEFAULT_MMAP_SIZE=0\x00DEFAULT_PAGE_SIZE=4096\x00DEFAULT_PCACHE_INITSZ=20\x00DEFAULT_RECURSIVE_TRIGGERS\x00DEFAULT_SECTOR_SIZE=4096\x00DEFAULT_SYNCHRONOUS=2\x00DEFAULT_WAL_AUTOCHECKPOINT=1000\x00DEFAULT_WAL_SYNCHRONOUS=2\x00DEFAULT_WORKER_THREADS=0\x00ENABLE_COLUMN_METADATA\x00ENABLE_FTS5\x00ENABLE_GEOPOLY\x00ENABLE_MATH_FUNCTIONS\x00ENABLE_MEMORY_MANAGEMENT\x00ENABLE_OFFSET_SQL_FUNC\x00ENABLE_PREUPDATE_HOOK\x00ENABLE_RBU\x00ENABLE_RTREE\x00ENABLE_SESSION\x00ENABLE_SNAPSHOT\x00ENABLE_STAT4\x00ENABLE_UNLOCK_NOTIFY\x00LIKE_DOESNT_MATCH_BLOBS\x00MALLOC_SOFT_LIMIT=1024\x00MAX_ATTACHED=10\x00MAX_COLUMN=2000\x00MAX_COMPOUND_SELECT=500\x00MAX_DEFAULT_PAGE_SIZE=8192\x00MAX_EXPR_DEPTH=1000\x00MAX_FUNCTION_ARG=127\x00MAX_LENGTH=1000000000\x00MAX_LIKE_PATTERN_LENGTH=50000\x00MAX_MMAP_SIZE=0x7fff0000\x00MAX_PAGE_COUNT=1073741823\x00MAX_PAGE_SIZE=65536\x00MAX_SQL_LENGTH=1000000000\x00MAX_TRIGGER_DEPTH=1000\x00MAX_VARIABLE_NUMBER=32766\x00MAX_VDBE_OP=250000000\x00MAX_WORKER_THREADS=8\x00MUTEX_NOOP\x00SOUNDEX\x00SYSTEM_MALLOC\x00TEMP_STORE=1\x00THREADSAFE=1\x00BINARY\x00ANY\x00BLOB\x00INT\x00INTEGER\x00REAL\x00TEXT\x0020b:20e\x0020c:20e\x0020e\x0040f-21a-21d\x00now\x00local time unavailable\x00second\x00minute\x00hour\x00\x00\x00day\x00\x00\x00\x00month\x00\x00year\x00\x00\x00auto\x00julianday\x00localtime\x00unixepoch\x00utc\x00weekday \x00start of \x00month\x00year\x00day\x00%02d\x00%06.3f\x00%03d\x00%.16g\x00%lld\x00%04d\x00date\x00time\x00datetime\x00strftime\x00current_time\x00current_timestamp\x00current_date\x00failed to allocate %u bytes of memory\x00failed memory resize %u to %u bytes\x00out of memory\x000123456789ABCDEF0123456789abcdef\x00-x0\x00X0\x00%\x00NaN\x00Inf\x00\x00NULL\x00(NULL)\x00.\x00(join-%u)\x00(subquery-%u)\x00thstndrd\x00922337203685477580\x00API call with %s database connection pointer\x00unopened\x00invalid\x00Savepoint\x00AutoCommit\x00Transaction\x00Checkpoint\x00JournalMode\x00Vacuum\x00VFilter\x00VUpdate\x00Init\x00Goto\x00Gosub\x00InitCoroutine\x00Yield\x00MustBeInt\x00Jump\x00Once\x00If\x00IfNot\x00IsType\x00Not\x00IfNullRow\x00SeekLT\x00SeekLE\x00SeekGE\x00SeekGT\x00IfNotOpen\x00IfNoHope\x00NoConflict\x00NotFound\x00Found\x00SeekRowid\x00NotExists\x00Last\x00IfSmaller\x00SorterSort\x00Sort\x00Rewind\x00SorterNext\x00Prev\x00Next\x00IdxLE\x00IdxGT\x00IdxLT\x00Or\x00And\x00IdxGE\x00RowSetRead\x00RowSetTest\x00Program\x00FkIfZero\x00IsNull\x00NotNull\x00Ne\x00Eq\x00Gt\x00Le\x00Lt\x00Ge\x00ElseEq\x00IfPos\x00IfNotZero\x00DecrJumpZero\x00IncrVacuum\x00VNext\x00Filter\x00PureFunc\x00Function\x00Return\x00EndCoroutine\x00HaltIfNull\x00Halt\x00Integer\x00Int64\x00String\x00BeginSubrtn\x00Null\x00SoftNull\x00Blob\x00Variable\x00Move\x00Copy\x00SCopy\x00IntCopy\x00FkCheck\x00ResultRow\x00CollSeq\x00AddImm\x00RealAffinity\x00Cast\x00Permutation\x00Compare\x00IsTrue\x00ZeroOrNull\x00Offset\x00Column\x00TypeCheck\x00Affinity\x00MakeRecord\x00Count\x00ReadCookie\x00SetCookie\x00ReopenIdx\x00BitAnd\x00BitOr\x00ShiftLeft\x00ShiftRight\x00Add\x00Subtract\x00Multiply\x00Divide\x00Remainder\x00Concat\x00OpenRead\x00OpenWrite\x00BitNot\x00OpenDup\x00OpenAutoindex\x00String8\x00OpenEphemeral\x00SorterOpen\x00SequenceTest\x00OpenPseudo\x00Close\x00ColumnsUsed\x00SeekScan\x00SeekHit\x00Sequence\x00NewRowid\x00Insert\x00RowCell\x00Delete\x00ResetCount\x00SorterCompare\x00SorterData\x00RowData\x00Rowid\x00NullRow\x00SeekEnd\x00IdxInsert\x00SorterInsert\x00IdxDelete\x00DeferredSeek\x00IdxRowid\x00FinishSeek\x00Destroy\x00Clear\x00ResetSorter\x00CreateBtree\x00SqlExec\x00ParseSchema\x00LoadAnalysis\x00DropTable\x00DropIndex\x00Real\x00DropTrigger\x00IntegrityCk\x00RowSetAdd\x00Param\x00FkCounter\x00MemMax\x00OffsetLimit\x00AggInverse\x00AggStep\x00AggStep1\x00AggValue\x00AggFinal\x00Expire\x00CursorLock\x00CursorUnlock\x00TableLock\x00VBegin\x00VCreate\x00VDestroy\x00VOpen\x00VInitIn\x00VColumn\x00VRename\x00Pagecount\x00MaxPgcnt\x00ClrSubtype\x00FilterAdd\x00Trace\x00CursorHint\x00ReleaseReg\x00Noop\x00Explain\x00Abortable\x00AreFileApisANSI\x00CharLowerW\x00CharUpperW\x00CloseHandle\x00CreateFileA\x00CreateFileW\x00CreateFileMappingA\x00CreateFileMappingW\x00CreateMutexW\x00DeleteFileA\x00DeleteFileW\x00FileTimeToLocalFileTime\x00FileTimeToSystemTime\x00FlushFileBuffers\x00FormatMessageA\x00FormatMessageW\x00FreeLibrary\x00GetCurrentProcessId\x00GetDiskFreeSpaceA\x00GetDiskFreeSpaceW\x00GetFileAttributesA\x00GetFileAttributesW\x00GetFileAttributesExW\x00GetFileSize\x00GetFullPathNameA\x00GetFullPathNameW\x00GetLastError\x00GetProcAddressA\x00GetSystemInfo\x00GetSystemTime\x00GetSystemTimeAsFileTime\x00GetTempPathA\x00GetTempPathW\x00GetTickCount\x00GetVersionExA\x00GetVersionExW\x00HeapAlloc\x00HeapCreate\x00HeapDestroy\x00HeapFree\x00HeapReAlloc\x00HeapSize\x00HeapValidate\x00HeapCompact\x00LoadLibraryA\x00LoadLibraryW\x00LocalFree\x00LockFile\x00LockFileEx\x00MapViewOfFile\x00MultiByteToWideChar\x00QueryPerformanceCounter\x00ReadFile\x00SetEndOfFile\x00SetFilePointer\x00Sleep\x00SystemTimeToFileTime\x00UnlockFile\x00UnlockFileEx\x00UnmapViewOfFile\x00WideCharToMultiByte\x00WriteFile\x00CreateEventExW\x00WaitForSingleObject\x00WaitForSingleObjectEx\x00SetFilePointerEx\x00GetFileInformationByHandleEx\x00MapViewOfFileFromApp\x00CreateFile2\x00LoadPackagedLibrary\x00GetTickCount64\x00GetNativeSystemInfo\x00OutputDebugStringA\x00OutputDebugStringW\x00GetProcessHeap\x00CreateFileMappingFromApp\x00InterlockedCompareExchange\x00UuidCreate\x00UuidCreateSequential\x00FlushViewOfFile\x00%s\x00OsError 0x%lx (%lu)\x00os_win.c:%d: (%lu) %s(%s) - %s\x00delayed %dms for lock/sharing conflict at line %d\x00winSeekFile\x00winClose\x00winRead\x00winWrite1\x00winWrite2\x00winTruncate1\x00winTruncate2\x00winSync1\x00winSync2\x00winFileSize\x00winUnlockReadLock\x00winUnlock\x00winLockSharedMemory\x00%s-shm\x00readonly_shm\x00winOpenShm\x00winShmMap1\x00winShmMap2\x00winShmMap3\x00winUnmapfile1\x00winUnmapfile2\x00winMapfile1\x00winMapfile2\x00etilqs_\x00winGetTempname1\x00winGetTempname2\x00winGetTempname3\x00winGetTempname4\x00winGetTempname5\x00abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\x00exclusive\x00winOpen\x00psow\x00winDelete\x00winAccess\x00%s%c%s\x00winFullPathname1\x00winFullPathname2\x00winFullPathname3\x00winFullPathname4\x00win32\x00win32-longpath\x00win32-none\x00win32-longpath-none\x00memdb\x00memdb(%p,%lld)\x00PRAGMA \"%w\".page_count\x00ATTACH x AS %Q\x00recovered %d pages from %s\x00-journal\x00-wal\x00nolock\x00immutable\x00PRAGMA table_list\x00recovered %d frames from WAL file %s\x00cannot limit WAL size: %s\x00SQLite format 3\x00:memory:\x00@  \x00\n\x00invalid page number %d\x002nd reference to page %d\x00Failed to read ptrmap key=%d\x00Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)\x00failed to get page %d\x00freelist leaf count too big on page %d\x00%s is %d but should be %d\x00size\x00overflow list length\x00Page %u: \x00unable to get the page. error code=%d\x00btreeInitPage() returns error code %d\x00free space corruption\x00On tree page %u cell %d: \x00On page %u at right child: \x00Offset %d out of range %d..%d\x00Extends off end of page\x00Rowid %lld out of order\x00Child page depth differs\x00Multiple uses for byte %u of page %u\x00Fragmentation of %d bytes reported as %d on page %u\x00Main freelist: \x00max rootpage (%d) disagrees with header (%d)\x00incremental_vacuum enabled with a max rootpage of zero\x00Page %d is never used\x00Pointer map page %d is referenced\x00unknown database %s\x00destination database is in use\x00source and destination must be distinct\x00%!.15g\x00-\x00%s%s\x00k(%d\x00B\x00,%s%s%s\x00N.\x00)\x00%.18s-%s\x00%s(%d)\x00%d\x00(blob)\x00vtab:%p\x00%c%u\x00]\x00program\x00?\x008\x0016LE\x0016BE\x00addr\x00opcode\x00p1\x00p2\x00p3\x00p4\x00p5\x00comment\x00id\x00parent\x00notused\x00detail\x00%.4c%s%.16c\x00MJ delete: %s\x00MJ collide: %s\x00-mj%06X9%02X\x00FOREIGN KEY constraint failed\x00a CHECK constraint\x00a generated column\x00an index\x00non-deterministic use of %s() in %s\x00API called with finalized prepared statement\x00API called with NULL prepared statement\x00string or blob too big\x00bind on a busy prepared statement: [%s]\x00-- \x00'%.*q'\x00zeroblob(%d)\x00x'\x00%02x\x00'\x00%s constraint failed\x00%z: %s\x00abort at %d in [%s]: %s\x00cannot store %s value in %s column %s.%s\x00cannot open savepoint - SQL statements in progress\x00no such savepoint: %s\x00cannot release savepoint - SQL statements in progress\x00cannot commit transaction - SQL statements in progress\x00cannot start a transaction within a transaction\x00cannot rollback - no transaction is active\x00cannot commit - no transaction is active\x00database schema has changed\x00index corruption\x00sqlite_master\x00SELECT*FROM\"%w\".%s WHERE %s ORDER BY rowid\x00too many levels of trigger recursion\x00cannot change %s wal mode from within a transaction\x00into\x00out of\x00database table is locked: %s\x00ValueList\x00-- %s\x00statement aborts at %d: [%s] %s\x00NOT NULL\x00UNIQUE\x00CHECK\x00FOREIGN KEY\x00cannot open value of type %s\x00null\x00real\x00integer\x00no such rowid: %lld\x00cannot open virtual table: %s\x00cannot open table without rowid: %s\x00cannot open view: %s\x00no such column: \"%s\"\x00foreign key\x00indexed\x00cannot open %s column for writing\x00sqlite_\x00sqlite_temp_master\x00sqlite_temp_schema\x00sqlite_schema\x00main\x00*\x00new\x00old\x00excluded\x00misuse of aliased aggregate %s\x00misuse of aliased window function %s\x00row value misused\x00double-quoted string literal: \"%w\"\x00coalesce\x00no such column\x00ambiguous column name\x00%s: %s.%s.%s\x00%s: %s.%s\x00%s: %s\x00partial index WHERE clauses\x00index expressions\x00CHECK constraints\x00generated columns\x00%s prohibited in %s\x00true\x00false\x00the \".\" operator\x00second argument to %#T() must be a constant between 0.0 and 1.0\x00not authorized to use function: %#T\x00non-deterministic functions\x00%#T() may not be used as a window function\x00window\x00aggregate\x00misuse of %s function %#T()\x00no such function: %#T\x00wrong number of arguments to function %#T()\x00FILTER may not be used with non-aggregate %#T()\x00subqueries\x00parameters\x00%r %s BY term out of range - should be between 1 and %d\x00too many terms in ORDER BY clause\x00ORDER\x00%r ORDER BY term does not match any column in the result set\x00too many terms in %s BY clause\x00HAVING clause on a non-aggregate query\x00GROUP\x00aggregate functions are not allowed in the GROUP BY clause\x00Expression tree is too large (maximum depth %d)\x00IN(...) element has %d term%s - expected %d\x00s\x000\x00too many arguments on function %T\x00unsafe use of %#T()\x00variable number must be between ?1 and ?%d\x00too many SQL variables\x00%d columns assigned %d values\x00too many columns in %s\x00_ROWID_\x00ROWID\x00OID\x00USING ROWID SEARCH ON TABLE %s FOR IN-OPERATOR\x00USING INDEX %s FOR IN-OPERATOR\x00sub-select returns %d columns - expected %d\x00REUSE LIST SUBQUERY %d\x00%sLIST SUBQUERY %d\x00CORRELATED \x00REUSE SUBQUERY %d\x00%sSCALAR SUBQUERY %d\x001\x000x\x00hex literal too big: %s%#T\x00generated column loop on \"%s\"\x00blob\x00text\x00numeric\x00flexnum\x00none\x00misuse of aggregate: %#T()\x00unknown function: %#T()\x00RAISE() may only be used within a trigger-program\x00B\x00C\x00D\x00E\x00F\x00table %s may not be altered\x00SELECT 1 FROM \"%w\".sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, %d, %Q, %d)=NULL \x00SELECT 1 FROM temp.sqlite_master WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%' AND sqlite_rename_test(%Q, sql, type, name, 1, %Q, %d)=NULL \x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_quotefix(%Q, sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_quotefix('temp', sql)WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X' AND sql NOT LIKE 'create virtual%%'\x00there is already another table or index with this name: %s\x00table\x00view %s may not be altered\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, %d) WHERE (type!='index' OR tbl_name=%Q COLLATE nocase)AND   name NOT LIKE 'sqliteX_%%' ESCAPE 'X'\x00UPDATE %Q.sqlite_master SET tbl_name = %Q, name = CASE WHEN type='table' THEN %Q WHEN name LIKE 'sqliteX_autoindex%%' ESCAPE 'X'      AND type='index' THEN 'sqlite_autoindex_' || %Q || substr(name,%d+18) ELSE name END WHERE tbl_name=%Q COLLATE nocase AND (type='table' OR type='index' OR type='trigger');\x00sqlite_sequence\x00UPDATE \"%w\".sqlite_sequence set name = %Q WHERE name = %Q\x00UPDATE sqlite_temp_schema SET sql = sqlite_rename_table(%Q, type, name, sql, %Q, %Q, 1), tbl_name = CASE WHEN tbl_name=%Q COLLATE nocase AND   sqlite_rename_test(%Q, sql, type, name, 1, 'after rename', 0) THEN %Q ELSE tbl_name END WHERE type IN ('view', 'trigger')\x00after rename\x00SELECT raise(ABORT,%Q) FROM \"%w\".\"%w\"\x00Cannot add a PRIMARY KEY column\x00Cannot add a UNIQUE column\x00Cannot add a REFERENCES column with non-NULL default value\x00Cannot add a NOT NULL column with default value NULL\x00Cannot add a column with non-constant default\x00cannot add a STORED column\x00UPDATE \"%w\".sqlite_master SET sql = printf('%%.%ds, ',sql) || %Q || substr(sql,1+length(printf('%%.%ds',sql))) WHERE type = 'table' AND name = %Q\x00SELECT CASE WHEN quick_check GLOB 'CHECK*' THEN raise(ABORT,'CHECK constraint failed') ELSE raise(ABORT,'NOT NULL constraint failed') END  FROM pragma_quick_check(%Q,%Q) WHERE quick_check GLOB 'CHECK*' OR quick_check GLOB 'NULL*'\x00virtual tables may not be altered\x00Cannot add a column to a view\x00sqlite_altertab_%s\x00view\x00virtual table\x00cannot %s %s \"%s\"\x00drop column from\x00rename columns of\x00no such column: \"%T\"\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, %d) WHERE name NOT LIKE 'sqliteX_%%' ESCAPE 'X'  AND (type != 'index' OR tbl_name = %Q)\x00UPDATE temp.sqlite_master SET sql = sqlite_rename_column(sql, type, name, %Q, %Q, %d, %Q, %d, 1) WHERE type IN ('trigger', 'view')\x00error in %s %s%s%s: %s\x00 \x00CREATE \x00\"%w\" \x00%Q%s\x00%.*s%s\x00cannot drop %s column: \"%s\"\x00PRIMARY KEY\x00cannot drop column \"%s\": no other columns exist\x00UPDATE \"%w\".sqlite_master SET sql = sqlite_drop_column(%d, sql, %d) WHERE (type=='table' AND tbl_name=%Q COLLATE nocase)\x00after drop column\x00sqlite_rename_column\x00sqlite_rename_table\x00sqlite_rename_test\x00sqlite_drop_column\x00sqlite_rename_quotefix\x00CREATE TABLE %Q.%s(%s)\x00DELETE FROM %Q.%s WHERE %s=%Q\x00DELETE FROM %Q.%s\x00sqlite_stat1\x00tbl,idx,stat\x00sqlite_stat4\x00tbl,idx,neq,nlt,ndlt,sample\x00sqlite_stat3\x00stat_init\x00stat_push\x00%llu\x00 %llu\x00%llu \x00stat_get\x00sqlite\\_%\x00BBB\x00idx\x00tbl\x00unordered*\x00sz=[0-9]*\x00noskipscan*\x00SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx\x00SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4\x00SELECT tbl,idx,stat FROM %Q.sqlite_stat1\x00x\x00\x00too many attached databases - max %d\x00database %s is already in use\x00database is already attached\x00attached databases must use the same text encoding as main database\x00unable to open database: %s\x00no such database: %s\x00cannot detach database %s\x00database %s is locked\x00sqlite_detach\x00sqlite_attach\x00%s cannot use variables\x00%s %T cannot reference objects in database %s\x00authorizer malfunction\x00%s.%s\x00%s.%z\x00access to %z is prohibited\x00not authorized\x00pragma_\x00no such view\x00no such table\x00corrupt database\x00unknown database %T\x00object name reserved for internal use: %s\x00temporary table name must be unqualified\x00%s %T already exists\x00there is already an index named %s\x00sqlite_returning\x00cannot use RETURNING in a trigger\x00too many columns on %s\x00always\x00generated\x00duplicate column name: %s\x00default value of column [%s] is not constant\x00cannot use DEFAULT on a generated column\x00generated columns cannot be part of the PRIMARY KEY\x00table \"%s\" has more than one primary key\x00AUTOINCREMENT is only allowed on an INTEGER PRIMARY KEY\x00virtual tables cannot use computed columns\x00virtual\x00stored\x00error in generated column \"%s\"\x00,\x00\n  \x00,\n  \x00\n)\x00CREATE TABLE \x00 TEXT\x00 NUM\x00 INT\x00 REAL\x00unknown datatype for %s.%s: \"%s\"\x00missing datatype for %s.%s\x00AUTOINCREMENT not allowed on WITHOUT ROWID tables\x00PRIMARY KEY missing on table %s\x00must have at least one non-generated column\x00TABLE\x00VIEW\x00CREATE %s %.*s\x00UPDATE %Q.sqlite_master SET type='%s', name=%Q, tbl_name=%Q, rootpage=#%d, sql=%Q WHERE rowid=#%d\x00CREATE TABLE %Q.sqlite_sequence(name,seq)\x00tbl_name='%q' AND type!='trigger'\x00parameters are not allowed in views\x00view %s is circularly defined\x00corrupt schema\x00UPDATE %Q.sqlite_master SET rootpage=%d WHERE #%d AND rootpage=#%d\x00sqlite_stat%d\x00DELETE FROM %Q.sqlite_sequence WHERE name=%Q\x00DELETE FROM %Q.sqlite_master WHERE tbl_name=%Q and type!='trigger'\x00stat\x00table %s may not be dropped\x00use DROP TABLE to delete table %s\x00use DROP VIEW to delete view %s\x00foreign key on %s should reference only one column of table %T\x00number of columns in foreign key does not match the number of columns in the referenced table\x00unknown column \"%s\" in foreign key definition\x00unsupported use of NULLS %s\x00FIRST\x00LAST\x00index\x00cannot create a TEMP index on non-TEMP table \"%s\"\x00table %s may not be indexed\x00views may not be indexed\x00virtual tables may not be indexed\x00there is already a table named %s\x00index %s already exists\x00sqlite_autoindex_%s_%d\x00expressions prohibited in PRIMARY KEY and UNIQUE constraints\x00conflicting ON CONFLICT clauses specified\x00invalid rootpage\x00CREATE%s INDEX %.*s\x00 UNIQUE\x00INSERT INTO %Q.sqlite_master VALUES('index',%Q,%Q,#%d,%Q);\x00name='%q' AND type='index'\x00no such index: %S\x00index associated with UNIQUE or PRIMARY KEY constraint cannot be dropped\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='index'\x00too many FROM clause terms, max: %d\x00a JOIN clause is required before %s\x00ON\x00USING\x00BEGIN\x00ROLLBACK\x00COMMIT\x00RELEASE\x00unable to open a temporary database file for storing temporary tables\x00index '%q'\x00, \x00%s.rowid\x00unable to identify the object to be reindexed\x00duplicate WITH table name: %s\x00no such collation sequence: %s\x00unsafe use of virtual table \"%s\"\x00table %s may not be modified\x00cannot modify %s because it is a view\x00rows deleted\x00integer overflow\x00%.*f\x00LIKE or GLOB pattern too complex\x00ESCAPE expression must be a single character\x00%!.20e\x00%Q\x00?000\x00MATCH\x00like\x00implies_nonnull_row\x00expr_compare\x00expr_implies_expr\x00affinity\x00soundex\x00load_extension\x00sqlite_compileoption_used\x00sqlite_compileoption_get\x00unlikely\x00likelihood\x00likely\x00sqlite_offset\x00ltrim\x00rtrim\x00trim\x00min\x00max\x00typeof\x00subtype\x00length\x00instr\x00printf\x00format\x00unicode\x00char\x00abs\x00round\x00upper\x00lower\x00hex\x00unhex\x00ifnull\x00random\x00randomblob\x00nullif\x00sqlite_version\x00sqlite_source_id\x00sqlite_log\x00quote\x00last_insert_rowid\x00changes\x00total_changes\x00replace\x00zeroblob\x00substr\x00substring\x00sum\x00total\x00avg\x00count\x00group_concat\x00glob\x00ceil\x00ceiling\x00floor\x00trunc\x00ln\x00log\x00log10\x00log2\x00exp\x00pow\x00power\x00mod\x00acos\x00asin\x00atan\x00atan2\x00cos\x00sin\x00tan\x00cosh\x00sinh\x00tanh\x00acosh\x00asinh\x00atanh\x00sqrt\x00radians\x00degrees\x00pi\x00sign\x00iif\x00foreign key mismatch - \"%w\" referencing \"%w\"\x00cannot INSERT into generated column \"%s\"\x00table %S has no column named %s\x00table %S has %d columns but %d values were supplied\x00%d values for %d columns\x00UPSERT not implemented for virtual table \"%s\"\x00cannot UPSERT a view\x00rows inserted\x00sqlite3_extension_init\x00sqlite3_\x00lib\x00_init\x00no entry point [%s] in shared library [%s]\x00error during initialization: %s\x00unable to open shared library [%.*s]\x00dll\x00automatic extension loading failed: %s\x00seq\x00from\x00to\x00on_update\x00on_delete\x00match\x00cid\x00name\x00type\x00notnull\x00dflt_value\x00pk\x00hidden\x00schema\x00ncol\x00wr\x00strict\x00seqno\x00desc\x00coll\x00key\x00builtin\x00enc\x00narg\x00flags\x00wdth\x00hght\x00flgs\x00unique\x00origin\x00partial\x00rowid\x00fkid\x00file\x00busy\x00checkpointed\x00database\x00status\x00cache_size\x00timeout\x00analysis_limit\x00application_id\x00auto_vacuum\x00automatic_index\x00busy_timeout\x00cache_spill\x00case_sensitive_like\x00cell_size_check\x00checkpoint_fullfsync\x00collation_list\x00compile_options\x00count_changes\x00data_store_directory\x00data_version\x00database_list\x00default_cache_size\x00defer_foreign_keys\x00empty_result_callbacks\x00encoding\x00foreign_key_check\x00foreign_key_list\x00foreign_keys\x00freelist_count\x00full_column_names\x00fullfsync\x00function_list\x00hard_heap_limit\x00ignore_check_constraints\x00incremental_vacuum\x00index_info\x00index_list\x00index_xinfo\x00integrity_check\x00journal_mode\x00journal_size_limit\x00legacy_alter_table\x00locking_mode\x00max_page_count\x00mmap_size\x00module_list\x00optimize\x00page_count\x00page_size\x00pragma_list\x00query_only\x00quick_check\x00read_uncommitted\x00recursive_triggers\x00reverse_unordered_selects\x00schema_version\x00secure_delete\x00short_column_names\x00shrink_memory\x00soft_heap_limit\x00synchronous\x00table_info\x00table_list\x00table_xinfo\x00temp_store\x00temp_store_directory\x00threads\x00trusted_schema\x00user_version\x00wal_autocheckpoint\x00wal_checkpoint\x00writable_schema\x00onoffalseyestruextrafull\x00normal\x00full\x00incremental\x00memory\x00temporary storage cannot be changed from within a transaction\x00SET NULL\x00SET DEFAULT\x00CASCADE\x00RESTRICT\x00NO ACTION\x00delete\x00persist\x00off\x00truncate\x00wal\x00w\x00a\x00sissii\x00utf8\x00utf16le\x00utf16be\x00-%T\x00fast\x00not a writable directory\x00Safety level may not be changed inside a transaction\x00reset\x00issisii\x00issisi\x00SELECT*FROM\"%w\"\x00shadow\x00sssiii\x00iisX\x00isiX\x00c\x00u\x00isisi\x00iss\x00is\x00iissssss\x00NONE\x00siX\x00*** in database %s ***\n\x00row not in PRIMARY KEY order for %s\x00NULL value in %s.%s\x00non-%s value in %s.%s\x00NUMERIC value in %s.%s\x00C\x00TEXT value in %s.%s\x00CHECK constraint failed in %s\x00row \x00 missing from index \x00 values differ from index \x00non-unique entry in index \x00wrong # of entries in index \x00ok\x00unsupported encoding: %s\x00restart\x00ANALYZE \"%w\".\"%w\"\x00UTF8\x00UTF-8\x00UTF-16le\x00UTF-16be\x00UTF16le\x00UTF16be\x00UTF-16\x00UTF16\x00CREATE TABLE x\x00%c\"%s\"\x00(\"%s\"\x00,arg HIDDEN\x00,schema HIDDEN\x00PRAGMA \x00%Q.\x00=%Q\x00error in %s %s after %s: %s\x00malformed database schema (%s)\x00%z - %s\x00rename\x00drop column\x00add column\x00orphan index\x00CREATE TABLE x(type text,name text,tbl_name text,rootpage int,sql text)\x00unsupported file format\x00SELECT*FROM\"%w\".%s ORDER BY rowid\x00database schema is locked: %s\x00statement too long\x00unknown join type: %T%s%T%s%T\x00naturaleftouterightfullinnercross\x00a NATURAL join may not have an ON or USING clause\x00cannot join using column %s - column not present in both tables\x00ambiguous reference to %s in USING()\x00UNION ALL\x00INTERSECT\x00EXCEPT\x00UNION\x00USE TEMP B-TREE FOR %s\x00USE TEMP B-TREE FOR %sORDER BY\x00RIGHT PART OF \x00column%d\x00%.*z:%u\x00NUM\x00cannot use window functions in recursive queries\x00recursive aggregate queries not supported\x00SETUP\x00RECURSIVE STEP\x00SCAN %d CONSTANT ROW%s\x00S\x00COMPOUND QUERY\x00LEFT-MOST SUBQUERY\x00%s USING TEMP B-TREE\x00all VALUES must have the same number of terms\x00SELECTs to the left and right of %s do not have the same number of result columns\x00MERGE (%s)\x00LEFT\x00RIGHT\x00no such index: %s\x00'%s' is not a function\x00no such index: \"%s\"\x00multiple references to recursive table: %s\x00circular reference: %s\x00table %s has %d values for %d columns\x00multiple recursive references: %s\x00recursive reference in a subquery: %s\x00%!S\x00too many references to \"%s\": max 65535\x00access to view \"%s\" prohibited\x00..%s\x00%s.%s.%s\x00no such table: %s\x00no tables specified\x00too many columns in result set\x00DISTINCT aggregates must have exactly one argument\x00USE TEMP B-TREE FOR %s(DISTINCT)\x00SCAN %s%s%s\x00 USING COVERING INDEX \x00target object/alias may not appear in FROM clause: %s\x00expected %d columns for '%s' but got %d\x00CO-ROUTINE %!S\x00MATERIALIZE %!S\x00DISTINCT\x00GROUP BY\x00sqlite3_get_table() called with two or more incompatible queries\x00temporary trigger may not have qualified name\x00trigger\x00cannot create triggers on virtual tables\x00trigger %T already exists\x00cannot create trigger on system table\x00cannot create %s trigger on view: %S\x00BEFORE\x00AFTER\x00cannot create INSTEAD OF trigger on table: %S\x00trigger \"%s\" may not write to shadow table \"%s\"\x00INSERT INTO %Q.sqlite_master VALUES('trigger',%Q,%Q,0,'CREATE TRIGGER %q')\x00type='trigger' AND name='%q'\x00no such trigger: %S\x00DELETE FROM %Q.sqlite_master WHERE name=%Q AND type='trigger'\x00%s RETURNING is not available on virtual tables\x00DELETE\x00UPDATE\x00RETURNING may not use \"TABLE.*\" wildcards\x00-- TRIGGER %s\x00cannot UPDATE generated column \"%s\"\x00no such column: %s\x00rows updated\x00%r \x00%sON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint\x00CRE\x00INS\x00cannot VACUUM from within a transaction\x00cannot VACUUM - SQL statements in progress\x00non-text filename\x00ATTACH %Q AS vacuum_db\x00output file already exists\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='table'AND name<>'sqlite_sequence' AND coalesce(rootpage,1)>0\x00SELECT sql FROM \"%w\".sqlite_schema WHERE type='index'\x00SELECT'INSERT INTO vacuum_db.'||quote(name)||' SELECT*FROM\"%w\".'||quote(name)FROM vacuum_db.sqlite_schema WHERE type='table'AND coalesce(rootpage,1)>0\x00INSERT INTO vacuum_db.sqlite_schema SELECT*FROM \"%w\".sqlite_schema WHERE type IN('view','trigger') OR(type='table'AND rootpage=0)\x00CREATE VIRTUAL TABLE %T\x00UPDATE %Q.sqlite_master SET type='table', name=%Q, tbl_name=%Q, rootpage=0, sql=%Q WHERE rowid=#%d\x00name=%Q AND sql=%Q\x00vtable constructor called recursively: %s\x00vtable constructor failed: %s\x00vtable constructor did not declare schema: %s\x00no such module: %s\x00<expr>\x00 AND \x00(\x00 (\x00%s=?\x00ANY(%s)\x00>\x00<\x00%s %S\x00SEARCH\x00SCAN\x00AUTOMATIC PARTIAL COVERING INDEX\x00AUTOMATIC COVERING INDEX\x00COVERING INDEX %s\x00INDEX %s\x00 USING \x00 USING INTEGER PRIMARY KEY (%s\x00>? AND %s\x00%c?)\x00 VIRTUAL TABLE INDEX %d:%s\x00 LEFT-JOIN\x00BLOOM FILTER ON %S (\x00rowid=?\x00MULTI-INDEX OR\x00INDEX %d\x00RIGHT-JOIN %s\x00regexp\x00ON clause references tables to its right\x00NOCASE\x00too many arguments on %s() - max %d\x00automatic index on %s(%s)\x00auto-index\x00%s.xBestIndex malfunction\x00abbreviated query algorithm search\x00no query solution\x00at most %d tables in a join\x00SCAN CONSTANT ROW\x00second argument to nth_value must be a positive integer\x00argument of ntile must be a positive integer\x00row_number\x00dense_rank\x00rank\x00percent_rank\x00cume_dist\x00ntile\x00last_value\x00nth_value\x00first_value\x00lead\x00lag\x00no such window: %s\x00RANGE with offset PRECEDING/FOLLOWING requires one ORDER BY expression\x00FILTER clause may only be used with aggregate window functions\x00misuse of aggregate: %s()\x00unsupported frame specification\x00PARTITION clause\x00ORDER BY clause\x00frame specification\x00cannot override %s of window: %s\x00DISTINCT is not supported for window functions\x00frame starting offset must be a non-negative integer\x00frame ending offset must be a non-negative integer\x00frame starting offset must be a non-negative number\x00frame ending offset must be a non-negative number\x00%s clause should come after %s not before\x00ORDER BY\x00LIMIT\x00too many terms in compound SELECT\x00syntax error after column name \"%.*s\"\x00parser stack overflow\x00unknown table option: %.*s\x00set list\x00near \"%T\": syntax error\x00qualified table names are not allowed on INSERT, UPDATE, and DELETE statements within triggers\x00the INDEXED BY clause is not allowed on UPDATE or DELETE statements within triggers\x00the NOT INDEXED clause is not allowed on UPDATE or DELETE statements within triggers\x00incomplete input\x00unrecognized token: \"%T\"\x00%s in \"%s\"\x00create\x00temp\x00temporary\x00end\x00explain\x00unable to close due to unfinalized statements or unfinished backups\x00unknown error\x00abort due to ROLLBACK\x00another row available\x00no more rows available\x00not an error\x00SQL logic error\x00access permission denied\x00query aborted\x00database is locked\x00database table is locked\x00attempt to write a readonly database\x00interrupted\x00disk I/O error\x00database disk image is malformed\x00unknown operation\x00database or disk is full\x00unable to open database file\x00locking protocol\x00constraint failed\x00datatype mismatch\x00bad parameter or other API misuse\x00authorization denied\x00column index out of range\x00file is not a database\x00notification message\x00warning message\x00unable to delete/modify user-function due to active statements\x00unable to use function %s in the requested context\x00unknown database: %s\x00unable to delete/modify collation sequence due to active statements\x00file:\x00localhost\x00invalid uri authority: %.*s\x00vfs\x00cache\x00mode\x00access\x00no such %s mode: %s\x00%s mode not allowed: %s\x00no such vfs: %s\x00shared\x00private\x00ro\x00rw\x00rwc\x00RTRIM\x00\x00\x00\x00%s at line %d of [%.10s]\x00database corruption\x00misuse\x00cannot open file\x00no such table column: %s.%s\x00SQLITE_\x00database is deadlocked\x00array\x00object\x000123456789abcdef\x00JSON cannot hold BLOB values\x00malformed JSON\x00[0]\x00JSON path error near '%q'\x00json_%s() needs an odd number of arguments\x00$[\x00$.\x00json_object() requires an even number of arguments\x00json_object() labels must be TEXT\x00set\x00insert\x00[]\x00{}\x00CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,json HIDDEN,root HIDDEN)\x00.%.*s\x00[%d]\x00$\x00json\x00json_array\x00json_array_length\x00json_extract\x00->\x00->>\x00json_insert\x00json_object\x00json_patch\x00json_quote\x00json_remove\x00json_replace\x00json_set\x00json_type\x00json_valid\x00json_group_array\x00json_group_object\x00json_each\x00json_tree\x00%s_node\x00data\x00DROP TABLE '%q'.'%q_node';DROP TABLE '%q'.'%q_rowid';DROP TABLE '%q'.'%q_parent';\x00RtreeMatchArg\x00SELECT * FROM %Q.%Q\x00UNIQUE constraint failed: %s.%s\x00rtree constraint failed: %s.(%s<=%s)\x00ALTER TABLE %Q.'%q_node'   RENAME TO \"%w_node\";ALTER TABLE %Q.'%q_parent' RENAME TO \"%w_parent\";ALTER TABLE %Q.'%q_rowid'  RENAME TO \"%w_rowid\";\x00SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'\x00node\x00CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY,nodeno\x00,a%d\x00);CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY,data);\x00CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,parentnode);\x00INSERT INTO \"%w\".\"%w_node\"VALUES(1,zeroblob(%d))\x00INSERT INTO\"%w\".\"%w_rowid\"(rowid,nodeno)VALUES(?1,?2)ON CONFLICT(rowid)DO UPDATE SET nodeno=excluded.nodeno\x00SELECT * FROM \"%w\".\"%w_rowid\" WHERE rowid=?1\x00UPDATE \"%w\".\"%w_rowid\"SET \x00a%d=coalesce(?%d,a%d)\x00a%d=?%d\x00 WHERE rowid=?1\x00INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_node' WHERE nodeno = ?1\x00SELECT nodeno FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_rowid' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_rowid' WHERE rowid = ?1\x00SELECT parentnode FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00INSERT OR REPLACE INTO '%q'.'%q_parent' VALUES(?1, ?2)\x00DELETE FROM '%q'.'%q_parent' WHERE nodeno = ?1\x00PRAGMA %Q.page_size\x00SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1\x00undersize RTree blobs in \"%q_node\"\x00Wrong number of columns for an rtree table\x00Too few columns for an rtree table\x00Too many columns for an rtree table\x00Auxiliary rtree columns must be last\x00CREATE TABLE x(%.*s INT\x00,%.*s\x00);\x00,%.*s REAL\x00,%.*s INT\x00{%lld\x00 %g\x00}\x00Invalid argument to rtreedepth()\x00%z%s%z\x00SELECT data FROM %Q.'%q_node' WHERE nodeno=?\x00Node %lld missing from database\x00SELECT parentnode FROM %Q.'%q_parent' WHERE nodeno=?1\x00SELECT nodeno FROM %Q.'%q_rowid' WHERE rowid=?1\x00Mapping (%lld -> %lld) missing from %s table\x00%_rowid\x00%_parent\x00Found (%lld -> %lld) in %s table, expected (%lld -> %lld)\x00Dimension %d of cell %d on node %lld is corrupt\x00Dimension %d of cell %d on node %lld is corrupt relative to parent\x00Node %lld is too small (%d bytes)\x00Rtree depth out of range (%d)\x00Node %lld is too small for cell count of %d (%d bytes)\x00SELECT count(*) FROM %Q.'%q%s'\x00Wrong number of entries in %%%s table - expected %lld, actual %lld\x00SELECT * FROM %Q.'%q_rowid'\x00Schema corrupt or not an rtree\x00_rowid\x00_parent\x00END\x00wrong number of arguments to function rtreecheck()\x00[\x00[%!g,%!g],\x00[%!g,%!g]]\x00<polyline points=\x00%c%g,%g\x00 %g,%g'\x00 %s\x00></polyline>\x00CREATE TABLE x(_shape\x00,%s\x00rtree\x00fullscan\x00_shape does not contain a valid polygon\x00geopoly_overlap\x00geopoly_within\x00geopoly\x00geopoly_area\x00geopoly_blob\x00geopoly_json\x00geopoly_svg\x00geopoly_contains_point\x00geopoly_debug\x00geopoly_bbox\x00geopoly_xform\x00geopoly_regular\x00geopoly_ccw\x00geopoly_group_bbox\x00rtreenode\x00rtreedepth\x00rtreecheck\x00rtree_i32\x00corrupt fossil delta\x00DROP TRIGGER IF EXISTS temp.rbu_insert_tr;DROP TRIGGER IF EXISTS temp.rbu_update1_tr;DROP TRIGGER IF EXISTS temp.rbu_update2_tr;DROP TRIGGER IF EXISTS temp.rbu_delete_tr;\x00SELECT rbu_target_name(name, type='view') AS target, name FROM sqlite_schema WHERE type IN ('table', 'view') AND target IS NOT NULL  %s ORDER BY name\x00AND rootpage!=0 AND rootpage IS NOT NULL\x00SELECT name, rootpage, sql IS NULL OR substr(8, 6)=='UNIQUE'   FROM main.sqlite_schema   WHERE type='index' AND tbl_name = ?\x00SELECT  (sql COLLATE nocase BETWEEN 'CREATE VIRTUAL' AND 'CREATE VIRTUAM'), rootpage  FROM sqlite_schema WHERE name=%Q\x00PRAGMA index_list=%Q\x00SELECT rootpage FROM sqlite_schema WHERE name = %Q\x00PRAGMA table_info=%Q\x00PRAGMA main.index_list = %Q\x00PRAGMA main.index_xinfo = %Q\x00SELECT * FROM '%q'\x00rbu_\x00rbu_rowid\x00table %q %s rbu_rowid column\x00may not have\x00requires\x00PRAGMA table_info(%Q)\x00column missing from %q: %s\x00%z%s\"%w\"\x00%z%s%s\"%w\"%s\x00SELECT max(_rowid_) FROM \"%s%w\"\x00 WHERE _rowid_ > %lld \x00 DESC\x00quote(\x00||','||\x00SELECT %s FROM \"%s%w\" ORDER BY %s LIMIT 1\x00 WHERE (%s) > (%s) \x00_rowid_\x00%z%s \"%w\" COLLATE %Q\x00%z%s \"rbu_imp_%d%w\" COLLATE %Q DESC\x00%z%s quote(\"rbu_imp_%d%w\")\x00SELECT %s FROM \"rbu_imp_%w\" ORDER BY %s LIMIT 1\x00%z%s%s\x00(%s) > (%s)\x00%z%s(%.*s) COLLATE %Q\x00%z%s\"%w\" COLLATE %Q\x00%z%s\"rbu_imp_%d%w\"%s\x00%z%s\"rbu_imp_%d%w\" %s COLLATE %Q\x00%z%s\"rbu_imp_%d%w\" IS ?\x00%z%s%s.\"%w\"\x00%z%sNULL\x00%z, %s._rowid_\x00_rowid_ = ?%d\x00%z%sc%d=?%d\x00_rowid_ = (SELECT id FROM rbu_imposter2 WHERE %z)\x00%z%s\"%w\"=?%d\x00invalid rbu_control value\x00%z%s\"%w\"=rbu_delta(\"%w\", ?%d)\x00%z%s\"%w\"=rbu_fossil_delta(\"%w\", ?%d)\x00PRIMARY KEY(\x00%z%s\"%w\"%s\x00%z)\x00SELECT name FROM sqlite_schema WHERE rootpage = ?\x00%z%sc%d %s COLLATE %Q\x00%z%sc%d%s\x00%z, id INTEGER\x00CREATE TABLE rbu_imposter2(%z, PRIMARY KEY(%z)) WITHOUT ROWID\x00PRIMARY KEY \x00%z%s\"%w\" %s %sCOLLATE %Q%s\x00 NOT NULL\x00%z, %z\x00CREATE TABLE \"rbu_imp_%w\"(%z)%s\x00 WITHOUT ROWID\x00INSERT INTO %s.'rbu_tmp_%q'(rbu_control,%s%s) VALUES(%z)\x00SELECT trim(sql) FROM sqlite_schema WHERE type='index' AND name=?\x00 LIMIT -1 OFFSET %d\x00CREATE TABLE \"rbu_imp_%w\"( %s, PRIMARY KEY( %s ) ) WITHOUT ROWID\x00INSERT INTO \"rbu_imp_%w\" VALUES(%s)\x00DELETE FROM \"rbu_imp_%w\" WHERE %s\x00SELECT %s, 0 AS rbu_control FROM '%q' %s %s %s ORDER BY %s%s\x00AND\x00WHERE\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s ORDER BY %s%s\x00SELECT %s, rbu_control FROM %s.'rbu_tmp_%q' %s UNION ALL SELECT %s, rbu_control FROM '%q' %s %s typeof(rbu_control)='integer' AND rbu_control!=1 ORDER BY %s%s\x00rbu_imp_\x00INSERT INTO \"%s%w\"(%s%s) VALUES(%s)\x00, _rowid_\x00DELETE FROM \"%s%w\" WHERE %s\x00, rbu_rowid\x00CREATE TABLE IF NOT EXISTS %s.'rbu_tmp_%q' AS SELECT *%s FROM '%q' WHERE 0;\x00, 0 AS rbu_rowid\x00CREATE TEMP TRIGGER rbu_delete_tr BEFORE DELETE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update1_tr BEFORE UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(3, %s);END;CREATE TEMP TRIGGER rbu_update2_tr AFTER UPDATE ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(4, %s);END;\x00CREATE TEMP TRIGGER rbu_insert_tr AFTER INSERT ON \"%s%w\" BEGIN   SELECT rbu_tmp_insert(0, %s);END;\x00,_rowid_ \x00,rbu_rowid\x00SELECT %s,%s rbu_control%s FROM '%q'%s %s %s %s\x000 AS \x00UPDATE \"%s%w\" SET %s WHERE %s\x00SELECT k, v FROM %s.rbu_state\x00file:///%s-vacuum?modeof=%s\x00ATTACH %Q AS stat\x00CREATE TABLE IF NOT EXISTS %s.rbu_state(k INTEGER PRIMARY KEY, v)\x00cannot vacuum wal mode database\x00file:%s-vactmp?rbu_memory=1%s%s\x00&\x00rbu_tmp_insert\x00rbu_fossil_delta\x00rbu_target_name\x00SELECT * FROM sqlite_schema\x00rbu vfs not found\x00PRAGMA main.wal_checkpoint=restart\x00rbu_exclusive_checkpoint\x00%s-oal\x00%s-wal\x00PRAGMA schema_version\x00PRAGMA schema_version = %d\x00INSERT OR REPLACE INTO %s.rbu_state(k, v) VALUES (%d, %d), (%d, %Q), (%d, %Q), (%d, %d), (%d, %d), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %lld), (%d, %Q)  \x00PRAGMA main.%s\x00PRAGMA main.%s = %d\x00PRAGMA writable_schema=1\x00SELECT sql FROM sqlite_schema WHERE sql!='' AND rootpage!=0 AND name!='sqlite_sequence'  ORDER BY type DESC\x00SELECT * FROM sqlite_schema WHERE rootpage=0 OR rootpage IS NULL\x00INSERT INTO sqlite_schema VALUES(?,?,?,?,?)\x00PRAGMA writable_schema=0\x00DELETE FROM %s.'rbu_tmp_%q'\x00rbu_state mismatch error\x00rbu_vfs_%d\x00SELECT count(*) FROM sqlite_schema WHERE type='index' AND tbl_name = %Q\x00rbu_index_cnt\x00SELECT 1 FROM sqlite_schema WHERE tbl_name = 'rbu_count'\x00SELECT sum(cnt * (1 + rbu_index_cnt(rbu_target_name(tbl))))FROM rbu_count\x00cannot update wal mode database\x00database modified during rbu %s\x00vacuum\x00update\x00BEGIN IMMEDIATE\x00PRAGMA journal_mode=off\x00-vactmp\x00DELETE FROM stat.rbu_state\x00rbu/zipvfs setup error\x00rbu(%s)/%z\x00rbu_memory\x00SELECT 0, 'tbl',  '', 0, '', 1     UNION ALL SELECT 1, 'idx',  '', 0, '', 2     UNION ALL SELECT 2, 'stat', '', 0, '', 0\x00PRAGMA '%q'.table_info('%q')\x00%z%s\"%w\".\"%w\".\"%w\"=\"%w\".\"%w\".\"%w\"\x00%z%s\"%w\".\"%w\".\"%w\" IS NOT \"%w\".\"%w\".\"%w\"\x00 OR \x00SELECT * FROM \"%w\".\"%w\" WHERE NOT EXISTS (  SELECT 1 FROM \"%w\".\"%w\" WHERE %s)\x00SELECT * FROM \"%w\".\"%w\", \"%w\".\"%w\" WHERE %s AND (%z)\x00table schemas do not match\x00SELECT tbl, ?2, stat FROM %Q.sqlite_stat1 WHERE tbl IS ?1 AND idx IS (CASE WHEN ?2=X'' THEN NULL ELSE ?2 END)\x00SELECT * FROM \x00 WHERE \x00 IS ?\x00SAVEPOINT changeset\x00RELEASE changeset\x00UPDATE main.\x00 SET \x00 = ?\x00idx IS CASE WHEN length(?4)=0 AND typeof(?4)='blob' THEN NULL ELSE ?4 END \x00DELETE FROM main.\x00 AND (?\x00AND \x00INSERT INTO main.\x00) VALUES(?\x00, ?\x00INSERT INTO main.sqlite_stat1 VALUES(?1, CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END, ?3)\x00DELETE FROM main.sqlite_stat1 WHERE tbl=?1 AND idx IS CASE WHEN length(?2)=0 AND typeof(?2)='blob' THEN NULL ELSE ?2 END AND (?4 OR stat IS ?3)\x00SAVEPOINT replace_op\x00RELEASE replace_op\x00SAVEPOINT changeset_apply\x00PRAGMA defer_foreign_keys = 1\x00sqlite3changeset_apply(): no such table: %s\x00sqlite3changeset_apply(): table %s has %d columns, expected %d or more\x00sqlite3changeset_apply(): primary key mismatch for table %s\x00PRAGMA defer_foreign_keys = 0\x00RELEASE changeset_apply\x00ROLLBACK TO changeset_apply\x00fts5: parser stack overflow\x00fts5: syntax error near \"%.*s\"\x00%z%.*s\x00wrong number of arguments to function highlight()\x00wrong number of arguments to function snippet()\x00snippet\x00highlight\x00bm25\x00prefix\x00malformed prefix=... directive\x00too many prefix indexes (max %d)\x00prefix length out of range (max 999)\x00tokenize\x00multiple tokenize=... directives\x00parse error in tokenize directive\x00content\x00multiple content=... directives\x00%Q.%Q\x00content_rowid\x00multiple content_rowid=... directives\x00columnsize\x00malformed columnsize=... directive\x00columns\x00malformed detail=... directive\x00unrecognized option: \"%.*s\"\x00reserved fts5 column name: %s\x00unindexed\x00unrecognized column option: %s\x00T.%Q\x00, T.%Q\x00, T.c%d\x00reserved fts5 table name: %s\x00parse error in \"%s\"\x00docsize\x00%Q.'%q_%s'\x00CREATE TABLE x(\x00%z%s%Q\x00%z, %Q HIDDEN, %s HIDDEN)\x00pgsz\x00hashsize\x00automerge\x00usermerge\x00crisismerge\x00SELECT k, v FROM %Q.'%q_config'\x00version\x00invalid fts5 file format (found %d, expected %d) - run 'rebuild'\x00unterminated string\x00fts5: syntax error near \"%.1s\"\x00OR\x00NOT\x00NEAR\x00expected integer, got \"%.*s\"\x00fts5: column queries are not supported (detail=none)\x00fts5: %s queries are not supported (detail!=full)\x00phrase\x00block\x00REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)\x00DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?\x00DELETE FROM '%q'.'%q_idx' WHERE segid=?\x00PRAGMA %Q.data_version\x00SELECT pgno FROM '%q'.'%q_idx' WHERE segid=? AND term<=? ORDER BY term DESC LIMIT 1\x00INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)\x00%s_data\x00id INTEGER PRIMARY KEY, block BLOB\x00segid, term, pgno, PRIMARY KEY(segid, term)\x00SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d ORDER BY 1, 2\x00\x00\x00\x00\x00\x00recursively defined fts5 content table\x00SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s\x00DESC\x00ASC\x00reads\x00unknown special query: %.*s\x00SELECT %s\x00no such function: %s\x00parse error in rank function: %s\x00%s: table does not support scanning\x00delete-all\x00'delete-all' may only be used with a contentless or external content fts5 table\x00rebuild\x00'rebuild' may not be used with a contentless fts5 table\x00merge\x00integrity-check\x00cannot %s contentless fts5 table: %s\x00DELETE from\x00no such cursor: %lld\x00no such tokenizer: %s\x00error in tokenizer constructor\x00fts5_api_ptr\x00fts5: 2023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00config\x00fts5\x00fts5_source_id\x00SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC\x00SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC\x00SELECT %s FROM %s T WHERE T.%Q=?\x00INSERT INTO %Q.'%q_content' VALUES(%s)\x00REPLACE INTO %Q.'%q_content' VALUES(%s)\x00DELETE FROM %Q.'%q_content' WHERE id=?\x00REPLACE INTO %Q.'%q_docsize' VALUES(?,?)\x00DELETE FROM %Q.'%q_docsize' WHERE id=?\x00SELECT sz FROM %Q.'%q_docsize' WHERE id=?\x00REPLACE INTO %Q.'%q_config' VALUES(?,?)\x00SELECT %s FROM %s AS T\x00DROP TABLE IF EXISTS %Q.'%q_data';DROP TABLE IF EXISTS %Q.'%q_idx';DROP TABLE IF EXISTS %Q.'%q_config';\x00DROP TABLE IF EXISTS %Q.'%q_docsize';\x00DROP TABLE IF EXISTS %Q.'%q_content';\x00ALTER TABLE %Q.'%q_%s' RENAME TO '%q_%s';\x00CREATE TABLE %Q.'%q_%q'(%s)%s\x00fts5: error creating shadow table %q_%s: %s\x00id INTEGER PRIMARY KEY\x00, c%d\x00id INTEGER PRIMARY KEY, sz BLOB\x00k PRIMARY KEY, v\x00DELETE FROM %Q.'%q_data';DELETE FROM %Q.'%q_idx';\x00DELETE FROM %Q.'%q_docsize';\x00SELECT count(*) FROM %Q.'%q_%s'\x00tokenchars\x00separators\x00L* N* Co\x00categories\x00remove_diacritics\x00unicode61\x00al\x00ance\x00ence\x00er\x00ic\x00able\x00ible\x00ant\x00ement\x00ment\x00ent\x00ion\x00ou\x00ism\x00ate\x00iti\x00ous\x00ive\x00ize\x00at\x00bl\x00ble\x00iz\x00ational\x00tional\x00tion\x00enci\x00anci\x00izer\x00logi\x00bli\x00alli\x00entli\x00eli\x00e\x00ousli\x00ization\x00ation\x00ator\x00alism\x00iveness\x00fulness\x00ful\x00ousness\x00aliti\x00iviti\x00biliti\x00ical\x00ness\x00icate\x00iciti\x00ative\x00alize\x00eed\x00ee\x00ed\x00ing\x00case_sensitive\x00ascii\x00porter\x00trigram\x00col\x00row\x00instance\x00fts5vocab: unknown table type: %Q\x00CREATE TABlE vocab(term, col, doc, cnt)\x00CREATE TABlE vocab(term, doc, cnt)\x00CREATE TABlE vocab(term, doc, col, offset)\x00wrong number of vtable arguments\x00recursive definition for %s.%s\x00SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'\x00no such fts5 table: %s.%s\x00fts5vocab\x002023-02-21 18:09:37 05941c2a04037fc3ed2ffae11f5d2260706f89431f463518740f72ada350866d\x00"
 var ts = (*reflect.StringHeader)(unsafe.Pointer(&ts1)).Data
diff --git a/vendor/modernc.org/sqlite/sqlite.go b/vendor/modernc.org/sqlite/sqlite.go
index ade56472..61826cd0 100644
--- a/vendor/modernc.org/sqlite/sqlite.go
+++ b/vendor/modernc.org/sqlite/sqlite.go
@@ -834,7 +834,6 @@ func applyQueryParams(c *conn, query string) error {
 			return fmt.Errorf("unknown _time_format %q", v)
 		}
 		c.writeTimeFormat = f
-		return nil
 	}
 
 	if v := q.Get("_txlock"); v != "" {
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 3cdd98aa..41e2f2e0 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -38,8 +38,8 @@ github.com/Rhymen/go-whatsapp/binary/token
 github.com/Rhymen/go-whatsapp/crypto/cbc
 github.com/Rhymen/go-whatsapp/crypto/curve25519
 github.com/Rhymen/go-whatsapp/crypto/hkdf
-# github.com/SevereCloud/vksdk/v2 v2.15.0
-## explicit; go 1.16
+# github.com/SevereCloud/vksdk/v2 v2.16.0
+## explicit; go 1.18
 github.com/SevereCloud/vksdk/v2
 github.com/SevereCloud/vksdk/v2/api
 github.com/SevereCloud/vksdk/v2/events
@@ -99,8 +99,8 @@ github.com/gomarkdown/markdown
 github.com/gomarkdown/markdown/ast
 github.com/gomarkdown/markdown/html
 github.com/gomarkdown/markdown/parser
-# github.com/google/gops v0.3.26
-## explicit; go 1.13
+# github.com/google/gops v0.3.27
+## explicit; go 1.17
 github.com/google/gops/agent
 github.com/google/gops/internal
 github.com/google/gops/signal
@@ -182,8 +182,8 @@ github.com/keybase/go-keybase-chat-bot/kbchat/types/chat1
 github.com/keybase/go-keybase-chat-bot/kbchat/types/gregor1
 github.com/keybase/go-keybase-chat-bot/kbchat/types/keybase1
 github.com/keybase/go-keybase-chat-bot/kbchat/types/stellar1
-# github.com/klauspost/compress v1.15.8
-## explicit; go 1.16
+# github.com/klauspost/compress v1.16.0
+## explicit; go 1.18
 github.com/klauspost/compress
 github.com/klauspost/compress/fse
 github.com/klauspost/compress/huff0
@@ -192,13 +192,13 @@ github.com/klauspost/compress/internal/snapref
 github.com/klauspost/compress/s2
 github.com/klauspost/compress/zstd
 github.com/klauspost/compress/zstd/internal/xxhash
-# github.com/klauspost/cpuid/v2 v2.0.12
+# github.com/klauspost/cpuid/v2 v2.2.3
 ## explicit; go 1.15
 github.com/klauspost/cpuid/v2
-# github.com/kyokomi/emoji/v2 v2.2.11
+# github.com/kyokomi/emoji/v2 v2.2.12
 ## explicit; go 1.14
 github.com/kyokomi/emoji/v2
-# github.com/labstack/echo/v4 v4.10.0
+# github.com/labstack/echo/v4 v4.10.2
 ## explicit; go 1.17
 github.com/labstack/echo/v4
 github.com/labstack/echo/v4/middleware
@@ -231,7 +231,7 @@ github.com/matterbridge/gozulipbot
 # github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba
 ## explicit
 github.com/matterbridge/logrus-prefixed-formatter
-# github.com/matterbridge/matterclient v0.0.0-20220624224459-272af20c7ddf
+# github.com/matterbridge/matterclient v0.0.0-20221106190440-8bcf49695e0d
 ## explicit; go 1.17
 github.com/matterbridge/matterclient
 # github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404
@@ -275,7 +275,7 @@ github.com/mattermost/mattermost-server/v6/utils/jsonutils
 # github.com/mattn/go-colorable v0.1.13
 ## explicit; go 1.15
 github.com/mattn/go-colorable
-# github.com/mattn/go-isatty v0.0.16
+# github.com/mattn/go-isatty v0.0.17
 ## explicit; go 1.15
 github.com/mattn/go-isatty
 # github.com/mattn/go-runewidth v0.0.13
@@ -364,7 +364,7 @@ github.com/pkg/errors
 # github.com/pmezard/go-difflib v1.0.0
 ## explicit
 github.com/pmezard/go-difflib/difflib
-# github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0
+# github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec
 ## explicit; go 1.12
 github.com/remyoudompheng/bigfft
 # github.com/rickb777/date v1.12.4
@@ -515,8 +515,8 @@ go.mau.fi/libsignal/util/errorhelper
 go.mau.fi/libsignal/util/keyhelper
 go.mau.fi/libsignal/util/medium
 go.mau.fi/libsignal/util/optional
-# go.mau.fi/whatsmeow v0.0.0-20230128195103-dcbc8dd31a22
-## explicit; go 1.18
+# go.mau.fi/whatsmeow v0.0.0-20230306190159-5caded34a872
+## explicit; go 1.19
 go.mau.fi/whatsmeow
 go.mau.fi/whatsmeow/appstate
 go.mau.fi/whatsmeow/appstate/lthash
@@ -547,7 +547,7 @@ go.uber.org/zap/internal/bufferpool
 go.uber.org/zap/internal/color
 go.uber.org/zap/internal/exit
 go.uber.org/zap/zapcore
-# golang.org/x/crypto v0.4.0
+# golang.org/x/crypto v0.6.0
 ## explicit; go 1.17
 golang.org/x/crypto/acme
 golang.org/x/crypto/acme/autocert
@@ -569,19 +569,18 @@ golang.org/x/crypto/scrypt
 golang.org/x/crypto/ssh
 golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
 golang.org/x/crypto/ssh/terminal
-# golang.org/x/image v0.5.0
+# golang.org/x/image v0.6.0
 ## explicit; go 1.12
 golang.org/x/image/riff
 golang.org/x/image/vp8
 golang.org/x/image/vp8l
 golang.org/x/image/webp
-# golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
+# golang.org/x/mod v0.8.0
 ## explicit; go 1.17
 golang.org/x/mod/semver
-# golang.org/x/net v0.7.0
+# golang.org/x/net v0.8.0
 ## explicit; go 1.17
 golang.org/x/net/context
-golang.org/x/net/context/ctxhttp
 golang.org/x/net/html
 golang.org/x/net/html/atom
 golang.org/x/net/http/httpguts
@@ -591,13 +590,13 @@ golang.org/x/net/http2/hpack
 golang.org/x/net/idna
 golang.org/x/net/publicsuffix
 golang.org/x/net/websocket
-# golang.org/x/oauth2 v0.4.0
+# golang.org/x/oauth2 v0.6.0
 ## explicit; go 1.17
 golang.org/x/oauth2
 golang.org/x/oauth2/clientcredentials
 golang.org/x/oauth2/internal
 golang.org/x/oauth2/microsoft
-# golang.org/x/sys v0.5.0
+# golang.org/x/sys v0.6.0
 ## explicit; go 1.17
 golang.org/x/sys/cpu
 golang.org/x/sys/execabs
@@ -605,10 +604,10 @@ golang.org/x/sys/internal/unsafeheader
 golang.org/x/sys/plan9
 golang.org/x/sys/unix
 golang.org/x/sys/windows
-# golang.org/x/term v0.5.0
+# golang.org/x/term v0.6.0
 ## explicit; go 1.17
 golang.org/x/term
-# golang.org/x/text v0.7.0
+# golang.org/x/text v0.8.0
 ## explicit; go 1.17
 golang.org/x/text/encoding
 golang.org/x/text/encoding/charmap
@@ -630,22 +629,23 @@ golang.org/x/text/transform
 golang.org/x/text/unicode/bidi
 golang.org/x/text/unicode/norm
 golang.org/x/text/width
-# golang.org/x/time v0.2.0
+# golang.org/x/time v0.3.0
 ## explicit
 golang.org/x/time/rate
-# golang.org/x/tools v0.1.12
+# golang.org/x/tools v0.6.0
 ## explicit; go 1.18
 golang.org/x/tools/go/gcexportdata
-golang.org/x/tools/go/internal/gcimporter
 golang.org/x/tools/go/internal/packagesdriver
-golang.org/x/tools/go/internal/pkgbits
 golang.org/x/tools/go/packages
 golang.org/x/tools/internal/event
 golang.org/x/tools/internal/event/core
 golang.org/x/tools/internal/event/keys
 golang.org/x/tools/internal/event/label
+golang.org/x/tools/internal/gcimporter
 golang.org/x/tools/internal/gocommand
 golang.org/x/tools/internal/packagesinternal
+golang.org/x/tools/internal/pkgbits
+golang.org/x/tools/internal/tokeninternal
 golang.org/x/tools/internal/typeparams
 golang.org/x/tools/internal/typesinternal
 # gomod.garykim.dev/nc-talk v0.3.0
@@ -663,7 +663,7 @@ google.golang.org/appengine/internal/log
 google.golang.org/appengine/internal/remote_api
 google.golang.org/appengine/internal/urlfetch
 google.golang.org/appengine/urlfetch
-# google.golang.org/protobuf v1.28.1
+# google.golang.org/protobuf v1.29.0
 ## explicit; go 1.11
 google.golang.org/protobuf/encoding/prototext
 google.golang.org/protobuf/encoding/protowire
@@ -722,8 +722,8 @@ modernc.org/cc/v3
 # modernc.org/ccgo/v3 v3.16.13
 ## explicit; go 1.17
 modernc.org/ccgo/v3/lib
-# modernc.org/libc v1.22.2
-## explicit; go 1.17
+# modernc.org/libc v1.22.3
+## explicit; go 1.18
 modernc.org/libc
 modernc.org/libc/errno
 modernc.org/libc/fcntl
@@ -753,14 +753,14 @@ modernc.org/libc/wctype
 # modernc.org/mathutil v1.5.0
 ## explicit; go 1.13
 modernc.org/mathutil
-# modernc.org/memory v1.4.0
+# modernc.org/memory v1.5.0
 ## explicit; go 1.18
 modernc.org/memory
 # modernc.org/opt v0.1.3
 ## explicit; go 1.13
 modernc.org/opt
-# modernc.org/sqlite v1.20.3
-## explicit; go 1.17
+# modernc.org/sqlite v1.21.0
+## explicit; go 1.18
 modernc.org/sqlite
 modernc.org/sqlite/lib
 # modernc.org/strutil v1.1.3

From 2c349c50c72ad2eb503d08bd59e4fc98b3c7e9a0 Mon Sep 17 00:00:00 2001
From: Joseph Mansy <36427684+yousefmansy1@users.noreply.github.com>
Date: Fri, 10 Mar 2023 13:28:32 -0800
Subject: [PATCH 12/25] Support handling delete message from whatsapp. (#1986)

---
 bridge/whatsappmulti/handlers.go | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/bridge/whatsappmulti/handlers.go b/bridge/whatsappmulti/handlers.go
index b8e78572..d99c6727 100644
--- a/bridge/whatsappmulti/handlers.go
+++ b/bridge/whatsappmulti/handlers.go
@@ -44,6 +44,8 @@ func (b *Bwhatsapp) handleMessage(message *events.Message) {
 		b.handleDocumentMessage(message)
 	case msg.ImageMessage != nil:
 		b.handleImageMessage(message)
+	case msg.ProtocolMessage != nil && *msg.ProtocolMessage.Type == proto.ProtocolMessage_REVOKE:
+		b.handleDelete(msg.ProtocolMessage)
 	}
 }
 
@@ -359,3 +361,20 @@ func (b *Bwhatsapp) handleDocumentMessage(msg *events.Message) {
 
 	b.Remote <- rmsg
 }
+
+func (b *Bwhatsapp) handleDelete(messageInfo *proto.ProtocolMessage) {
+	sender, _ := types.ParseJID(*messageInfo.Key.Participant)
+
+	rmsg := config.Message{
+		Account:  b.Account,
+		Protocol: b.Protocol,
+		ID:       getMessageIdFormat(sender, *messageInfo.Key.Id),
+		Event:    config.EventMsgDelete,
+		Text:     config.EventMsgDelete,
+		Channel:  *messageInfo.Key.RemoteJid,
+	}
+
+	b.Log.Debugf("<= Sending message from %s to gateway", b.Account)
+	b.Log.Debugf("<= Message is %#v", rmsg)
+	b.Remote <- rmsg
+}

From 53b63adc71938b020e5003ed29382a14166de1db Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Fri, 10 Mar 2023 22:29:44 +0100
Subject: [PATCH 13/25] Update to actions v3 (#2009)

---
 .github/workflows/development.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
index ff8c1ce4..ed3ac762 100644
--- a/.github/workflows/development.yml
+++ b/.github/workflows/development.yml
@@ -5,11 +5,11 @@ jobs:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 20
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           version: latest
           args: "-v --new-from-rev HEAD~5"
@@ -21,12 +21,12 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Install Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go-version }}
         stable: false
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
           fetch-depth: 0
     - name: Test
@@ -40,19 +40,19 @@ jobs:
         CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags "-s -X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o output/mac/matterbridge-$VERSION-darwin-amd64
     - name: Upload linux 64-bit
       if: startsWith(matrix.go-version,'1.20')
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: matterbridge-linux-64bit
         path: output/lin
     - name: Upload windows 64-bit
       if: startsWith(matrix.go-version,'1.20')
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: matterbridge-windows-64bit
         path: output/win
     - name: Upload darwin 64-bit
       if: startsWith(matrix.go-version,'1.20')
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: matterbridge-darwin-64bit
         path: output/mac

From 544cd5cd9ee8fc48b4056a10316f79d6a96c63bb Mon Sep 17 00:00:00 2001
From: ilmaisin <iiro.laiho@iki.fi>
Date: Fri, 10 Mar 2023 23:30:48 +0200
Subject: [PATCH 14/25] Fix Android media download problem (whatsapp) (#2010)

---
 bridge/whatsappmulti/whatsapp.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bridge/whatsappmulti/whatsapp.go b/bridge/whatsappmulti/whatsapp.go
index e943fc86..99e56446 100644
--- a/bridge/whatsappmulti/whatsapp.go
+++ b/bridge/whatsappmulti/whatsapp.go
@@ -243,6 +243,7 @@ func (b *Bwhatsapp) PostDocumentMessage(msg config.Message, filetype string) (st
 		FileSha256:    resp.FileSHA256,
 		FileLength:    goproto.Uint64(resp.FileLength),
 		Url:           &resp.URL,
+		DirectPath:    &resp.DirectPath,
 		ContextInfo:   ctx,
 	}
 
@@ -280,6 +281,7 @@ func (b *Bwhatsapp) PostImageMessage(msg config.Message, filetype string) (strin
 		FileSha256:    resp.FileSHA256,
 		FileLength:    goproto.Uint64(resp.FileLength),
 		Url:           &resp.URL,
+		DirectPath:    &resp.DirectPath,
 		ContextInfo:   ctx,
 	}
 
@@ -313,6 +315,7 @@ func (b *Bwhatsapp) PostVideoMessage(msg config.Message, filetype string) (strin
 		FileSha256:    resp.FileSHA256,
 		FileLength:    goproto.Uint64(resp.FileLength),
 		Url:           &resp.URL,
+		DirectPath:    &resp.DirectPath,
 		ContextInfo:   ctx,
 	}
 
@@ -345,6 +348,7 @@ func (b *Bwhatsapp) PostAudioMessage(msg config.Message, filetype string) (strin
 		FileSha256:    resp.FileSHA256,
 		FileLength:    goproto.Uint64(resp.FileLength),
 		Url:           &resp.URL,
+		DirectPath:    &resp.DirectPath,
 		ContextInfo:   ctx,
 	}
 

From a3deb4872656389425c8d3b9abb7c7d428bb8fe7 Mon Sep 17 00:00:00 2001
From: mvoolt <77506726+mvoolt@users.noreply.github.com>
Date: Fri, 10 Mar 2023 23:57:35 +0200
Subject: [PATCH 15/25] Add support for Mumble servers with no message length
 limit (#2008)

* Rename .{jfif,jpe} to .jpg (mumble)

* Fix messages not sending in properly if no limit is set (mumble)

Co-authored-by: yellows111 <ice_ice@email.com>

* Formatting fix (mumble)

---------

Co-authored-by: yellows111 <ice_ice@email.com>
---
 bridge/mumble/handlers.go | 10 ++++++++--
 bridge/mumble/mumble.go   |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/bridge/mumble/handlers.go b/bridge/mumble/handlers.go
index 8120159a..830aa5c0 100644
--- a/bridge/mumble/handlers.go
+++ b/bridge/mumble/handlers.go
@@ -42,7 +42,14 @@ func (b *Bmumble) handleTextMessage(event *gumble.TextMessageEvent) {
 		if part.Image == nil {
 			rmsg.Text = part.Text
 		} else {
-			fname := b.Account + "_" + strconv.FormatInt(now.UnixNano(), 10) + "_" + strconv.Itoa(i) + part.FileExtension
+			fileExt := part.FileExtension
+			if fileExt == ".jfif" {
+				fileExt = ".jpg"
+			}
+			if fileExt == ".jpe" {
+				fileExt = ".jpg"
+			}
+			fname := b.Account + "_" + strconv.FormatInt(now.UnixNano(), 10) + "_" + strconv.Itoa(i) + fileExt
 			rmsg.Extra = make(map[string][]interface{})
 			if err = helper.HandleDownloadSize(b.Log, &rmsg, fname, int64(len(part.Image)), b.General); err != nil {
 				b.Log.WithError(err).Warn("not including image in message")
@@ -62,7 +69,6 @@ func (b *Bmumble) handleConnect(event *gumble.ConnectEvent) {
 	}
 	// No need to talk or listen
 	event.Client.Self.SetSelfDeafened(true)
-	event.Client.Self.SetSelfMuted(true)
 	// if the Channel variable is set, this is a reconnect -> rejoin channel
 	if b.Channel != nil {
 		if err := b.doJoin(event.Client, *b.Channel); err != nil {
diff --git a/bridge/mumble/mumble.go b/bridge/mumble/mumble.go
index 945cf559..859ca4ab 100644
--- a/bridge/mumble/mumble.go
+++ b/bridge/mumble/mumble.go
@@ -250,7 +250,12 @@ func (b *Bmumble) processMessage(msg *config.Message) {
 	// If there is a maximum message length, split and truncate the lines
 	var msgLines []string
 	if maxLength := b.serverConfig.MaximumMessageLength; maxLength != nil {
-		msgLines = helper.GetSubLines(msg.Text, *maxLength-len(msg.Username), b.GetString("MessageClipped"))
+		if *maxLength != 0 { // Some servers will have unlimited message lengths.
+			// Not doing this makes underflows happen.
+			msgLines = helper.GetSubLines(msg.Text, *maxLength-len(msg.Username), b.GetString("MessageClipped"))
+		} else {
+			msgLines = helper.GetSubLines(msg.Text, 0, b.GetString("MessageClipped"))
+		}
 	} else {
 		msgLines = helper.GetSubLines(msg.Text, 0, b.GetString("MessageClipped"))
 	}

From 356ada872c0e1564097e2f8165931fb8c9ee9d23 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sat, 11 Mar 2023 17:55:11 +0100
Subject: [PATCH 16/25] Add handlers at the end. Fixes #1988 (discord) (#2011)

---
 bridge/discord/discord.go | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index 5ae6c572..51dbe6bc 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -81,17 +81,6 @@ func (b *Bdiscord) Connect() error {
 		return err
 	}
 	b.Log.Info("Connection succeeded")
-	b.c.AddHandler(b.messageCreate)
-	b.c.AddHandler(b.messageTyping)
-	b.c.AddHandler(b.messageUpdate)
-	b.c.AddHandler(b.messageDelete)
-	b.c.AddHandler(b.messageDeleteBulk)
-	b.c.AddHandler(b.memberAdd)
-	b.c.AddHandler(b.memberRemove)
-	b.c.AddHandler(b.memberUpdate)
-	if b.GetInt("debuglevel") == 1 {
-		b.c.AddHandler(b.messageEvent)
-	}
 	// Add privileged intent for guild member tracking. This is needed to track nicks
 	// for display names and @mention translation
 	b.c.Identify.Intents = discordgo.MakeIntent(discordgo.IntentsAllWithoutPrivileged |
@@ -233,6 +222,19 @@ func (b *Bdiscord) Connect() error {
 			b.nickMemberMap[member.Nick] = member
 		}
 	}
+
+	b.c.AddHandler(b.messageCreate)
+	b.c.AddHandler(b.messageTyping)
+	b.c.AddHandler(b.messageUpdate)
+	b.c.AddHandler(b.messageDelete)
+	b.c.AddHandler(b.messageDeleteBulk)
+	b.c.AddHandler(b.memberAdd)
+	b.c.AddHandler(b.memberRemove)
+	b.c.AddHandler(b.memberUpdate)
+	if b.GetInt("debuglevel") == 1 {
+		b.c.AddHandler(b.messageEvent)
+	}
+
 	return nil
 }
 

From 89e2dbac1504d6df205938df750fa9eb15996afd Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sat, 11 Mar 2023 18:14:49 +0100
Subject: [PATCH 17/25] Check client disconnect to exit for loop (api). Fixes
 #1983 (#2012)

Also update to latest melody upstream
---
 bridge/api/api.go                             |  19 +-
 go.mod                                        |   2 +-
 go.sum                                        |   4 +-
 .../olahol/melody}/.gitignore                 |   0
 .../olahol/melody}/CHANGELOG.md               |   8 +
 .../olahol/melody}/LICENSE                    |   0
 vendor/github.com/olahol/melody/README.md     | 157 +++++++++++++++
 .../olahol/melody}/config.go                  |   0
 .../olahol/melody}/doc.go                     |   8 +-
 .../olahol/melody}/envelope.go                |   0
 vendor/github.com/olahol/melody/errors.go     |  10 +
 .../olahol/melody}/hub.go                     |  11 ++
 .../olahol/melody}/melody.go                  |  40 ++--
 .../olahol/melody}/session.go                 |  72 ++++---
 vendor/gopkg.in/olahol/melody.v1/.travis.yml  |  10 -
 vendor/gopkg.in/olahol/melody.v1/README.md    | 185 ------------------
 vendor/modules.txt                            |   6 +-
 17 files changed, 278 insertions(+), 254 deletions(-)
 rename vendor/{gopkg.in/olahol/melody.v1 => github.com/olahol/melody}/.gitignore (100%)
 rename vendor/{gopkg.in/olahol/melody.v1 => github.com/olahol/melody}/CHANGELOG.md (79%)
 rename vendor/{gopkg.in/olahol/melody.v1 => github.com/olahol/melody}/LICENSE (100%)
 create mode 100644 vendor/github.com/olahol/melody/README.md
 rename vendor/{gopkg.in/olahol/melody.v1 => github.com/olahol/melody}/config.go (100%)
 rename vendor/{gopkg.in/olahol/melody.v1 => github.com/olahol/melody}/doc.go (75%)
 rename vendor/{gopkg.in/olahol/melody.v1 => github.com/olahol/melody}/envelope.go (100%)
 create mode 100644 vendor/github.com/olahol/melody/errors.go
 rename vendor/{gopkg.in/olahol/melody.v1 => github.com/olahol/melody}/hub.go (88%)
 rename vendor/{gopkg.in/olahol/melody.v1 => github.com/olahol/melody}/melody.go (93%)
 rename vendor/{gopkg.in/olahol/melody.v1 => github.com/olahol/melody}/session.go (78%)
 delete mode 100644 vendor/gopkg.in/olahol/melody.v1/.travis.yml
 delete mode 100644 vendor/gopkg.in/olahol/melody.v1/README.md

diff --git a/bridge/api/api.go b/bridge/api/api.go
index 515007f0..9e7679d3 100644
--- a/bridge/api/api.go
+++ b/bridge/api/api.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/olahol/melody.v1"
+	"github.com/olahol/melody"
 
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
@@ -166,15 +166,20 @@ func (b *API) handleStream(c echo.Context) error {
 	}
 	c.Response().Flush()
 	for {
+		select {
 		// TODO: this causes issues, messages should be broadcasted to all connected clients
-		msg := b.Messages.Dequeue()
-		if msg != nil {
-			if err := json.NewEncoder(c.Response()).Encode(msg); err != nil {
-				return err
+		default:
+			msg := b.Messages.Dequeue()
+			if msg != nil {
+				if err := json.NewEncoder(c.Response()).Encode(msg); err != nil {
+					return err
+				}
+				c.Response().Flush()
 			}
-			c.Response().Flush()
+			time.Sleep(100 * time.Millisecond)
+		case <-c.Request().Context().Done():
+			return nil
 		}
-		time.Sleep(200 * time.Millisecond)
 	}
 }
 
diff --git a/go.mod b/go.mod
index f4e31db3..e2379e41 100644
--- a/go.mod
+++ b/go.mod
@@ -34,6 +34,7 @@ require (
 	github.com/mattn/godown v0.0.1
 	github.com/mdp/qrterminal v1.0.1
 	github.com/nelsonken/gomf v0.0.0-20190423072027-c65cc0469e94
+	github.com/olahol/melody v1.1.2
 	github.com/paulrosania/go-charset v0.0.0-20190326053356-55c9d7a5834c
 	github.com/rs/xid v1.4.0
 	github.com/russross/blackfriday v1.6.0
@@ -53,7 +54,6 @@ require (
 	golang.org/x/text v0.8.0
 	gomod.garykim.dev/nc-talk v0.3.0
 	google.golang.org/protobuf v1.29.0
-	gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376
 	layeh.com/gumble v0.0.0-20221205141517-d1df60a3cc14
 	modernc.org/sqlite v1.21.0
 )
diff --git a/go.sum b/go.sum
index af479145..ac913120 100644
--- a/go.sum
+++ b/go.sum
@@ -1246,6 +1246,8 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/olahol/melody v1.1.2 h1:9PZ5kYv/CUy0PRZcJCKja1MUxAh6olVeHkyqaQxO7n0=
+github.com/olahol/melody v1.1.2/go.mod h1:GgkTl6Y7yWj/HtfD48Q5vLKPVoZOH+Qqgfa7CvJgJM4=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.0-20180506121414-d4647c9c7a84/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
@@ -2465,8 +2467,6 @@ gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3M
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
-gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376 h1:sY2a+y0j4iDrajJcorb+a0hJIQ6uakU5gybjfLWHlXo=
-gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376/go.mod h1:BHKOc1m5wm8WwQkMqYBoo4vNxhmF7xg8+xhG8L+Cy3M=
 gopkg.in/olivere/elastic.v6 v6.2.35/go.mod h1:2cTT8Z+/LcArSWpCgvZqBgt3VOqXiy7v00w12Lz8bd4=
 gopkg.in/olivere/elastic.v6 v6.2.37/go.mod h1:2cTT8Z+/LcArSWpCgvZqBgt3VOqXiy7v00w12Lz8bd4=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
diff --git a/vendor/gopkg.in/olahol/melody.v1/.gitignore b/vendor/github.com/olahol/melody/.gitignore
similarity index 100%
rename from vendor/gopkg.in/olahol/melody.v1/.gitignore
rename to vendor/github.com/olahol/melody/.gitignore
diff --git a/vendor/gopkg.in/olahol/melody.v1/CHANGELOG.md b/vendor/github.com/olahol/melody/CHANGELOG.md
similarity index 79%
rename from vendor/gopkg.in/olahol/melody.v1/CHANGELOG.md
rename to vendor/github.com/olahol/melody/CHANGELOG.md
index ff511ddd..e0b19412 100644
--- a/vendor/gopkg.in/olahol/melody.v1/CHANGELOG.md
+++ b/vendor/github.com/olahol/melody/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2022-09-12 (v1.1.0)
+
+* Create Go module.
+* Update examples.
+* Fix concurrent panic (PR-65).
+* Add `Sessions` to get all sessions (PR-53).
+* Add `LocalAddr` and `RemoteAddr` (PR-55).
+
 ## 2017-05-18
 
 * Fix `HandleSentMessageBinary`.
diff --git a/vendor/gopkg.in/olahol/melody.v1/LICENSE b/vendor/github.com/olahol/melody/LICENSE
similarity index 100%
rename from vendor/gopkg.in/olahol/melody.v1/LICENSE
rename to vendor/github.com/olahol/melody/LICENSE
diff --git a/vendor/github.com/olahol/melody/README.md b/vendor/github.com/olahol/melody/README.md
new file mode 100644
index 00000000..53196b44
--- /dev/null
+++ b/vendor/github.com/olahol/melody/README.md
@@ -0,0 +1,157 @@
+# melody
+
+![Build Status](https://github.com/olahol/melody/actions/workflows/test.yml/badge.svg)
+[![Codecov](https://img.shields.io/codecov/c/github/olahol/melody)](https://app.codecov.io/github/olahol/melody)
+[![Go Report Card](https://goreportcard.com/badge/github.com/olahol/melody)](https://goreportcard.com/report/github.com/olahol/melody)
+[![GoDoc](https://godoc.org/github.com/olahol/melody?status.svg)](https://godoc.org/github.com/olahol/melody)
+
+> :notes: Minimalist websocket framework for Go.
+
+Melody is websocket framework based on [github.com/gorilla/websocket](https://github.com/gorilla/websocket)
+that abstracts away the tedious parts of handling websockets. It gets out of
+your way so you can write real-time apps. Features include:
+
+* [x] Clear and easy interface similar to `net/http` or Gin.
+* [x] A simple way to broadcast to all or selected connected sessions.
+* [x] Message buffers making concurrent writing safe.
+* [x] Automatic handling of sending ping/pong heartbeats that timeout broken sessions.
+* [x] Store data on sessions.
+
+## Install
+
+```bash
+go get github.com/olahol/melody
+```
+
+## [Example: chat](https://github.com/olahol/melody/tree/master/examples/chat)
+
+[![Chat](https://cdn.rawgit.com/olahol/melody/master/examples/chat/demo.gif "Demo")](https://github.com/olahol/melody/tree/master/examples/chat)
+
+```go
+package main
+
+import (
+	"net/http"
+
+	"github.com/olahol/melody"
+)
+
+func main() {
+	m := melody.New()
+
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		http.ServeFile(w, r, "index.html")
+	})
+
+	http.HandleFunc("/ws", func(w http.ResponseWriter, r *http.Request) {
+		m.HandleRequest(w, r)
+	})
+
+	m.HandleMessage(func(s *melody.Session, msg []byte) {
+		m.Broadcast(msg)
+	})
+
+	http.ListenAndServe(":5000", nil)
+}
+```
+
+## [Example: gophers](https://github.com/olahol/melody/tree/master/examples/gophers)
+
+[![Gophers](https://cdn.rawgit.com/olahol/melody/master/examples/gophers/demo.gif "Demo")](https://github.com/olahol/melody/tree/master/examples/gophers)
+
+```go
+package main
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/google/uuid"
+	"github.com/olahol/melody"
+)
+
+type GopherInfo struct {
+	ID, X, Y string
+}
+
+func main() {
+	m := melody.New()
+
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		http.ServeFile(w, r, "index.html")
+	})
+
+	http.HandleFunc("/ws", func(w http.ResponseWriter, r *http.Request) {
+		m.HandleRequest(w, r)
+	})
+
+	m.HandleConnect(func(s *melody.Session) {
+		ss, _ := m.Sessions()
+
+		for _, o := range ss {
+			value, exists := o.Get("info")
+
+			if !exists {
+				continue
+			}
+
+			info := value.(*GopherInfo)
+
+			s.Write([]byte("set " + info.ID + " " + info.X + " " + info.Y))
+		}
+
+		id := uuid.NewString()
+		s.Set("info", &GopherInfo{id, "0", "0"})
+
+		s.Write([]byte("iam " + id))
+	})
+
+	m.HandleDisconnect(func(s *melody.Session) {
+		value, exists := s.Get("info")
+
+		if !exists {
+			return
+		}
+
+		info := value.(*GopherInfo)
+
+		m.BroadcastOthers([]byte("dis "+info.ID), s)
+	})
+
+	m.HandleMessage(func(s *melody.Session, msg []byte) {
+		p := strings.Split(string(msg), " ")
+		value, exists := s.Get("info")
+
+		if len(p) != 2 || !exists {
+			return
+		}
+
+		info := value.(*GopherInfo)
+		info.X = p[0]
+		info.Y = p[1]
+
+		m.BroadcastOthers([]byte("set "+info.ID+" "+info.X+" "+info.Y), s)
+	})
+
+	http.ListenAndServe(":5000", nil)
+}
+```
+
+### [More examples](https://github.com/olahol/melody/tree/master/examples)
+
+## [Documentation](https://godoc.org/github.com/olahol/melody)
+
+## Contributors
+
+<a href="https://github.com/olahol/melody/graphs/contributors">
+	<img src="https://contrib.rocks/image?repo=olahol/melody" />
+</a>
+
+## FAQ
+
+If you are getting a `403` when trying  to connect to your websocket you can [change allow all origin hosts](http://godoc.org/github.com/gorilla/websocket#hdr-Origin_Considerations):
+
+```go
+m := melody.New()
+m.Upgrader.CheckOrigin = func(r *http.Request) bool { return true }
+```
diff --git a/vendor/gopkg.in/olahol/melody.v1/config.go b/vendor/github.com/olahol/melody/config.go
similarity index 100%
rename from vendor/gopkg.in/olahol/melody.v1/config.go
rename to vendor/github.com/olahol/melody/config.go
diff --git a/vendor/gopkg.in/olahol/melody.v1/doc.go b/vendor/github.com/olahol/melody/doc.go
similarity index 75%
rename from vendor/gopkg.in/olahol/melody.v1/doc.go
rename to vendor/github.com/olahol/melody/doc.go
index a65aa634..b54b6d4a 100644
--- a/vendor/gopkg.in/olahol/melody.v1/doc.go
+++ b/vendor/github.com/olahol/melody/doc.go
@@ -9,14 +9,14 @@
 // A broadcasting echo server:
 //
 //  func main() {
-//  	r := gin.Default()
 //  	m := melody.New()
-//  	r.GET("/ws", func(c *gin.Context) {
-//  		m.HandleRequest(c.Writer, c.Request)
+//  	http.HandleFunc("/ws", func(w http.ResponseWriter, r *http.Request) {
+//  		m.HandleRequest(w, r)
 //  	})
 //  	m.HandleMessage(func(s *melody.Session, msg []byte) {
 //  		m.Broadcast(msg)
 //  	})
-//  	r.Run(":5000")
+//  	http.ListenAndServe(":5000", nil)
 //  }
+
 package melody
diff --git a/vendor/gopkg.in/olahol/melody.v1/envelope.go b/vendor/github.com/olahol/melody/envelope.go
similarity index 100%
rename from vendor/gopkg.in/olahol/melody.v1/envelope.go
rename to vendor/github.com/olahol/melody/envelope.go
diff --git a/vendor/github.com/olahol/melody/errors.go b/vendor/github.com/olahol/melody/errors.go
new file mode 100644
index 00000000..d8be6157
--- /dev/null
+++ b/vendor/github.com/olahol/melody/errors.go
@@ -0,0 +1,10 @@
+package melody
+
+import "errors"
+
+var (
+	ErrClosed            = errors.New("melody instance is closed")
+	ErrSessionClosed     = errors.New("session is closed")
+	ErrWriteClosed       = errors.New("tried to write to closed a session")
+	ErrMessageBufferFull = errors.New("session message buffer is full")
+)
diff --git a/vendor/gopkg.in/olahol/melody.v1/hub.go b/vendor/github.com/olahol/melody/hub.go
similarity index 88%
rename from vendor/gopkg.in/olahol/melody.v1/hub.go
rename to vendor/github.com/olahol/melody/hub.go
index edc6337d..4a8cffac 100644
--- a/vendor/gopkg.in/olahol/melody.v1/hub.go
+++ b/vendor/github.com/olahol/melody/hub.go
@@ -78,3 +78,14 @@ func (h *hub) len() int {
 
 	return len(h.sessions)
 }
+
+func (h *hub) all() []*Session {
+	h.rwmutex.RLock()
+	defer h.rwmutex.RUnlock()
+
+	s := make([]*Session, 0, len(h.sessions))
+	for k := range h.sessions {
+		s = append(s, k)
+	}
+	return s
+}
diff --git a/vendor/gopkg.in/olahol/melody.v1/melody.go b/vendor/github.com/olahol/melody/melody.go
similarity index 93%
rename from vendor/gopkg.in/olahol/melody.v1/melody.go
rename to vendor/github.com/olahol/melody/melody.go
index 6e416b15..ca2c5dd1 100644
--- a/vendor/gopkg.in/olahol/melody.v1/melody.go
+++ b/vendor/github.com/olahol/melody/melody.go
@@ -1,7 +1,6 @@
 package melody
 
 import (
-	"errors"
 	"net/http"
 	"sync"
 
@@ -164,23 +163,24 @@ func (m *Melody) HandleRequest(w http.ResponseWriter, r *http.Request) error {
 // HandleRequestWithKeys does the same as HandleRequest but populates session.Keys with keys.
 func (m *Melody) HandleRequestWithKeys(w http.ResponseWriter, r *http.Request, keys map[string]interface{}) error {
 	if m.hub.closed() {
-		return errors.New("melody instance is closed")
+		return ErrClosed
 	}
 
-	conn, err := m.Upgrader.Upgrade(w, r, nil)
+	conn, err := m.Upgrader.Upgrade(w, r, w.Header())
 
 	if err != nil {
 		return err
 	}
 
 	session := &Session{
-		Request: r,
-		Keys:    keys,
-		conn:    conn,
-		output:  make(chan *envelope, m.Config.MessageBufferSize),
-		melody:  m,
-		open:    true,
-		rwmutex: &sync.RWMutex{},
+		Request:    r,
+		Keys:       keys,
+		conn:       conn,
+		output:     make(chan *envelope, m.Config.MessageBufferSize),
+		outputDone: make(chan struct{}),
+		melody:     m,
+		open:       true,
+		rwmutex:    &sync.RWMutex{},
 	}
 
 	m.hub.register <- session
@@ -205,7 +205,7 @@ func (m *Melody) HandleRequestWithKeys(w http.ResponseWriter, r *http.Request, k
 // Broadcast broadcasts a text message to all sessions.
 func (m *Melody) Broadcast(msg []byte) error {
 	if m.hub.closed() {
-		return errors.New("melody instance is closed")
+		return ErrClosed
 	}
 
 	message := &envelope{t: websocket.TextMessage, msg: msg}
@@ -217,7 +217,7 @@ func (m *Melody) Broadcast(msg []byte) error {
 // BroadcastFilter broadcasts a text message to all sessions that fn returns true for.
 func (m *Melody) BroadcastFilter(msg []byte, fn func(*Session) bool) error {
 	if m.hub.closed() {
-		return errors.New("melody instance is closed")
+		return ErrClosed
 	}
 
 	message := &envelope{t: websocket.TextMessage, msg: msg, filter: fn}
@@ -246,7 +246,7 @@ func (m *Melody) BroadcastMultiple(msg []byte, sessions []*Session) error {
 // BroadcastBinary broadcasts a binary message to all sessions.
 func (m *Melody) BroadcastBinary(msg []byte) error {
 	if m.hub.closed() {
-		return errors.New("melody instance is closed")
+		return ErrClosed
 	}
 
 	message := &envelope{t: websocket.BinaryMessage, msg: msg}
@@ -258,7 +258,7 @@ func (m *Melody) BroadcastBinary(msg []byte) error {
 // BroadcastBinaryFilter broadcasts a binary message to all sessions that fn returns true for.
 func (m *Melody) BroadcastBinaryFilter(msg []byte, fn func(*Session) bool) error {
 	if m.hub.closed() {
-		return errors.New("melody instance is closed")
+		return ErrClosed
 	}
 
 	message := &envelope{t: websocket.BinaryMessage, msg: msg, filter: fn}
@@ -274,10 +274,18 @@ func (m *Melody) BroadcastBinaryOthers(msg []byte, s *Session) error {
 	})
 }
 
+// Sessions returns all sessions. An error is returned if the melody session is closed.
+func (m *Melody) Sessions() ([]*Session, error) {
+	if m.hub.closed() {
+		return nil, ErrClosed
+	}
+	return m.hub.all(), nil
+}
+
 // Close closes the melody instance and all connected sessions.
 func (m *Melody) Close() error {
 	if m.hub.closed() {
-		return errors.New("melody instance is already closed")
+		return ErrClosed
 	}
 
 	m.hub.exit <- &envelope{t: websocket.CloseMessage, msg: []byte{}}
@@ -289,7 +297,7 @@ func (m *Melody) Close() error {
 // Use the FormatCloseMessage function to format a proper close message payload.
 func (m *Melody) CloseWithMsg(msg []byte) error {
 	if m.hub.closed() {
-		return errors.New("melody instance is already closed")
+		return ErrClosed
 	}
 
 	m.hub.exit <- &envelope{t: websocket.CloseMessage, msg: msg}
diff --git a/vendor/gopkg.in/olahol/melody.v1/session.go b/vendor/github.com/olahol/melody/session.go
similarity index 78%
rename from vendor/gopkg.in/olahol/melody.v1/session.go
rename to vendor/github.com/olahol/melody/session.go
index 3997cefe..879a724d 100644
--- a/vendor/gopkg.in/olahol/melody.v1/session.go
+++ b/vendor/github.com/olahol/melody/session.go
@@ -1,7 +1,7 @@
 package melody
 
 import (
-	"errors"
+	"net"
 	"net/http"
 	"sync"
 	"time"
@@ -11,31 +11,32 @@ import (
 
 // Session wrapper around websocket connections.
 type Session struct {
-	Request *http.Request
-	Keys    map[string]interface{}
-	conn    *websocket.Conn
-	output  chan *envelope
-	melody  *Melody
-	open    bool
-	rwmutex *sync.RWMutex
+	Request    *http.Request
+	Keys       map[string]interface{}
+	conn       *websocket.Conn
+	output     chan *envelope
+	outputDone chan struct{}
+	melody     *Melody
+	open       bool
+	rwmutex    *sync.RWMutex
 }
 
 func (s *Session) writeMessage(message *envelope) {
 	if s.closed() {
-		s.melody.errorHandler(s, errors.New("tried to write to closed a session"))
+		s.melody.errorHandler(s, ErrWriteClosed)
 		return
 	}
 
 	select {
 	case s.output <- message:
 	default:
-		s.melody.errorHandler(s, errors.New("session message buffer is full"))
+		s.melody.errorHandler(s, ErrMessageBufferFull)
 	}
 }
 
 func (s *Session) writeRaw(message *envelope) error {
 	if s.closed() {
-		return errors.New("tried to write to a closed session")
+		return ErrWriteClosed
 	}
 
 	s.conn.SetWriteDeadline(time.Now().Add(s.melody.Config.WriteWait))
@@ -56,12 +57,13 @@ func (s *Session) closed() bool {
 }
 
 func (s *Session) close() {
-	if !s.closed() {
-		s.rwmutex.Lock()
-		s.open = false
+	s.rwmutex.Lock()
+	open := s.open
+	s.open = false
+	s.rwmutex.Unlock()
+	if open {
 		s.conn.Close()
-		close(s.output)
-		s.rwmutex.Unlock()
+		close(s.outputDone)
 	}
 }
 
@@ -76,11 +78,7 @@ func (s *Session) writePump() {
 loop:
 	for {
 		select {
-		case msg, ok := <-s.output:
-			if !ok {
-				break loop
-			}
-
+		case msg := <-s.output:
 			err := s.writeRaw(msg)
 
 			if err != nil {
@@ -101,8 +99,14 @@ loop:
 			}
 		case <-ticker.C:
 			s.ping()
+		case _, ok := <-s.outputDone:
+			if !ok {
+				break loop
+			}
 		}
 	}
+
+	s.close()
 }
 
 func (s *Session) readPump() {
@@ -142,7 +146,7 @@ func (s *Session) readPump() {
 // Write writes message to session.
 func (s *Session) Write(msg []byte) error {
 	if s.closed() {
-		return errors.New("session is closed")
+		return ErrSessionClosed
 	}
 
 	s.writeMessage(&envelope{t: websocket.TextMessage, msg: msg})
@@ -153,7 +157,7 @@ func (s *Session) Write(msg []byte) error {
 // WriteBinary writes a binary message to session.
 func (s *Session) WriteBinary(msg []byte) error {
 	if s.closed() {
-		return errors.New("session is closed")
+		return ErrSessionClosed
 	}
 
 	s.writeMessage(&envelope{t: websocket.BinaryMessage, msg: msg})
@@ -164,7 +168,7 @@ func (s *Session) WriteBinary(msg []byte) error {
 // Close closes session.
 func (s *Session) Close() error {
 	if s.closed() {
-		return errors.New("session is already closed")
+		return ErrSessionClosed
 	}
 
 	s.writeMessage(&envelope{t: websocket.CloseMessage, msg: []byte{}})
@@ -176,7 +180,7 @@ func (s *Session) Close() error {
 // Use the FormatCloseMessage function to format a proper close message payload.
 func (s *Session) CloseWithMsg(msg []byte) error {
 	if s.closed() {
-		return errors.New("session is already closed")
+		return ErrSessionClosed
 	}
 
 	s.writeMessage(&envelope{t: websocket.CloseMessage, msg: msg})
@@ -184,9 +188,12 @@ func (s *Session) CloseWithMsg(msg []byte) error {
 	return nil
 }
 
-// Set is used to store a new key/value pair exclusivelly for this session.
+// Set is used to store a new key/value pair exclusively for this session.
 // It also lazy initializes s.Keys if it was not used previously.
 func (s *Session) Set(key string, value interface{}) {
+	s.rwmutex.Lock()
+	defer s.rwmutex.Unlock()
+
 	if s.Keys == nil {
 		s.Keys = make(map[string]interface{})
 	}
@@ -197,6 +204,9 @@ func (s *Session) Set(key string, value interface{}) {
 // Get returns the value for the given key, ie: (value, true).
 // If the value does not exists it returns (nil, false)
 func (s *Session) Get(key string) (value interface{}, exists bool) {
+	s.rwmutex.RLock()
+	defer s.rwmutex.RUnlock()
+
 	if s.Keys != nil {
 		value, exists = s.Keys[key]
 	}
@@ -217,3 +227,13 @@ func (s *Session) MustGet(key string) interface{} {
 func (s *Session) IsClosed() bool {
 	return s.closed()
 }
+
+// LocalAddr returns the local addr of the connection.
+func (s *Session) LocalAddr() net.Addr {
+	return s.conn.LocalAddr()
+}
+
+// RemoteAddr returns the remote addr of the connection.
+func (s *Session) RemoteAddr() net.Addr {
+	return s.conn.RemoteAddr()
+}
diff --git a/vendor/gopkg.in/olahol/melody.v1/.travis.yml b/vendor/gopkg.in/olahol/melody.v1/.travis.yml
deleted file mode 100644
index f1a141cd..00000000
--- a/vendor/gopkg.in/olahol/melody.v1/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-language: go
-sudo: required
-go:
-- 1.6
-- 1.7
-- 1.8
-install:
-  - go get github.com/gorilla/websocket
-script:
-  - go test
diff --git a/vendor/gopkg.in/olahol/melody.v1/README.md b/vendor/gopkg.in/olahol/melody.v1/README.md
deleted file mode 100644
index 67e3ab50..00000000
--- a/vendor/gopkg.in/olahol/melody.v1/README.md
+++ /dev/null
@@ -1,185 +0,0 @@
-# melody
-
-[![Build Status](https://travis-ci.org/olahol/melody.svg)](https://travis-ci.org/olahol/melody)
-[![Coverage Status](https://img.shields.io/coveralls/olahol/melody.svg?style=flat)](https://coveralls.io/r/olahol/melody)
-[![GoDoc](https://godoc.org/github.com/olahol/melody?status.svg)](https://godoc.org/github.com/olahol/melody)
-
-> :notes: Minimalist websocket framework for Go.
-
-Melody is websocket framework based on [github.com/gorilla/websocket](https://github.com/gorilla/websocket)
-that abstracts away the tedious parts of handling websockets. It gets out of
-your way so you can write real-time apps. Features include:
-
-* [x] Clear and easy interface similar to `net/http` or Gin.
-* [x] A simple way to broadcast to all or selected connected sessions.
-* [x] Message buffers making concurrent writing safe.
-* [x] Automatic handling of ping/pong and session timeouts.
-* [x] Store data on sessions.
-
-## Install
-
-```bash
-go get gopkg.in/olahol/melody.v1
-```
-
-## [Example: chat](https://github.com/olahol/melody/tree/master/examples/chat)
-
-[![Chat](https://cdn.rawgit.com/olahol/melody/master/examples/chat/demo.gif "Demo")](https://github.com/olahol/melody/tree/master/examples/chat)
-
-Using [Gin](https://github.com/gin-gonic/gin):
-```go
-package main
-
-import (
-	"github.com/gin-gonic/gin"
-	"gopkg.in/olahol/melody.v1"
-	"net/http"
-)
-
-func main() {
-	r := gin.Default()
-	m := melody.New()
-
-	r.GET("/", func(c *gin.Context) {
-		http.ServeFile(c.Writer, c.Request, "index.html")
-	})
-
-	r.GET("/ws", func(c *gin.Context) {
-		m.HandleRequest(c.Writer, c.Request)
-	})
-
-	m.HandleMessage(func(s *melody.Session, msg []byte) {
-		m.Broadcast(msg)
-	})
-
-	r.Run(":5000")
-}
-```
-
-Using [Echo](https://github.com/labstack/echo):
-```go
-package main
-
-import (
-	"github.com/labstack/echo"
-	"github.com/labstack/echo/engine/standard"
-	"github.com/labstack/echo/middleware"
-	"gopkg.in/olahol/melody.v1"
-	"net/http"
-)
-
-func main() {
-	e := echo.New()
-	m := melody.New()
-
-	e.Use(middleware.Logger())
-	e.Use(middleware.Recover())
-
-	e.GET("/", func(c echo.Context) error {
-		http.ServeFile(c.Response().(*standard.Response).ResponseWriter, c.Request().(*standard.Request).Request, "index.html")
-		return nil
-	})
-
-	e.GET("/ws", func(c echo.Context) error {
-		m.HandleRequest(c.Response().(*standard.Response).ResponseWriter, c.Request().(*standard.Request).Request)
-		return nil
-	})
-
-	m.HandleMessage(func(s *melody.Session, msg []byte) {
-		m.Broadcast(msg)
-	})
-
-	e.Run(standard.New(":5000"))
-}
-```
-
-## [Example: gophers](https://github.com/olahol/melody/tree/master/examples/gophers)
-
-[![Gophers](https://cdn.rawgit.com/olahol/melody/master/examples/gophers/demo.gif "Demo")](https://github.com/olahol/melody/tree/master/examples/gophers)
-
-```go
-package main
-
-import (
-	"github.com/gin-gonic/gin"
-	"gopkg.in/olahol/melody.v1"
-	"net/http"
-	"strconv"
-	"strings"
-	"sync"
-)
-
-type GopherInfo struct {
-	ID, X, Y string
-}
-
-func main() {
-	router := gin.Default()
-	mrouter := melody.New()
-	gophers := make(map[*melody.Session]*GopherInfo)
-	lock := new(sync.Mutex)
-	counter := 0
-
-	router.GET("/", func(c *gin.Context) {
-		http.ServeFile(c.Writer, c.Request, "index.html")
-	})
-
-	router.GET("/ws", func(c *gin.Context) {
-		mrouter.HandleRequest(c.Writer, c.Request)
-	})
-
-	mrouter.HandleConnect(func(s *melody.Session) {
-		lock.Lock()
-		for _, info := range gophers {
-			s.Write([]byte("set " + info.ID + " " + info.X + " " + info.Y))
-		}
-		gophers[s] = &GopherInfo{strconv.Itoa(counter), "0", "0"}
-		s.Write([]byte("iam " + gophers[s].ID))
-		counter += 1
-		lock.Unlock()
-	})
-
-	mrouter.HandleDisconnect(func(s *melody.Session) {
-		lock.Lock()
-		mrouter.BroadcastOthers([]byte("dis "+gophers[s].ID), s)
-		delete(gophers, s)
-		lock.Unlock()
-	})
-
-	mrouter.HandleMessage(func(s *melody.Session, msg []byte) {
-		p := strings.Split(string(msg), " ")
-		lock.Lock()
-		info := gophers[s]
-		if len(p) == 2 {
-			info.X = p[0]
-			info.Y = p[1]
-			mrouter.BroadcastOthers([]byte("set "+info.ID+" "+info.X+" "+info.Y), s)
-		}
-		lock.Unlock()
-	})
-
-	router.Run(":5000")
-}
-```
-
-### [More examples](https://github.com/olahol/melody/tree/master/examples)
-
-## [Documentation](https://godoc.org/github.com/olahol/melody)
-
-## Contributors
-
-* Ola Holmström (@olahol)
-* Shogo Iwano (@shiwano)
-* Matt Caldwell (@mattcaldwell)
-* Heikki Uljas (@huljas)
-* Robbie Trencheny (@robbiet480)
-* yangjinecho (@yangjinecho)
-
-## FAQ
-
-If you are getting a `403` when trying  to connect to your websocket you can [change allow all origin hosts](http://godoc.org/github.com/gorilla/websocket#hdr-Origin_Considerations):
-
-```go
-m := melody.New()
-m.Upgrader.CheckOrigin = func(r *http.Request) bool { return true }
-```
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 41e2f2e0..1b9fa5bf 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -333,6 +333,9 @@ github.com/mrexodia/wray
 # github.com/nelsonken/gomf v0.0.0-20190423072027-c65cc0469e94
 ## explicit; go 1.12
 github.com/nelsonken/gomf
+# github.com/olahol/melody v1.1.2
+## explicit; go 1.19
+github.com/olahol/melody
 # github.com/opentracing/opentracing-go v1.2.0
 ## explicit; go 1.14
 github.com/opentracing/opentracing-go
@@ -698,9 +701,6 @@ gopkg.in/ini.v1
 # gopkg.in/natefinch/lumberjack.v2 v2.0.0
 ## explicit
 gopkg.in/natefinch/lumberjack.v2
-# gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376
-## explicit
-gopkg.in/olahol/melody.v1
 # gopkg.in/yaml.v2 v2.4.0
 ## explicit; go 1.15
 gopkg.in/yaml.v2

From f345eeae55232ddd7cf800c8303b4298fb1b8c52 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sat, 11 Mar 2023 18:18:24 +0100
Subject: [PATCH 18/25] Set correct loglevel (whatsapp). Fixes #1980 (#2013)

---
 bridge/whatsappmulti/handlers.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridge/whatsappmulti/handlers.go b/bridge/whatsappmulti/handlers.go
index d99c6727..ae825f75 100644
--- a/bridge/whatsappmulti/handlers.go
+++ b/bridge/whatsappmulti/handlers.go
@@ -31,7 +31,7 @@ func (b *Bwhatsapp) handleMessage(message *events.Message) {
 		return
 	}
 
-	b.Log.Infof("Receiving message %#v", msg)
+	b.Log.Debugf("Receiving message %#v", msg)
 
 	switch {
 	case msg.Conversation != nil || msg.ExtendedTextMessage != nil:

From 8587fa85854b8ba14a171edf1c9c7e8f066eb6fb Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sat, 11 Mar 2023 18:55:29 +0100
Subject: [PATCH 19/25] Fix possible panic in mattermost. (mattermost) Fixes
 #1947 (#2014)

---
 bridge/mattermost/mattermost.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index 2b44dcfa..be24ba17 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -161,7 +161,7 @@ func (b *Bmattermost) Send(msg config.Message) (string, error) {
 		if err != nil {
 			b.Log.Errorf("getting post %s failed: %s", msg.ParentID, err)
 		}
-		if post.RootId != "" {
+		if post != nil && post.RootId != "" {
 			msg.ParentID = post.RootId
 		}
 	}

From 0917e173831e20f54fe08b1bb6442a0fdeb07776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Asiel=20D=C3=ADaz=20Ben=C3=ADtez?= <adbenitez@nauta.cu>
Date: Sat, 11 Mar 2023 16:34:27 -0500
Subject: [PATCH 20/25] Allow to send files in Extra via /api/message (api)
 (#1993)

---
 bridge/api/api.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bridge/api/api.go b/bridge/api/api.go
index 9e7679d3..c0bef0e2 100644
--- a/bridge/api/api.go
+++ b/bridge/api/api.go
@@ -1,6 +1,7 @@
 package api
 
 import (
+	"encoding/base64"
 	"encoding/json"
 	"net/http"
 	"sync"
@@ -12,6 +13,7 @@ import (
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
+	"github.com/mitchellh/mapstructure"
 	ring "github.com/zfjagann/golang-ring"
 )
 
@@ -137,6 +139,15 @@ func (b *API) handlePostMessage(c echo.Context) error {
 	message.Account = b.Account
 	message.ID = ""
 	message.Timestamp = time.Now()
+	for i, f := range message.Extra["file"] {
+		fi := config.FileInfo{}
+		mapstructure.Decode(f.(map[string]interface{}), &fi)
+		var data []byte
+		// mapstructure doesn't decode base64 into []byte, so it must be done manually for fi.Data
+		data, _ = base64.StdEncoding.DecodeString(f.(map[string]interface{})["Data"].(string))
+		fi.Data = &data
+		message.Extra["file"][i] = fi
+	}
 	b.Log.Debugf("Sending message from %s on %s to gateway", message.Username, "api")
 	b.Remote <- message
 	return c.JSON(http.StatusOK, message)

From c2b8e298d8c0a15a0e6489b658efe58030a18164 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sat, 11 Mar 2023 23:10:41 +0100
Subject: [PATCH 21/25] Add extra error checking for fileinfo (api) (#2015)

---
 bridge/api/api.go | 28 +++++++++++++++++++++++++---
 go.mod            |  2 +-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/bridge/api/api.go b/bridge/api/api.go
index c0bef0e2..cb348f16 100644
--- a/bridge/api/api.go
+++ b/bridge/api/api.go
@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"net/http"
+	"strings"
 	"sync"
 	"time"
 
@@ -139,12 +140,33 @@ func (b *API) handlePostMessage(c echo.Context) error {
 	message.Account = b.Account
 	message.ID = ""
 	message.Timestamp = time.Now()
+
+	var (
+		fm map[string]interface{}
+		ds string
+		ok bool
+	)
+
 	for i, f := range message.Extra["file"] {
 		fi := config.FileInfo{}
-		mapstructure.Decode(f.(map[string]interface{}), &fi)
-		var data []byte
+		if fm, ok = f.(map[string]interface{}); !ok {
+			return echo.NewHTTPError(http.StatusInternalServerError, "invalid format for extra")
+		}
+		err := mapstructure.Decode(fm, &fi)
+		if err != nil {
+			if !strings.Contains(err.Error(), "got string") {
+				return err
+			}
+		}
 		// mapstructure doesn't decode base64 into []byte, so it must be done manually for fi.Data
-		data, _ = base64.StdEncoding.DecodeString(f.(map[string]interface{})["Data"].(string))
+		if ds, ok = fm["Data"].(string); !ok {
+			return echo.NewHTTPError(http.StatusInternalServerError, "invalid format for data")
+		}
+
+		data, err := base64.StdEncoding.DecodeString(ds)
+		if err != nil {
+			return err
+		}
 		fi.Data = &data
 		message.Extra["file"][i] = fi
 	}
diff --git a/go.mod b/go.mod
index e2379e41..91adf773 100644
--- a/go.mod
+++ b/go.mod
@@ -33,6 +33,7 @@ require (
 	github.com/mattermost/mattermost-server/v6 v6.7.2
 	github.com/mattn/godown v0.0.1
 	github.com/mdp/qrterminal v1.0.1
+	github.com/mitchellh/mapstructure v1.5.0
 	github.com/nelsonken/gomf v0.0.0-20190423072027-c65cc0469e94
 	github.com/olahol/melody v1.1.2
 	github.com/paulrosania/go-charset v0.0.0-20190326053356-55c9d7a5834c
@@ -96,7 +97,6 @@ require (
 	github.com/minio/minio-go/v7 v7.0.24 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/monaco-io/request v1.0.5 // indirect

From 601f48a50ea31a9631011766c680ecef931ddafc Mon Sep 17 00:00:00 2001
From: Thom Dickson <td3of4@gmail.com>
Date: Tue, 14 Mar 2023 18:03:04 -0400
Subject: [PATCH 22/25] Add support for Telegram topics (telegram) (#1942)

Topics are surfaced by appending /<topic-id> to the channel setting for the gateway.
An example for the topic with ID of 16 would be:

```
[[gateway.inout]]
account="telegram.mytelegram"
channel="-100xxxxxxxxxx/16"
```
---
 bridge/telegram/handlers.go                   |  27 +-
 bridge/telegram/telegram.go                   |  59 +-
 go.mod                                        |   2 +-
 go.sum                                        |   4 +-
 .../telegram-bot-api/v6}/.gitignore           |   1 +
 .../telegram-bot-api/v6}/LICENSE.txt          |   0
 .../telegram-bot-api/v6}/README.md            |   4 +-
 .../telegram-bot-api/v6}/book.toml            |   0
 .../telegram-bot-api/v6}/bot.go               |  40 +-
 .../telegram-bot-api/v6}/configs.go           | 502 ++++++++++++-
 .../telegram-bot-api/v6}/helpers.go           |  66 +-
 .../telegram-bot-api/v6}/log.go               |   0
 .../telegram-bot-api/v6}/params.go            |   7 +
 .../telegram-bot-api/v6}/passport.go          |   0
 .../telegram-bot-api/v6}/types.go             | 669 ++++++++++++++++--
 vendor/modules.txt                            |   6 +-
 16 files changed, 1266 insertions(+), 121 deletions(-)
 rename vendor/github.com/{go-telegram-bot-api/telegram-bot-api/v5 => matterbridge/telegram-bot-api/v6}/.gitignore (77%)
 rename vendor/github.com/{go-telegram-bot-api/telegram-bot-api/v5 => matterbridge/telegram-bot-api/v6}/LICENSE.txt (100%)
 rename vendor/github.com/{go-telegram-bot-api/telegram-bot-api/v5 => matterbridge/telegram-bot-api/v6}/README.md (96%)
 rename vendor/github.com/{go-telegram-bot-api/telegram-bot-api/v5 => matterbridge/telegram-bot-api/v6}/book.toml (100%)
 rename vendor/github.com/{go-telegram-bot-api/telegram-bot-api/v5 => matterbridge/telegram-bot-api/v6}/bot.go (94%)
 rename vendor/github.com/{go-telegram-bot-api/telegram-bot-api/v5 => matterbridge/telegram-bot-api/v6}/configs.go (82%)
 rename vendor/github.com/{go-telegram-bot-api/telegram-bot-api/v5 => matterbridge/telegram-bot-api/v6}/helpers.go (94%)
 rename vendor/github.com/{go-telegram-bot-api/telegram-bot-api/v5 => matterbridge/telegram-bot-api/v6}/log.go (100%)
 rename vendor/github.com/{go-telegram-bot-api/telegram-bot-api/v5 => matterbridge/telegram-bot-api/v6}/params.go (93%)
 rename vendor/github.com/{go-telegram-bot-api/telegram-bot-api/v5 => matterbridge/telegram-bot-api/v6}/passport.go (100%)
 rename vendor/github.com/{go-telegram-bot-api/telegram-bot-api/v5 => matterbridge/telegram-bot-api/v6}/types.go (82%)

diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go
index 5ffb1eca..985397ef 100644
--- a/bridge/telegram/handlers.go
+++ b/bridge/telegram/handlers.go
@@ -11,7 +11,7 @@ import (
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/bridge/helper"
 	"github.com/davecgh/go-spew/spew"
-	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+	tgbotapi "github.com/matterbridge/telegram-bot-api/v6"
 )
 
 func (b *Btelegram) handleUpdate(rmsg *config.Message, message, posted, edited *tgbotapi.Message) *tgbotapi.Message {
@@ -20,6 +20,11 @@ func (b *Btelegram) handleUpdate(rmsg *config.Message, message, posted, edited *
 		if posted.Text == "/chatId" {
 			chatID := strconv.FormatInt(posted.Chat.ID, 10)
 
+			// Handle chat topics
+			if posted.IsTopicMessage {
+				chatID = chatID + "/" + strconv.Itoa(posted.MessageThreadID)
+			}
+
 			_, err := b.Send(config.Message{
 				Channel: chatID,
 				Text:    fmt.Sprintf("ID of this chat: %s", chatID),
@@ -91,7 +96,8 @@ func (b *Btelegram) handleForwarded(rmsg *config.Message, message *tgbotapi.Mess
 
 // handleQuoting handles quoting of previous messages
 func (b *Btelegram) handleQuoting(rmsg *config.Message, message *tgbotapi.Message) {
-	if message.ReplyToMessage != nil {
+	// Used to check if the message was a reply to the root topic
+	if message.ReplyToMessage != nil && !(message.ReplyToMessage.MessageID == message.MessageThreadID) { //nolint:nestif
 		usernameReply := ""
 		if message.ReplyToMessage.From != nil {
 			if b.GetBool("UseFirstName") {
@@ -211,9 +217,14 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
 		// set the ID's from the channel or group message
 		rmsg.ID = strconv.Itoa(message.MessageID)
 		rmsg.Channel = strconv.FormatInt(message.Chat.ID, 10)
+		if message.MessageThreadID != 0 {
+			rmsg.Channel += "/" + strconv.Itoa(message.MessageThreadID)
+		}
 
 		// preserve threading from telegram reply
-		if message.ReplyToMessage != nil {
+		if message.ReplyToMessage != nil &&
+			// Used to check if the message was a reply to the root topic
+			!(message.ReplyToMessage.MessageID == message.MessageThreadID) {
 			rmsg.ParentID = strconv.Itoa(message.ReplyToMessage.MessageID)
 		}
 
@@ -326,12 +337,12 @@ func (b *Btelegram) maybeConvertWebp(name *string, data *[]byte) {
 
 // handleDownloadFile handles file download
 func (b *Btelegram) handleDownload(rmsg *config.Message, message *tgbotapi.Message) error {
-	size := 0
+	size := int64(0)
 	var url, name, text string
 	switch {
 	case message.Sticker != nil:
 		text, name, url = b.getDownloadInfo(message.Sticker.FileID, ".webp", true)
-		size = message.Sticker.FileSize
+		size = int64(message.Sticker.FileSize)
 	case message.Voice != nil:
 		text, name, url = b.getDownloadInfo(message.Voice.FileID, ".ogg", true)
 		size = message.Voice.FileSize
@@ -348,7 +359,7 @@ func (b *Btelegram) handleDownload(rmsg *config.Message, message *tgbotapi.Messa
 		text = " " + message.Document.FileName + " : " + url
 	case message.Photo != nil:
 		photos := message.Photo
-		size = photos[len(photos)-1].FileSize
+		size = int64(photos[len(photos)-1].FileSize)
 		text, name, url = b.getDownloadInfo(photos[len(photos)-1].FileID, "", true)
 	}
 
@@ -452,7 +463,7 @@ func (b *Btelegram) handleEdit(msg *config.Message, chatid int64) (string, error
 }
 
 // handleUploadFile handles native upload of files
-func (b *Btelegram) handleUploadFile(msg *config.Message, chatid int64, parentID int) (string, error) {
+func (b *Btelegram) handleUploadFile(msg *config.Message, chatid int64, threadid int, parentID int) (string, error) {
 	var media []interface{}
 	for _, f := range msg.Extra["file"] {
 		fi := f.(config.FileInfo)
@@ -502,7 +513,7 @@ func (b *Btelegram) handleUploadFile(msg *config.Message, chatid int64, parentID
 		}
 	}
 
-	return b.sendMediaFiles(msg, chatid, parentID, media)
+	return b.sendMediaFiles(msg, chatid, threadid, parentID, media)
 }
 
 func (b *Btelegram) handleQuote(message, quoteNick, quoteMessage string) string {
diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go
index 43cb818f..e7885ca3 100644
--- a/bridge/telegram/telegram.go
+++ b/bridge/telegram/telegram.go
@@ -10,7 +10,7 @@ import (
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/bridge/helper"
-	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+	tgbotapi "github.com/matterbridge/telegram-bot-api/v6"
 )
 
 const (
@@ -86,11 +86,41 @@ func TGGetParseMode(b *Btelegram, username string, text string) (textout string,
 	return textout, parsemode
 }
 
+func (b *Btelegram) getIds(channel string) (int64, int, error) {
+	var chatid int64
+	topicid := 0
+
+	// get the chatid
+	if strings.Contains(channel, "/") { //nolint:nestif
+		s := strings.Split(channel, "/")
+		if len(s) < 2 {
+			b.Log.Errorf("Invalid channel format: %#v\n", channel)
+			return 0, 0, nil
+		}
+		id, err := strconv.ParseInt(s[0], 10, 64)
+		if err != nil {
+			return 0, 0, err
+		}
+		chatid = id
+		tid, err := strconv.Atoi(s[1])
+		if err != nil {
+			return 0, 0, err
+		}
+		topicid = tid
+	} else {
+		id, err := strconv.ParseInt(channel, 10, 64)
+		if err != nil {
+			return 0, 0, err
+		}
+		chatid = id
+	}
+	return chatid, topicid, nil
+}
+
 func (b *Btelegram) Send(msg config.Message) (string, error) {
 	b.Log.Debugf("=> Receiving %#v", msg)
 
-	// get the chatid
-	chatid, err := strconv.ParseInt(msg.Channel, 10, 64)
+	chatid, topicid, err := b.getIds(msg.Channel)
 	if err != nil {
 		return "", err
 	}
@@ -123,13 +153,13 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {
 	// Upload a file if it exists
 	if msg.Extra != nil {
 		for _, rmsg := range helper.HandleExtra(&msg, b.General) {
-			if _, msgErr := b.sendMessage(chatid, rmsg.Username, rmsg.Text, parentID); msgErr != nil {
+			if _, msgErr := b.sendMessage(chatid, topicid, rmsg.Username, rmsg.Text, parentID); msgErr != nil {
 				b.Log.Errorf("sendMessage failed: %s", msgErr)
 			}
 		}
 		// check if we have files to upload (from slack, telegram or mattermost)
 		if len(msg.Extra["file"]) > 0 {
-			return b.handleUploadFile(&msg, chatid, parentID)
+			return b.handleUploadFile(&msg, chatid, topicid, parentID)
 		}
 	}
 
@@ -143,7 +173,7 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {
 	// Ignore empty text field needs for prevent double messages from whatsapp to telegram
 	// when sending media with text caption
 	if msg.Text != "" {
-		return b.sendMessage(chatid, msg.Username, msg.Text, parentID)
+		return b.sendMessage(chatid, topicid, msg.Username, msg.Text, parentID)
 	}
 
 	return "", nil
@@ -157,9 +187,12 @@ func (b *Btelegram) getFileDirectURL(id string) string {
 	return res
 }
 
-func (b *Btelegram) sendMessage(chatid int64, username, text string, parentID int) (string, error) {
+func (b *Btelegram) sendMessage(chatid int64, topicid int, username, text string, parentID int) (string, error) {
 	m := tgbotapi.NewMessage(chatid, "")
 	m.Text, m.ParseMode = TGGetParseMode(b, username, text)
+	if topicid != 0 {
+		m.BaseChat.MessageThreadID = topicid
+	}
 	m.ReplyToMessageID = parentID
 	m.DisableWebPagePreview = b.GetBool("DisableWebPagePreview")
 
@@ -171,11 +204,19 @@ func (b *Btelegram) sendMessage(chatid int64, username, text string, parentID in
 }
 
 // sendMediaFiles native upload media files via media group
-func (b *Btelegram) sendMediaFiles(msg *config.Message, chatid int64, parentID int, media []interface{}) (string, error) {
+func (b *Btelegram) sendMediaFiles(msg *config.Message, chatid int64, threadid int, parentID int, media []interface{}) (string, error) {
 	if len(media) == 0 {
 		return "", nil
 	}
-	mg := tgbotapi.MediaGroupConfig{ChatID: chatid, ChannelUsername: msg.Username, Media: media, ReplyToMessageID: parentID}
+	mg := tgbotapi.MediaGroupConfig{
+		BaseChat: tgbotapi.BaseChat{
+			ChatID:           chatid,
+			MessageThreadID:  threadid,
+			ChannelUsername:  msg.Username,
+			ReplyToMessageID: parentID,
+		},
+		Media: media,
+	}
 	messages, err := b.c.SendMediaGroup(mg)
 	if err != nil {
 		return "", err
diff --git a/go.mod b/go.mod
index 91adf773..c4c8c24a 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,6 @@ require (
 	github.com/d5/tengo/v2 v2.13.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/fsnotify/fsnotify v1.6.0
-	github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
 	github.com/gomarkdown/markdown v0.0.0-20221013030248-663e2500819c
 	github.com/google/gops v0.3.27
 	github.com/gorilla/schema v1.2.0
@@ -29,6 +28,7 @@ require (
 	github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75
 	github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba
 	github.com/matterbridge/matterclient v0.0.0-20221106190440-8bcf49695e0d
+	github.com/matterbridge/telegram-bot-api/v6 v6.5.0
 	github.com/mattermost/mattermost-server/v5 v5.39.3
 	github.com/mattermost/mattermost-server/v6 v6.7.2
 	github.com/mattn/godown v0.0.1
diff --git a/go.sum b/go.sum
index ac913120..f2087fe6 100644
--- a/go.sum
+++ b/go.sum
@@ -607,8 +607,6 @@ github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 h1:wG8n/XJQ07TmjbITcGiUaOtXxdrINDz1b0J1w0SzqDc=
-github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1/go.mod h1:A2S0CWkNylc2phvKXWBBdD3K0iGnDBGbzRpISP2zBl8=
 github.com/go-test/deep v1.0.4 h1:u2CU3YKy9I2pmu9pX0eq50wCgjfGIt539SqR7FbHiho=
 github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
@@ -1085,6 +1083,8 @@ github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d97130
 github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba/go.mod h1:iXGEotOvwI1R1SjLxRc+BF5rUORTMtE0iMZBT2lxqAU=
 github.com/matterbridge/matterclient v0.0.0-20221106190440-8bcf49695e0d h1:aI0ANEzy3dMv3vEAMQ80AItNie0fBR9ZxE2sAedORmM=
 github.com/matterbridge/matterclient v0.0.0-20221106190440-8bcf49695e0d/go.mod h1:Zg8PH1P/1CNUxozQ8blnjAV9PA4Qn2qWf33cX5yNKGM=
+github.com/matterbridge/telegram-bot-api/v6 v6.5.0 h1:wCnHWvt4WGhfognQsuu2OnHyqENBdJRf2mReYTCXggQ=
+github.com/matterbridge/telegram-bot-api/v6 v6.5.0/go.mod h1:/hSLrs8h/xNsQglQXjwXJ92iZU8XfTGkYUQ7KVDWEVo=
 github.com/mattermost/go-i18n v1.11.0/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34=
 github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 h1:Khvh6waxG1cHc4Cz5ef9n3XVCxRWpAKUtqg9PJl5+y8=
 github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34=
diff --git a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/.gitignore b/vendor/github.com/matterbridge/telegram-bot-api/v6/.gitignore
similarity index 77%
rename from vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/.gitignore
rename to vendor/github.com/matterbridge/telegram-bot-api/v6/.gitignore
index eb7a23b2..d3083e5f 100644
--- a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/.gitignore
+++ b/vendor/github.com/matterbridge/telegram-bot-api/v6/.gitignore
@@ -2,3 +2,4 @@
 coverage.out
 tmp/
 book/
+.vscode/
diff --git a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/LICENSE.txt b/vendor/github.com/matterbridge/telegram-bot-api/v6/LICENSE.txt
similarity index 100%
rename from vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/LICENSE.txt
rename to vendor/github.com/matterbridge/telegram-bot-api/v6/LICENSE.txt
diff --git a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/README.md b/vendor/github.com/matterbridge/telegram-bot-api/v6/README.md
similarity index 96%
rename from vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/README.md
rename to vendor/github.com/matterbridge/telegram-bot-api/v6/README.md
index 45d3e1db..b18d15dd 100644
--- a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/README.md
+++ b/vendor/github.com/matterbridge/telegram-bot-api/v6/README.md
@@ -85,9 +85,9 @@ func main() {
 
 	log.Printf("Authorized on account %s", bot.Self.UserName)
 
-	wh, _ := tgbotapi.NewWebhookWithCert("https://www.google.com:8443/"+bot.Token, "cert.pem")
+	wh, _ := tgbotapi.NewWebhookWithCert("https://www.example.com:8443/"+bot.Token, "cert.pem")
 
-	_, err = bot.SetWebhook(wh)
+	_, err = bot.Request(wh)
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/book.toml b/vendor/github.com/matterbridge/telegram-bot-api/v6/book.toml
similarity index 100%
rename from vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/book.toml
rename to vendor/github.com/matterbridge/telegram-bot-api/v6/book.toml
diff --git a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/bot.go b/vendor/github.com/matterbridge/telegram-bot-api/v6/bot.go
similarity index 94%
rename from vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/bot.go
rename to vendor/github.com/matterbridge/telegram-bot-api/v6/bot.go
index c58afec4..39037b8d 100644
--- a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/bot.go
+++ b/vendor/github.com/matterbridge/telegram-bot-api/v6/bot.go
@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"net/url"
@@ -151,7 +150,7 @@ func (bot *BotAPI) decodeAPIResponse(responseBody io.Reader, resp *APIResponse)
 	}
 
 	// if debug, read response body
-	data, err := ioutil.ReadAll(responseBody)
+	data, err := io.ReadAll(responseBody)
 	if err != nil {
 		return nil, err
 	}
@@ -494,6 +493,8 @@ func (bot *BotAPI) ListenForWebhookRespReqFormat(w http.ResponseWriter, r *http.
 	ch := make(chan Update, bot.Buffer)
 
 	func(w http.ResponseWriter, r *http.Request) {
+		defer close(ch)
+
 		update, err := bot.HandleUpdate(r)
 		if err != nil {
 			errMsg, _ := json.Marshal(map[string]string{"error": err.Error()})
@@ -504,7 +505,6 @@ func (bot *BotAPI) ListenForWebhookRespReqFormat(w http.ResponseWriter, r *http.
 		}
 
 		ch <- *update
-		close(ch)
 	}(w, r)
 
 	return ch
@@ -681,12 +681,7 @@ func (bot *BotAPI) GetMyCommandsWithConfig(config GetMyCommandsConfig) ([]BotCom
 // forwardMessage, but the copied message doesn't have a link to the original
 // message. Returns the MessageID of the sent message on success.
 func (bot *BotAPI) CopyMessage(config CopyMessageConfig) (MessageID, error) {
-	params, err := config.params()
-	if err != nil {
-		return MessageID{}, err
-	}
-
-	resp, err := bot.MakeRequest(config.method(), params)
+	resp, err := bot.Request(config)
 	if err != nil {
 		return MessageID{}, err
 	}
@@ -697,6 +692,33 @@ func (bot *BotAPI) CopyMessage(config CopyMessageConfig) (MessageID, error) {
 	return messageID, err
 }
 
+// AnswerWebAppQuery sets the result of an interaction with a Web App and send a
+// corresponding message on behalf of the user to the chat from which the query originated.
+func (bot *BotAPI) AnswerWebAppQuery(config AnswerWebAppQueryConfig) (SentWebAppMessage, error) {
+	var sentWebAppMessage SentWebAppMessage
+
+	resp, err := bot.Request(config)
+	if err != nil {
+		return sentWebAppMessage, err
+	}
+
+	err = json.Unmarshal(resp.Result, &sentWebAppMessage)
+	return sentWebAppMessage, err
+}
+
+// GetMyDefaultAdministratorRights gets the current default administrator rights of the bot.
+func (bot *BotAPI) GetMyDefaultAdministratorRights(config GetMyDefaultAdministratorRightsConfig) (ChatAdministratorRights, error) {
+	var rights ChatAdministratorRights
+
+	resp, err := bot.Request(config)
+	if err != nil {
+		return rights, err
+	}
+
+	err = json.Unmarshal(resp.Result, &rights)
+	return rights, err
+}
+
 // EscapeText takes an input text and escape Telegram markup symbols.
 // In this way we can send a text without being afraid of having to escape the characters manually.
 // Note that you don't have to include the formatting style in the input text, or it will be escaped too.
diff --git a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/configs.go b/vendor/github.com/matterbridge/telegram-bot-api/v6/configs.go
similarity index 82%
rename from vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/configs.go
rename to vendor/github.com/matterbridge/telegram-bot-api/v6/configs.go
index 5e43af49..09c9c468 100644
--- a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/configs.go
+++ b/vendor/github.com/matterbridge/telegram-bot-api/v6/configs.go
@@ -265,7 +265,9 @@ func (CloseConfig) params() (Params, error) {
 // BaseChat is base type for all chat config types.
 type BaseChat struct {
 	ChatID                   int64 // required
+	MessageThreadID          int
 	ChannelUsername          string
+	ProtectContent           bool
 	ReplyToMessageID         int
 	ReplyMarkup              interface{}
 	DisableNotification      bool
@@ -276,9 +278,11 @@ func (chat *BaseChat) params() (Params, error) {
 	params := make(Params)
 
 	params.AddFirstValid("chat_id", chat.ChatID, chat.ChannelUsername)
+	params.AddNonZero("message_thread_id", chat.MessageThreadID)
 	params.AddNonZero("reply_to_message_id", chat.ReplyToMessageID)
 	params.AddBool("disable_notification", chat.DisableNotification)
 	params.AddBool("allow_sending_without_reply", chat.AllowSendingWithoutReply)
+	params.AddBool("protect_content", chat.ProtectContent)
 
 	err := params.AddInterface("reply_markup", chat.ReplyMarkup)
 
@@ -319,6 +323,21 @@ func (edit BaseEdit) params() (Params, error) {
 	return params, err
 }
 
+// BaseSpoiler is base type of structures with spoilers.
+type BaseSpoiler struct {
+	HasSpoiler bool
+}
+
+func (spoiler BaseSpoiler) params() (Params, error) {
+	params := make(Params)
+
+	if spoiler.HasSpoiler {
+		params.AddBool("has_spoiler", true)
+	}
+
+	return params, nil
+}
+
 // MessageConfig contains information about a SendMessage request.
 type MessageConfig struct {
 	BaseChat
@@ -403,6 +422,7 @@ func (config CopyMessageConfig) method() string {
 // PhotoConfig contains information about a SendPhoto request.
 type PhotoConfig struct {
 	BaseFile
+	BaseSpoiler
 	Thumb           RequestFileData
 	Caption         string
 	ParseMode       string
@@ -418,6 +438,15 @@ func (config PhotoConfig) params() (Params, error) {
 	params.AddNonEmpty("caption", config.Caption)
 	params.AddNonEmpty("parse_mode", config.ParseMode)
 	err = params.AddInterface("caption_entities", config.CaptionEntities)
+	if err != nil {
+		return params, err
+	}
+
+	p1, err := config.BaseSpoiler.params()
+	if err != nil {
+		return params, err
+	}
+	params.Merge(p1)
 
 	return params, err
 }
@@ -553,6 +582,7 @@ func (config StickerConfig) files() []RequestFile {
 // VideoConfig contains information about a SendVideo request.
 type VideoConfig struct {
 	BaseFile
+	BaseSpoiler
 	Thumb             RequestFileData
 	Duration          int
 	Caption           string
@@ -572,6 +602,15 @@ func (config VideoConfig) params() (Params, error) {
 	params.AddNonEmpty("parse_mode", config.ParseMode)
 	params.AddBool("supports_streaming", config.SupportsStreaming)
 	err = params.AddInterface("caption_entities", config.CaptionEntities)
+	if err != nil {
+		return params, err
+	}
+
+	p1, err := config.BaseSpoiler.params()
+	if err != nil {
+		return params, err
+	}
+	params.Merge(p1)
 
 	return params, err
 }
@@ -599,6 +638,7 @@ func (config VideoConfig) files() []RequestFile {
 // AnimationConfig contains information about a SendAnimation request.
 type AnimationConfig struct {
 	BaseFile
+	BaseSpoiler
 	Duration        int
 	Thumb           RequestFileData
 	Caption         string
@@ -616,6 +656,15 @@ func (config AnimationConfig) params() (Params, error) {
 	params.AddNonEmpty("caption", config.Caption)
 	params.AddNonEmpty("parse_mode", config.ParseMode)
 	err = params.AddInterface("caption_entities", config.CaptionEntities)
+	if err != nil {
+		return params, err
+	}
+
+	p1, err := config.BaseSpoiler.params()
+	if err != nil {
+		return params, err
+	}
+	params.Merge(p1)
 
 	return params, err
 }
@@ -972,13 +1021,15 @@ func (config GetGameHighScoresConfig) method() string {
 // ChatActionConfig contains information about a SendChatAction request.
 type ChatActionConfig struct {
 	BaseChat
-	Action string // required
+	MessageThreadID int
+	Action          string // required
 }
 
 func (config ChatActionConfig) params() (Params, error) {
 	params, err := config.BaseChat.params()
 
 	params["action"] = config.Action
+	params.AddNonZero("message_thread_id", config.MessageThreadID)
 
 	return params, err
 }
@@ -1162,6 +1213,7 @@ type WebhookConfig struct {
 	MaxConnections     int
 	AllowedUpdates     []string
 	DropPendingUpdates bool
+	SecretToken        string
 }
 
 func (config WebhookConfig) method() string {
@@ -1179,6 +1231,7 @@ func (config WebhookConfig) params() (Params, error) {
 	params.AddNonZero("max_connections", config.MaxConnections)
 	err := params.AddInterface("allowed_updates", config.AllowedUpdates)
 	params.AddBool("drop_pending_updates", config.DropPendingUpdates)
+	params.AddNonEmpty("secret_token", config.SecretToken)
 
 	return params, err
 }
@@ -1240,6 +1293,29 @@ func (config InlineConfig) params() (Params, error) {
 	return params, err
 }
 
+// AnswerWebAppQueryConfig is used to set the result of an interaction with a
+// Web App and send a corresponding message on behalf of the user to the chat
+// from which the query originated.
+type AnswerWebAppQueryConfig struct {
+	// WebAppQueryID is the unique identifier for the query to be answered.
+	WebAppQueryID string `json:"web_app_query_id"`
+	// Result is an InlineQueryResult object describing the message to be sent.
+	Result interface{} `json:"result"`
+}
+
+func (config AnswerWebAppQueryConfig) method() string {
+	return "answerWebAppQuery"
+}
+
+func (config AnswerWebAppQueryConfig) params() (Params, error) {
+	params := make(Params)
+
+	params["web_app_query_id"] = config.WebAppQueryID
+	err := params.AddInterface("result", config.Result)
+
+	return params, err
+}
+
 // CallbackConfig contains information on making a CallbackQuery response.
 type CallbackConfig struct {
 	CallbackQueryID string `json:"callback_query_id"`
@@ -1324,8 +1400,9 @@ type KickChatMemberConfig = BanChatMemberConfig
 // RestrictChatMemberConfig contains fields to restrict members of chat
 type RestrictChatMemberConfig struct {
 	ChatMemberConfig
-	UntilDate   int64
-	Permissions *ChatPermissions
+	UntilDate                     int64
+	UseIndependentChatPermissions bool
+	Permissions                   *ChatPermissions
 }
 
 func (config RestrictChatMemberConfig) method() string {
@@ -1337,6 +1414,7 @@ func (config RestrictChatMemberConfig) params() (Params, error) {
 
 	params.AddFirstValid("chat_id", config.ChatID, config.SuperGroupUsername, config.ChannelUsername)
 	params.AddNonZero64("user_id", config.UserID)
+	params.AddBool("use_independent_chat_permissions", config.UseIndependentChatPermissions)
 
 	err := params.AddInterface("permissions", config.Permissions)
 	params.AddNonZero64("until_date", config.UntilDate)
@@ -1353,11 +1431,12 @@ type PromoteChatMemberConfig struct {
 	CanPostMessages     bool
 	CanEditMessages     bool
 	CanDeleteMessages   bool
-	CanManageVoiceChats bool
+	CanManageVideoChats bool
 	CanInviteUsers      bool
 	CanRestrictMembers  bool
 	CanPinMessages      bool
 	CanPromoteMembers   bool
+	CanManageTopics     bool
 }
 
 func (config PromoteChatMemberConfig) method() string {
@@ -1376,11 +1455,12 @@ func (config PromoteChatMemberConfig) params() (Params, error) {
 	params.AddBool("can_post_messages", config.CanPostMessages)
 	params.AddBool("can_edit_messages", config.CanEditMessages)
 	params.AddBool("can_delete_messages", config.CanDeleteMessages)
-	params.AddBool("can_manage_voice_chats", config.CanManageVoiceChats)
+	params.AddBool("can_manage_video_chats", config.CanManageVideoChats)
 	params.AddBool("can_invite_users", config.CanInviteUsers)
 	params.AddBool("can_restrict_members", config.CanRestrictMembers)
 	params.AddBool("can_pin_messages", config.CanPinMessages)
 	params.AddBool("can_promote_members", config.CanPromoteMembers)
+	params.AddBool("can_manage_topics", config.CanManageTopics)
 
 	return params, nil
 }
@@ -1500,7 +1580,8 @@ func (ChatAdministratorsConfig) method() string {
 // restrict members.
 type SetChatPermissionsConfig struct {
 	ChatConfig
-	Permissions *ChatPermissions
+	UseIndependentChatPermissions bool
+	Permissions                   *ChatPermissions
 }
 
 func (SetChatPermissionsConfig) method() string {
@@ -1511,6 +1592,7 @@ func (config SetChatPermissionsConfig) params() (Params, error) {
 	params := make(Params)
 
 	params.AddFirstValid("chat_id", config.ChatID, config.SuperGroupUsername)
+	params.AddBool("use_independent_chat_permissions", config.UseIndependentChatPermissions)
 	err := params.AddInterface("permissions", config.Permissions)
 
 	return params, err
@@ -1759,6 +1841,64 @@ func (config InvoiceConfig) method() string {
 	return "sendInvoice"
 }
 
+// InvoiceLinkConfig contains information for createInvoiceLink method
+type InvoiceLinkConfig struct {
+	Title                     string         //Required
+	Description               string         //Required
+	Payload                   string         //Required
+	ProviderToken             string         //Required
+	Currency                  string         //Required
+	Prices                    []LabeledPrice //Required
+	MaxTipAmount              int
+	SuggestedTipAmounts       []int
+	ProviderData              string
+	PhotoURL                  string
+	PhotoSize                 int
+	PhotoWidth                int
+	PhotoHeight               int
+	NeedName                  bool
+	NeedPhoneNumber           bool
+	NeedEmail                 bool
+	NeedShippingAddress       bool
+	SendPhoneNumberToProvider bool
+	SendEmailToProvider       bool
+	IsFlexible                bool
+}
+
+func (config InvoiceLinkConfig) params() (Params, error) {
+	params := make(Params)
+
+	params["title"] = config.Title
+	params["description"] = config.Description
+	params["payload"] = config.Payload
+	params["provider_token"] = config.ProviderToken
+	params["currency"] = config.Currency
+	if err := params.AddInterface("prices", config.Prices); err != nil {
+		return params, err
+	}
+
+	params.AddNonZero("max_tip_amount", config.MaxTipAmount)
+	err := params.AddInterface("suggested_tip_amounts", config.SuggestedTipAmounts)
+	params.AddNonEmpty("provider_data", config.ProviderData)
+	params.AddNonEmpty("photo_url", config.PhotoURL)
+	params.AddNonZero("photo_size", config.PhotoSize)
+	params.AddNonZero("photo_width", config.PhotoWidth)
+	params.AddNonZero("photo_height", config.PhotoHeight)
+	params.AddBool("need_name", config.NeedName)
+	params.AddBool("need_phone_number", config.NeedPhoneNumber)
+	params.AddBool("need_email", config.NeedEmail)
+	params.AddBool("need_shipping_address", config.NeedShippingAddress)
+	params.AddBool("send_phone_number_to_provider", config.SendPhoneNumberToProvider)
+	params.AddBool("send_email_to_provider", config.SendEmailToProvider)
+	params.AddBool("is_flexible", config.IsFlexible)
+
+	return params, err
+}
+
+func (config InvoiceLinkConfig) method() string {
+	return "createInvoiceLink"
+}
+
 // ShippingConfig contains information for answerShippingQuery request.
 type ShippingConfig struct {
 	ShippingQueryID string // required
@@ -1782,7 +1922,7 @@ func (config ShippingConfig) params() (Params, error) {
 	return params, err
 }
 
-// PreCheckoutConfig conatins information for answerPreCheckoutQuery request.
+// PreCheckoutConfig contains information for answerPreCheckoutQuery request.
 type PreCheckoutConfig struct {
 	PreCheckoutQueryID string // required
 	OK                 bool   // required
@@ -1979,6 +2119,24 @@ func (config GetStickerSetConfig) params() (Params, error) {
 	return params, nil
 }
 
+// GetCustomEmojiStickersConfig get information about
+// custom emoji stickers by their identifiers.
+type GetCustomEmojiStickersConfig struct {
+	CustomEmojiIDs []string
+}
+
+func (config GetCustomEmojiStickersConfig) params() (Params, error) {
+	params := make(Params)
+
+	params.AddInterface("custom_emoji_ids", config.CustomEmojiIDs)
+
+	return params, nil
+}
+
+func (config GetCustomEmojiStickersConfig) method() string {
+	return "getCustomEmojiStickers"
+}
+
 // UploadStickerConfig allows you to upload a sticker for use in a set later.
 type UploadStickerConfig struct {
 	UserID     int64
@@ -2013,8 +2171,9 @@ type NewStickerSetConfig struct {
 	Title         string
 	PNGSticker    RequestFileData
 	TGSSticker    RequestFileData
+	StickerType   string
 	Emojis        string
-	ContainsMasks bool
+	ContainsMasks bool // deprecated
 	MaskPosition  *MaskPosition
 }
 
@@ -2028,11 +2187,10 @@ func (config NewStickerSetConfig) params() (Params, error) {
 	params.AddNonZero64("user_id", config.UserID)
 	params["name"] = config.Name
 	params["title"] = config.Title
-
 	params["emojis"] = config.Emojis
 
 	params.AddBool("contains_masks", config.ContainsMasks)
-
+	params.AddNonEmpty("sticker_type", string(config.StickerType))
 	err := params.AddInterface("mask_position", config.MaskPosition)
 
 	return params, err
@@ -2195,16 +2353,246 @@ func (config DeleteChatStickerSetConfig) params() (Params, error) {
 	return params, nil
 }
 
+// GetForumTopicIconStickersConfig allows you to get custom emoji stickers,
+// which can be used as a forum topic icon by any user.
+type GetForumTopicIconStickersConfig struct{}
+
+func (config GetForumTopicIconStickersConfig) method() string {
+	return "getForumTopicIconStickers"
+}
+
+func (config GetForumTopicIconStickersConfig) params() (Params, error) {
+	return nil, nil
+}
+
+// BaseForum is a base type for all forum config types.
+type BaseForum struct {
+	ChatID             int64
+	SuperGroupUsername string
+}
+
+func (config BaseForum) params() (Params, error) {
+	params := make(Params)
+
+	params.AddFirstValid("chat_id", config.ChatID, config.SuperGroupUsername)
+
+	return params, nil
+}
+
+// CreateForumTopicConfig allows you to create a topic
+// in a forum supergroup chat.
+type CreateForumTopicConfig struct {
+	BaseForum
+	Name              string
+	IconColor         int
+	IconCustomEmojiID string
+}
+
+func (config CreateForumTopicConfig) method() string {
+	return "createForumTopic"
+}
+
+func (config CreateForumTopicConfig) params() (Params, error) {
+	params := make(Params)
+
+	params.AddNonEmpty("name", config.Name)
+	params.AddNonZero("icon_color", config.IconColor)
+	params.AddNonEmpty("icon_custom_emoji_id", config.IconCustomEmojiID)
+
+	p1, _ := config.BaseForum.params()
+	params.Merge(p1)
+
+	return params, nil
+}
+
+// EditForumTopicConfig allows you to edit
+// name and icon of a topic in a forum supergroup chat.
+type EditForumTopicConfig struct {
+	BaseForum
+	MessageThreadID   int
+	Name              string
+	IconCustomEmojiID string
+}
+
+func (config EditForumTopicConfig) method() string {
+	return "editForumTopic"
+}
+
+func (config EditForumTopicConfig) params() (Params, error) {
+	params := make(Params)
+
+	params.AddNonZero("message_thread_id", config.MessageThreadID)
+	params.AddNonEmpty("name", config.Name)
+	params.AddNonEmpty("icon_custom_emoji_id", config.IconCustomEmojiID)
+
+	p1, _ := config.BaseForum.params()
+	params.Merge(p1)
+
+	return params, nil
+}
+
+// CloseForumTopicConfig allows you to close
+// an open topic in a forum supergroup chat.
+type CloseForumTopicConfig struct {
+	BaseForum
+	MessageThreadID int
+}
+
+func (config CloseForumTopicConfig) method() string {
+	return "closeForumTopic"
+}
+
+func (config CloseForumTopicConfig) params() (Params, error) {
+	params := make(Params)
+
+	params.AddNonZero("message_thread_id", config.MessageThreadID)
+
+	p1, _ := config.BaseForum.params()
+	params.Merge(p1)
+
+	return params, nil
+}
+
+// ReopenForumTopicConfig allows you to reopen
+// an closed topic in a forum supergroup chat.
+type ReopenForumTopicConfig struct {
+	BaseForum
+	MessageThreadID int
+}
+
+func (config ReopenForumTopicConfig) method() string {
+	return "reopenForumTopic"
+}
+
+func (config ReopenForumTopicConfig) params() (Params, error) {
+	params := make(Params)
+
+	params.AddFirstValid("chat_id", config.ChatID, config.SuperGroupUsername)
+	params.AddNonZero("message_thread_id", config.MessageThreadID)
+
+	p1, _ := config.BaseForum.params()
+	params.Merge(p1)
+
+	return params, nil
+}
+
+// DeleteForumTopicConfig allows you to delete a forum topic
+// along with all its messages in a forum supergroup chat.
+type DeleteForumTopicConfig struct {
+	BaseForum
+	MessageThreadID int
+}
+
+func (config DeleteForumTopicConfig) method() string {
+	return "deleteForumTopic"
+}
+
+func (config DeleteForumTopicConfig) params() (Params, error) {
+	params := make(Params)
+
+	params.AddNonZero("message_thread_id", config.MessageThreadID)
+
+	p1, _ := config.BaseForum.params()
+	params.Merge(p1)
+
+	return params, nil
+}
+
+// UnpinAllForumTopicMessagesConfig allows you to clear the list
+// of pinned messages in a forum topic.
+type UnpinAllForumTopicMessagesConfig struct {
+	BaseForum
+	MessageThreadID int
+}
+
+func (config UnpinAllForumTopicMessagesConfig) method() string {
+	return "unpinAllForumTopicMessages"
+}
+
+func (config UnpinAllForumTopicMessagesConfig) params() (Params, error) {
+	params := make(Params)
+
+	params.AddFirstValid("chat_id", config.ChatID, config.SuperGroupUsername)
+	params.AddNonZero("message_thread_id", config.MessageThreadID)
+
+	p1, _ := config.BaseForum.params()
+	params.Merge(p1)
+
+	return params, nil
+}
+
+// UnpinAllForumTopicMessagesConfig allows you to edit the name of
+// the 'General' topic in a forum supergroup chat.
+// The bot must be an administrator in the chat for this to work
+// and must have can_manage_topics administrator rights. Returns True on success.
+type EditGeneralForumTopicConfig struct {
+	BaseForum
+	Name string
+}
+
+func (config EditGeneralForumTopicConfig) method() string {
+	return "editGeneralForumTopic"
+}
+
+func (config EditGeneralForumTopicConfig) params() (Params, error) {
+	params := make(Params)
+
+	params.AddNonEmpty("name", config.Name)
+
+	p1, _ := config.BaseForum.params()
+	params.Merge(p1)
+
+	return params, nil
+}
+
+// CloseGeneralForumTopicConfig allows you to to close an open 'General' topic
+// in a forum supergroup chat. The bot must be an administrator in the chat
+// for this to work and must have the can_manage_topics administrator rights.
+// Returns True on success.
+type CloseGeneralForumTopicConfig struct{ BaseForum }
+
+func (config CloseGeneralForumTopicConfig) method() string {
+	return "closeGeneralForumTopic"
+}
+
+// CloseGeneralForumTopicConfig allows you to reopen a closed 'General' topic
+// in a forum supergroup chat. The bot must be an administrator in the chat
+// for this to work and must have the can_manage_topics administrator rights.
+// The topic will be automatically unhidden if it was hidden.
+// Returns True on success.
+type ReopenGeneralForumTopicConfig struct{ BaseForum }
+
+func (config ReopenGeneralForumTopicConfig) method() string {
+	return "reopenGeneralForumTopic"
+}
+
+// HideGeneralForumTopicConfig allows you to hide the 'General' topic
+// in a forum supergroup chat. The bot must be an administrator in the chat
+// for this to work and must have the can_manage_topics administrator rights.
+// The topic will be automatically closed if it was open.
+// Returns True on success.
+type HideGeneralForumTopicConfig struct{ BaseForum }
+
+func (config HideGeneralForumTopicConfig) method() string {
+	return "hideGeneralForumTopic"
+}
+
+// UnhideGeneralForumTopicConfig allows you to unhide the 'General' topic
+// in a forum supergroup chat. The bot must be an administrator in the chat
+// for this to work and must have the can_manage_topics administrator rights.
+// Returns True on success.
+type UnhideGeneralForumTopicConfig struct{ BaseForum }
+
+func (config UnhideGeneralForumTopicConfig) method() string {
+	return "unhideGeneralForumTopic"
+}
+
 // MediaGroupConfig allows you to send a group of media.
 //
 // Media consist of InputMedia items (InputMediaPhoto, InputMediaVideo).
 type MediaGroupConfig struct {
-	ChatID          int64
-	ChannelUsername string
-
-	Media               []interface{}
-	DisableNotification bool
-	ReplyToMessageID    int
+	BaseChat
+	Media []interface{}
 }
 
 func (config MediaGroupConfig) method() string {
@@ -2212,13 +2600,16 @@ func (config MediaGroupConfig) method() string {
 }
 
 func (config MediaGroupConfig) params() (Params, error) {
-	params := make(Params)
+	params, err := config.BaseChat.params()
+	if err != nil {
+		return nil, err
+	}
 
 	params.AddFirstValid("chat_id", config.ChatID, config.ChannelUsername)
 	params.AddBool("disable_notification", config.DisableNotification)
 	params.AddNonZero("reply_to_message_id", config.ReplyToMessageID)
 
-	err := params.AddInterface("media", prepareInputMediaForParams(config.Media))
+	err = params.AddInterface("media", prepareInputMediaForParams(config.Media))
 
 	return params, err
 }
@@ -2313,6 +2704,81 @@ func (config DeleteMyCommandsConfig) params() (Params, error) {
 	return params, err
 }
 
+// SetChatMenuButtonConfig changes the bot's menu button in a private chat,
+// or the default menu button.
+type SetChatMenuButtonConfig struct {
+	ChatID          int64
+	ChannelUsername string
+
+	MenuButton *MenuButton
+}
+
+func (config SetChatMenuButtonConfig) method() string {
+	return "setChatMenuButton"
+}
+
+func (config SetChatMenuButtonConfig) params() (Params, error) {
+	params := make(Params)
+
+	if err := params.AddFirstValid("chat_id", config.ChatID, config.ChannelUsername); err != nil {
+		return params, err
+	}
+	err := params.AddInterface("menu_button", config.MenuButton)
+
+	return params, err
+}
+
+type GetChatMenuButtonConfig struct {
+	ChatID          int64
+	ChannelUsername string
+}
+
+func (config GetChatMenuButtonConfig) method() string {
+	return "getChatMenuButton"
+}
+
+func (config GetChatMenuButtonConfig) params() (Params, error) {
+	params := make(Params)
+
+	err := params.AddFirstValid("chat_id", config.ChatID, config.ChannelUsername)
+
+	return params, err
+}
+
+type SetMyDefaultAdministratorRightsConfig struct {
+	Rights      ChatAdministratorRights
+	ForChannels bool
+}
+
+func (config SetMyDefaultAdministratorRightsConfig) method() string {
+	return "setMyDefaultAdministratorRights"
+}
+
+func (config SetMyDefaultAdministratorRightsConfig) params() (Params, error) {
+	params := make(Params)
+
+	err := params.AddInterface("rights", config.Rights)
+	params.AddBool("for_channels", config.ForChannels)
+
+	return params, err
+}
+
+type GetMyDefaultAdministratorRightsConfig struct {
+	ForChannels bool
+}
+
+func (config GetMyDefaultAdministratorRightsConfig) method() string {
+	return "getMyDefaultAdministratorRights"
+}
+
+func (config GetMyDefaultAdministratorRightsConfig) params() (Params, error) {
+	params := make(Params)
+
+	params.AddBool("for_channels", config.ForChannels)
+
+	return params, nil
+}
+
 // prepareInputMediaParam evaluates a single InputMedia and determines if it
 // needs to be modified for a successful upload. If it returns nil, then the
 // value does not need to be included in the params. Otherwise, it will return
diff --git a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/helpers.go b/vendor/github.com/matterbridge/telegram-bot-api/v6/helpers.go
similarity index 94%
rename from vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/helpers.go
rename to vendor/github.com/matterbridge/telegram-bot-api/v6/helpers.go
index 8220e74e..bdf2ee97 100644
--- a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/helpers.go
+++ b/vendor/github.com/matterbridge/telegram-bot-api/v6/helpers.go
@@ -1,7 +1,14 @@
 package tgbotapi
 
 import (
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/hex"
+	"errors"
+	"fmt"
 	"net/url"
+	"sort"
+	"strings"
 )
 
 // NewMessage creates a new Message.
@@ -171,7 +178,9 @@ func NewVoice(chatID int64, file RequestFileData) VoiceConfig {
 // two to ten InputMediaPhoto or InputMediaVideo.
 func NewMediaGroup(chatID int64, files []interface{}) MediaGroupConfig {
 	return MediaGroupConfig{
-		ChatID: chatID,
+		BaseChat: BaseChat{
+			ChatID: chatID,
+		},
 		Media:  files,
 	}
 }
@@ -567,7 +576,7 @@ func NewEditMessageText(chatID int64, messageID int, text string) EditMessageTex
 	}
 }
 
-// NewEditMessageTextAndMarkup allows you to edit the text and replymarkup of a message.
+// NewEditMessageTextAndMarkup allows you to edit the text and reply markup of a message.
 func NewEditMessageTextAndMarkup(chatID int64, messageID int, text string, replyMarkup InlineKeyboardMarkup) EditMessageTextConfig {
 	return EditMessageTextConfig{
 		BaseEdit: BaseEdit{
@@ -618,6 +627,15 @@ func NewKeyboardButton(text string) KeyboardButton {
 	}
 }
 
+// NewKeyboardButtonWebApp creates a keyboard button with text
+// which goes to a WebApp.
+func NewKeyboardButtonWebApp(text string, webapp WebAppInfo) KeyboardButton {
+	return KeyboardButton{
+		Text:   text,
+		WebApp: &webapp,
+	}
+}
+
 // NewKeyboardButtonContact creates a keyboard button that requests
 // user contact information upon click.
 func NewKeyboardButtonContact(text string) KeyboardButton {
@@ -673,6 +691,15 @@ func NewInlineKeyboardButtonData(text, data string) InlineKeyboardButton {
 	}
 }
 
+// NewInlineKeyboardButtonWebApp creates an inline keyboard button with text
+// which goes to a WebApp.
+func NewInlineKeyboardButtonWebApp(text string, webapp WebAppInfo) InlineKeyboardButton {
+	return InlineKeyboardButton{
+		Text:   text,
+		WebApp: &webapp,
+	}
+}
+
 // NewInlineKeyboardButtonLoginURL creates an inline keyboard button with text
 // which goes to a LoginURL.
 func NewInlineKeyboardButtonLoginURL(text string, loginURL LoginURL) InlineKeyboardButton {
@@ -925,3 +952,38 @@ func NewDeleteMyCommandsWithScope(scope BotCommandScope) DeleteMyCommandsConfig
 func NewDeleteMyCommandsWithScopeAndLanguage(scope BotCommandScope, languageCode string) DeleteMyCommandsConfig {
 	return DeleteMyCommandsConfig{Scope: &scope, LanguageCode: languageCode}
 }
+
+// ValidateWebAppData validate data received via the Web App
+// https://core.telegram.org/bots/webapps#validating-data-received-via-the-web-app
+func ValidateWebAppData(token, telegramInitData string) (bool, error) {
+	initData, err := url.ParseQuery(telegramInitData)
+	if err != nil {
+		return false, fmt.Errorf("error parsing data %w", err)
+	}
+
+	dataCheckString := make([]string, 0, len(initData))
+	for k, v := range initData {
+		if k == "hash" {
+			continue
+		}
+		if len(v) > 0 {
+			dataCheckString = append(dataCheckString, fmt.Sprintf("%s=%s", k, v[0]))
+		}
+	}
+
+	sort.Strings(dataCheckString)
+
+	secret := hmac.New(sha256.New, []byte("WebAppData"))
+	secret.Write([]byte(token))
+
+	hHash := hmac.New(sha256.New, secret.Sum(nil))
+	hHash.Write([]byte(strings.Join(dataCheckString, "\n")))
+
+	hash := hex.EncodeToString(hHash.Sum(nil))
+
+	if initData.Get("hash") != hash {
+		return false, errors.New("hash not equal")
+	}
+
+	return true, nil
+}
diff --git a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/log.go b/vendor/github.com/matterbridge/telegram-bot-api/v6/log.go
similarity index 100%
rename from vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/log.go
rename to vendor/github.com/matterbridge/telegram-bot-api/v6/log.go
diff --git a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/params.go b/vendor/github.com/matterbridge/telegram-bot-api/v6/params.go
similarity index 93%
rename from vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/params.go
rename to vendor/github.com/matterbridge/telegram-bot-api/v6/params.go
index 134f85e4..118af364 100644
--- a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/params.go
+++ b/vendor/github.com/matterbridge/telegram-bot-api/v6/params.go
@@ -95,3 +95,10 @@ func (p Params) AddFirstValid(key string, args ...interface{}) error {
 
 	return nil
 }
+
+// Merge merges two sets of parameters. Overwrites old fields if present
+func (p *Params) Merge(p1 Params) {
+	for k, v := range p1 {
+		(*p)[k] = v
+	}
+}
\ No newline at end of file
diff --git a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/passport.go b/vendor/github.com/matterbridge/telegram-bot-api/v6/passport.go
similarity index 100%
rename from vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/passport.go
rename to vendor/github.com/matterbridge/telegram-bot-api/v6/passport.go
diff --git a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/types.go b/vendor/github.com/matterbridge/telegram-bot-api/v6/types.go
similarity index 82%
rename from vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/types.go
rename to vendor/github.com/matterbridge/telegram-bot-api/v6/types.go
index 847f1b14..97fce226 100644
--- a/vendor/github.com/go-telegram-bot-api/telegram-bot-api/v5/types.go
+++ b/vendor/github.com/matterbridge/telegram-bot-api/v6/types.go
@@ -101,19 +101,19 @@ type Update struct {
 	// unblocked by the user.
 	//
 	// optional
-	MyChatMember *ChatMemberUpdated `json:"my_chat_member"`
+	MyChatMember *ChatMemberUpdated `json:"my_chat_member,omitempty"`
 	// ChatMember is a chat member's status was updated in a chat. The bot must
 	// be an administrator in the chat and must explicitly specify "chat_member"
 	// in the list of allowed_updates to receive these updates.
 	//
 	// optional
-	ChatMember *ChatMemberUpdated `json:"chat_member"`
+	ChatMember *ChatMemberUpdated `json:"chat_member,omitempty"`
 	// ChatJoinRequest is a request to join the chat has been sent. The bot must
 	// have the can_invite_users administrator right in the chat to receive
 	// these updates.
 	//
 	// optional
-	ChatJoinRequest *ChatJoinRequest `json:"chat_join_request"`
+	ChatJoinRequest *ChatJoinRequest `json:"chat_join_request,omitempty"`
 }
 
 // SentFrom returns the user who sent an update. Can be nil, if Telegram did not provide information
@@ -183,6 +183,14 @@ type User struct {
 	//
 	// optional
 	IsBot bool `json:"is_bot,omitempty"`
+	// IsPremium true, if user has Telegram Premium
+	//
+	// optional
+	IsPremium bool `json:"is_premium,omitempty"`
+	// AddedToAttachmentMenu true, if this user added the bot to the attachment menu
+	//
+	// optional
+	AddedToAttachmentMenu bool `json:"added_to_attachment_menu,omitempty"`
 	// FirstName user's or bot's first name
 	FirstName string `json:"first_name"`
 	// LastName user's or bot's last name
@@ -257,8 +265,22 @@ type Chat struct {
 	//
 	// optional
 	LastName string `json:"last_name,omitempty"`
+	// IsForum is true if the supergroup chat is a forum (has topics enabled)
+	//
+	// optional
+	IsForum bool `json:"is_forum,omitempty"`
 	// Photo is a chat photo
 	Photo *ChatPhoto `json:"photo"`
+	// If non-empty, the list of all active chat usernames;
+	// for private chats, supergroups and channels. Returned only in getChat.
+	//
+	// optional
+	ActiveUsernames []string `json:"active_usernames,omitempty"`
+	// Custom emoji identifier of emoji status of the other party
+	// in a private chat. Returned only in getChat.
+	//
+	// optional
+	EmojiStatusCustomEmojiID string `json:"emoji_status_custom_emoji_id,omitempty"`
 	// Bio is the bio of the other party in a private chat. Returned only in
 	// getChat
 	//
@@ -270,6 +292,24 @@ type Chat struct {
 	//
 	// optional
 	HasPrivateForwards bool `json:"has_private_forwards,omitempty"`
+	// HasRestrictedVoiceAndVideoMessages if the privacy settings of the other party
+	// restrict sending voice and video note messages
+	// in the private chat. Returned only in getChat.
+	//
+	// optional
+	HasRestrictedVoiceAndVideoMessages bool `json:"has_restricted_voice_and_video_messages,omitempty"`
+	// JoinToSendMessages is true, if users need to join the supergroup
+	// before they can send messages.
+	// Returned only in getChat
+	//
+	// optional
+	JoinToSendMessages bool `json:"join_to_send_messages,omitempty"`
+	// JoinByRequest is true, if all users directly joining the supergroup
+	// need to be approved by supergroup administrators.
+	// Returned only in getChat.
+	//
+	// optional
+	JoinByRequest bool `json:"join_by_request,omitempty"`
 	// Description for groups, supergroups and channel chats
 	//
 	// optional
@@ -290,7 +330,7 @@ type Chat struct {
 	// optional
 	Permissions *ChatPermissions `json:"permissions,omitempty"`
 	// SlowModeDelay is for supergroups, the minimum allowed delay between
-	// consecutive messages sent by each unpriviledged user. Returned only in
+	// consecutive messages sent by each unprivileged user. Returned only in
 	// getChat.
 	//
 	// optional
@@ -300,6 +340,17 @@ type Chat struct {
 	//
 	// optional
 	MessageAutoDeleteTime int `json:"message_auto_delete_time,omitempty"`
+	// HasAggressiveAntiSpamEnabled is true if aggressive anti-spam checks are enabled
+	// in the supergroup. The field is only available to chat administrators.
+	// Returned only in getChat.
+	//
+	// optional
+	HasAggressiveAntiSpamEnabled bool `json:"has_aggressive_anti_spam_enabled,omitempty"`
+	// HasHiddenMembers is true if non-administrators can only get
+	// the list of bots and administrators in the chat.
+	//
+	// optional
+	HasHiddenMembers bool `json:"has_hidden_members,omitempty"`
 	// HasProtectedContent is true if messages from the chat can't be forwarded
 	// to other chats. Returned only in getChat.
 	//
@@ -325,7 +376,7 @@ type Chat struct {
 	// connected. Returned only in getChat.
 	//
 	// optional
-	Location *ChatLocation `json:"location"`
+	Location *ChatLocation `json:"location,omitempty"`
 }
 
 // IsPrivate returns if the Chat is a private conversation.
@@ -357,6 +408,11 @@ func (c Chat) ChatConfig() ChatConfig {
 type Message struct {
 	// MessageID is a unique message identifier inside this chat
 	MessageID int `json:"message_id"`
+	// Unique identifier of a message thread to which the message belongs;
+	// for supergroups only
+	//
+	// optional
+	MessageThreadID int `json:"message_thread_id,omitempty"`
 	// From is a sender, empty for messages sent to channels;
 	//
 	// optional
@@ -400,6 +456,10 @@ type Message struct {
 	//
 	// optional
 	ForwardDate int `json:"forward_date,omitempty"`
+	// IsTopicMessage true if the message is sent to a forum topic
+	//
+	// optional
+	IsTopicMessage bool `json:"is_topic_message,omitempty"`
 	// IsAutomaticForward is true if the message is a channel post that was
 	// automatically forwarded to the connected discussion group.
 	//
@@ -445,6 +505,11 @@ type Message struct {
 	//
 	// optional
 	Animation *Animation `json:"animation,omitempty"`
+	// PremiumAnimation message is an animation, information about the animation.
+	// For backward compatibility, when this field is set, the document field will also be set;
+	//
+	// optional
+	PremiumAnimation *Animation `json:"premium_animation,omitempty"`
 	// Audio message is an audio file, information about the file;
 	//
 	// optional
@@ -481,6 +546,10 @@ type Message struct {
 	//
 	// optional
 	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
+	// HasSpoiler True, if the message media is covered by a spoiler animation
+	//
+	// optional
+	HasMediaSpoiler bool `json:"has_media_spoiler,omitempty"`
 	// Contact message is a shared contact, information about the contact;
 	//
 	// optional
@@ -553,7 +622,7 @@ type Message struct {
 	// settings changed in the chat.
 	//
 	// optional
-	MessageAutoDeleteTimerChanged *MessageAutoDeleteTimerChanged `json:"message_auto_delete_timer_changed"`
+	MessageAutoDeleteTimerChanged *MessageAutoDeleteTimerChanged `json:"message_auto_delete_timer_changed,omitempty"`
 	// MigrateToChatID is the group has been migrated to a supergroup with the specified identifier.
 	// This number may be greater than 32 bits and some programming languages
 	// may have difficulty/silent defects in interpreting it.
@@ -585,11 +654,24 @@ type Message struct {
 	//
 	// optional
 	SuccessfulPayment *SuccessfulPayment `json:"successful_payment,omitempty"`
+	// UserShared is a service message: a user was shared with the bot
+	//
+	// optional
+	UserShared *UserShared `json:"user_shared,omitempty"`
+	// ChatShared is a service message: a chat was shared with the bot
+	//
+	// optional
+	ChatShared *ChatShared `json:"chat_shared,omitempty"`
 	// ConnectedWebsite is the domain name of the website on which the user has
 	// logged in;
 	//
 	// optional
 	ConnectedWebsite string `json:"connected_website,omitempty"`
+	// WriteAccessAllowed is a service message: the user allowed the bot
+	// added to the attachment menu to write messages
+	//
+	// optional
+	WriteAccessAllowed *WriteAccessAllowed `json:"write_access_allowed,omitempty"`
 	// PassportData is a Telegram Passport data;
 	//
 	// optional
@@ -598,24 +680,52 @@ type Message struct {
 	// triggered another user's proximity alert while sharing Live Location
 	//
 	// optional
-	ProximityAlertTriggered *ProximityAlertTriggered `json:"proximity_alert_triggered"`
-	// VoiceChatScheduled is a service message: voice chat scheduled.
+	ProximityAlertTriggered *ProximityAlertTriggered `json:"proximity_alert_triggered,omitempty"`
+	// ForumTopicCreated is a service message: forum topic created
 	//
 	// optional
-	VoiceChatScheduled *VoiceChatScheduled `json:"voice_chat_scheduled"`
-	// VoiceChatStarted is a service message: voice chat started.
+	ForumTopicCreated *ForumTopicCreated `json:"forum_topic_created,omitempty"`
+	// ForumTopicClosed is a service message: forum topic edited
 	//
 	// optional
-	VoiceChatStarted *VoiceChatStarted `json:"voice_chat_started"`
-	// VoiceChatEnded is a service message: voice chat ended.
+	ForumTopicEdited *ForumTopicEdited `json:"forum_topic_edited,omitempty"`
+	// ForumTopicClosed is a service message: forum topic closed
 	//
 	// optional
-	VoiceChatEnded *VoiceChatEnded `json:"voice_chat_ended"`
-	// VoiceChatParticipantsInvited is a service message: new participants
-	// invited to a voice chat.
+	ForumTopicClosed *ForumTopicClosed `json:"forum_topic_closed,omitempty"`
+	// ForumTopicReopened is a service message: forum topic reopened
 	//
 	// optional
-	VoiceChatParticipantsInvited *VoiceChatParticipantsInvited `json:"voice_chat_participants_invited"`
+	ForumTopicReopened *ForumTopicReopened `json:"forum_topic_reopened,omitempty"`
+	// GeneralForumTopicHidden is a service message: the 'General' forum topic hidden
+	//
+	// optional
+	GeneralForumTopicHidden *GeneralForumTopicHidden `json:"general_forum_topic_hidden,omitempty"`
+	// GeneralForumTopicUnhidden is a service message: the 'General' forum topic unhidden
+	//
+	// optional
+	GeneralForumTopicUnhidden *GeneralForumTopicUnhidden `json:"general_forum_topic_unhidden,omitempty"`
+	// VideoChatScheduled is a service message: video chat scheduled.
+	//
+	// optional
+	VideoChatScheduled *VideoChatScheduled `json:"video_chat_scheduled,omitempty"`
+	// VideoChatStarted is a service message: video chat started.
+	//
+	// optional
+	VideoChatStarted *VideoChatStarted `json:"video_chat_started,omitempty"`
+	// VideoChatEnded is a service message: video chat ended.
+	//
+	// optional
+	VideoChatEnded *VideoChatEnded `json:"video_chat_ended,omitempty"`
+	// VideoChatParticipantsInvited is a service message: new participants
+	// invited to a video chat.
+	//
+	// optional
+	VideoChatParticipantsInvited *VideoChatParticipantsInvited `json:"video_chat_participants_invited,omitempty"`
+	// WebAppData is a service message: data sent by a Web App.
+	//
+	// optional
+	WebAppData *WebAppData `json:"web_app_data,omitempty"`
 	// ReplyMarkup is the Inline keyboard attached to the message.
 	// login_url buttons are represented as ordinary url buttons.
 	//
@@ -712,10 +822,12 @@ type MessageEntity struct {
 	//  “italic” (italic text),
 	//  “underline” (underlined text),
 	//  “strikethrough” (strikethrough text),
+	//  "spoiler" (spoiler message),
 	//  “code” (monowidth string),
 	//  “pre” (monowidth block),
 	//  “text_link” (for clickable text URLs),
 	//  “text_mention” (for users without usernames)
+	//  “text_mention” (for inline custom emoji stickers)
 	Type string `json:"type"`
 	// Offset in UTF-16 code units to the start of the entity
 	Offset int `json:"offset"`
@@ -733,6 +845,10 @@ type MessageEntity struct {
 	//
 	// optional
 	Language string `json:"language,omitempty"`
+	// CustomEmojiID for “custom_emoji” only, unique identifier of the custom emoji
+	//
+	// optional
+	CustomEmojiID string `json:"custom_emoji_id"`
 }
 
 // ParseURL attempts to parse a URL contained within a MessageEntity.
@@ -749,6 +865,12 @@ func (e MessageEntity) IsMention() bool {
 	return e.Type == "mention"
 }
 
+// IsTextMention returns true if the type of the message entity is "text_mention"
+// (At this time, the user field exists, and occurs when tagging a member without a username)
+func (e MessageEntity) IsTextMention() bool {
+	return e.Type == "text_mention"
+}
+
 // IsHashtag returns true if the type of the message entity is "hashtag".
 func (e MessageEntity) IsHashtag() bool {
 	return e.Type == "hashtag"
@@ -843,7 +965,7 @@ type Animation struct {
 	// FileSize file size
 	//
 	// optional
-	FileSize int `json:"file_size,omitempty"`
+	FileSize int64 `json:"file_size,omitempty"`
 }
 
 // Audio represents an audio file to be treated as music by the Telegram clients.
@@ -876,7 +998,7 @@ type Audio struct {
 	// FileSize file size
 	//
 	// optional
-	FileSize int `json:"file_size,omitempty"`
+	FileSize int64 `json:"file_size,omitempty"`
 	// Thumbnail is the album cover to which the music file belongs
 	//
 	// optional
@@ -907,7 +1029,7 @@ type Document struct {
 	// FileSize file size
 	//
 	// optional
-	FileSize int `json:"file_size,omitempty"`
+	FileSize int64 `json:"file_size,omitempty"`
 }
 
 // Video represents a video file.
@@ -940,7 +1062,7 @@ type Video struct {
 	// FileSize file size
 	//
 	// optional
-	FileSize int `json:"file_size,omitempty"`
+	FileSize int64 `json:"file_size,omitempty"`
 }
 
 // VideoNote object represents a video message.
@@ -982,7 +1104,7 @@ type Voice struct {
 	// FileSize file size
 	//
 	// optional
-	FileSize int `json:"file_size,omitempty"`
+	FileSize int64 `json:"file_size,omitempty"`
 }
 
 // Contact represents a phone contact.
@@ -1134,6 +1256,15 @@ type Venue struct {
 	GooglePlaceType string `json:"google_place_type,omitempty"`
 }
 
+// WebAppData Contains data sent from a Web App to the bot.
+type WebAppData struct {
+	// Data is the data. Be aware that a bad client can send arbitrary data in this field.
+	Data string `json:"data"`
+	// ButtonText is the text of the web_app keyboard button, from which the Web App
+	// was opened. Be aware that a bad client can send arbitrary data in this field.
+	ButtonText string `json:"button_text"`
+}
+
 // ProximityAlertTriggered represents a service message sent when a user in the
 // chat triggers a proximity alert sent by another user.
 type ProximityAlertTriggered struct {
@@ -1152,37 +1283,109 @@ type MessageAutoDeleteTimerChanged struct {
 	MessageAutoDeleteTime int `json:"message_auto_delete_time"`
 }
 
-// VoiceChatScheduled represents a service message about a voice chat scheduled
+// ForumTopicCreated represents a service message about a new forum topic
+// created in the chat.
+type ForumTopicCreated struct {
+	// Name is the name of topic
+	Name string `json:"name"`
+	// IconColor is the color of the topic icon in RGB format
+	IconColor int `json:"icon_color"`
+	// IconCustomEmojiID is the unique identifier of the custom emoji
+	// shown as the topic icon
+	//
+	// optional
+	IconCustomEmojiID string `json:"icon_custom_emoji_id,omitempty"`
+}
+
+// ForumTopicClosed represents a service message about a forum topic
+// closed in the chat. Currently holds no information.
+type ForumTopicClosed struct {
+}
+
+// ForumTopicEdited object represents a service message about an edited forum topic.
+type ForumTopicEdited struct {
+	// Name is the new name of the topic, if it was edited
+	//
+	// optional
+	Name string `json:"name,omitempty"`
+	// IconCustomEmojiID is the new identifier of the custom emoji
+	// shown as the topic icon, if it was edited;
+	// an empty string if the icon was removed
+	//
+	// optional
+	IconCustomEmojiID *string `json:"icon_custom_emoji_id,omitempty"`
+}
+
+// ForumTopicReopened represents a service message about a forum topic
+// reopened in the chat. Currently holds no information.
+type ForumTopicReopened struct {
+}
+
+// GeneralForumTopicHidden represents a service message about General forum topic
+// hidden in the chat. Currently holds no information.
+type GeneralForumTopicHidden struct {
+}
+
+// GeneralForumTopicUnhidden represents a service message about General forum topic
+// unhidden in the chat. Currently holds no information.
+type GeneralForumTopicUnhidden struct {
+}
+
+// UserShared object contains information about the user whose identifier
+// was shared with the bot using a KeyboardButtonRequestUser button.
+type UserShared struct {
+	// RequestID is an indentifier of the request.
+	RequestID int `json:"request_id"`
+	// UserID in an identifier of the shared user.
+	UserID int64 `json:"user_id"`
+}
+
+// ChatShared contains information about the chat whose identifier
+// was shared with the bot using a KeyboardButtonRequestChat button.
+type ChatShared struct {
+	// RequestID is an indentifier of the request.
+	RequestID int `json:"request_id"`
+	// ChatID is an identifier of the shared chat.
+	ChatID int64 `json:"chat_id"`
+}
+
+// WriteAccessAllowed represents a service message about a user
+// allowing a bot added to the attachment menu to write messages.
+// Currently holds no information.
+type WriteAccessAllowed struct {
+}
+
+// VideoChatScheduled represents a service message about a voice chat scheduled
 // in the chat.
-type VoiceChatScheduled struct {
+type VideoChatScheduled struct {
 	// Point in time (Unix timestamp) when the voice chat is supposed to be
 	// started by a chat administrator
 	StartDate int `json:"start_date"`
 }
 
 // Time converts the scheduled start date into a Time.
-func (m *VoiceChatScheduled) Time() time.Time {
+func (m *VideoChatScheduled) Time() time.Time {
 	return time.Unix(int64(m.StartDate), 0)
 }
 
-// VoiceChatStarted represents a service message about a voice chat started in
+// VideoChatStarted represents a service message about a voice chat started in
 // the chat.
-type VoiceChatStarted struct{}
+type VideoChatStarted struct{}
 
-// VoiceChatEnded represents a service message about a voice chat ended in the
+// VideoChatEnded represents a service message about a voice chat ended in the
 // chat.
-type VoiceChatEnded struct {
+type VideoChatEnded struct {
 	// Voice chat duration; in seconds.
 	Duration int `json:"duration"`
 }
 
-// VoiceChatParticipantsInvited represents a service message about new members
+// VideoChatParticipantsInvited represents a service message about new members
 // invited to a voice chat.
-type VoiceChatParticipantsInvited struct {
+type VideoChatParticipantsInvited struct {
 	// New members that were invited to the voice chat.
 	//
 	// optional
-	Users []User `json:"users"`
+	Users []User `json:"users,omitempty"`
 }
 
 // UserProfilePhotos contains a set of user profile photos.
@@ -1205,7 +1408,7 @@ type File struct {
 	// FileSize file size, if known
 	//
 	// optional
-	FileSize int `json:"file_size,omitempty"`
+	FileSize int64 `json:"file_size,omitempty"`
 	// FilePath file path
 	//
 	// optional
@@ -1219,10 +1422,24 @@ func (f *File) Link(token string) string {
 	return fmt.Sprintf(FileEndpoint, token, f.FilePath)
 }
 
+// WebAppInfo contains information about a Web App.
+type WebAppInfo struct {
+	// URL is the HTTPS URL of a Web App to be opened with additional data as
+	// specified in Initializing Web Apps.
+	URL string `json:"url"`
+}
+
 // ReplyKeyboardMarkup represents a custom keyboard with reply options.
 type ReplyKeyboardMarkup struct {
 	// Keyboard is an array of button rows, each represented by an Array of KeyboardButton objects
 	Keyboard [][]KeyboardButton `json:"keyboard"`
+	// IsPersistent requests clients to always show the keyboard
+	// when the regular keyboard is hidden.
+	// Defaults to false, in which case the custom keyboard can be hidden
+	// and opened with a keyboard icon.
+	//
+	// optional
+	IsPersistent bool `json:"is_persistent"`
 	// ResizeKeyboard requests clients to resize the keyboard vertically for optimal fit
 	// (e.g., make the keyboard smaller if there are just two rows of buttons).
 	// Defaults to false, in which case the custom keyboard
@@ -1264,6 +1481,20 @@ type KeyboardButton struct {
 	// Text of the button. If none of the optional fields are used,
 	// it will be sent as a message when the button is pressed.
 	Text string `json:"text"`
+	// RequestUser if specified, pressing the button will open
+	// a list of suitable users. Tapping on any user will send
+	// their identifier to the bot in a "user_shared" service message.
+	// Available in private chats only.
+	//
+	// optional
+	RequestUser *KeyboardButtonRequestUser `json:"request_user,omitempty"`
+	// RequestChat if specified, pressing the button will open
+	// a list of suitable chats. Tapping on a chat will send
+	// its identifier to the bot in a "chat_shared" service message.
+	// Available in private chats only.
+	//
+	// optional
+	RequestChat *KeyboardButtonRequestChat `json:"request_chat,omitempty"`
 	// RequestContact if True, the user's phone number will be sent
 	// as a contact when the button is pressed.
 	// Available in private chats only.
@@ -1276,11 +1507,83 @@ type KeyboardButton struct {
 	//
 	// optional
 	RequestLocation bool `json:"request_location,omitempty"`
-	// RequestPoll if True, the user will be asked to create a poll and send it
+	// RequestPoll if specified, the user will be asked to create a poll and send it
 	// to the bot when the button is pressed. Available in private chats only
 	//
 	// optional
 	RequestPoll *KeyboardButtonPollType `json:"request_poll,omitempty"`
+	// WebApp if specified, the described Web App will be launched when the button
+	// is pressed. The Web App will be able to send a “web_app_data” service
+	// message. Available in private chats only.
+	//
+	// optional
+	WebApp *WebAppInfo `json:"web_app,omitempty"`
+}
+
+// KeyboardButtonRequestUser defines the criteria used to request
+// a suitable user. The identifier of the selected user will be shared
+// with the bot when the corresponding button is pressed.
+type KeyboardButtonRequestUser struct {
+	// RequestID is a signed 32-bit identifier of the request.
+	RequestID int `json:"request_id"`
+	// UserIsBot pass True to request a bot,
+	// pass False to request a regular user.
+	// If not specified, no additional restrictions are applied.
+	//
+	// optional
+	UserIsBot bool `json:"user_is_bot,omitempty"`
+	// UserIsPremium pass True to request a premium user,
+	// pass False to request a non-premium user.
+	// If not specified, no additional restrictions are applied.
+	//
+	// optional
+	UserIsPremium bool `json:"user_is_premium,omitempty"`
+}
+
+// KeyboardButtonRequestChat defines the criteria used to request
+// a suitable chat. The identifier of the selected chat will be shared
+// with the bot when the corresponding button is pressed.
+type KeyboardButtonRequestChat struct {
+	// RequestID is a signed 32-bit identifier of the request.
+	RequestID int `json:"request_id"`
+	// ChatIsChannel pass True to request a channel chat,
+	// pass False to request a group or a supergroup chat.
+	ChatIsChannel bool `json:"chat_is_channel"`
+	// ChatIsForum pass True to request a forum supergroup,
+	// pass False to request a non-forum chat.
+	// If not specified, no additional restrictions are applied.
+	//
+	// optional
+	ChatIsForum bool `json:"chat_is_forum,omitempty"`
+	// ChatHasUsername pass True to request a supergroup or a channel with a username,
+	// pass False to request a chat without a username.
+	// If not specified, no additional restrictions are applied.
+	//
+	// optional
+	ChatHasUsername bool `json:"chat_has_username,omitempty"`
+	// ChatIsCreated pass True to request a chat owned by the user.
+	// Otherwise, no additional restrictions are applied.
+	//
+	// optional
+	ChatIsCreated bool `json:"chat_is_created,omitempty"`
+	// UserAdministratorRights is a JSON-serialized object listing
+	// the required administrator rights of the user in the chat.
+	// If not specified, no additional restrictions are applied.
+	//
+	// optional
+	UserAdministratorRights *ChatAdministratorRights `json:"user_administrator_rights,omitempty"`
+	// BotAdministratorRights is a JSON-serialized object listing
+	// the required administrator rights of the bot in the chat.
+	// The rights must be a subset of user_administrator_rights.
+	// If not specified, no additional restrictions are applied.
+	//
+	// optional
+	BotAdministratorRights *ChatAdministratorRights `json:"bot_administrator_rights,omitempty"`
+	// BotIsMember pass True to request a chat with the bot as a member.
+	// Otherwise, no additional restrictions are applied.
+	//
+	// optional
+	BotIsMember bool `json:"bot_is_member,omitempty"`
 }
 
 // KeyboardButtonPollType represents type of poll, which is allowed to
@@ -1347,6 +1650,12 @@ type InlineKeyboardButton struct {
 	//
 	// optional
 	CallbackData *string `json:"callback_data,omitempty"`
+	// WebApp is the Description of the Web App that will be launched when the user presses the button.
+	// The Web App will be able to send an arbitrary message on behalf of the user using the method
+	// answerWebAppQuery. Available only in private chats between a user and the bot.
+	//
+	// optional
+	WebApp *WebAppInfo `json:"web_app,omitempty"`
 	// SwitchInlineQuery if set, pressing the button will prompt the user to select one of their chats,
 	// open that chat and insert the bot's username and the specified inline query in the input field.
 	// Can be empty, in which case just the bot's username will be inserted.
@@ -1505,7 +1814,7 @@ type ChatInviteLink struct {
 	// be approved by chat administrators.
 	//
 	// optional
-	CreatesJoinRequest bool `json:"creates_join_request"`
+	CreatesJoinRequest bool `json:"creates_join_request,omitempty"`
 	// IsPrimary is true, if the link is primary.
 	IsPrimary bool `json:"is_primary"`
 	// IsRevoked is true, if the link is revoked.
@@ -1513,22 +1822,37 @@ type ChatInviteLink struct {
 	// Name is the name of the invite link.
 	//
 	// optional
-	Name string `json:"name"`
+	Name string `json:"name,omitempty"`
 	// ExpireDate is the point in time (Unix timestamp) when the link will
 	// expire or has been expired.
 	//
 	// optional
-	ExpireDate int `json:"expire_date"`
+	ExpireDate int `json:"expire_date,omitempty"`
 	// MemberLimit is the maximum number of users that can be members of the
 	// chat simultaneously after joining the chat via this invite link; 1-99999.
 	//
 	// optional
-	MemberLimit int `json:"member_limit"`
+	MemberLimit int `json:"member_limit,omitempty"`
 	// PendingJoinRequestCount is the number of pending join requests created
 	// using this link.
 	//
 	// optional
-	PendingJoinRequestCount int `json:"pending_join_request_count"`
+	PendingJoinRequestCount int `json:"pending_join_request_count,omitempty"`
+}
+
+type ChatAdministratorRights struct {
+	IsAnonymous         bool `json:"is_anonymous"`
+	CanManageChat       bool `json:"can_manage_chat"`
+	CanDeleteMessages   bool `json:"can_delete_messages"`
+	CanManageVideoChats bool `json:"can_manage_video_chats"`
+	CanRestrictMembers  bool `json:"can_restrict_members"`
+	CanPromoteMembers   bool `json:"can_promote_members"`
+	CanChangeInfo       bool `json:"can_change_info"`
+	CanInviteUsers      bool `json:"can_invite_users"`
+	CanPostMessages     bool `json:"can_post_messages"`
+	CanEditMessages     bool `json:"can_edit_messages"`
+	CanPinMessages      bool `json:"can_pin_messages"`
+	CanManageTopics     bool `json:"can_manage_topics"`
 }
 
 // ChatMember contains information about one member of a chat.
@@ -1552,7 +1876,7 @@ type ChatMember struct {
 	// in the chat is hidden
 	//
 	// optional
-	IsAnonymous bool `json:"is_anonymous"`
+	IsAnonymous bool `json:"is_anonymous,omitempty"`
 	// UntilDate restricted and kicked only.
 	// Date when restrictions will be lifted for this user;
 	// unix time.
@@ -1571,7 +1895,7 @@ type ChatMember struct {
 	// any other administrator privilege.
 	//
 	// optional
-	CanManageChat bool `json:"can_manage_chat"`
+	CanManageChat bool `json:"can_manage_chat,omitempty"`
 	// CanPostMessages administrators only.
 	// True, if the administrator can post in the channel;
 	// channels only.
@@ -1589,11 +1913,11 @@ type ChatMember struct {
 	//
 	// optional
 	CanDeleteMessages bool `json:"can_delete_messages,omitempty"`
-	// CanManageVoiceChats administrators only.
-	// True, if the administrator can manage voice chats.
+	// CanManageVideoChats administrators only.
+	// True, if the administrator can manage video chats.
 	//
 	// optional
-	CanManageVoiceChats bool `json:"can_manage_voice_chats"`
+	CanManageVideoChats bool `json:"can_manage_video_chats,omitempty"`
 	// CanRestrictMembers administrators only.
 	// True, if the administrator can restrict, ban or unban chat members.
 	//
@@ -1621,6 +1945,12 @@ type ChatMember struct {
 	//
 	// optional
 	CanPinMessages bool `json:"can_pin_messages,omitempty"`
+	// CanManageTopics administrators and restricted only.
+	// True, if the user is allowed to create, rename,
+	// close, and reopen forum topics; supergroups only
+	//
+	// optional
+	CanManageTopics bool `json:"can_manage_topics,omitempty"`
 	// IsMember is true, if the user is a member of the chat at the moment of
 	// the request
 	IsMember bool `json:"is_member"`
@@ -1628,11 +1958,36 @@ type ChatMember struct {
 	//
 	// optional
 	CanSendMessages bool `json:"can_send_messages,omitempty"`
-	// CanSendMediaMessages restricted only.
-	// True, if the user is allowed to send text messages, contacts, locations and venues
+	// CanSendAudios restricted only.
+	// True, if the user is allowed to send audios
 	//
 	// optional
-	CanSendMediaMessages bool `json:"can_send_media_messages,omitempty"`
+	CanSendAudios bool
+	// CanSendDocuments restricted only.
+	// True, if the user is allowed to send documents
+	//
+	// optional
+	CanSendDocuments bool
+	// CanSendPhotos is restricted only.
+	// True, if the user is allowed to send photos
+	//
+	// optional
+	CanSendPhotos bool
+	// CanSendVideos restricted only.
+	// True, if the user is allowed to send videos
+	//
+	// optional
+	CanSendVideos bool
+	// CanSendVideoNotes restricted only.
+	// True, if the user is allowed to send video notes
+	//
+	// optional
+	CanSendVideoNotes bool
+	// CanSendVoiceNotes restricted only.
+	// True, if the user is allowed to send voice notes
+	//
+	// optional
+	CanSendVoiceNotes bool
 	// CanSendPolls restricted only.
 	// True, if the user is allowed to send polls
 	//
@@ -1663,6 +2018,27 @@ func (chat ChatMember) HasLeft() bool { return chat.Status == "left" }
 // WasKicked returns if the ChatMember was kicked from the chat.
 func (chat ChatMember) WasKicked() bool { return chat.Status == "kicked" }
 
+// SetCanSendMediaMessages is a method to replace field "can_send_media_messages".
+// It sets CanSendAudio, CanSendDocuments, CanSendPhotos, CanSendVideos,
+// CanSendVideoNotes, CanSendVoiceNotes to passed value.
+func (chat *ChatMember) SetCanSendMediaMessages(b bool) {
+	chat.CanSendAudios = b
+	chat.CanSendDocuments = b
+	chat.CanSendPhotos = b
+	chat.CanSendVideos = b
+	chat.CanSendVideoNotes = b
+	chat.CanSendVoiceNotes = b
+}
+
+// CanSendMediaMessages method to replace field "can_send_media_messages".
+// It returns true if CanSendAudio and CanSendDocuments and CanSendPhotos and CanSendVideos and
+// CanSendVideoNotes and CanSendVoiceNotes are true.
+func (chat *ChatMember) CanSendMediaMessages() bool {
+	return chat.CanSendAudios && chat.CanSendDocuments &&
+		chat.CanSendPhotos && chat.CanSendVideos &&
+		chat.CanSendVideoNotes && chat.CanSendVoiceNotes
+}
+
 // ChatMemberUpdated represents changes in the status of a chat member.
 type ChatMemberUpdated struct {
 	// Chat the user belongs to.
@@ -1679,7 +2055,7 @@ type ChatMemberUpdated struct {
 	// for joining by invite link events only.
 	//
 	// optional
-	InviteLink *ChatInviteLink `json:"invite_link"`
+	InviteLink *ChatInviteLink `json:"invite_link,omitempty"`
 }
 
 // ChatJoinRequest represents a join request sent to a chat.
@@ -1688,16 +2064,18 @@ type ChatJoinRequest struct {
 	Chat Chat `json:"chat"`
 	// User that sent the join request.
 	From User `json:"from"`
+	// UserChatID identifier of a private chat with the user who sent the join request.
+	UserChatID int64 `json:"user_chat_id"`
 	// Date the request was sent in Unix time.
 	Date int `json:"date"`
 	// Bio of the user.
 	//
 	// optional
-	Bio string `json:"bio"`
+	Bio string `json:"bio,omitempty"`
 	// InviteLink is the link that was used by the user to send the join request.
 	//
 	// optional
-	InviteLink *ChatInviteLink `json:"invite_link"`
+	InviteLink *ChatInviteLink `json:"invite_link,omitempty"`
 }
 
 // ChatPermissions describes actions that a non-administrator user is
@@ -1708,12 +2086,30 @@ type ChatPermissions struct {
 	//
 	// optional
 	CanSendMessages bool `json:"can_send_messages,omitempty"`
-	// CanSendMediaMessages is true, if the user is allowed to send audios,
-	// documents, photos, videos, video notes and voice notes, implies
-	// can_send_messages
+	// CanSendAudios is true, if the user is allowed to send audios
 	//
 	// optional
-	CanSendMediaMessages bool `json:"can_send_media_messages,omitempty"`
+	CanSendAudios bool
+	// CanSendDocuments is true, if the user is allowed to send documents
+	//
+	// optional
+	CanSendDocuments bool
+	// CanSendPhotos is true, if the user is allowed to send photos
+	//
+	// optional
+	CanSendPhotos bool
+	// CanSendVideos is true, if the user is allowed to send videos
+	//
+	// optional
+	CanSendVideos bool
+	// CanSendVideoNotes is true, if the user is allowed to send video notes
+	//
+	// optional
+	CanSendVideoNotes bool
+	// CanSendVoiceNotes is true, if the user is allowed to send voice notes
+	//
+	// optional
+	CanSendVoiceNotes bool
 	// CanSendPolls is true, if the user is allowed to send polls, implies
 	// can_send_messages
 	//
@@ -1744,6 +2140,32 @@ type ChatPermissions struct {
 	//
 	// optional
 	CanPinMessages bool `json:"can_pin_messages,omitempty"`
+	// CanManageTopics is true, if the user is allowed to create forum topics.
+	// If omitted defaults to the value of can_pin_messages
+	//
+	// optional
+	CanManageTopics bool `json:"can_manage_topics,omitempty"`
+}
+
+// SetCanSendMediaMessages is a method to replace field "can_send_media_messages".
+// It sets CanSendAudio, CanSendDocuments, CanSendPhotos, CanSendVideos,
+// CanSendVideoNotes, CanSendVoiceNotes to passed value.
+func (c *ChatPermissions) SetCanSendMediaMessages(b bool) {
+	c.CanSendAudios = b
+	c.CanSendDocuments = b
+	c.CanSendPhotos = b
+	c.CanSendVideos = b
+	c.CanSendVideoNotes = b
+	c.CanSendVoiceNotes = b
+}
+
+// CanSendMediaMessages method to replace field "can_send_media_messages".
+// It returns true if CanSendAudio and CanSendDocuments and CanSendPhotos and CanSendVideos and
+// CanSendVideoNotes and CanSendVoiceNotes are true.
+func (c *ChatPermissions) CanSendMediaMessages() bool {
+	return c.CanSendAudios && c.CanSendDocuments &&
+		c.CanSendPhotos && c.CanSendVideos &&
+		c.CanSendVideoNotes && c.CanSendVoiceNotes
 }
 
 // ChatLocation represents a location to which a chat is connected.
@@ -1756,6 +2178,21 @@ type ChatLocation struct {
 	Address string `json:"address"`
 }
 
+// ForumTopic represents a forum topic.
+type ForumTopic struct {
+	// MessageThreadID is the unique identifier of the forum topic
+	MessageThreadID int `json:"message_thread_id"`
+	// Name is the name of the topic
+	Name string `json:"name"`
+	// IconColor is the color of the topic icon in RGB format
+	IconColor int `json:"icon_color"`
+	// IconCustomEmojiID is the unique identifier of the custom emoji
+	// shown as the topic icon
+	//
+	// optional
+	IconCustomEmojiID string `json:"icon_custom_emoji_id,omitempty"`
+}
+
 // BotCommand represents a bot command.
 type BotCommand struct {
 	// Command text of the command, 1-32 characters.
@@ -1775,6 +2212,20 @@ type BotCommandScope struct {
 	UserID int64  `json:"user_id,omitempty"`
 }
 
+// MenuButton describes the bot's menu button in a private chat.
+type MenuButton struct {
+	// Type is the type of menu button, must be one of:
+	// - `commands`
+	// - `web_app`
+	// - `default`
+	Type string `json:"type"`
+	// Text is the text on the button, for `web_app` type.
+	Text string `json:"text,omitempty"`
+	// WebApp is the description of the Web App that will be launched when the
+	// user presses the button for the `web_app` type.
+	WebApp *WebAppInfo `json:"web_app,omitempty"`
+}
+
 // ResponseParameters are various errors that can be returned in APIResponse.
 type ResponseParameters struct {
 	// The group has been migrated to a supergroup with the specified identifier.
@@ -1814,7 +2265,11 @@ type BaseInputMedia struct {
 	// which can be specified instead of parse_mode
 	//
 	// optional
-	CaptionEntities []MessageEntity `json:"caption_entities"`
+	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
+	// HasSpoiler pass True, if the photo needs to be covered with a spoiler animation
+	//
+	// optional
+	HasSpoiler bool `json:"has_spoiler,omitempty"`
 }
 
 // InputMediaPhoto is a photo to send as part of a media group.
@@ -1846,6 +2301,10 @@ type InputMediaVideo struct {
 	//
 	// optional
 	SupportsStreaming bool `json:"supports_streaming,omitempty"`
+	// HasSpoiler pass True, if the video needs to be covered with a spoiler animation
+	//
+	// optional
+	HasSpoiler bool `json:"has_spoiler,omitempty"`
 }
 
 // InputMediaAnimation is an animation to send as part of a media group.
@@ -1868,6 +2327,10 @@ type InputMediaAnimation struct {
 	//
 	// optional
 	Duration int `json:"duration,omitempty"`
+	// HasSpoiler pass True, if the photo needs to be covered with a spoiler animation
+	//
+	// optional
+	HasSpoiler bool `json:"has_spoiler,omitempty"`
 }
 
 // InputMediaAudio is an audio to send as part of a media group.
@@ -1908,6 +2371,13 @@ type InputMediaDocument struct {
 	DisableContentTypeDetection bool `json:"disable_content_type_detection,omitempty"`
 }
 
+// Constant values for sticker types
+const (
+	StickerTypeRegular     = "regular"
+	StickerTypeMask        = "mask"
+	StickerTypeCustomEmoji = "custom_emoji"
+)
+
 // Sticker represents a sticker.
 type Sticker struct {
 	// FileID is an identifier for this file, which can be used to download or
@@ -1917,6 +2387,10 @@ type Sticker struct {
 	// which is supposed to be the same over time and for different bots.
 	// Can't be used to download or reuse the file.
 	FileUniqueID string `json:"file_unique_id"`
+	// Type is a type of the sticker, currently one of “regular”,
+	// “mask”, “custom_emoji”. The type of the sticker is independent
+	// from its format, which is determined by the fields is_animated and is_video.
+	Type string `json:"type"`
 	// Width sticker width
 	Width int `json:"width"`
 	// Height sticker height
@@ -1925,6 +2399,10 @@ type Sticker struct {
 	//
 	// optional
 	IsAnimated bool `json:"is_animated,omitempty"`
+	// IsVideo true, if the sticker is a video sticker
+	//
+	// optional
+	IsVideo bool `json:"is_video,omitempty"`
 	// Thumbnail sticker thumbnail in the .WEBP or .JPG format
 	//
 	// optional
@@ -1937,26 +2415,55 @@ type Sticker struct {
 	//
 	// optional
 	SetName string `json:"set_name,omitempty"`
+	// PremiumAnimation for premium regular stickers, premium animation for the sticker
+	//
+	// optional
+	PremiumAnimation *File `json:"premium_animation,omitempty"`
 	// MaskPosition is for mask stickers, the position where the mask should be
 	// placed
 	//
 	// optional
 	MaskPosition *MaskPosition `json:"mask_position,omitempty"`
+	// CustomEmojiID for custom emoji stickers, unique identifier of the custom emoji
+	//
+	// optional
+	CustomEmojiID string `json:"custom_emoji_id,omitempty"`
 	// FileSize
 	//
 	// optional
 	FileSize int `json:"file_size,omitempty"`
 }
 
+// IsRegular returns if the Sticker is regular
+func (s Sticker) IsRegular() bool {
+	return s.Type == StickerTypeRegular
+}
+
+// IsMask returns if the Sticker is mask
+func (s Sticker) IsMask() bool {
+	return s.Type == StickerTypeMask
+}
+
+// IsCustomEmoji returns if the Sticker is custom emoji
+func (s Sticker) IsCustomEmoji() bool {
+	return s.Type == StickerTypeCustomEmoji
+}
+
 // StickerSet represents a sticker set.
 type StickerSet struct {
 	// Name sticker set name
 	Name string `json:"name"`
 	// Title sticker set title
 	Title string `json:"title"`
+	// StickerType of stickers in the set, currently one of “regular”, “mask”, “custom_emoji”
+	StickerType string `json:"sticker_type"`
 	// IsAnimated true, if the sticker set contains animated stickers
 	IsAnimated bool `json:"is_animated"`
+	// IsVideo true, if the sticker set contains video stickers
+	IsVideo bool `json:"is_video"`
 	// ContainsMasks true, if the sticker set contains masks
+	//
+	// deprecated. Use sticker_type instead
 	ContainsMasks bool `json:"contains_masks"`
 	// Stickers list of all set stickers
 	Stickers []Sticker `json:"stickers"`
@@ -1964,6 +2471,21 @@ type StickerSet struct {
 	Thumbnail *PhotoSize `json:"thumb"`
 }
 
+// IsRegular returns if the StickerSet is regular
+func (s StickerSet) IsRegular() bool {
+	return s.StickerType == StickerTypeRegular
+}
+
+// IsMask returns if the StickerSet is mask
+func (s StickerSet) IsMask() bool {
+	return s.StickerType == StickerTypeMask
+}
+
+// IsCustomEmoji returns if the StickerSet is custom emoji
+func (s StickerSet) IsCustomEmoji() bool {
+	return s.StickerType == StickerTypeCustomEmoji
+}
+
 // MaskPosition describes the position on faces where a mask should be placed
 // by default.
 type MaskPosition struct {
@@ -2043,6 +2565,9 @@ type WebhookInfo struct {
 	//
 	// optional
 	LastErrorMessage string `json:"last_error_message,omitempty"`
+	// LastSynchronizationErrorDate is the unix time of the most recent error that
+	// happened when trying to synchronize available updates with Telegram datacenters.
+	LastSynchronizationErrorDate int `json:"last_synchronization_error_date,omitempty"`
 	// MaxConnections maximum allowed number of simultaneous
 	// HTTPS connections to the webhook for update delivery.
 	//
@@ -2077,7 +2602,7 @@ type InlineQuery struct {
 	// unless the request was sent from a secret chat
 	//
 	// optional
-	ChatType string `json:"chat_type"`
+	ChatType string `json:"chat_type,omitempty"`
 	// Location sender location, only for bots that request user location.
 	//
 	// optional
@@ -2590,23 +3115,23 @@ type InlineQueryResultLocation struct {
 	// measured in meters; 0-1500
 	//
 	// optional
-	HorizontalAccuracy float64 `json:"horizontal_accuracy"`
+	HorizontalAccuracy float64 `json:"horizontal_accuracy,omitempty"`
 	// LivePeriod is the period in seconds for which the location can be
 	// updated, should be between 60 and 86400.
 	//
 	// optional
-	LivePeriod int `json:"live_period"`
+	LivePeriod int `json:"live_period,omitempty"`
 	// Heading is for live locations, a direction in which the user is moving,
 	// in degrees. Must be between 1 and 360 if specified.
 	//
 	// optional
-	Heading int `json:"heading"`
+	Heading int `json:"heading,omitempty"`
 	// ProximityAlertRadius is for live locations, a maximum distance for
 	// proximity alerts about approaching another chat member, in meters. Must
 	// be between 1 and 100000 if specified.
 	//
 	// optional
-	ProximityAlertRadius int `json:"proximity_alert_radius"`
+	ProximityAlertRadius int `json:"proximity_alert_radius,omitempty"`
 	// ReplyMarkup inline keyboard attached to the message
 	//
 	// optional
@@ -2640,15 +3165,15 @@ type InlineQueryResultMPEG4GIF struct {
 	// Width video width
 	//
 	// optional
-	Width int `json:"mpeg4_width"`
+	Width int `json:"mpeg4_width,omitempty"`
 	// Height vVideo height
 	//
 	// optional
-	Height int `json:"mpeg4_height"`
+	Height int `json:"mpeg4_height,omitempty"`
 	// Duration video duration
 	//
 	// optional
-	Duration int `json:"mpeg4_duration"`
+	Duration int `json:"mpeg4_duration,omitempty"`
 	// ThumbURL url of the static (JPEG or GIF) or animated (MPEG4) thumbnail for the result.
 	ThumbURL string `json:"thumb_url"`
 	// Title for the result
@@ -2896,6 +3421,16 @@ type ChosenInlineResult struct {
 	Query string `json:"query"`
 }
 
+// SentWebAppMessage contains information about an inline message sent by a Web App
+// on behalf of a user.
+type SentWebAppMessage struct {
+	// Identifier of the sent inline message. Available only if there is an inline
+	// keyboard attached to the message.
+	//
+	// optional
+	InlineMessageID string `json:"inline_message_id,omitempty"`
+}
+
 // InputTextMessageContent contains text for displaying
 // as an inline query result.
 type InputTextMessageContent struct {
@@ -2929,7 +3464,7 @@ type InputLocationMessageContent struct {
 	// measured in meters; 0-1500
 	//
 	// optional
-	HorizontalAccuracy float64 `json:"horizontal_accuracy"`
+	HorizontalAccuracy float64 `json:"horizontal_accuracy,omitempty"`
 	// LivePeriod is the period in seconds for which the location can be
 	// updated, should be between 60 and 86400
 	//
@@ -2939,13 +3474,13 @@ type InputLocationMessageContent struct {
 	// in degrees. Must be between 1 and 360 if specified.
 	//
 	// optional
-	Heading int `json:"heading"`
+	Heading int `json:"heading,omitempty"`
 	// ProximityAlertRadius is for live locations, a maximum distance for
 	// proximity alerts about approaching another chat member, in meters. Must
 	// be between 1 and 100000 if specified.
 	//
 	// optional
-	ProximityAlertRadius int `json:"proximity_alert_radius"`
+	ProximityAlertRadius int `json:"proximity_alert_radius,omitempty"`
 }
 
 // InputVenueMessageContent contains a venue for displaying
@@ -2970,11 +3505,11 @@ type InputVenueMessageContent struct {
 	// GooglePlaceID is the Google Places identifier of the venue
 	//
 	// optional
-	GooglePlaceID string `json:"google_place_id"`
+	GooglePlaceID string `json:"google_place_id,omitempty"`
 	// GooglePlaceType is the Google Places type of the venue
 	//
 	// optional
-	GooglePlaceType string `json:"google_place_type"`
+	GooglePlaceType string `json:"google_place_type,omitempty"`
 }
 
 // InputContactMessageContent contains a contact for displaying
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1b9fa5bf..2f650c86 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -83,9 +83,6 @@ github.com/fsnotify/fsnotify
 # github.com/go-asn1-ber/asn1-ber v1.5.3
 ## explicit; go 1.13
 github.com/go-asn1-ber/asn1-ber
-# github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
-## explicit; go 1.16
-github.com/go-telegram-bot-api/telegram-bot-api/v5
 # github.com/golang-jwt/jwt v3.2.2+incompatible
 ## explicit
 github.com/golang-jwt/jwt
@@ -234,6 +231,9 @@ github.com/matterbridge/logrus-prefixed-formatter
 # github.com/matterbridge/matterclient v0.0.0-20221106190440-8bcf49695e0d
 ## explicit; go 1.17
 github.com/matterbridge/matterclient
+# github.com/matterbridge/telegram-bot-api/v6 v6.5.0
+## explicit; go 1.16
+github.com/matterbridge/telegram-bot-api/v6
 # github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404
 ## explicit
 github.com/mattermost/go-i18n/i18n

From 24cf007a74bf1e04456ae05c9ccc73b1fb823b88 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Tue, 14 Mar 2023 23:05:48 +0100
Subject: [PATCH 23/25] Update matterbridge.toml.sample

---
 matterbridge.toml.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 96104501..db413852 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -1956,6 +1956,7 @@ enable=true
     #   nctalk   |      token         |           xs25tz5y            | The token in the URL when you are in a chat. It will be the last part of the URL.
     # -------------------------------------------------------------------------------------------------------------------------------------
     #  telegram  |      chatid        |          -123456789           | A large negative number. see https://www.linkedin.com/pulse/telegram-bots-beginners-marco-frau
+    #            |   chatid/topicid   |          -123456789/12        | A large negative number/number.
     # -------------------------------------------------------------------------------------------------------------------------------------
     #  vk        |      peerid        |          2000000002           | A number that starts form 2000000000. Use --debug and send any message in chat to get PeerID in the logs
     # -------------------------------------------------------------------------------------------------------------------------------------

From d42277979abcefe885bb068cad989eaf71460872 Mon Sep 17 00:00:00 2001
From: Joseph Mansy <36427684+yousefmansy1@users.noreply.github.com>
Date: Tue, 14 Mar 2023 15:12:45 -0700
Subject: [PATCH 24/25] Support topic changes and Join/Leave messages
 (whatsapp) (#2017)

---
 bridge/whatsappmulti/handlers.go | 73 ++++++++++++++++++++++++++++++++
 bridge/whatsappmulti/helpers.go  | 23 ++++++++++
 2 files changed, 96 insertions(+)

diff --git a/bridge/whatsappmulti/handlers.go b/bridge/whatsappmulti/handlers.go
index ae825f75..8791df5e 100644
--- a/bridge/whatsappmulti/handlers.go
+++ b/bridge/whatsappmulti/handlers.go
@@ -21,9 +21,82 @@ func (b *Bwhatsapp) eventHandler(evt interface{}) {
 	switch e := evt.(type) {
 	case *events.Message:
 		b.handleMessage(e)
+	case *events.GroupInfo:
+		b.handleGroupInfo(e)
 	}
 }
 
+func (b *Bwhatsapp) handleGroupInfo(event *events.GroupInfo) {
+
+	b.Log.Debugf("Receiving event %#v", event)
+
+	switch {
+	case event.Join != nil:
+		b.handleUserJoin(event)
+	case event.Leave != nil:
+		b.handleUserLeave(event)
+	case event.Topic != nil:
+		b.handleTopicChange(event)
+	}
+}
+
+func (b *Bwhatsapp) handleUserJoin(event *events.GroupInfo) {
+	for _, joinedJid := range event.Join {
+		senderName := b.getSenderNameFromJID(joinedJid)
+
+		rmsg := config.Message{
+			UserID:   joinedJid.String(),
+			Username: senderName,
+			Channel:  event.JID.String(),
+			Account:  b.Account,
+			Protocol: b.Protocol,
+			Event:    config.EventJoinLeave,
+			Text:     "joined chat",
+		}
+
+		b.Remote <- rmsg
+	}
+}
+func (b *Bwhatsapp) handleUserLeave(event *events.GroupInfo) {
+	for _, leftJid := range event.Leave {
+		senderName := b.getSenderNameFromJID(leftJid)
+
+		rmsg := config.Message{
+			UserID:   leftJid.String(),
+			Username: senderName,
+			Channel:  event.JID.String(),
+			Account:  b.Account,
+			Protocol: b.Protocol,
+			Event:    config.EventJoinLeave,
+			Text:     "left chat",
+		}
+
+		b.Remote <- rmsg
+	}
+}
+func (b *Bwhatsapp) handleTopicChange(event *events.GroupInfo) {
+	msg := event.Topic
+	senderJid := msg.TopicSetBy
+	senderName := b.getSenderNameFromJID(senderJid)
+
+	text := msg.Topic
+	if text == "" {
+		text = "removed topic"
+	}
+
+	rmsg := config.Message{
+		UserID:   senderJid.String(),
+		Username: senderName,
+		Channel:  event.JID.String(),
+		Account:  b.Account,
+		Protocol: b.Protocol,
+		Event:    config.EventTopicChange,
+		Text:     "Topic changed: " + text,
+	}
+
+	b.Remote <- rmsg
+}
+
 func (b *Bwhatsapp) handleMessage(message *events.Message) {
 	msg := message.Message
 	switch {
diff --git a/bridge/whatsappmulti/helpers.go b/bridge/whatsappmulti/helpers.go
index 963eafa1..b0686190 100644
--- a/bridge/whatsappmulti/helpers.go
+++ b/bridge/whatsappmulti/helpers.go
@@ -64,6 +64,29 @@ func (b *Bwhatsapp) getSenderName(info types.MessageInfo) string {
 	return "Someone"
 }
 
+func (b *Bwhatsapp) getSenderNameFromJID(senderJid types.JID) string {
+	sender, exists := b.contacts[senderJid]
+
+	if !exists || (sender.FullName == "" && sender.FirstName == "") {
+		b.reloadContacts() // Contacts may need to be reloaded
+		sender, exists = b.contacts[senderJid]
+	}
+
+	if exists && sender.FullName != "" {
+		return sender.FullName
+	}
+
+	if exists && sender.FirstName != "" {
+		return sender.FirstName
+	}
+
+	if sender.PushName != "" {
+		return sender.PushName
+	}
+
+	return "Someone"
+}
+
 func (b *Bwhatsapp) getSenderNotify(senderJid types.JID) string {
 	sender, exists := b.contacts[senderJid]
 

From 839f384e45ce518e3ed67a9f51b4593b28c1a79b Mon Sep 17 00:00:00 2001
From: Joseph Mansy <36427684+yousefmansy1@users.noreply.github.com>
Date: Tue, 14 Mar 2023 15:16:22 -0700
Subject: [PATCH 25/25] Return a message ID when sending with a webhook
 (discord) (#1976)

Resolves #1975
---
 bridge/discord/webhook.go | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/bridge/discord/webhook.go b/bridge/discord/webhook.go
index c34fc945..b518ea62 100644
--- a/bridge/discord/webhook.go
+++ b/bridge/discord/webhook.go
@@ -47,8 +47,9 @@ func (b *Bdiscord) maybeGetLocalAvatar(msg *config.Message) string {
 // Returns messageID and error.
 func (b *Bdiscord) webhookSend(msg *config.Message, channelID string) (*discordgo.Message, error) {
 	var (
-		res *discordgo.Message
-		err error
+		res  *discordgo.Message
+		res2 *discordgo.Message
+		err  error
 	)
 
 	// If avatar is unset, mutate the message to include the local avatar (but only if settings say we should do this)
@@ -84,7 +85,7 @@ func (b *Bdiscord) webhookSend(msg *config.Message, channelID string) (*discordg
 			}
 			content := fi.Comment
 
-			_, e2 := b.transmitter.Send(
+			res2, err = b.transmitter.Send(
 				channelID,
 				&discordgo.WebhookParams{
 					Username:        msg.Username,
@@ -94,11 +95,16 @@ func (b *Bdiscord) webhookSend(msg *config.Message, channelID string) (*discordg
 					AllowedMentions: b.getAllowedMentions(),
 				},
 			)
-			if e2 != nil {
-				b.Log.Errorf("Could not send file %#v for message %#v: %s", file, msg, e2)
+			if err != nil {
+				b.Log.Errorf("Could not send file %#v for message %#v: %s", file, msg, err)
 			}
 		}
 	}
+
+	if msg.Text == "" {
+		res = res2
+	}
+
 	return res, err
 }